Update copyright notice

[empserver] / src / lib / player / empmod.c

diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c
index 4f17df558e017c4216561573e171d9f63b2902cc..46eca006df66c980f2cd96d38152f3cd7b481ed6 100644 (file)
--- a/src/lib/player/empmod.c
+++ b/src/lib/player/empmod.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -32,7 +32,7 @@
  *     Thomas Ruschak, 1992
  *     Ken Stevens, 1995
  *     Steve McClure, 1996-2000
- *     Markus Armbruster, 2004-2012
+ *     Markus Armbruster, 2004-2015
  */
 
 /*
@@ -46,6 +46,7 @@
 #include "com.h"
 #include "player.h"
 #include "prototypes.h"
+#include "testing.h"
 
 struct cmndstr player_coms[] = {
 /*  command form                       cost    addr    permit */
@@ -81,7 +82,7 @@ struct cmndstr player_coms[] = {
     {"coastwatch <SECTS>", 1, coas, C_MOD, NORM + CAP},
     {"collect <LOAN> <SECT>", 2, coll, C_MOD, NORM + MONEY + CAP},
     {"commodity <SECTS>", 0, comm, 0, NONVIS},
-    {"consider <loan|treaty> <LOAN/TREATY> <acc|decl|post>",
+    {"consider <loan> <LOAN> <acc|decl|post>",
      1, cons, C_MOD, NORM + CAP},
     {"convert <SECTS> <NUM>", 2, conv, C_MOD, NORM + MONEY + CAP},
     {"country <NATS>", 0, coun, 0, 0},
@@ -99,7 +100,7 @@ struct cmndstr player_coms[] = {
      1, drop, C_MOD, NORM + MONEY + CAP},
     {"dump <SECTS> [<fields>]", 0, dump, 0, NORM},
     {"echo [<string>]", 0, echo, 0, 0},
-    {"edit <country|land|ship|plane|unit> <NAT|SECT|SHIP|PLANE|LAND> [<KEY> <VALUE>]...",
+    {"edit <l|s|p|u|n|c> <SECTS|SHIPS|PLANES|LANDS|NUKES|NATS> [<KEY> <VALUE>]...",
      0, edit, C_MOD, GOD},
     {"enable", 0, enab, C_MOD, GOD},
     {"enlist <SECTS> <NUM>", 2, enli, C_MOD, NORM + MONEY + CAP},
@@ -113,7 +114,6 @@ struct cmndstr player_coms[] = {
     {"fleetadd <FLEET> <SHIPS>", 0, flee, C_MOD, NORM},
     {"fly <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION> <COM>",
      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 + CAP},
     {"give <COMM> <SECTS> <NUM>", 0, give, C_MOD, GOD},
@@ -144,7 +144,7 @@ struct cmndstr player_coms[] = {
     {"lookout <SHIPS>", 1, look, 0, NORM + CAP},
     {"lost", 0, lost, 0, NORM},
     {"lradar <UNITS | SECTS>", 1, lrad, C_MOD, NORM + CAP},
-    {"lretreat <UNITS|ARMY> <PATH> [i|h|b|c]",
+    {"lretreat <UNITS|ARMY> [q | <PATH> <i|h|b|c>]",
      1, lretr, C_MOD, NORM + CAP},
     {"lstat <UNITS>", 0, lsta, 0, NORM},
     {"ltend <COMM> <tender-SHIPS> <NUM> <UNITS>",
@@ -161,20 +161,18 @@ struct cmndstr player_coms[] = {
     {"motd", 0, show_motd, 0, 0},
     {"move <COMM> <SECT> <NUM> <PATH|DESTINATION>",
      1, move, C_MOD, NORM + CAP},
-    {"mquota <SHIPS> <value>", 2, mobq, C_MOD, NORM + CAP},
     {"name <SHIPS> <NAME>", 0, name, C_MOD, NORM},
     {"nation [as-COUNTRY]", 0, nati, 0, 0},
     {"navigate <SHIPS> <PATH|DESTINATION>", 1, navi, C_MOD, NORM + CAP},
     {"nbmap <SECTS|NUKE> [s|l|n|p|r|t|*|h]", 0, map, C_MOD, NORM},
-    {"ndump <SECTS>", 0, ndump, 0, NORM},
+    {"ndump <NUKES>", 0, ndump, 0, NORM},
     {"newcap <NAT> <SECTOR>", 0, new, C_MOD, GOD},
     {"neweff <SECTS>", 0, newe, 0, NORM},
     {"newspaper [days]", 0, news, 0, 0},
     {"nmap <SECTS|NUKE> [s|l|n|p|*|h]", 0, map, C_MOD, NORM},
-    {"nuke <SECTS>", 0, nuke, 0, NORM},
-    {"offer <loan|treaty> <NAT> [<NUM> <DAYS> <IRATE>]",
+    {"nuke <NUKES>", 0, nuke, 0, NORM},
+    {"offer <loan> <NAT> [<NUM> <DAYS> <IRATE>]",
      1, offe, C_MOD, NORM + MONEY + CAP},
-    {"order <SHIPS> <c|s|r|d|l> ", 1, orde, C_MOD, NORM + CAP},
     {"origin <SECT|COUNTRY|~>", 1, orig, C_MOD, NORM},
     {"paradrop <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION>",
      3, para, C_MOD, NORM + MONEY + CAP},
@@ -192,7 +190,6 @@ 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, 0, NORM},
     {"quit", 0, quit, 0, 0},
     {"radar <SHIPS | SECTS>", 1, rada, C_MOD, NORM + CAP},
     {"range <PLANES> <range>", 1, range, C_MOD, NORM + CAP},
@@ -200,7 +197,7 @@ struct cmndstr player_coms[] = {
     {"realm <number> [<SECTS>]", 0, real, C_MOD, NORM},
     {"recon <spy-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION>",
      3, reco, C_MOD, NORM + MONEY + CAP},
-    {"reject <reject|accept> <announcements|mail|treaties|loans> <NAT>",
+    {"reject <reject|accept> <announcements|mail|loans> <NAT>",
      2, reje, C_MOD, NORM},
     {"relations  [as-COUNTRY]", 0, rela, 0, 0},
     {"reload", 0, relo, C_MOD, GOD},
@@ -208,11 +205,10 @@ struct cmndstr player_coms[] = {
     {"report <NATS>", 0, repo, 0, 0},
     {"reset <lot #> <0|price>", 1, rese, C_MOD, NORM + CAP},
     {"resource <SECTS>", 0, reso, 0, NONVIS},
-    {"retreat <SHIPS|FLEET> <PATH> [i|t|s|h|b|d|u|c]",
+    {"retreat <SHIPS|FLEET> [q | <PATH> <i|t|s|h|b|d|u|c>]",
      1, retr, C_MOD, NORM + CAP},
     {"route <COMM> <SECTS>", 1, rout, C_MOD, NORM},
     {"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 + CAP},
     {"sbmap <SECTS|SHIP> [s|l|n|p|r|t|*|h]", 0, map, C_MOD, NORM},
@@ -239,12 +235,12 @@ 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, 0, 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},
+    {"start <TYPE> <SECTS|PLANES|SHIPS|UNITS|NUKES>", 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},
+    {"stockpile <STOCKPILE> <NUKES>", 0, stoc, C_MOD, NORM},
+    {"stop <TYPE> <SECTS|PLANES|SHIPS|UNITS|NUKES>", 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},
@@ -265,21 +261,20 @@ struct cmndstr player_coms[] = {
     {"trade", 1, trad, C_MOD, NORM + MONEY + CAP},
     {"transport <\"nuke\"|\"plane\"> <NUKES|PLANES> <PATH|DESTINATION>",
      1, tran, C_MOD, NORM + CAP},
-    {"treaty <TREATIES>", 0, trea, 0, NORM + MONEY + CAP},
     {"turn <\"on\"|\"off\"|\"mess\">", 0, turn, C_MOD, GOD},
     {"unload <COMM|\"land\"|\"plane\"> <SHIPS> <NUM|UNIT|PLANE>",
      1, load, C_MOD, NORM + CAP},
-    {"unsail <SHIPS>", 1, sail, C_MOD, NORM + CAP},
     {"update", 0, upda, 0, 0},
     {"upgrade <s|p|l> <SHIPS|PLANES|UNITS>",
      1, upgr, C_MOD, NORM + MONEY + CAP},
     {"version", 0, vers, 0, 0},
     {"wall [<message>]", 0, wall, 0, NORM},
-    {"wingadd <WING> <PLANES>", 1, wing, C_MOD, NORM},
+    {"wingadd <WING> <PLANES>", 0, wing, C_MOD, NORM},
     {"wipe <SECTS>", 1, wipe, C_MOD, NORM},
     {"wire [yes|no|<days>]", 0, rea, C_MOD, 0},
     {"work <LAND UNITS> <AMOUNT>", 1, work, C_MOD, NORM + MONEY + CAP},
     {"xdump [\"meta\"] <TYPE> [<RECORDS>]", 0, xdump, 0, 0},
     {"zdone <y|n|c>", 0, zdon, C_MOD, NORM},
+    {"__cmd \"added\" <NUM> <NUM> <NUM>", 0, testing_cmd, 0, TESTING},
     {NULL, 0, NULL, 0, 0}
 };