X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fsubs%2Fshpsub.c;h=51fe707949ef9aa53d1b3d4128025bd3f78d1066;hp=4bb1064f09c1503733dcf3b3ac0f24b1d2bd7d6e;hb=bd07ee186b0e5c8d21cdf3238b71671ef3226d22;hpb=b0644e822cd10d93c1168f7b356068fabc02b2bf diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c index 4bb1064f0..51fe70794 100644 --- a/src/lib/subs/shpsub.c +++ b/src/lib/subs/shpsub.c @@ -1,6 +1,6 @@ /* * Empire - A multi-player, client/server Internet based war game. - * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak, + * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak, * Ken Stevens, Steve McClure * * This program is free software; you can redistribute it and/or modify @@ -26,11 +26,11 @@ * --- * * shpsub.c: Ship subroutine stuff - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1996-2000 - * Markus Armbruster, 2006-2008 + * Markus Armbruster, 2006-2009 */ #include @@ -53,7 +53,7 @@ #include "unit.h" static int shp_check_one_mines(struct ulist *); -static int shp_hit_mine(struct shpstr *, struct mchrstr *); +static int shp_hit_mine(struct shpstr *); static void shp_mess(char *, struct ulist *); void @@ -241,7 +241,7 @@ shp_check_one_mines(struct ulist *mlp) return 0; if (chance(DMINE_HITCHANCE(sect.sct_mines))) { actor = mlp->unit.ship.shp_own; - shp_hit_mine(&mlp->unit.ship, ((struct mchrstr *)mlp->chrp)); + shp_hit_mine(&mlp->unit.ship); sect.sct_mines--; if (map_set(actor, sect.sct_x, sect.sct_y, 'X', 0)) writemap(actor); @@ -418,16 +418,18 @@ shp_contains(struct emp_qelem *list, int newx, int newy, int wantflags, } static struct ulist * -most_valuable_ship(struct emp_qelem *list) +most_valuable_ship(struct emp_qelem *list, coord x, coord y) { struct emp_qelem *qp; struct emp_qelem *next; struct ulist *mlp; - struct ulist *mvs = 0; + struct ulist *mvs = NULL; for (qp = list->q_back; qp != list; qp = next) { next = qp->q_back; mlp = (struct ulist *)qp; + if (mlp->unit.ship.shp_x != x || mlp->unit.ship.shp_y != y) + continue; if (((struct mchrstr *)mlp->chrp)->m_flags & M_SUB) continue; if (!((struct mchrstr *)mlp->chrp)->m_nxlight && @@ -478,38 +480,48 @@ static int shp_missile_interdiction(struct emp_qelem *list, coord newx, coord newy, natid victim) { - int dam; - int twotries; + int dam, sublaunch; int stopping = 0; struct emp_qelem msl_list, *qp, *newqp; + struct plist *plp; struct ulist *mvs; - char what[512]; + + mvs = most_valuable_ship(list, newx, newy); + if (!mvs) + return 0; msl_sel(&msl_list, newx, newy, victim, P_T | P_MAR, 0, MI_INTERDICT); - twotries = 0; - while (!QEMPTY(&msl_list) && (mvs = most_valuable_ship(list))) { - sprintf(what, "%s", prship(&mvs->unit.ship)); - dam = msl_launch_mindam(&msl_list, newx, newy, - shp_hardtarget(&mvs->unit.ship), - EF_SHIP, 1, what, victim, MI_INTERDICT); - if (dam) { - mpr(victim, - "missile interdiction mission does %d damage to %s!\n", - dam, what); - shp_damage_one(mvs, dam); - twotries = 0; - stopping |= 1; - } else if (++twotries >= 2) { - break; + for (qp = msl_list.q_back; qp != &msl_list; qp = newqp) { + newqp = qp->q_back; + plp = (struct plist *)qp; + + 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; + stopping = 1; + if (msl_hit(&plp->plane, + 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, + "missile interdiction mission does %d damage to %s!\n", + dam, prship(&mvs->unit.ship)); + shp_damage_one(mvs, dam); + } + } else { + dam = pln_damage(&plp->plane, 'p', 0); + collateral_damage(newx, newy, dam); + } + mvs = most_valuable_ship(list, newx, newy); + use_up_msl: + plp->plane.pln_effic = 0; + putplane(plp->plane.pln_uid, &plp->plane); } - } - qp = msl_list.q_forw; - while (qp != msl_list.q_forw) { - newqp = qp->q_forw; emp_remque(qp); free(qp); - qp = newqp; } return stopping; @@ -566,6 +578,7 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy, struct sctstr fsect; int trange, range; int dam; + int stopping = 0; int totdam = 0; signed char notified[MAXNOC]; int i; @@ -609,13 +622,14 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy, putsect(&fsect); if (dam < 0) continue; + stopping = 1; totdam += dam; mpr(victim, "Incoming fire does %d damage!\n", dam); -/* - mpr(victim, "%s fires at you for %d!\n", - xyas(fsect.sct_x,fsect.sct_y,victim), - dam); -*/ +#if 0 + mpr(victim, "%s fires at you for %d!\n", + xyas(fsect.sct_x,fsect.sct_y,victim), + dam); +#endif wu(0, fsect.sct_own, "%s fires at %s ships in %s for %d!\n", xyas(fsect.sct_x, fsect.sct_y, @@ -624,8 +638,26 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy, nreport(fsect.sct_own, N_SHP_SHELL, victim, 1); } if (totdam > 0) - return shp_damage(list, totdam, 0, M_SUB, newx, newy); - return 0; + shp_damage(list, totdam, 0, M_SUB, newx, newy); + return stopping; +} + +static int +shp_mission_interdiction(struct emp_qelem *list, coord x, coord y, + natid victim, int subs) +{ + char *what = subs ? "subs" : "ships"; + int wantflags = subs ? M_SUB : 0; + int nowantflags = subs ? 0 : M_SUB; + int mission = subs ? MI_SINTERDICT : MI_INTERDICT; + int dam; + + dam = unit_interdict(x, y, victim, what, + shp_easiest_target(list, wantflags, nowantflags), + mission); + if (dam >= 0) + shp_damage(list, dam, wantflags, nowantflags, x, y); + return dam >= 0; } static int @@ -637,26 +669,12 @@ shp_interdict(struct emp_qelem *list, coord newx, coord newy, natid victim) stopping |= shp_fort_interdiction(list, newx, newy, victim); if (shp_contains(list, newx, newy, 0, M_SUB)) { - stopping |= - shp_damage(list, - unit_interdict(newx, newy, victim, "ships", - shp_easiest_target(list, 0, M_SUB), - MI_INTERDICT), - 0, M_SUB, newx, newy); - if (most_valuable_ship(list)) { - stopping |= - shp_missile_interdiction(list, newx, newy, victim); - } + stopping |= shp_mission_interdiction(list, newx, newy, victim, 0); + stopping |= shp_missile_interdiction(list, newx, newy, victim); } } - if (shp_contains(list, newx, newy, M_SUB, 0)) { - stopping |= - shp_damage(list, - unit_interdict(newx, newy, victim, "subs", - shp_easiest_target(list, M_SUB, 0), - MI_SINTERDICT), - M_SUB, 0, newx, newy); - } + if (shp_contains(list, newx, newy, M_SUB, 0)) + stopping |= shp_mission_interdiction(list, newx, newy, victim, 1); return stopping; } @@ -678,7 +696,7 @@ shp_hardtarget(struct shpstr *sp) } static int -shp_hit_mine(struct shpstr *sp, struct mchrstr *mcp) +shp_hit_mine(struct shpstr *sp) { double m; @@ -688,7 +706,7 @@ shp_hit_mine(struct shpstr *sp, struct mchrstr *mcp) nreport(sp->shp_own, N_HIT_MINE, 0, 1); m = MINE_DAMAGE(); - if (mcp->m_flags & M_SWEEP) + if (mchr[sp->shp_uid].m_flags & M_SWEEP) m /= 2.0; shipdamage(sp, ldround(m, 1)); @@ -810,11 +828,11 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor, } /* - * shp_miss_defence - * Check for incoming missiles with a P_MAR flag. + * shp_miss_defence + * Check for incoming missiles with a P_MAR flag. * Return True=1 if the missile was shotdown. * Or False=0 - * + * * Chad Zabel, July 95 */ @@ -824,7 +842,6 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget) struct nstr_item ni; struct shpstr ship; int hitchance; - int shell; double gun, eff, teff; snxtitem_dist(&ni, EF_SHIP, dx, dy, 1); @@ -842,17 +859,14 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget) if (ship.shp_effic < 60) continue; - shell = ship.shp_item[I_SHELL]; if (ship.shp_item[I_MILIT] < 1) /* do we have mil? */ continue; - if (shell < 2) { /* do we need shells */ - shell += supply_commod(ship.shp_own, ship.shp_x, ship.shp_y, - I_SHELL, 2); - if (shell < 2) - continue; - } if (ship.shp_item[I_GUN] < 1) /* we need at least 1 gun */ continue; + if (!shp_supply(&ship, I_SHELL, 2)) + continue; + ship.shp_item[I_SHELL] -= 2; + putship(ship.shp_uid, &ship); /* now calculate the odds */ gun = shp_usable_guns(&ship); @@ -870,9 +884,6 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget) mpr(ship.shp_own, "Ship #%i anti-missile system activated!\n", ship.shp_uid); mpr(ship.shp_own, "%d%% hitchance...", hitchance); - /* use ammo */ - ship.shp_item[I_SHELL] = shell - 2; - putship(ship.shp_uid, &ship); if (roll(100) <= hitchance) { mpr(bombown, "KABOOOM!! Missile destroyed\n\n"); @@ -908,20 +919,18 @@ shp_missdef(struct shpstr *sp, natid victim) sprintf(buf, "%s", prship(&mlp->unit.ship)); eff = sp->shp_effic; - if (most_valuable_ship(&list)) { - shp_missile_interdiction(&list, sp->shp_x, sp->shp_y, sp->shp_own); - getship(sp->shp_uid, sp); - - if (!sp->shp_own) { - wu(0, victim, - "missiles launched in defense did 100%% damage to %s\n", - buf); - wu(0, victim, "%s sunk!\n", buf); - } else if (eff > 0 && sp->shp_effic < eff) { - wu(0, victim, - "missiles launched in defense did %d%% damage to %s\n", - 100 * (eff - sp->shp_effic) / eff, buf); - } + shp_missile_interdiction(&list, sp->shp_x, sp->shp_y, sp->shp_own); + getship(sp->shp_uid, sp); + + if (!sp->shp_own) { + wu(0, victim, + "missiles launched in defense did 100%% damage to %s\n", + buf); + wu(0, victim, "%s sunk!\n", buf); + } else if (eff > 0 && sp->shp_effic < eff) { + wu(0, victim, + "missiles launched in defense did %d%% damage to %s\n", + 100 * (eff - sp->shp_effic) / eff, buf); } if (!QEMPTY(&list)) free(mlp);