flags = pln_caps(bomb_list);
if (opt_HIDDEN)
setcont(player->cnum, sect.sct_own, FOUND_FLY);
- if (sect.sct_type == SCT_WATER) {
+ if (sect.sct_type == SCT_WATER)
pr("flying over %s at %s\n",
dchr[sect.sct_type].d_name, xyas(x, y, player->cnum));
- if (mission_flags & PM_S)
- plane_sweep(bomb_list, x, y);
- if (flags & P_A)
- plane_sona(bomb_list, x, y, &head);
- } else if (flags & P_S)
+ else if (flags & P_S)
satdisp_sect(§, flags & P_I ? 10 : 50);
else
look_at_sect(§, 25);
- changed += map_set(player->cnum, sect.sct_x, sect.sct_y,
- dchr[sect.sct_type].d_mnem, 0);
+
if (flags & P_S)
satdisp_units(sect.sct_x, sect.sct_y);
else {
cname(cn), xyas(x, y, player->cnum));
}
}
- } else {
- PR(plane_owner, "flying over %s at %s\n",
- dchr[sect.sct_type].d_name, xyas(x, y, plane_owner));
- changed += map_set(plane_owner, sect.sct_x, sect.sct_y,
- dchr[sect.sct_type].d_mnem, 0);
- }
+ } else
+ mpr(plane_owner, "flying over %s at %s\n",
+ dchr[sect.sct_type].d_name, xyas(x, y, plane_owner));
+ changed += map_set(plane_owner, sect.sct_x, sect.sct_y,
+ dchr[sect.sct_type].d_mnem, 0);
evaded = do_evade(bomb_list, esc_list);
if (!evaded) {
continue;
if (cn != sect.sct_own && !gotships[cn] && !gotlands[cn])
continue;
- PR(cn, "%s planes spotted over %s\n",
- cname(plane_owner), xyas(x, y, cn));
+ mpr(cn, "%s planes spotted over %s\n",
+ cname(plane_owner), xyas(x, y, cn));
if (opt_HIDDEN)
setcont(cn, plane_owner, FOUND_FLY);
}
}
}
+ if (mission_flags & PM_R) {
+ flags = pln_caps(bomb_list);
+ if (sect.sct_type == SCT_WATER && mission_flags & PM_S)
+ plane_sweep(bomb_list, x, y);
+ if (sect.sct_type == SCT_WATER && flags & P_A)
+ plane_sona(bomb_list, x, y, &head);
+ }
+
dir = *path++;
if (!dir || QEMPTY(bomb_list) || (val = diridx(dir)) == DIR_STOP)
break;
putplane(pp->pln_uid, pp);
if (first) {
first = 0;
- PR(plane_owner, "%s launches SAMs!\n", cname(def_own));
- PR(def_own, "Launching SAMs at %s planes over %s!\n",
- cname(plane_owner), xyas(x, y, def_own));
+ mpr(plane_owner, "%s launches SAMs!\n", cname(def_own));
+ mpr(def_own, "Launching SAMs at %s planes over %s!\n",
+ cname(plane_owner), xyas(x, y, def_own));
ac_combat_headers(plane_owner, def_own);
}
ac_dog(aplp, dplp);
}
}
if (!first) {
- PR(plane_owner, "\n");
- PR(def_own, "\n");
+ mpr(plane_owner, "\n");
+ mpr(def_own, "\n");
}
}
}
if (icount == 0)
return;
- PR(plane_owner, "%d %s fighter%s rising to intercept!\n",
- icount, cname(def_own), icount == 1 ? " is" : "s are");
- PR(def_own, "%d fighter%s intercepting %s planes over %s!\n",
- icount, icount == 1 ? " is" : "s are", cname(plane_owner),
- xyas(x, y, def_own));
+ mpr(plane_owner, "%d %s fighter%s rising to intercept!\n",
+ icount, cname(def_own), icount == 1 ? " is" : "s are");
+ mpr(def_own, "%d fighter%s intercepting %s planes over %s!\n",
+ icount, icount == 1 ? " is" : "s are", cname(plane_owner),
+ xyas(x, y, def_own));
ac_combat_headers(plane_owner, def_own);
ac_airtoair(esc_list, &int_list);
ac_airtoair(bomb_list, &int_list);
- PR(plane_owner, "\n");
- PR(def_own, "\n");
+ mpr(plane_owner, "\n");
+ mpr(def_own, "\n");
pln_put(&int_list);
}
static void
ac_combat_headers(natid plane_owner, natid def_own)
{
- PR(plane_owner,
- " %-10.10s %-10.10s strength int odds damage results\n",
- cname(plane_owner), cname(def_own));
- PR(def_own,
- " %-10.10s %-10.10s strength int odds damage results\n",
- cname(def_own), cname(plane_owner));
+ mpr(plane_owner,
+ " %-10.10s %-10.10s strength int odds damage results\n",
+ cname(plane_owner), cname(def_own));
+ mpr(def_own,
+ " %-10.10s %-10.10s strength int odds damage results\n",
+ cname(def_own), cname(plane_owner));
}
/*
}
}
+static void
+ac_dog_report(natid to, int intensity, double odds,
+ struct plist *p1, int val1, int dam1, char *dam_mesg1,
+ struct plist *p2, int val2, int dam2, char *dam_mesg2)
+{
+ mpr(to, " %3.3s #%-4d %3.3s #%-4d %3d/%-3d %3d %3.2f %3d/%-3d"
+ "%-13.13s %-13.13s\n",
+ p1->pcp->pl_name, p1->plane.pln_uid,
+ p2->pcp->pl_name, p2->plane.pln_uid,
+ val1, val2, intensity, odds, dam1, dam2,
+ dam_mesg1, dam_mesg2);
+}
+
static void
ac_dog(struct plist *ap, struct plist *dp)
{
int att, def;
double odds;
- int intensity;
+ int intensity, i;
natid att_own, def_own;
int adam, ddam;
char adam_mesg[14], ddam_mesg[14];
att_own = ap->plane.pln_own;
def_own = dp->plane.pln_own;
- PR(att_own, " %3.3s #%-4d %3.3s #%-4d",
- ap->pcp->pl_name,
- ap->plane.pln_uid, dp->pcp->pl_name, dp->plane.pln_uid);
- if (def_own)
- PR(def_own, " %3.3s #%-4d %3.3s #%-4d",
- dp->pcp->pl_name,
- dp->plane.pln_uid, ap->pcp->pl_name, ap->plane.pln_uid);
att = pln_att(&ap->plane);
if (att == 0)
att = pln_def(&ap->plane);
odds = 0.05;
intensity = roll(20) + roll(20) + roll(20) + roll(20) + 1;
- PR(att_own, " %3d/%-3d %3d %3.2f ", att, def, intensity, odds);
- PR(def_own, " %3d/%-3d %3d %3.2f ", def, att, intensity, odds);
-
adam = 0;
ddam = 0;
- while ((intensity--) > 0) {
-
+ for (i = 0; i < intensity; i++) {
if (chance(odds)) {
- ddam += 1;
- if ((dp->plane.pln_effic - ddam) < PLANE_MINEFF)
- intensity = 0;
+ ddam++;
+ if (dp->plane.pln_effic - ddam < PLANE_MINEFF)
+ break;
} else {
- adam += 1;
- if ((ap->plane.pln_effic - adam) < PLANE_MINEFF)
- intensity = 0;
+ adam++;
+ if (ap->plane.pln_effic - adam < PLANE_MINEFF)
+ break;
}
}
if (dp->pcp->pl_flags & P_M)
ddam = 100;
- PR(att_own, "%3d/%-3d", adam, ddam);
- PR(def_own, "%3d/%-3d", ddam, adam);
ac_planedamage(ap, def_own, adam, 0, adam_mesg);
ac_planedamage(dp, att_own, ddam, 0, ddam_mesg);
- PR(att_own, "%-13.13s %-13.13s\n", adam_mesg, ddam_mesg);
- PR(def_own, "%-13.13s %-13.13s\n", ddam_mesg, adam_mesg);
+ ac_dog_report(att_own, intensity, odds,
+ ap, att, adam, adam_mesg,
+ dp, def, ddam, ddam_mesg);
+ ac_dog_report(def_own, intensity, odds,
+ dp, def, ddam, ddam_mesg,
+ ap, att, adam, adam_mesg);
if (opt_HIDDEN) {
setcont(att_own, def_own, FOUND_FLY);
ac_planedamage(struct plist *plp, natid from, int dam, int flak,
char *mesg)
{
- struct plnstr *pp;
+ int disp = ac_damage_plane(&plp->plane, from, dam, flak, mesg);
+
+ if (disp) {
+ pln_put1(plp);
+ } else
+ putplane(plp->plane.pln_uid, &plp->plane);
+}
+
+int
+ac_damage_plane(struct plnstr *pp, natid from, int dam, int flak,
+ char *mesg)
+{
int eff, disp;
*mesg = 0;
if (dam <= 0) {
- snprintf(mesg, 14, " no damage");
- return;
+ if (!flak)
+ snprintf(mesg, 14, " no damage");
+ return 0;
}
- pp = &plp->plane;
eff = pp->pln_effic - dam;
if (eff < 0)
eff = 0;
pp->pln_effic = eff;
pp->pln_mobil -= MIN(32 + pp->pln_mobil, dam / 2);
- if (disp) {
- if (disp == 1 && from != 0 && (plp->pcp->pl_flags & P_M) == 0)
- nreport(from, N_DOWN_PLANE, pp->pln_own, 1);
- pln_put1(plp);
- } else
- putplane(pp->pln_uid, pp);
+
+ if (disp == 1 && from != 0 && !(plchr[pp->pln_type].pl_flags & P_M))
+ nreport(from, N_DOWN_PLANE, pp->pln_own, 1);
+ return disp;
}
static void
gun = MIN(FLAK_GUN_MAX, from->sct_item[I_GUN]);
gun = roundavg(tfact(from->sct_own, 2.0 * gun));
if (gun > 0) {
- PR(plane_owner, "firing %d flak guns in %s...\n",
- gun, xyas(from->sct_x, from->sct_y, plane_owner));
- if (from->sct_own != 0)
- PR(from->sct_own, "firing %d flak guns in %s...\n",
- gun, xyas(from->sct_x, from->sct_y, from->sct_own));
+ mpr(plane_owner, "firing %d flak guns in %s...\n",
+ gun, xyas(from->sct_x, from->sct_y, plane_owner));
+ mpr(from->sct_own, "firing %d flak guns in %s...\n",
+ gun, xyas(from->sct_x, from->sct_y, from->sct_own));
ac_fireflak(list, from->sct_own, gun);
}
}
struct mchrstr *mcp;
double flak, total, ngun;
int gun;
- int rel;
struct plist *plp;
natid plane_owner;
natid from;
mcp = &mchr[(int)ship.shp_type];
if (mcp->m_flags & M_SUB)
continue;
- rel = getrel(getnatp(ship.shp_own), plane_owner);
- if (rel > HOSTILE)
+ if (getrel(getnatp(ship.shp_own), plane_owner) > HOSTILE)
continue;
gun = shp_usable_guns(&ship);
if (gun == 0)
ngun += flak;
total += techfact(ship.shp_tech, flak * 2.0);
- PR(ship.shp_own, "firing %.0f flak guns from %s...\n",
- flak, prship(&ship));
+ mpr(ship.shp_own, "firing %.0f flak guns from %s...\n",
+ flak, prship(&ship));
from = ship.shp_own;
}
gun = roundavg(total);
if (gun > 0) {
- PR(plane_owner, "Flak! Ships firing %d flak guns...\n", gun);
+ mpr(plane_owner, "Flak! Ships firing %d flak guns...\n", gun);
ac_fireflak(list, from, gun);
}
}
struct lchrstr *lcp;
double flak, total, ngun;
int aaf, gun;
- int rel;
struct plist *plp;
natid plane_owner;
natid from;
continue;
if (land.lnd_ship >= 0 || land.lnd_land >= 0)
continue;
- rel = getrel(getnatp(land.lnd_own), plane_owner);
- if (rel > HOSTILE)
+ if (getrel(getnatp(land.lnd_own), plane_owner) > HOSTILE)
continue;
flak = aaf * 1.5 * land.lnd_effic / 100.0;
ngun += flak;
total += techfact(land.lnd_tech, flak * 2.0);
- PR(land.lnd_own, "firing flak guns from unit %s (aa rating %d)\n",
- prland(&land), aaf);
+ mpr(land.lnd_own, "firing flak guns from unit %s (aa rating %d)\n",
+ prland(&land), aaf);
from = land.lnd_own;
}
gun = roundavg(total);
if (gun > 0) {
- PR(plane_owner, "Flak! Land units firing %d flak guns...\n", gun);
+ mpr(plane_owner, "Flak! Land units firing %d flak guns...\n", gun);
ac_fireflak(list, from, gun);
}
}
plp = (struct plist *)qp;
n = ac_flak_dam(guns, pln_def(&plp->plane), plp->pcp->pl_flags);
ac_planedamage(plp, from, n, 1, msg);
- PR(plp->plane.pln_own, " %s %s takes %d%s.\n",
- cname(plp->plane.pln_own), prplane(&plp->plane), n, msg);
+ mpr(plp->plane.pln_own, " %s takes %d%s%s.\n",
+ prplane(&plp->plane), n, *msg ? " --" : "", msg);
}
}
projects / empserver / blobdiff