]> git.pond.sub.org Git - empserver/blobdiff - src/lib/commands/torp.c
retreat: Fix group retreat after failed board sinks ship
[empserver] / src / lib / commands / torp.c
index 8ad43b5395b4f285cd429d13c79d0ebd25c275c3..d945d180860f60d8c68352e2275d7123a7a241c0 100644 (file)
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  torp.c: Fire torpedoes at enemy ships
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare
  *     Thomas Ruschak, 1992
  *     Ken Stevens, 1995
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2004-2015
  */
 
-#include <stdio.h>
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "ship.h"
-#include "file.h"
-#include "xy.h"
-#include "nat.h"
-#include "nsc.h"
+#include <config.h>
+
+#include "chance.h"
+#include "commands.h"
 #include "news.h"
 #include "retreat.h"
-#include "damage.h"
-#include "commands.h"
-
-void anti_torp(int f, int ntorping, int vshipown);
-void fire_dchrg(struct shpstr *sp, struct shpstr *targ, int range, int ntargets);
+#include "ship.h"
 
-s_char *prsub(struct shpstr *sp);
+static void anti_torp(int f, int ntorping, int vshipown);
+static void fire_dchrg(struct shpstr *, struct shpstr *, int);
+static int fire_torp(struct shpstr *, struct shpstr *, int);
 
 int
 torp(void)
 {
-       extern  int torpedo_damage;
-       natid   vshipown;
-       int     range;
-       int     dam;
-       int     shells;
-       int     subno;
-       int     victno;
-       double  erange;
-       double  hitchance;
-       struct  shpstr vship;
-       struct  shpstr sub;
-       s_char  *ptr;
-        double mobcost;
-       struct  mchrstr *mcp;
-       struct  nstr_item nbst;
-       s_char  buf[1024];
-       s_char  *sav;
-       int     ntorping=0;
-       s_char  prompt[128];
-
-       if (!(sav = getstarg(player->argp[1], "From ship(s)? ", buf)))
-               return RET_SYN;
-        if (!snxtitem(&nbst, EF_SHIP, sav))
-                return RET_SYN;
-       while (nxtitem(&nbst, (s_char *)&sub)){
-               if (sub.shp_own != player->cnum)
-                       continue;
-               if ((mchr[(int)sub.shp_type].m_flags & M_TORP) == 0)
-                       continue;
-               shells = getvar(V_SHELL, (s_char *)&sub, EF_SHIP);
-               if (shells < 3)
-                       shells += supply_commod(sub.shp_own,sub.shp_x,sub.shp_y,I_SHELL,
-                               3-shells);
-               if (getvar(V_GUN, (s_char *)&sub, EF_SHIP) == 0 || shells < 3)
-                       continue;
-               if (getvar(V_MILIT, (s_char *)&sub, EF_SHIP) < 1)
-                       continue;
-               if (sub.shp_effic < 60)
-                       continue;
-               if (sub.shp_mobil <= 0)
-                       continue;
-               ntorping++;
+    natid vshipown;
+    int range;
+    int dam;
+    int subno;
+    int victno;
+    int erange;
+    double hitchance;
+    struct shpstr vship;
+    struct shpstr sub;
+    char *ptr;
+    struct nstr_item nbst;
+    char buf[1024];
+    int ntorping = 0;
+    char prompt[128];
+
+    if (!snxtitem(&nbst, EF_SHIP, player->argp[1], "From ship(s)? "))
+       return RET_SYN;
+    while (nxtitem(&nbst, &sub)) {
+       if (sub.shp_own != player->cnum)
+           continue;
+       if ((mchr[(int)sub.shp_type].m_flags & M_TORP) == 0)
+           continue;
+       if (sub.shp_item[I_GUN] == 0
+           || sub.shp_item[I_SHELL] < SHP_TORP_SHELLS)
+           continue;
+       if (sub.shp_item[I_MILIT] < 1)
+           continue;
+       if (sub.shp_effic < 60)
+           continue;
+       if (sub.shp_mobil <= 0)
+           continue;
+       ntorping++;
+    }
+    pr("%d ships are eligible to torpedo\n", ntorping);
+    snxtitem_rewind(&nbst);
+    while (nxtitem(&nbst, &sub)) {
+       if (!sub.shp_own)
+           continue;
+       if (sub.shp_own != player->cnum) {
+           continue;
        }
-       pr("%d ships are eligible to torp\n",ntorping);
-       snxtitem(&nbst, EF_SHIP, sav);
-       while (nxtitem(&nbst, (s_char *)&sub)) {
-               if (!sub.shp_own)
-                       continue;
-               if (sub.shp_own != player->cnum) {
-                       continue;
-               }
-               if ((mchr[(int)sub.shp_type].m_flags & M_TORP) == 0) {
-                       pr("Ship # %d: A %s can't fire torpedoes!\n", sub.shp_uid,
-                              mchr[(int)sub.shp_type].m_name);
-                       continue;
-               }
-               shells = getvar(V_SHELL, (s_char *)&sub, EF_SHIP);
-               if (shells < 3)
-                       shells += supply_commod(sub.shp_own,sub.shp_x,sub.shp_y
-,I_SHELL,
-                               3-shells);
-               if (getvar(V_GUN, (s_char *)&sub, EF_SHIP) == 0 || shells < 3) {
-                       pr("Ship #%d has insufficient armament\n",sub.shp_uid);
-                       continue;
-               }
-               if (getvar(V_MILIT, (s_char *)&sub, EF_SHIP) < 1){
-                       pr("Ship #%d has insufficient crew\n",sub.shp_uid);
-                       continue;
-               }
-               if (sub.shp_effic < 60) {
-                       pr("Ship #%d torpedo tubes inoperative.\n",sub.shp_uid);
-                       continue;
-               }
-               if (sub.shp_mobil <= 0) {
-                       pr("Ship #%d has insufficient mobility\n",sub.shp_uid);
-                       continue;
-               }
-               bzero(buf,80);
-               subno=sub.shp_uid;
-               sprintf(prompt, "Ship %d, target? ",sub.shp_uid);
-               if ((ptr = getstarg(player->argp[2],prompt, buf)) == 0)
-                       return RET_SYN;
-               if (!check_ship_ok(&sub))
-                   return RET_FAIL;
-               if ((victno = atoi(ptr)) < 0)
-                       return RET_SYN;
-               if (!getship(victno, &vship))
-                       return RET_FAIL;
-               if (!vship.shp_own)
-                       return RET_FAIL;
-               vshipown=vship.shp_own;
-               if (victno == subno) {
-                       pr("Shooting yourself, eh?  How strange...\n");
-                       continue;
-               }
-               if (mchr[(int)vship.shp_type].m_flags & M_SUB) {
-                       if (!(mchr[(int)sub.shp_type].m_flags & M_SUBT)){
-                               pr("You can't torpedo a submarine!\n");
-                               continue;
-                       }
-               }
-               if ((mchr[(int)sub.shp_type].m_flags & M_SUB) == 0)
-                       anti_torp(sub.shp_uid,ntorping,vshipown);
-               getship(sub.shp_uid,&sub);
-               if (sub.shp_own == 0){
-                       continue;
-               }
-               erange = ((double)sub.shp_effic/100.0) *
-                       techfact(sub.shp_tech, ((double)sub.shp_frnge));
-               erange = (double)roundrange(erange);
-               pr("Effective torpedo range is %.1f\n", erange);
-               shells -= 3;
-               putvar(V_SHELL, shells, (s_char *)&sub, EF_SHIP);
-               putship(sub.shp_uid,&sub);
-               mcp = &mchr[(int)sub.shp_type];
-               mobcost = sub.shp_effic * 0.01 * sub.shp_speed;
-               mobcost = (480.0 / (mobcost + techfact(sub.shp_tech, mobcost)));
-
-               /* Mob cost for a torp is equal to the cost of 1/2 sector of movement */
-               mobcost /= 2.0;
-               sub.shp_mobil -= mobcost;
-               pr("Whooosh... ");
-               getship(victno, &vship);
-               vshipown = vship.shp_own;
-               range = mapdist(sub.shp_x, sub.shp_y, vship.shp_x, vship.shp_y);
-               hitchance = DTORP_HITCHANCE(range, sub.shp_visib);
-               if (range <= erange) {
-                       pr("Hitchance = %d%%\n",(int)(hitchance*100));
-               }
-               /* Now, can the torpedo even get there? */
-               if (!line_of_sight((s_char **)0, sub.shp_x, sub.shp_y,
-                                  vship.shp_x, vship.shp_y)) {
-                   pr("BOOM!... Torpedo slams into land before reaching target.\n");
-                   /* We only tell the victim if we were within range. */
-                   if (range <= erange) {
-                       if (vshipown != 0)
-                           wu(0, vshipown, "Torpedo sighted @ %s by %s\n",
-                              xyas(sub.shp_x, sub.shp_y, vshipown),
-                              prship(&vship));
-                   }
-               } else if (range > erange) {
-                       pr("Out of range\n");
-               } else if (hitchance >= 1.0 || chance(hitchance)) {
-                       pr("BOOM!...\n");
-                       dam = TORP_DAMAGE();
-                       if(vshipown != 0)
-                       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){
-                               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)
-                               pr("%s sunk!\n",
-                                  prship(&vship));
-                       putship(vship.shp_uid, &vship);
-                       if (mchr[(int)sub.shp_type].m_flags & M_SUB)
-                               nreport(vshipown, N_TORP_SHIP, 0, 1);
-                       else
-                               nreport(vshipown, N_SHIP_TORP, player->cnum, 1);
-               } else {
-                       pr("Missed\n");
-                       if (vshipown != 0)
-                           wu(0, vshipown, "Torpedo sighted @ %s by %s\n",
-                              xyas(sub.shp_x, sub.shp_y, vshipown),
-                              prship(&vship));
-               }
-               sub.shp_mission=0;
-               putship(sub.shp_uid, &sub);
-               if (mchr[(int)sub.shp_type].m_flags & M_SUB)
-                       anti_torp(sub.shp_uid,ntorping,vshipown);
+       if ((mchr[(int)sub.shp_type].m_flags & M_TORP) == 0) {
+           pr("Ship # %d: A %s can't fire torpedoes!\n",
+              sub.shp_uid, mchr[(int)sub.shp_type].m_name);
+           continue;
+       }
+       if (sub.shp_item[I_GUN] == 0
+           || sub.shp_item[I_SHELL] < SHP_TORP_SHELLS) {
+           pr("Ship #%d has insufficient armament\n", sub.shp_uid);
+           continue;
+       }
+       if (sub.shp_item[I_MILIT] < 1) {
+           pr("Ship #%d has insufficient crew\n", sub.shp_uid);
+           continue;
+       }
+       if (sub.shp_effic < 60) {
+           pr("Ship #%d torpedo tubes inoperative.\n", sub.shp_uid);
+           continue;
+       }
+       if (sub.shp_mobil <= 0) {
+           pr("Ship #%d has insufficient mobility\n", sub.shp_uid);
+           continue;
+       }
+       subno = sub.shp_uid;
+       sprintf(prompt, "Ship %d, target? ", sub.shp_uid);
+       if (!(ptr = getstarg(player->argp[2], prompt, buf)))
+           return RET_SYN;
+       if (!check_ship_ok(&sub))
+           return RET_FAIL;
+       if ((victno = atoi(ptr)) < 0)
+           return RET_SYN;
+       if (!getship(victno, &vship))
+           return RET_FAIL;
+       if (!vship.shp_own)
+           return RET_FAIL;
+       vshipown = vship.shp_own;
+       if (victno == subno) {
+           pr("Shooting yourself, eh?  How strange...\n");
+           continue;
+       }
+       if (mchr[(int)vship.shp_type].m_flags & M_SUB) {
+           if (!(mchr[(int)sub.shp_type].m_flags & M_SUBT)) {
+               pr("You can't torpedo a submarine!\n");
+               continue;
+           }
+       }
+       dam = shp_torp(&sub, 1);
+       sub.shp_mission = 0;
+       putship(sub.shp_uid, &sub);
+       if (CANT_HAPPEN(dam < 0)) {
+           pr("Ship #%d has insufficient armament\n", sub.shp_uid);
+           continue;
        }
-       return RET_OK;
-}
-
-void
-anti_torp(int f, int ntorping, int vshipown)
-{
-       int     range;
-       double  erange;
-       struct  shpstr sub;
-       struct  shpstr dd;
-       int     x;
-
-       getship(f,&sub);
-
-       if (sub.shp_own == vshipown)
-               return;
 
        if ((mchr[(int)sub.shp_type].m_flags & M_SUB) == 0)
-               pr("Starting our attack run...\n");
-
-       x=0;
-       while (getship(x++,&dd) && sub.shp_effic >= SHIP_MINEFF){
-               if (dd.shp_own == 0)
-                       continue;
-               if (dd.shp_own != vshipown)
-                       continue;
-               if (dd.shp_effic < 60)
-                       continue;
-
-               if (!canshoot(&dd,&sub))
-                       continue;
-
-               erange = techfact(dd.shp_tech,
-                       ((double)dd.shp_frnge))/ 2.0;
-
-               erange = (double)roundrange(erange);
-
-               range = mapdist(sub.shp_x, sub.shp_y, dd.shp_x, dd.shp_y);
-
-               if (range > erange)
-                       continue;
-
-               if (!line_of_sight((s_char **)0, sub.shp_x, sub.shp_y,
-                                  dd.shp_x, dd.shp_y))
-                   continue;
-
-               if (cantorp(&dd,&sub)){
-                       /* Try torping.. if we can, maybe we can fire */
-                       if (!fire_torp(&dd,&sub,range,ntorping))
-                               if (candchrg(&dd,&sub))
-                                       fire_dchrg(&dd,&sub,range,ntorping);
-               }else
-                       fire_dchrg(&dd,&sub,range,ntorping);
+           anti_torp(sub.shp_uid, ntorping, vshipown);
+       getship(sub.shp_uid, &sub);
+       if (sub.shp_own == 0)
+           continue;
+
+       erange = roundrange(torprange(&sub));
+       pr("Effective torpedo range is %d.0\n", erange);
+       pr("Whooosh... ");
+       getship(victno, &vship);
+       vshipown = vship.shp_own;
+       range = mapdist(sub.shp_x, sub.shp_y, vship.shp_x, vship.shp_y);
+       hitchance = shp_torp_hitchance(&sub, range);
+       if (range <= erange) {
+           pr("Hitchance = %d%%\n", (int)(hitchance * 100));
+       }
+       /* Now, can the torpedo even get there? */
+       if (!line_of_sight(NULL, sub.shp_x, sub.shp_y,
+                          vship.shp_x, vship.shp_y)) {
+           pr("BOOM!... Torpedo slams into land before reaching target.\n");
+           /* We only tell the victim if we were within range. */
+           if (range <= erange) {
+               if (vshipown != 0)
+                   wu(0, vshipown, "Torpedo sighted @ %s by %s\n",
+                      xyas(sub.shp_x, sub.shp_y, vshipown),
+                      prship(&vship));
+           }
+       } else if (range > erange) {
+           pr("Out of range\n");
+       } else if (chance(hitchance)) {
+           pr("BOOM!...\n");
+           if (vshipown != 0)
+               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);
+           pr("Torpedo hit %s for %d damage.\n", prsub(&vship), dam);
+           if (!(mchr[vship.shp_type].m_flags & M_SUB)) {
+               if (mchr[sub.shp_type].m_flags & M_SUB)
+                   nreport(vshipown, N_TORP_SHIP, 0, 1);
+               else
+                   nreport(vshipown, N_SHIP_TORP, player->cnum, 1);
+           }
+           shipdamage(&vship, dam);
+           if (vship.shp_effic < SHIP_MINEFF)
+               pr("%s sunk!\n", prsub(&vship));
+           if (vship.shp_rflags & RET_TORPED)
+               retreat_ship(&vship, vshipown, 't');
+           putship(vship.shp_uid, &vship);
+       } else {
+           pr("Missed\n");
+           if (vshipown != 0)
+               wu(0, vshipown, "Torpedo sighted @ %s by %s\n",
+                  xyas(sub.shp_x, sub.shp_y, vshipown), prship(&vship));
        }
-}
-
-/* Can ship A shoot at ship B? */
-int
-canshoot(struct shpstr *a, struct shpstr *b)
-{
-       /* Anyone can shoot a normal ship */
-       if ((mchr[(int)b->shp_type].m_flags & M_SUB) == 0)
-               return 1;
-
-       /* You can depth-charge a sub */
-       if (mchr[(int)a->shp_type].m_flags & M_DCH)
-               return 1;
-
-       /* If you have SUBT flag, you can torp a sub */
-       if (mchr[(int)a->shp_type].m_flags & M_SUBT)
-               return 1;
 
-       return 0;
+       if (mchr[(int)sub.shp_type].m_flags & M_SUB)
+           anti_torp(sub.shp_uid, ntorping, vshipown);
+    }
+    return RET_OK;
 }
 
-/* Can ship A torp ship B? */
-int
-cantorp(struct shpstr *a, struct shpstr *b)
+static void
+anti_torp(int f, int ntorping, int vshipown)
 {
-       if ((mchr[(int)a->shp_type].m_flags & M_TORP) == 0)
-               return 0;
-
-       /* Anyone with TORP flag can torp a normal ship */
-       if ((mchr[(int)b->shp_type].m_flags & M_SUB) == 0)
-               return 1;
+    struct shpstr sub;
+    struct shpstr dd;
+    int x;
 
-       /* Ship b is a sub, so we need to have the SUBT flag */
-       if (mchr[(int)a->shp_type].m_flags & M_SUBT)
-               return 1;
+    getship(f, &sub);
 
-       return 0;
-}
+    if (sub.shp_own == vshipown)
+       return;
 
-/* Can ship A depth-charge (or fire guns at) ship B? */
-int
-candchrg(struct shpstr *a, struct shpstr *b)
-{
-       if ((mchr[(int)b->shp_type].m_flags & M_SUB) == 0){
-               if ((mchr[(int)a->shp_type].m_flags & M_SUB) == 0)
-                       return 1;
+    if ((mchr[(int)sub.shp_type].m_flags & M_SUB) == 0)
+       pr("Starting our attack run...\n");
 
-               return 0;
-       }
+    x = 0;
+    while (getship(x++, &dd) && sub.shp_effic >= SHIP_MINEFF) {
+       if (dd.shp_own == 0)
+           continue;
+       if (dd.shp_own != vshipown)
+           continue;
 
-       if ((mchr[(int)a->shp_type].m_flags & M_DCH) == 0)
-               return 0;
-
-       return 1;
+       if (!fire_torp(&dd, &sub, ntorping))
+           fire_dchrg(&dd, &sub, ntorping);
+    }
 }
 
-void
-fire_dchrg(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
+static void
+fire_dchrg(struct shpstr *sp, struct shpstr *targ, int ntargets)
 {
-       int     dam;
-       int     shells;
-       int     gun;
-       double  guneff;
-
-       shells = getvar(V_SHELL, (s_char *)sp, EF_SHIP);
-       gun = getvar(V_GUN, (s_char *)sp, EF_SHIP);
-       gun = min(gun, sp->shp_glim);
-       gun = min(gun, getvar(V_MILIT, (s_char *)sp, EF_SHIP)/2);
-
-       shells+=supply_commod(sp->shp_own,sp->shp_x,sp->shp_y,I_SHELL,(gun+1)/2-shells);
-
-       gun = min(gun, shells*2);
-       if (gun == 0) return;
-
-       /* ok, all set.. now, we shoot */
-       shells -= ldround(((double)gun)/2.0,1);
-       putvar(V_SHELL, shells, (s_char *)sp, EF_SHIP);
-       putship(sp->shp_uid,sp);
-
-       guneff = seagun(sp->shp_effic, gun);
-       dam = (int)guneff;
-
-       if ((mchr[(int)targ->shp_type].m_flags & M_SUB) == 0){
-               pr_beep();
-               pr("Kaboom!!! Incoming shells!\n");
-               if(sp->shp_own != 0)
-                       wu(0, sp->shp_own,
-                          "%s fired at %s\n",
-                          prship(sp),
-                          prship(targ));
-
-               if (ntargets > 2)
-                       dam /= ((float)ntargets/2.0);
-               pr_beep();
-               pr("BLAM! %d damage!\n", dam);
-               shipdamage(targ, dam);
-               putship(targ->shp_uid,targ);
-       }else{
-               pr("\nCAPTAIN!  !!Depth charges!!...\n");
-               if(sp->shp_own != 0)
-                       wu(0, sp->shp_own,
-                               "%s depth charged %s\n",
-                          prship(sp), prsub(targ));
-
-               if (ntargets>2)
-                       dam /= ((float)ntargets/2.0);
-
-               pr("click...WHAM!  %d damage!\n", dam);
-               shipdamage(targ, dam);
-               putship(targ->shp_uid,targ);
-       }
+    int range, erange, dam;
+
+    erange = roundrange(shp_fire_range(sp));
+    range = mapdist(sp->shp_x, sp->shp_y, targ->shp_x, targ->shp_y);
+    if (range > erange)
+       return;
+
+    if ((mchr[(int)targ->shp_type].m_flags & M_SUB) == 0) {
+       /* Return fire to a torpedo boat */
+       if (mchr[sp->shp_type].m_flags & M_SUB)
+           return;             /* sub deck gun can't return fire */
+       dam = shp_fire(sp);
+       putship(sp->shp_uid, sp);
+       if (dam < 0)
+           return;
+       if (ntargets > 2)
+           dam /= ntargets / 2;
+
+       pr_beep();
+       pr("Kaboom!!! Incoming shells!\n");
+       if (sp->shp_own != 0)
+           wu(0, sp->shp_own,
+              "%s fired at %s\n", prship(sp), prship(targ));
+       pr_beep();
+       pr("BLAM! %d damage!\n", dam);
+    } else {
+       /* Return fire to a submarine */
+       dam = shp_dchrg(sp);
+       putship(sp->shp_uid, sp);
+       if (dam < 0)
+           return;
+       if (ntargets > 2)
+           dam /= ntargets / 2;
+
+       pr("\nCAPTAIN!  !!Depth charges!!...\n");
+       if (sp->shp_own != 0)
+           wu(0, sp->shp_own,
+              "%s depth charged %s\n", prship(sp), prsub(targ));
+       pr("click...WHAM!  %d damage!\n", dam);
+    }
+    shipdamage(targ, dam);
+    putship(targ->shp_uid, targ);
 }
 
-int
-fire_torp(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
+static int
+fire_torp(struct shpstr *sp, struct shpstr *targ, int ntargets)
 {
-       extern  int torpedo_damage;
-       int     dam;
-       int     shells;
-       double  hitchance;
-        double mobcost;
-       struct  mchrstr *mcp;
-
-       shells = getvar(V_SHELL, (s_char *)sp, EF_SHIP);
-
-       if (shells < 3)
-               shells += supply_commod(sp->shp_own,sp->shp_x,sp->shp_y,I_SHELL,
-                       3-shells);
-
-       if (getvar(V_GUN, (s_char *)sp, EF_SHIP) == 0 || shells < 3)
-               return 0;
-
-       if (getvar(V_MILIT, (s_char *)sp, EF_SHIP) < 1)
-               return 0;
-
-       if (sp->shp_effic < 60)
-               return 0;
-
-       if (sp->shp_mobil <= 0)
-               return 0;
-
-       /* All set.. fire! */
-       shells -= 3;
-       putvar(V_SHELL, shells, (s_char *)sp, EF_SHIP);
-       putship(sp->shp_uid,sp);
+    int range, erange, dam;
 
-       mcp = &mchr[(int)sp->shp_type];
-       mobcost = sp->shp_effic * 0.01 * sp->shp_speed;
-       mobcost = (480.0 / (mobcost + techfact(sp->shp_tech, mobcost)));
+    if ((mchr[targ->shp_type].m_flags & M_SUB)
+       && (mchr[sp->shp_type].m_flags & M_SUBT) == 0)
+       return 0;               /* need sub-torp to torpedo a sub */
 
-       /* Mob cost for a torp is equal to the cost of 1/2 sector of movement */
-       mobcost /= 2.0;
-       sp->shp_mobil -= mobcost;
-
-       hitchance = DTORP_HITCHANCE(range, sp->shp_visib);
-
-       pr("Captain! Torpedoes sighted!\n");
-
-       if (chance(hitchance)) {
-               pr("BOOM!...\n");
-               if(sp->shp_own != 0)
-               wu(0, sp->shp_own, "%s @ %s torpedoed %s\n",
-                  prship(sp),
-                  xyas(sp->shp_x, sp->shp_y, sp->shp_own),
-                  prsub(targ));
-               dam = TORP_DAMAGE();
+    erange = roundrange(torprange(sp));
+    range = mapdist(sp->shp_x, sp->shp_y, targ->shp_x, targ->shp_y);
+    if (range > erange)
+       return 0;
 
-               if (ntargets>2)
-                       dam /= ((float)ntargets/2.0);
+    if (!line_of_sight(NULL, sp->shp_x, sp->shp_y,
+                      targ->shp_x, targ->shp_y))
+       return 0;
+    dam = shp_torp(sp, 1);
+    putship(sp->shp_uid, sp);
+    if (dam < 0)
+       return 0;
 
-               shipdamage(targ, dam);
-               putship(targ->shp_uid, targ);
+    pr("Captain! Torpedoes sighted!\n");
 
-               if (mchr[(int)sp->shp_type].m_flags & M_SUB)
-                       nreport(targ->shp_own, N_TORP_SHIP, 0, 1);
-               else
-                       nreport(targ->shp_own, N_SHIP_TORP, player->cnum, 1);
-       } else {
-               pr("Missed!\n");
-               if(sp->shp_own != 0)
-               wu(0, sp->shp_own,
-                  "%s missed %s with a torp at %s\n",
-                  prship(sp), prsub(targ),
-                  xyas(sp->shp_x, sp->shp_y, sp->shp_own));
+    if (chance(shp_torp_hitchance(sp, range))) {
+       pr("BOOM!...\n");
+       if (!(mchr[targ->shp_type].m_flags & M_SUB)) {
+           if (mchr[sp->shp_type].m_flags & M_SUB)
+               nreport(targ->shp_own, N_TORP_SHIP, 0, 1);
+           else
+               nreport(targ->shp_own, N_SHIP_TORP, sp->shp_own, 1);
        }
-
-       return 1;
+       if (sp->shp_own != 0)
+           wu(0, sp->shp_own, "%s @ %s torpedoed %s\n",
+              prship(sp),
+              xyas(sp->shp_x, sp->shp_y, sp->shp_own), prsub(targ));
+       if (ntargets > 2)
+           dam /= ntargets / 2;
+
+       shipdamage(targ, dam);
+       putship(targ->shp_uid, targ);
+
+    } else {
+       pr("Missed!\n");
+       if (sp->shp_own != 0)
+           wu(0, sp->shp_own,
+              "%s missed %s with a torpedo at %s\n",
+              prship(sp), prsub(targ),
+              xyas(sp->shp_x, sp->shp_y, sp->shp_own));
+    }
+
+    return 1;
 }
 
-s_char *
+char *
 prsub(struct shpstr *sp)
 {
-       if (mchr[(int)sp->shp_type].m_flags & M_SUB)
-               return "sub";
-       else
-               return prship(sp);
+    if (mchr[(int)sp->shp_type].m_flags & M_SUB)
+       return "sub";
+    else
+       return prship(sp);
 }