Limit nukes to strategic missions

[empserver] / src / lib / commands / arm.c

diff --git a/src/lib/commands/arm.c b/src/lib/commands/arm.c
index 1cf2da09b4a8a6dd17e231c867c44f6e3e0f076d..144336cd729cf9c91bb25a50228b5f1610e9c9bf 100644 (file)
--- a/src/lib/commands/arm.c
+++ b/src/lib/commands/arm.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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
@@ -26,26 +26,21 @@
  *  ---
  *
  *  arm.c: Arm planes (missiles) with nuclear devices
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Ken Stevens, 1995
  *     Steve McClure, 2000
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2008
  */
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "nuke.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
+#include <stdio.h>
 #include "commands.h"
+#include "nuke.h"
 #include "optlist.h"
+#include "plane.h"
 
 int
 arm(void)
@@ -60,24 +55,26 @@ arm(void)
     char buf[1024];
     char prompt[128];
 
-    if (!snxtitem(&ni, EF_PLANE, player->argp[1]))
+    if (!snxtitem(&ni, EF_PLANE, player->argp[1], NULL))
        return RET_SYN;
     while (nxtitem(&ni, &pl)) {
-       if (!player->owner)
+       if (!player->owner
+           && getrel(getnatp(pl.pln_own), player->cnum) != ALLIED)
            continue;
        plc = &plchr[(int)pl.pln_type];
-       if ((plc->pl_flags & (P_O | P_M)) == (P_O | P_M)) {
+       if ((plc->pl_flags & (P_O | P_N | P_MAR))
+           || (plc->pl_flags & (P_M | P_F)) == (P_M | P_F)) {
            pr("A %s cannot carry nuclear devices!\n", plc->pl_name);
            return RET_FAIL;
        }
        if (opt_MARKET) {
            if (ontradingblock(EF_PLANE, &pl)) {
-               pr("You cannot disarm %s while it is on the trading block!\n",
+               pr("You cannot arm %s while it is on the trading block!\n",
                   prplane(&pl));
                return RET_FAIL;
            }
        }
-       if (pl.pln_nuketype < 0) {
+       if (!getnuke(nuk_on_plane(&pl), &nuke)) {
            sprintf(prompt, "Nuclear device for %s: ", prplane(&pl));
            p = getstarg(player->argp[2], prompt, buf);
            if (!p || !*p)
@@ -87,29 +84,35 @@ arm(void)
            nukno = atoi(p);
            if (!getnuke(nukno, &nuke) || !player->owner)
                return RET_FAIL;
-       } else {
-           if (nuk_on_plane(&nuke, pl.pln_uid) < 0) {
-               CANT_REACH();
-               continue;
-           }
        }
        ncp = &nchr[nuke.nuk_type];
-       if (pl.pln_load < ncp->n_weight) {
+       if (pln_load(&pl) < ncp->n_weight) {
            pr("A %s cannot carry %s devices!\n",
               plc->pl_name, ncp->n_name);
            return RET_FAIL;
        }
        p = getstarg(player->argp[3], "Airburst [n]? ", buf);
+       if (!p)
+           return RET_FAIL;
 
        if (!check_plane_ok(&pl) || !check_nuke_ok(&nuke))
            return RET_FAIL;
 
-       if (p && (*p == 'y' || *p == 'Y'))
+       if (nuke.nuk_plane >= 0 && nuke.nuk_plane != pl.pln_uid) {
+           pr("%s is already armed on plane #%d!\n",
+              prnuke(&nuke), nuke.nuk_plane);
+           return RET_FAIL;
+       }
+
+       if (*p == 'y' || *p == 'Y')
            pl.pln_flags |= PLN_AIRBURST;
        else
            pl.pln_flags &= ~PLN_AIRBURST;
+       pl.pln_mission = 0;
 
-       pl.pln_nuketype = nuke.nuk_type;
+       snprintf(buf, sizeof(buf), "armed on your %s in %s",
+                prplane(&pl), xyas(pl.pln_x, pl.pln_y, pl.pln_own));
+       gift(pl.pln_own, player->cnum, &nuke, buf);
        nuke.nuk_plane = pl.pln_uid;
        putplane(pl.pln_uid, &pl);
        putnuke(nuke.nuk_uid, &nuke);
@@ -131,12 +134,12 @@ disarm(void)
     struct sctstr sect;
     char buf[128];
 
-    if (!snxtitem(&ni, EF_PLANE, player->argp[1]))
+    if (!snxtitem(&ni, EF_PLANE, player->argp[1], NULL))
        return RET_SYN;
     while (nxtitem(&ni, &pl)) {
        if (!player->owner)
            continue;
-       if (pl.pln_nuketype == -1)
+       if (!getnuke(nuk_on_plane(&pl), &nuke))
            continue;
        if (opt_MARKET) {
            if (ontradingblock(EF_PLANE, &pl)) {
@@ -145,17 +148,18 @@ disarm(void)
                return RET_FAIL;
            }
        }
-       if (nuk_on_plane(&nuke, pl.pln_uid) < 0) {
-           CANT_REACH();
+       getsect(nuke.nuk_x, nuke.nuk_y, &sect);
+       if (!player->owner
+           && getrel(getnatp(sect.sct_own), player->cnum) != ALLIED) {
+           pr("Disarming %s in sector %s requires an alliance!\n",
+              prplane(&pl), xyas(sect.sct_x, sect.sct_y, player->cnum));
            continue;
        }
-       getsect(nuke.nuk_x, nuke.nuk_y, &sect);
        snprintf(buf, sizeof(buf), "unloaded in your %s at %s",
                 dchr[sect.sct_type].d_name,
                 xyas(sect.sct_x, sect.sct_y, sect.sct_own));
-       gift(sect.sct_own, player->cnum, &nuke, EF_NUKE, buf);
+       gift(sect.sct_own, player->cnum, &nuke, buf);
        nuke.nuk_plane = -1;
-       pl.pln_nuketype = -1;
        pl.pln_flags &= ~PLN_AIRBURST;
        putplane(pl.pln_uid, &pl);
        putnuke(nuke.nuk_uid, &nuke);