Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

http://bugs.eressea.de/view.php?id=1651

Browse source 
"Temp-Einheiten erben Lernschwelle nicht"
This commit is contained in:
Enno Rehling 2009-10-20 17:04:31 +00:00
parent c54e3f3be5
commit b83ae9fb58
1 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/common/kernel/unit.c
View file

@ -929,37 +929,44 @@ transfermen(unit * u, unit * u2, int n)
assert(u2->number+n>0); assert(u2->number+n>0);
for (sk=0; sk!=MAXSKILLS; ++sk) { for (sk=0; sk!=MAXSKILLS; ++sk) {
double dlevel = 0.0;
int weeks, level = 0; int weeks, level = 0;
sv = get_skill(u, sk); sv = get_skill(u, sk);
sn = get_skill(u2, sk); sn = get_skill(u2, sk);
if (sv==NULL && sn==NULL) continue; if (sv==NULL && sn==NULL) continue;
if (sv && sv->level) { if (sn==NULL && u2->number==0) {
dlevel += (sv->level + 1 - sv->weeks/(sv->level+1.0)) * n; /* new unit, easy to solve */
level += sv->level * n; level = sv->level;
} weeks = sv->weeks;
if (sn && sn->level) {
dlevel += (sn->level + 1 - sn->weeks/(sn->level+1.0)) * u2->number;
level += sn->level * u2->number;
}
dlevel = dlevel / (n + u2->number);
level = level / (n + u2->number);
if (level<=dlevel) {
/* apply the remaining fraction to the number of weeks to go.
* subtract the according number of weeks, getting closer to the
* next level */
level = (int)dlevel;
weeks = (level+1) - (int)((dlevel - level) * (level+1));
} else { } else {
/* make it harder to reach the next level. double dlevel = 0.0;
* weeks+level is the max difficulty, 1 - the fraction between
* level and dlevel applied to the number of weeks between this if (sv && sv->level) {
* and the previous level is the added difficutly */ dlevel += (sv->level + 1 - sv->weeks/(sv->level+1.0)) * n;
level = (int)dlevel+1; level += sv->level * n;
weeks = 1 + 2 * level - (int)((1 + dlevel - level) * level); }
if (sn && sn->level) {
dlevel += (sn->level + 1 - sn->weeks/(sn->level+1.0)) * u2->number;
level += sn->level * u2->number;
}
dlevel = dlevel / (n + u2->number);
level = level / (n + u2->number);
if (level<=dlevel) {
/* apply the remaining fraction to the number of weeks to go.
* subtract the according number of weeks, getting closer to the
* next level */
level = (int)dlevel;
weeks = (level+1) - (int)((dlevel - level) * (level+1));
} else {
/* make it harder to reach the next level.
* weeks+level is the max difficulty, 1 - the fraction between
* level and dlevel applied to the number of weeks between this
* and the previous level is the added difficutly */
level = (int)dlevel+1;
weeks = 1 + 2 * level - (int)((1 + dlevel - level) * level);
}
} }
if (level) { if (level) {
if (sn==NULL) sn = add_skill(u2, sk); if (sn==NULL) sn = add_skill(u2, sk);