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

new volcano damage calculation was broken.

This commit is contained in:
Enno Rehling 2021-03-24 20:55:51 +01:00
parent 335740d12b
commit 19db01af67
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/volcano.c
View File

@ -92,6 +92,7 @@ int volcano_damage(unit* u, const char* dice)
}
for (i = 0; i != u->number; ++i) {
int h = hp + ((i < remain) ? 1 : 0);
int damage = dice_rand(dice) - protect;
if (damage > 0) {
if (i == 0 || ac > 0) {
@ -99,32 +100,27 @@ int volcano_damage(unit* u, const char* dice)
damage -= ac;
}
if (damage > 0) {
int h = hp + ((i < remain) ? 1 : 0);
if (damage >= h) {
if (rc_cat && u_race(u) == rc_cat && ((rng_int() % 7) == 0)) {
/* cats have nine lives */
total += h;
continue;
}
else if (healings > 0) {
--healings;
if (resurrect_unit(u)) {
/* take no damage at all */
total += h;
continue;
}
}
++dead;
damage = h;
}
else {
total += (h - damage);
}
total += damage;
}
}
}
scale_number(u, u->number - dead);
u->hp = total;
u->hp -= total;
return dead;
}