nukes: New selector stockpile

Not interesting without way to make stockpiles.  Coming soon.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/nuke.h b/include/nuke.h
index a59afa3fd48c2bab8ebc7816387b19fbdcf0af6c..918e92a7a16082fd4038bb09fdac2d0f9c589340 100644 (file)
--- a/include/nuke.h
+++ b/include/nuke.h
@@ -53,7 +53,7 @@ struct nukstr {
     signed char nuk_mobil;     /* unused, always 0 */
     unsigned char nuk_off;     /* repairs stopped? (unused) */
     short nuk_tech;            /* nuke's tech level */
-    char nuk_stockpile;                /* group membership, unused */
+    char nuk_stockpile;                /* group membership */
     coord nuk_opx, nuk_opy;    /* Op sector coords, unused */
     short nuk_mission;         /* mission code, unused */
     short nuk_radius;          /* mission radius, unused */

diff --git a/src/lib/common/nsc.c b/src/lib/common/nsc.c
index 55fc237e64826058817d5bcedabad0995f2a09eb..4f371245c77dcb6996f8028f46b8527632ca2668 100644 (file)
--- a/src/lib/common/nsc.c
+++ b/src/lib/common/nsc.c
@@ -407,6 +407,7 @@ struct castr lchr_ca[] = {
 struct castr nuke_ca[] = {
 #define CURSTR struct nukstr
     NSC_GENITEM(EF_NUKE, EF_NUKE_CHR),
+    {"stockpile", fldoff(nuk_stockpile), NSC_STRINGY, 1, NULL, EF_BAD, 0},
     {"plane", fldoff(nuk_plane), NSC_INT, 0, NULL, EF_PLANE, 0},
     {NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
 #undef CURSTR

diff --git a/tests/actofgod/actofgod.xdump b/tests/actofgod/actofgod.xdump
index 5a0903ae5982e716d32fd6ab8dcccac4be2b8199..a446e56347434e8638a9995a807aad9ca5ccd654 100644 (file)
--- a/tests/actofgod/actofgod.xdump
+++ b/tests/actofgod/actofgod.xdump
@@ -353,7 +353,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
 49 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 /config
 config nuke
-uid owner xloc yloc type effic mobil off tech opx opy mission radius plane
+uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile plane
 /config
 config news
 actor action victim times duration time

diff --git a/tests/fairland/fairland.xdump b/tests/fairland/fairland.xdump
index 59c17ab565bee448cbc21ff71d457f9c3313b1e1..4566bd0a0b9f08f00f718a4e3eab83d31f224e57 100644 (file)
--- a/tests/fairland/fairland.xdump
+++ b/tests/fairland/fairland.xdump
@@ -1035,7 +1035,7 @@ config land
 uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship harden retreat rflags rpath civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime land access
 /config
 config nuke
-uid owner xloc yloc type effic mobil off tech opx opy mission radius plane
+uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile plane
 /config
 config news
 actor action victim times duration time

diff --git a/tests/files/files.xdump b/tests/files/files.xdump
index d33ca7b3a27b6c560553228aaabe931b30ffa679..6b863ab67f24145ae6ee15041e9ea8cde0cb5664 100644 (file)
--- a/tests/files/files.xdump
+++ b/tests/files/files.xdump
@@ -1035,7 +1035,7 @@ config land
 uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship harden retreat rflags rpath civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime land access
 /config
 config nuke
-uid owner xloc yloc type effic mobil off tech opx opy mission radius plane
+uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile plane
 /config
 config news
 actor action victim times duration time

diff --git a/tests/smoke/fairland.xdump b/tests/smoke/fairland.xdump
index 047b8605c9bbec8a91d464d4038181cd7a4406de..5d5f498886d1677aff083e9048e472d7ca180ade 100644 (file)
--- a/tests/smoke/fairland.xdump
+++ b/tests/smoke/fairland.xdump
@@ -1035,7 +1035,7 @@ config land
 uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship harden retreat rflags rpath civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime land access
 /config
 config nuke
-uid owner xloc yloc type effic mobil off tech opx opy mission radius plane
+uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile plane
 /config
 config news
 actor action victim times duration time

diff --git a/tests/smoke/journal.log b/tests/smoke/journal.log
index 11ec1b009e0d11bd5e2ce720d4ce69ff5946e5d3..2af540c06f460de4f3af22910529e94bb8db0f40 100644 (file)
--- a/tests/smoke/journal.log
+++ b/tests/smoke/journal.log
@@ -326,8 +326,9 @@
     Play#0 output Play#0 1 "opy" 10 0 0 -1
     Play#0 output Play#0 1 "mission" 6 0 0 35
     Play#0 output Play#0 1 "radius" 6 0 0 -1
+    Play#0 output Play#0 1 "stockpile" 14 0 1 -1
     Play#0 output Play#0 1 "plane" 8 0 0 2
-    Play#0 output Play#0 1 /14
+    Play#0 output Play#0 1 /15
     Play#0 output Play#0 6 0 640
     Play#0 input xdump meta news
     Play#0 command xdump
@@ -1473,8 +1474,9 @@
     Play#2 output Play#2 1 "opy" 10 0 0 -1
     Play#2 output Play#2 1 "mission" 6 0 0 35
     Play#2 output Play#2 1 "radius" 6 0 0 -1
+    Play#2 output Play#2 1 "stockpile" 14 0 1 -1
     Play#2 output Play#2 1 "plane" 8 0 0 2
-    Play#2 output Play#2 1 /14
+    Play#2 output Play#2 1 /15
     Play#2 output Play#2 6 0 636
     Play#2 input xdump meta news
     Play#2 command xdump

diff --git a/tests/smoke/smoke.xdump b/tests/smoke/smoke.xdump
index af132a196541021008bd06f6e0804042e30d4e92..a50f42cb979c539847467522a9975c8648eb40f2 100644 (file)
--- a/tests/smoke/smoke.xdump
+++ b/tests/smoke/smoke.xdump
@@ -1185,7 +1185,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
 49 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 /config
 config nuke
-uid owner xloc yloc type effic mobil off tech opx opy mission radius plane
+uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile plane
 /config
 config news
 actor action victim times duration time