Fix and enable collateral damage for missing missiles
Collateral damage was disabled, because after msl_hit() reported a miss, the missile may or may not have reached the target. Fix by splitting msl_launch() off msl_hit(). Drop the disabled collateral damage code for sector targets, because sectors can't be missed. Enable it for ships and land units. Since msl_launch() returns whether the missile is sub-launched, drop launch_missile() parameter sublaunch, and simplify its caller.
This commit is contained in:
parent
e7fec28009
commit
fd894d9864
6 changed files with 66 additions and 81 deletions
|
|
@ -720,7 +720,7 @@ lnd_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
|
|||
{
|
||||
int mindam = lnd_count(list) * 20;
|
||||
int hardtarget = lnd_easiest_target(list);
|
||||
int dam, newdam;
|
||||
int dam, newdam, sublaunch;
|
||||
struct plist *plp;
|
||||
struct emp_qelem msl_list, *qp, *newqp;
|
||||
|
||||
|
|
@ -732,22 +732,18 @@ lnd_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
|
|||
plp = (struct plist *)qp;
|
||||
|
||||
if (dam < mindam && mission_pln_equip(plp, NULL, 'p') >= 0) {
|
||||
if (msl_launch(&plp->plane, EF_LAND, "troops",
|
||||
newx, newy, victim, &sublaunch) < 0)
|
||||
goto use_up_msl;
|
||||
if (msl_hit(&plp->plane, hardtarget, EF_LAND,
|
||||
N_LND_MISS, N_LND_SMISS,
|
||||
"troops", newx, newy, victim)) {
|
||||
N_LND_MISS, N_LND_SMISS, sublaunch, victim)) {
|
||||
newdam = pln_damage(&plp->plane, 'p', 1);
|
||||
dam += newdam;
|
||||
#if 0
|
||||
/*
|
||||
* FIXME want collateral damage on miss, but we get here
|
||||
* too when launch fails or missile is intercepted
|
||||
*/
|
||||
} else {
|
||||
/* Missiles that miss have to hit somewhere! */
|
||||
newdam = pln_damage(&plp->plane, 'p', 0);
|
||||
collateral_damage(newx, newy, newdam);
|
||||
#endif
|
||||
}
|
||||
use_up_msl:
|
||||
plp->plane.pln_effic = 0;
|
||||
putplane(plp->plane.pln_uid, &plp->plane);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -389,7 +389,7 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
|
|||
struct plchrstr *pcp;
|
||||
int dam = 0, dam2;
|
||||
natid plane_owner = 0;
|
||||
int md, range, air_dam;
|
||||
int md, range, air_dam, sublaunch;
|
||||
double hitchance, vrange;
|
||||
int targeting_ships = *s == 's'; /* "subs" or "ships" FIXME gross! */
|
||||
|
||||
|
|
@ -562,22 +562,15 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
|
|||
&& !CANT_HAPPEN(hardtarget != SECT_HARDTARGET
|
||||
|| (plp->pcp->pl_flags & P_MAR))
|
||||
&& mission_pln_equip(plp, NULL, 'p') >= 0) {
|
||||
if (msl_hit(&plp->plane, SECT_HARDTARGET, EF_SECTOR,
|
||||
N_SCT_MISS, N_SCT_SMISS,
|
||||
"sector", x, y, victim)) {
|
||||
dam2 = pln_damage(&plp->plane, 'p', 1);
|
||||
air_dam += dam2;
|
||||
#if 0
|
||||
/*
|
||||
* FIXME want collateral damage on miss, but we get here
|
||||
* too when launch fails or missile is intercepted
|
||||
*/
|
||||
} else {
|
||||
/* Missiles that miss have to hit somewhere! */
|
||||
dam2 = pln_damage(&plp->plane, 'p', 0);
|
||||
collateral_damage(x, y, dam2);
|
||||
#endif
|
||||
}
|
||||
if (msl_launch(&plp->plane, EF_SECTOR, "sector", x, y, victim,
|
||||
&sublaunch) < 0)
|
||||
goto use_up_msl;
|
||||
if (!msl_hit(&plp->plane, SECT_HARDTARGET, EF_SECTOR,
|
||||
N_SCT_MISS, N_SCT_SMISS, sublaunch, victim))
|
||||
CANT_REACH();
|
||||
dam2 = pln_damage(&plp->plane, 'p', 1);
|
||||
air_dam += dam2;
|
||||
use_up_msl:
|
||||
plp->plane.pln_effic = 0;
|
||||
putplane(plp->plane.pln_uid, &plp->plane);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
* Known contributors to this file:
|
||||
* Ken Stevens, 1995
|
||||
* Steve McClure, 1996-2000
|
||||
* Markus Armbruster, 2004-2009
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
|
@ -54,15 +55,13 @@
|
|||
#include "xy.h"
|
||||
|
||||
int
|
||||
msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
|
||||
int snews_item, char *what, coord x, coord y, int victim)
|
||||
msl_launch(struct plnstr *pp, int type, char *what, coord x, coord y,
|
||||
natid victim, int *sublaunchp)
|
||||
{
|
||||
int hit;
|
||||
struct shpstr ship;
|
||||
struct sctstr sect;
|
||||
int sublaunch = 0;
|
||||
struct plchrstr *pcp = plchr + pp->pln_type;
|
||||
int hitchance;
|
||||
char *from;
|
||||
int dam;
|
||||
|
||||
|
|
@ -108,7 +107,7 @@ msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
|
|||
putsect(§);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
return -1;
|
||||
}
|
||||
|
||||
CANT_HAPPEN(pp->pln_flags & PLN_LAUNCHED);
|
||||
|
|
@ -123,14 +122,26 @@ msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
|
|||
|
||||
if ((pcp->pl_flags & P_T && !(pcp->pl_flags & P_MAR))) {
|
||||
if (msl_abm_intercept(pp, x, y, sublaunch))
|
||||
return 0;
|
||||
return -1;
|
||||
}
|
||||
if (pcp->pl_flags & P_MAR) {
|
||||
if (shp_missile_defense(x, y, pp->pln_own, pln_def(pp))) {
|
||||
return 0;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (sublaunchp)
|
||||
*sublaunchp = sublaunch;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
msl_hit(struct plnstr *pp, int hardtarget, int type,
|
||||
int news_item, int snews_item, int sublaunch, natid victim)
|
||||
{
|
||||
struct plchrstr *pcp = plchr + pp->pln_type;
|
||||
int hitchance, hit;
|
||||
|
||||
if (nuk_on_plane(pp) >= 0) {
|
||||
mpr(pp->pln_own, "\tArming nuclear warheads...\n");
|
||||
hit = 1;
|
||||
|
|
@ -294,8 +305,9 @@ msl_intercept(struct plnstr *msl, struct sctstr *sp, int sublaunch,
|
|||
def_name, who, att_name, cname(sp->sct_own));
|
||||
}
|
||||
|
||||
if (msl_hit(pp, pln_def(msl), EF_PLANE, 0, 0,
|
||||
att_name, sp->sct_x, sp->sct_y, msl->pln_own)) {
|
||||
if (msl_launch(pp, EF_PLANE, att_name, sp->sct_x, sp->sct_y,
|
||||
msl->pln_own, NULL) >= 0
|
||||
&& msl_hit(pp, pln_def(msl), EF_PLANE, 0, 0, 0, msl->pln_own)) {
|
||||
mpr(msl->pln_own, "%s destroyed by %s %s!\n",
|
||||
att_name, cname(pp->pln_own), def_name);
|
||||
mpr(sp->sct_own, "%s %s intercepted!\n", who, att_name);
|
||||
|
|
|
|||
|
|
@ -480,7 +480,7 @@ static int
|
|||
shp_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
|
||||
natid victim)
|
||||
{
|
||||
int dam;
|
||||
int dam, sublaunch;
|
||||
int stopping = 0;
|
||||
struct emp_qelem msl_list, *qp, *newqp;
|
||||
struct plist *plp;
|
||||
|
|
@ -494,11 +494,12 @@ shp_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
|
|||
|
||||
mvs = most_valuable_ship(list, newx, newy);
|
||||
if (mvs && mission_pln_equip(plp, NULL, 'p') >= 0) {
|
||||
if (msl_launch(&plp->plane, EF_SHIP, prship(&mvs->unit.ship),
|
||||
newx, newy, victim, &sublaunch) < 0)
|
||||
goto use_up_msl;
|
||||
if (msl_hit(&plp->plane,
|
||||
shp_hardtarget(&mvs->unit.ship),
|
||||
EF_SHIP, N_SHP_MISS, N_SHP_SMISS,
|
||||
prship(&mvs->unit.ship),
|
||||
newx, newy, victim)) {
|
||||
shp_hardtarget(&mvs->unit.ship), EF_SHIP,
|
||||
N_SHP_MISS, N_SHP_SMISS, sublaunch, victim)) {
|
||||
dam = pln_damage(&plp->plane, 'p', 1);
|
||||
if (dam) {
|
||||
mpr(victim,
|
||||
|
|
@ -507,17 +508,11 @@ shp_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
|
|||
shp_damage_one(mvs, dam);
|
||||
stopping = 1;
|
||||
}
|
||||
#if 0
|
||||
/*
|
||||
* FIXME want collateral damage on miss, but we get here
|
||||
* too when launch fails or missile is intercepted
|
||||
*/
|
||||
} else {
|
||||
/* Missiles that miss have to hit somewhere! */
|
||||
dam = pln_damage(&plp->plane, 'p', 0);
|
||||
collateral_damage(newx, newy, dam);
|
||||
#endif
|
||||
}
|
||||
use_up_msl:
|
||||
plp->plane.pln_effic = 0;
|
||||
putplane(plp->plane.pln_uid, &plp->plane);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue