]> git.pond.sub.org Git - empserver/blobdiff - src/lib/subs/shpsub.c
Fix and enable collateral damage for missing missiles
[empserver] / src / lib / subs / shpsub.c
index bed6d02f06111b93e998f90da29c101e4c4ab108..50e942f78f95a32f765dac9348446412a49334d4 100644 (file)
@@ -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-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
  *  ---
  *
  *  shpsub.c: Ship subroutine stuff
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1996-2000
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2009
  */
 
 #include <config.h>
@@ -58,11 +58,6 @@ static void shp_mess(char *, struct ulist *);
 
 void
 shp_sel(struct nstr_item *ni, struct emp_qelem *list)
-
-
-    /*  int     wantflags;
-       int      nowantflags;
-     */
 {
     struct shpstr ship;
     struct mchrstr *mcp;
@@ -73,11 +68,6 @@ shp_sel(struct nstr_item *ni, struct emp_qelem *list)
        if (!player->owner)
            continue;
        mcp = &mchr[(int)ship.shp_type];
-       /* if (wantflags && (mcp->m_flags & wantflags) != wantflags)
-          continue;
-          if (nowantflags && mcp->m_flags & nowantflags)
-          continue;
-        */
        if (opt_MARKET) {
            if (ontradingblock(EF_SHIP, &ship)) {
                pr("ship #%d inelligible - it's for sale.\n",
@@ -85,18 +75,6 @@ shp_sel(struct nstr_item *ni, struct emp_qelem *list)
                continue;
            }
        }
-       /* This abuse is better fixed by building a ship with the normal negative
-          mobility that everything else is built with */
-/*
-       if (opt_MOB_ACCESS) {
-         if (ship.shp_effic < 21 &&
-           ship.shp_mobil < etu_per_update) {
-           pr("%s needs at least %d mob to navigate.\n",
-              prship(&ship), etu_per_update);
-           continue;
-         }
-       }
-*/
        ship.shp_mission = 0;
        ship.shp_rflags = 0;
        memset(ship.shp_rpath, 0, sizeof(ship.shp_rpath));
@@ -237,13 +215,13 @@ shp_sweep(struct emp_qelem *ship_list, int verbose, int takemob, natid actor)
        }
        sect.sct_mines = mines;
        mlp->unit.ship.shp_item[I_SHELL] = shells;
+       putship(mlp->unit.ship.shp_uid, &mlp->unit.ship);
+       putsect(&sect);
        if (shp_check_one_mines(mlp)) {
            stopping = 1;
            emp_remque(qp);
            free(qp);
        }
-       putship(mlp->unit.ship.shp_uid, &mlp->unit.ship);
-       putsect(&sect);
     }
     if (changed)
        writemap(actor);
@@ -440,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 &&
@@ -500,38 +480,44 @@ 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];
 
     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;
+
+       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, 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);
+                   stopping = 1;
+               }
+           } else {
+               dam = pln_damage(&plp->plane, 'p', 0);
+               collateral_damage(newx, newy, dam);
+           }
+       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;
@@ -587,8 +573,6 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
     struct nstr_sect ns;
     struct sctstr fsect;
     int trange, range;
-    double guneff;
-    int shell, gun;
     int dam;
     int totdam = 0;
     signed char notified[MAXNOC];
@@ -625,35 +609,21 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
     while (nxtsct(&ns, &fsect)) {
        if (!notified[fsect.sct_own])
            continue;
-       gun = fsect.sct_item[I_GUN];
-       if (gun < 1)
-           continue;
        range = roundrange(fortrange(&fsect));
        trange = mapdist(newx, newy, fsect.sct_x, fsect.sct_y);
        if (trange > range)
            continue;
-       if (fsect.sct_item[I_MILIT] < 5)
-           continue;
-       shell = fsect.sct_item[I_SHELL];
-       if (shell < 1)
-           shell += supply_commod(fsect.sct_own, fsect.sct_x, fsect.sct_y,
-                                  I_SHELL, 1);
-       if (shell < 1)
-           continue;
-       shell--;
-       fsect.sct_item[I_SHELL] = shell;
+       dam = fort_fire(&fsect);
        putsect(&fsect);
-       if (gun > 7)
-           gun = 7;
-       guneff = landgun((int)fsect.sct_effic, gun);
-       dam = (int)guneff;
+       if (dam < 0)
+           continue;
        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,
@@ -681,7 +651,7 @@ shp_interdict(struct emp_qelem *list, coord newx, coord newy, natid victim)
                                          shp_easiest_target(list, 0, M_SUB),
                                          MI_INTERDICT),
                           0, M_SUB, newx, newy);
-           if (most_valuable_ship(list)) {
+           if (most_valuable_ship(list, newx, newy)) {
                stopping |=
                    shp_missile_interdiction(list, newx, newy, victim);
            }
@@ -706,13 +676,13 @@ shp_hardtarget(struct shpstr *sp)
     int vis, onsea;
     struct mchrstr *mcp = mchr + sp->shp_type;
 
-    vis = sp->shp_visib;
+    vis = shp_visib(sp);
     getsect(sp->shp_x, sp->shp_y, &sect);
     onsea = sect.sct_type == SCT_WATER;
     if (mcp->m_flags & M_SUB)
        vis *= 4;
     return (int)((sp->shp_effic / 100.0) *
-                (20 + sp->shp_speed * onsea / 2.0 - vis));
+                (20 + shp_speed(sp) * onsea / 2.0 - vis));
 }
 
 static int
@@ -848,11 +818,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
  */
 
@@ -862,7 +832,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);
@@ -880,20 +849,17 @@ 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 = MIN(ship.shp_item[I_GUN], ship.shp_glim);
+       gun = shp_usable_guns(&ship);
        eff = ship.shp_effic / 100.0;
        teff = ship.shp_tech / (ship.shp_tech + 200.0);
        /* raise 4.5 for better interception -KHS */
@@ -908,9 +874,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");
@@ -946,7 +909,7 @@ shp_missdef(struct shpstr *sp, natid victim)
     sprintf(buf, "%s", prship(&mlp->unit.ship));
 
     eff = sp->shp_effic;
-    if (most_valuable_ship(&list)) {
+    if (most_valuable_ship(&list, sp->shp_x, sp->shp_y)) {
        shp_missile_interdiction(&list, sp->shp_x, sp->shp_y, sp->shp_own);
        getship(sp->shp_uid, sp);
 
@@ -968,7 +931,7 @@ shp_missdef(struct shpstr *sp, natid victim)
 double
 shp_mobcost(struct shpstr *sp)
 {
-    return speed_factor(sp->shp_effic * 0.01 * sp->shp_speed,
+    return speed_factor(sp->shp_effic * 0.01 * shp_speed(sp),
                        sp->shp_tech);
 }
 
@@ -984,9 +947,4 @@ shp_set_tech(struct shpstr *sp, int tlev)
        tlev = mcp->m_tech;
 
     sp->shp_tech = tlev;
-    sp->shp_armor = m_armor(mcp, tlev);
-    sp->shp_speed = m_speed(mcp, tlev);
-    sp->shp_visib = m_visib(mcp, tlev);
-    sp->shp_frnge = m_frnge(mcp, tlev);
-    sp->shp_glim  = m_glim(mcp, tlev);
 }