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

update/revolt: Fix body count report

Browse source 
The body count reflects what take_casualties() should do, not what it
actually does.  It can be quite off, as the update test's changed
output shows.  Mostly because take_casualties() is utterly confused.
That'll be fixed next.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-09-18 11:27:30 +02:00
parent e55fb2227b
commit f0a0de54b7
3 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/update/99-POGO
View file

@ -182,10 +182,8 @@ land 0:31,-16:-1
| BUG: "Sector -12,-8 has been retaken!" instead of takeover
| -10,-8 che win, don't take over
| -8,-8 che lose
| BUG: body count off, claims 7m, actually 11m
| BUG: che kill 4m more than they should
| -6,-8 che lose
| BUG: body count off, claims 26m, actually 50m
| BUG: inf#29 shouldn't die
| plague stage 4 (dying) -16:-1,-6 ship#10 land#10
| -16,-6 reverts to deity

4
tests/update/journal.log
View file

@ -1374,10 +1374,10 @@
Play#0 output Play#0 1 Guerrilla warfare in -10,-8
Play#0 output Play#0 1 body count: troops: 10, rebels: 5
Play#0 output Play#0 1 Guerrilla warfare in -8,-8
Play#0 output Play#0 1 body count: troops: 7, rebels: 22
Play#0 output Play#0 1 body count: troops: 11, rebels: 22
Play#0 output Play#0 1 inf infantry #29 dies fighting guerrillas in -6,-8
Play#0 output Play#0 1 Guerrilla warfare in -6,-8
Play#0 output Play#0 1 body count: troops: 26, rebels: 52
Play#0 output Play#0 1 body count: troops: 50, rebels: 52
Play#0 output Play#0 1 Revolutionary subversion reported in -13,-7!
Play#0 output Play#0 1 PLAGUE deaths reported in -16,-6
Play#0 output Play#0 1 PLAGUE deaths reported in -14,-6