empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nukes: New selector stockpile

Browse source 
Not interesting without way to make stockpiles.  Coming soon.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-12-29 19:43:47 +01:00
parent cf1c2e9f3c
commit 329da055dd
8 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/nuke.h
View file

@ -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 */

1
src/lib/common/nsc.c
View file

@ -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

2
tests/actofgod/actofgod.xdump
View file

@ -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

2
tests/fairland/fairland.xdump
View file

@ -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

2
tests/files/files.xdump
View file

@ -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

2
tests/smoke/fairland.xdump
View file

@ -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

6
tests/smoke/journal.log
View file

@ -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

2
tests/smoke/smoke.xdump
View file

@ -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