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

torpedo: Fix mobility cost of retreat after hit

Browse source 
torp() applies torpedo damage after retreat.  Wrong, because mobility
cost increases with damage.  Broken since retreat was added in
Chainsaw.

Fix by applying damage before retreat.  Bonus: bulletins make more
sense.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-04 13:12:48 +01:00
parent b14f5276ab
commit f9316f71c4
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/commands/torp.c
View file

@ -31,7 +31,7 @@
* Thomas Ruschak, 1992
* Ken Stevens, 1995
* Steve McClure, 2000
* Markus Armbruster, 2004-2010
* Markus Armbruster, 2004-2015
*/
#include <config.h>
@ -178,11 +178,9 @@ torp(void)
wu(0, vshipown, "%s in %s torpedoed %s for %d damage.\n",
prsub(&sub), xyas(sub.shp_x, sub.shp_y, vshipown),
prship(&vship), dam);
if (vship.shp_rflags & RET_TORPED) {
shipdamage(&vship, dam);
if (vship.shp_rflags & RET_TORPED)
retreat_ship(&vship, 't');
shipdamage(&vship, dam);
} else
shipdamage(&vship, dam);
pr("Torpedo hit %s for %d damage.\n", prship(&vship), dam);
if (vship.shp_effic < SHIP_MINEFF)