From 9bd8521e74a831403ba7ea924cf5942cea49f8c3 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 18 Feb 2012 16:49:53 +0100
Subject: [PATCH] Revise money and capital command permissions

arm and disarm no longer require money, for consistency with the other
commands to move stuff around.

satellite no longer requires money, for consistency with lookout,
radar, sonar and skywatch.

qorder, sorder, survey and test no longer require a capital, for
consistency with the other commands that report on stuff the player
owns.

start and stop no longer require a capital, for consistency with the
other commands to control production.

fortify now requires a capital, for consistency with mission, morale
and range.
---
 src/lib/player/empmod.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c
index 6233dbffd..941d59677 100644
--- a/src/lib/player/empmod.c
+++ b/src/lib/player/empmod.c
@@ -48,7 +48,7 @@ struct cmndstr player_coms[] = {
     {"announce", 0, tele, C_MOD, 0},
     {"anti <SECT>", 3, anti, C_MOD, NORM + MONEY + CAP},
     {"apropos <topic>", 0, apro, 0, 0},
-    {"arm <PLANE> <NUKE> <airburst?>", 3, arm, C_MOD, NORM + MONEY + CAP},
+    {"arm <PLANE> <NUKE> <airburst?>", 3, arm, C_MOD, NORM + CAP},
     {"army <ARMY> <UNITS>", 0, army, C_MOD, NORM},
     {"assault <to-SECT> <from-SHIP> [<forts?> <ships?> <arty?> <planes?>]",
      3, assa, C_MOD, NORM + MONEY + CAP},
@@ -87,7 +87,7 @@ struct cmndstr player_coms[] = {
      NORM + MONEY + CAP},
     {"designate <SECTS> <type>", 1, desi, C_MOD, NORM},
     {"disable", 0, disa, C_MOD, GOD},
-    {"disarm <PLANE>", 2, disarm, C_MOD, NORM + MONEY + CAP},
+    {"disarm <PLANE>", 2, disarm, C_MOD, NORM + CAP},
     {"distribute <SECTS> <DISTSECT|.|h>", 1, dist, C_MOD, NORM},
     {"drop <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION> <COMM>",
      1, drop, C_MOD, NORM + MONEY + CAP},
@@ -109,7 +109,7 @@ struct cmndstr player_coms[] = {
      2, fly, C_MOD, NORM + MONEY + CAP},
     {"follow <leader> <SHIPS>", 1, foll, C_MOD, NORM + CAP},
     {"force", 0, force, C_MOD, GOD},
-    {"fortify <UNITS> <MOB>", 1, fort, C_MOD, NORM},
+    {"fortify <UNITS> <MOB>", 1, fort, C_MOD, NORM + CAP},
     {"give <COMM> <SECT> <NUM>", 0, give, C_MOD, GOD},
     {"grind <SECT> <NUM>", 1, grin, C_MOD, NORM + MONEY + CAP},
     {"harden <PLANES> <NUM>", 2, hard, C_MOD, NORM + MONEY + CAP},
@@ -186,7 +186,7 @@ struct cmndstr player_coms[] = {
     {"pray", 0, tele, C_MOD, NORM},
     {"production <SECTS>", 0, prod, 0, NORM},
     {"pstat <PLANES>", 0, pstat, 0, NORM},
-    {"qorder <SHIPS>", 0, qorde, C_MOD, NORM + CAP},
+    {"qorder <SHIPS>", 0, qorde, C_MOD, NORM},
     {"quit", 0, quit, 0, 0},
     {"radar <SHIPS | SECTS>", 1, rada, C_MOD, NORM + CAP},
     {"range <PLANES> <range>", 1, range, C_MOD, NORM + CAP},
@@ -208,7 +208,7 @@ struct cmndstr player_coms[] = {
     {"sabotage <UNITS>", 1, sabo, C_MOD, NORM + MONEY + CAP},
     {"sail <SHIPS> <PATH>", 1, sail, C_MOD, NORM + CAP},
     {"satellite <PLANE> [<se|sh|l> [?cond&cond&...]]",
-     1, sate, C_MOD, NORM + MONEY + CAP},
+     1, sate, C_MOD, NORM + CAP},
     {"sbmap <SECTS|SHIP> [s|l|n|p|r|t|*|h]", 0, map, C_MOD, NORM},
     {"scrap <s|p|l> <SHIPS|PLANES|UNITS>",
      2, scra, C_MOD, NORM + MONEY + CAP},
@@ -233,15 +233,15 @@ struct cmndstr player_coms[] = {
     {"skywatch <SECTS>", 1, skyw, C_MOD, NORM + CAP},
     {"smap <SECTS|SHIP> [s|l|n|p|*|h]", 0, map, C_MOD, NORM},
     {"sonar <SHIPS> <brief?>", 1, sona, C_MOD, NORM + CAP},
-    {"sorder <SHIPS>", 0, sorde, C_MOD, NORM + CAP},
+    {"sorder <SHIPS>", 0, sorde, C_MOD, NORM},
     {"spy <SECTS>", 1, spy, C_MOD, NORM + CAP},
     {"sstat <SHIPS>", 0, sstat, 0, NORM},
-    {"start <TYPE> <SECTS|PLANES|SHIPS|UNITS>", 1, start, C_MOD, NORM + CAP},
+    {"start <TYPE> <SECTS|PLANES|SHIPS|UNITS>", 1, start, C_MOD, NORM},
     {"starvation [<SECTS>|l <UNITS>|s <SHIPS>]", 0, starve, 0, NORM},
-    {"stop <TYPE> <SECTS|PLANES|SHIPS|UNITS>", 1, stop, C_MOD, NORM + CAP},
+    {"stop <TYPE> <SECTS|PLANES|SHIPS|UNITS>", 1, stop, C_MOD, NORM},
     {"strength <SECTS>", 1, stre, C_MOD, NORM},
     {"supply <LAND UNITS>", 1, supp, C_MOD, NORM + CAP},
-    {"survey <SELECTOR> <SECTS>", 0, surv, C_MOD, NORM + CAP},
+    {"survey <SELECTOR> <SECTS>", 0, surv, C_MOD, NORM},
     {"swapsector <SECT> <SECT>", 0, swaps, C_MOD, GOD},
     {"sweep <sweep-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION>",
      3, reco, C_MOD, NORM + MONEY + CAP},
@@ -250,7 +250,7 @@ struct cmndstr player_coms[] = {
      1, tend, C_MOD, NORM + CAP},
     {"territory <SECTS> <NUMBER> [<FIELD>]", 0, terr, C_MOD, NORM},
     {"test <COMM> <SECT> <NUM> <PATH|DESTINATION>",
-     1, move, C_MOD, NORM + CAP},
+     1, move, C_MOD, NORM},
     {"threshold <COMM> <SECTS> <THRESH>", 1, thre, C_MOD, NORM},
     {"toggle [inform|flash|beep|coastwatch|sonar|techlists] [on|off]",
      0, togg, C_MOD, 0},
-- 
2.43.0