empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update/revolt: Fix land unit casualties

Browse source 
Fix the bug demonstrated by the previous commit:
take_casualties_from_lands() limits total casualties to @each.  It
should limit each land unit's casualties, and only if !may_kill.  This
can lead to fewer casualties than called for; oops in
take_casualties().  Broken in commit 025e9cc25, v4.4.0.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2018-04-10 16:31:11 +02:00
parent d111522fe8
commit 60429028e7
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/update/journal.log
View file

@ -1364,11 +1364,11 @@
Play#0 output Play#0 1 rebels murder 2 military
Play#0 output Play#0 1 Partisans take over -14,-8!
Play#0 output Play#0 1 sec security #25 kills 4 guerrillas in raid at -12,-8!
Play#0 output Play#0 1 sec security #27 dies fighting guerrillas in -12,-8
Play#0 output Play#0 1 sec security #25 blown up by the crew when POGO took -12,-8!
Play#0 output Play#0 1 inf infantry #26 captured when POGO took -12,-8!
Play#0 output Play#0 1 sec security #27 blown up by the crew when POGO took -12,-8!
Play#0 output Play#0 1 Guerrilla warfare in -12,-8
Play#0 output Play#0 1 rebels murder 59 military
Play#0 output Play#0 1 rebels murder 70 military
Play#0 output Play#0 1 Partisans take over -12,-8!
Play#0 output Play#0 1 Guerrilla warfare in -10,-8
Play#0 output Play#0 1 body count: troops: 10, rebels: 5