/*
* 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
* ---
*
* 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-2009
*/
#include <config.h>
#include "commands.h"
-#include "damage.h"
#include "news.h"
#include "optlist.h"
#include "retreat.h"
#include "ship.h"
static void anti_torp(int f, int ntorping, int vshipown);
-static int candchrg(struct shpstr *, struct shpstr *);
-static int canshoot(struct shpstr *, struct shpstr *);
-static int cantorp(struct shpstr *, struct shpstr *);
static void fire_dchrg(struct shpstr *, struct shpstr *, int);
static int fire_torp(struct shpstr *, struct shpstr *, int);
char *ptr;
struct nstr_item nbst;
char buf[1024];
- char *sav;
int ntorping = 0;
char prompt[128];
- if (!(sav = getstarg(player->argp[1], "From ship(s)? ", buf)))
- return RET_SYN;
- if (!snxtitem(&nbst, EF_SHIP, sav))
+ if (!snxtitem(&nbst, EF_SHIP, player->argp[1], "From ship(s)? "))
return RET_SYN;
while (nxtitem(&nbst, &sub)) {
if (sub.shp_own != player->cnum)
ntorping++;
}
pr("%d ships are eligible to torp\n", ntorping);
- snxtitem(&nbst, EF_SHIP, sav);
+ snxtitem_rewind(&nbst);
while (nxtitem(&nbst, &sub)) {
if (!sub.shp_own)
continue;
}
subno = sub.shp_uid;
sprintf(prompt, "Ship %d, target? ", sub.shp_uid);
- if ((ptr = getstarg(player->argp[2], prompt, buf)) == 0)
+ if (!(ptr = getstarg(player->argp[2], prompt, buf)))
return RET_SYN;
if (!check_ship_ok(&sub))
return RET_FAIL;
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);
+ hitchance = shp_torp_hitchance(&sub, range);
if (range <= erange) {
pr("Hitchance = %d%%\n", (int)(hitchance * 100));
}
continue;
if (dd.shp_own != vshipown)
continue;
- if (!canshoot(&dd, &sub))
- continue;
- if (cantorp(&dd, &sub)) {
- /* Try torping.. if we can, maybe we can fire */
- if (!fire_torp(&dd, &sub, ntorping))
- if (candchrg(&dd, &sub))
- fire_dchrg(&dd, &sub, ntorping);
- } else
+ if (!fire_torp(&dd, &sub, ntorping))
fire_dchrg(&dd, &sub, ntorping);
}
}
-/* Can ship A shoot at ship B? */
-static 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;
-}
-
-/* Can ship A torp ship B? */
-static int
-cantorp(struct shpstr *a, struct shpstr *b)
-{
- 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;
-
- /* 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;
-
- return 0;
-}
-
-/* Can ship A depth-charge (or fire guns at) ship B? */
-static 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;
-
- return 0;
- }
-
- if ((mchr[(int)a->shp_type].m_flags & M_DCH) == 0)
- return 0;
-
- return 1;
-}
-
static void
fire_dchrg(struct shpstr *sp, struct shpstr *targ, int ntargets)
{
int range, erange, dam;
- erange = roundrange(effrange(sp->shp_frnge, sp->shp_tech));
+ 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)
"%s fired at %s\n", prship(sp), prship(targ));
pr_beep();
pr("BLAM! %d damage!\n", dam);
- shipdamage(targ, dam);
- putship(targ->shp_uid, targ);
} else {
+ /* Return fire to a submarine */
dam = shp_dchrg(sp);
putship(sp->shp_uid, sp);
if (dam < 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);
}
+ shipdamage(targ, dam);
+ putship(targ->shp_uid, targ);
}
static int
{
int range, erange, dam;
+ 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 */
+
erange = roundrange(torprange(sp));
range = mapdist(sp->shp_x, sp->shp_y, targ->shp_x, targ->shp_y);
if (range > erange)
pr("Captain! Torpedoes sighted!\n");
- if (chance(DTORP_HITCHANCE(range, sp->shp_visib))) {
+ if (chance(shp_torp_hitchance(sp, range))) {
pr("BOOM!...\n");
if (sp->shp_own != 0)
wu(0, sp->shp_own, "%s @ %s torpedoed %s\n",
projects / empserver / blobdiff