/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
* Thomas Ruschak, 1992
* Ken Stevens, 1995
* Steve McClure, 2000
- * Markus Armbruster, 2004-2010
+ * Markus Armbruster, 2004-2015
*/
#include <config.h>
+#include "chance.h"
#include "commands.h"
#include "news.h"
#include "retreat.h"
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)
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);
-
+ 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, 't');
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 (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, sp->shp_own, 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));
}