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

fire: Simplify logic to use depth charges rather than guns

Browse source 
Meaning of targ_sub changes from "target is a submarine" to "attacking
the target with depth charges".

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-02-08 12:20:56 +01:00
parent 634aa708f4
commit 2f24a01c65
1 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/lib/commands/mfir.c
View file

@ -40,8 +40,11 @@
#include "optlist.h" #include "optlist.h"
#include "retreat.h" #include "retreat.h"
enum targ_type { enum targ_type { /* Targeting... */
targ_land, targ_ship, targ_sub, targ_bogus targ_land, /* a sector with guns */
targ_ship, /* a ship with guns */
targ_sub, /* a submarine with depth charges */
targ_bogus /* a bogus sector with guns */
}; };
struct flist { struct flist {
@ -232,8 +235,7 @@ multifire(void)
pr("No such ship exists!\n"); pr("No such ship exists!\n");
continue; continue;
} }
target = (mchr[(int)vship.shp_type].m_flags & M_SUB) ? target = targ_ship; /* targ_ship vs. targ_sub decided below */
targ_sub : targ_ship;
vict = vship.shp_own; vict = vship.shp_own;
x = vship.shp_x; x = vship.shp_x;
y = vship.shp_y; y = vship.shp_y;
@ -263,7 +265,7 @@ multifire(void)
if (type == EF_SHIP) { if (type == EF_SHIP) {
if (!check_ship_ok(&fship)) if (!check_ship_ok(&fship))
return RET_FAIL; return RET_FAIL;
if (target == targ_sub || target == targ_ship) { if (target == targ_ship) {
if (fship.shp_uid == vship.shp_uid) { if (fship.shp_uid == vship.shp_uid) {
pr("You can't fire upon yourself!\n"); pr("You can't fire upon yourself!\n");
continue; continue;
@ -272,16 +274,15 @@ multifire(void)
range = shp_fire_range(&fship); range = shp_fire_range(&fship);
range2 = roundrange(range); range2 = roundrange(range);
pr("range is %d.00 (%.2f)\n", range2, range); pr("range is %d.00 (%.2f)\n", range2, range);
if (target == targ_sub /* Use depth charges against subs, but only when in range */
&& trange <= range2 if (target == targ_ship && trange <= range2
&& (mchr[(int)fship.shp_type].m_flags & M_DCH)) { && (mchr[vship.shp_type].m_flags & M_SUB)
&& (mchr[fship.shp_type].m_flags & M_DCH))
target = targ_sub;
if (target == targ_sub)
dam = shp_dchrg(&fship); dam = shp_dchrg(&fship);
} else { else
if (target == targ_sub)
/* Don't tell it's a sub */
range2 = -1;
dam = shp_fire(&fship); dam = shp_fire(&fship);
}
fship.shp_mission = 0; fship.shp_mission = 0;
putship(fship.shp_uid, &fship); putship(fship.shp_uid, &fship);
if (CANT_HAPPEN(dam < 0)) { if (CANT_HAPPEN(dam < 0)) {
@ -302,15 +303,9 @@ multifire(void)
continue; continue;
} }
} }
range = lnd_fire_range(&fland); range = lnd_fire_range(&fland);
range2 = roundrange(range); range2 = roundrange(range);
pr("range is %d.00 (%.2f)\n", range2, range); pr("range is %d.00 (%.2f)\n", range2, range);
if (target == targ_sub) {
/* Don't tell it's a sub */
range2 = -1;
}
dam = lnd_fire(&fland); dam = lnd_fire(&fland);
fland.lnd_mission = 0; fland.lnd_mission = 0;
putland(fland.lnd_uid, &fland); putland(fland.lnd_uid, &fland);
@ -341,11 +336,14 @@ multifire(void)
range = fortrange(&fsect); range = fortrange(&fsect);
range2 = roundrange(range); range2 = roundrange(range);
pr("range is %d.00 (%.2f)\n", range2, range); pr("range is %d.00 (%.2f)\n", range2, range);
if (target == targ_sub) {
/* Don't tell it's a sub */
range2 = -1;
}
} }
/*
* If the player fires guns at a submarine, take care not to
* disclose it's a submarine: pretend the target is out of range.
*/
if (target == targ_ship && (mchr[vship.shp_type].m_flags & M_SUB))
range2 = -1;
if (trange > range2) { if (trange > range2) {
pr("Target out of range.\n"); pr("Target out of range.\n");
continue; continue;
@ -362,6 +360,7 @@ multifire(void)
pr("Kaboom!!!\n"); pr("Kaboom!!!\n");
break; break;
} }
switch (target) { switch (target) {
case targ_bogus: case targ_bogus:
case targ_land: case targ_land: