Remove reserve mission's reaction radius bonus

Reserve missions are now useless.  They'll become useful again in a
later commit.

diff --git a/info/Attacking.t b/info/Attacking.t
index 1b5a7fcb30d499dac24b6b96274fd5e94b19b9c6..35282d3627df752f907af36178f26821ea8b17af 100644 (file)
--- a/info/Attacking.t
+++ b/info/Attacking.t
@@ -144,8 +144,8 @@ restrictions apply to reacting land units:
 - The unit must be in range.
 .FI
 If the unit is in a 60% efficient headquarters, then 1 is added to its
-reaction radius.  If it is on "reserve" mission, then 2 is added to
-the radius.  Note that you can limit the reaction radius of your land
+reaction radius.
+Note that you can limit the reaction radius of your land
 units using the "lrange" command.
 .s1
 .L "(5)  Calculate support."

diff --git a/info/mission.t b/info/mission.t
index df352537d8e1dc03805949ebef044a955d7d0a0b..3c2a946717c1014617a66c7306bc0c14e19b2ca1 100644 (file)
--- a/info/mission.t
+++ b/info/mission.t
@@ -289,20 +289,16 @@ lost his planes.
 .s1
 RESERVE MISSIONS (land units only)
 .s1
-A land unit given reserve orders has an increased ability to react to enemy
-attacks. A reserve unit has its reaction radius increased by 2.
-(Note: this is cumulative with the +1 modifier for being at an
-efficient headquarters, so a reserve unit at an HQ would have a +3).
-See info attack for more details on reaction.
-.s1
-Note that units with a reserve mission retain this status, even though they
-move to the threatened sector and return. This is an exception to the normal
+This mission has no effect at this time.
+.s1
+Note that units with a reserve mission retain this status even when they
+react to a threatened sector and return. This is an exception to the normal
 rules on losing your mission status. If, however, the land unit is forced to
-retreat from the combat (see land combat for details), it WOULD lose its status.
+retreat from the combat (see land combat for details), it DOES lose its status.
 .s1
 When a unit with a reserve mission is listed, the op sector is the sector
 the unit is in, and the radius is the units maximum reaction radius, including
-the bonus for the reserve mission and HQ (if applicable). Note that the unit's
+the bonus for HQ (if applicable). Note that the unit's
 actual radius might be different if it was changed by lrange command.
 .s1
 Note: information gained from planes flying missions is automatically

diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c
index 13a8adf88cfe0d75fecc27f2654db6680f53bfdc..d251d9fc4750459ed4d1b36da765732b9f600df3 100644 (file)
--- a/src/lib/commands/miss.c
+++ b/src/lib/commands/miss.c
@@ -294,20 +294,16 @@ mission(void)
               obj_nameof(gp), mission_name(mission),
               xyas(x, y, player->cnum), gp->radius);
        } else if (mission == MI_RESERVE) {
-           int plus = 2;
-
-           if (((struct lndstr *)gp)->lnd_rad_max == 0) {
-               plus = 0;
-           } else {
+           radius = ((struct lndstr *)gp)->lnd_rad_max;
+           if (radius) {
                getsect(gp->x, gp->y, &opsect);
                if ((opsect.sct_type == SCT_HEADQ)
                    && (opsect.sct_effic >= 60))
-                   plus++;
-               plus += ((struct lndstr *)gp)->lnd_rad_max;
+                   radius++;
            }
 
            pr("%s on %s mission with maximum reaction radius %d\n",
-              obj_nameof(gp), mission_name(mission), plus);
+              obj_nameof(gp), mission_name(mission), radius);
        } else if (mission) {
            pr("%s on %s mission\n", obj_nameof(gp),
               mission_name(mission));

diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index ab750392de86a056c21a6f3180b6ea5a7cc1ee1e..0c67580af863434f9344098c6669c7f931f58659 100644 (file)
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -1511,9 +1511,6 @@ att_reacting_units(struct combat *def, struct emp_qelem *list, int a_spy,
        else
            radius = land.lnd_rad_max;
 
-       if (land.lnd_mission == MI_RESERVE)
-           radius += 2;
-
        if (dist > radius)
            continue;
 

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index 197c4bcd8ac14d2e8671a77223513f079bc77766..c6644fa80be12c5dfbc78b44f5b823ede3c5b542 100644 (file)
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -797,7 +797,6 @@ show_mission(int type, struct nstr_item *np)
            radius = item.land.lnd_rad_max;
 
            if (radius) {
-               radius += 2;
                getsect(gp->x, gp->y, &sect);
                if ((sect.sct_type == SCT_HEADQ) && (sect.sct_effic >= 60))
                    radius++;