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

fix reduce_skill max_week calculation.

Browse source
This commit is contained in:
Enno Rehling 2018-01-26 18:18:12 +01:00
parent ff85cda724
commit ed623732d3
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/kernel/skills.c
View file

@ -178,6 +178,7 @@ void sk_set(skill * sv, int level)
assert(sv && level != 0); assert(sv && level != 0);
sv->weeks = skill_weeks(level); sv->weeks = skill_weeks(level);
sv->level = level; sv->level = level;
assert(sv->weeks <= sv->level * 2 + 1);
} }
static bool rule_random_progress(void) static bool rule_random_progress(void)
@ -215,6 +216,7 @@ void increase_skill(unit * u, skill_t sk, int weeks)
sk_set(sv, sv->level + 1); sk_set(sv, sv->level + 1);
} }
sv->weeks -= weeks; sv->weeks -= weeks;
assert(sv->weeks <= sv->level * 2 + 1);
} }
void reduce_skill(unit * u, skill * sv, int weeks) void reduce_skill(unit * u, skill * sv, int weeks)
@ -229,11 +231,13 @@ void reduce_skill(unit * u, skill * sv, int weeks)
while (sv->level > 0 && sv->weeks > max_weeks) { while (sv->level > 0 && sv->weeks > max_weeks) {
sv->weeks -= sv->level; sv->weeks -= sv->level;
--sv->level; --sv->level;
max_weeks -= 2;
} }
if (sv->level == 0) { if (sv->level == 0) {
/* reroll */ /* reroll */
sv->weeks = skill_weeks(sv->level); sv->weeks = skill_weeks(sv->level);
} }
assert(sv->weeks <= sv->level * 2 + 1);
} }
int skill_compare(const skill * sk, const skill * sc) int skill_compare(const skill * sk, const skill * sc)