/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2021, 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/>.
*
* ---
*
* Thomas Ruschak, 1992
* Ken Stevens, 1995
* Steve McClure, 2000
- * Markus Armbruster, 2004-2008
+ * Markus Armbruster, 2004-2021
*/
#include <config.h>
+#include "chance.h"
#include "commands.h"
#include "news.h"
-#include "optlist.h"
#include "retreat.h"
#include "ship.h"
double hitchance;
struct shpstr vship;
struct shpstr sub;
+ struct mchrstr *sub_mcp;
char *ptr;
struct nstr_item nbst;
char buf[1024];
continue;
ntorping++;
}
- pr("%d ships are eligible to torp\n", ntorping);
+ pr("%d ships are eligible to torpedo\n", ntorping);
snxtitem_rewind(&nbst);
while (nxtitem(&nbst, &sub)) {
if (!sub.shp_own)
if (sub.shp_own != player->cnum) {
continue;
}
- if ((mchr[(int)sub.shp_type].m_flags & M_TORP) == 0) {
+ sub_mcp = &mchr[sub.shp_type];
+ if (!(sub_mcp->m_flags & M_TORP)) {
pr("Ship # %d: A %s can't fire torpedoes!\n",
- sub.shp_uid, mchr[(int)sub.shp_type].m_name);
+ sub.shp_uid, sub_mcp->m_name);
continue;
}
if (sub.shp_item[I_GUN] == 0
}
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;
continue;
}
if (mchr[(int)vship.shp_type].m_flags & M_SUB) {
- if (!(mchr[(int)sub.shp_type].m_flags & M_SUBT)) {
+ if (!(sub_mcp->m_flags & M_SUBT)) {
pr("You can't torpedo a submarine!\n");
continue;
}
continue;
}
- if ((mchr[(int)sub.shp_type].m_flags & M_SUB) == 0)
+ if (!(sub_mcp->m_flags & M_SUB)) {
+ pr("Starting our attack run...\n");
anti_torp(sub.shp_uid, ntorping, vshipown);
+ }
getship(sub.shp_uid, &sub);
if (sub.shp_own == 0)
continue;
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));
+ pr("Hit chance = %.0f%%\n", 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)) {
+ if (range > erange)
+ pr("Out of range\n");
+ else 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");
+ if (vshipown != 0 && vshipown != player->cnum)
+ wu(0, vshipown, "Torpedo sighted @ %s by %s\n",
+ xyas(sub.shp_x, sub.shp_y, vshipown),
+ prship(&vship));
} else if (chance(hitchance)) {
pr("BOOM!...\n");
- if (vshipown != 0)
+ if (vshipown != 0 && vshipown != player->cnum)
wu(0, vshipown, "%s in %s torpedoed %s for %d damage.\n",
- prsub(&sub), xyas(sub.shp_x, sub.shp_y, vshipown),
+ sub_mcp->m_flags & M_SUB ? "sub" : prship(&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);
-
+ 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", prship(&vship));
+ pr("%s sunk!\n", prsub(&vship));
+ if (vship.shp_rflags & RET_TORPED)
+ retreat_ship(&vship, vshipown);
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)
+ if (vshipown != 0 && vshipown != player->cnum)
wu(0, vshipown, "Torpedo sighted @ %s by %s\n",
xyas(sub.shp_x, sub.shp_y, vshipown), prship(&vship));
}
- if (mchr[(int)sub.shp_type].m_flags & M_SUB)
+ if (sub_mcp->m_flags & M_SUB)
anti_torp(sub.shp_uid, ntorping, vshipown);
}
return RET_OK;
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)
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);
+ }
if (sp->shp_own != 0)
wu(0, sp->shp_own, "%s @ %s torpedoed %s\n",
prship(sp),
shipdamage(targ, dam);
putship(targ->shp_uid, targ);
- 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",
+ "%s missed %s with a torpedo at %s\n",
prship(sp), prsub(targ),
xyas(sp->shp_x, sp->shp_y, sp->shp_own));
}
prsub(struct shpstr *sp)
{
if (mchr[(int)sp->shp_type].m_flags & M_SUB)
- return "sub";
+ return prbuf("sub #%d", sp->shp_uid);
else
return prship(sp);
}
projects / empserver / blobdiff