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

config: Add sect-chr flags, replace cost by flag "deity"

Browse source 
Give sector types capability flags (dchrstr member d_flags), like
ship, plane, land unit and nuke types have.

Member d_cost is effectively a flag since the previous commit.
Replace it by capability flag "deity".  This is an xdump compatibility
break.  To provide the customary grace period, we'd have make selector
cost virtual instead, and deprecate it.  But we're not bothering with
maintaining xdump compatibility in this release.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-05 19:22:45 +02:00
parent ba2795fbf7
commit 16bf0d28b2
12 changed files with 240 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

156
src/lib/global/sect.config
View file

@ -40,6 +40,9 @@
# The sector types (column uid) must match the compiled-in types
# defined in sect.h.
# Available capability flags are in compiled-in table sect-chr-flags.
# info Sector-types should document them all.
# Sector terrain (column terra) is the uid of the underlying terrain
# sector type. Sector types that occur in that column are terrain
# types, and must have themselves as terrain.
@ -48,12 +51,9 @@
# types (column nav) are in compiled-in table sector-navigation.
# Packing types (column pkg) are in compiled-in table packing.
# Players can only designate sectors with a non-negative value in
# column cost, and only to something with the same terrain. All
# sectors with the same terrain and non-negative cost should have the
# same population limit (column maxpop), or else players can abuse
# redesignation to mass-murder people. Other than that, cost has no
# purpose anymore.
# All sectors with the same terrain and without capability deity
# should have the same population limit (column maxpop), or else
# players can abuse redesignation to mass-murder people.
# A sector with urban packing (urba in column pkg) is a big city.
# Column maxpop applies at 0% efficiency. The limit at 100% is ten
@ -64,83 +64,83 @@
# econfig key custom_tables.
config sect-chr
uid mnem prd peff val cost bui lcm hcm maint name ...
0 "." -1 0 0 -1 0 0 0 0 "sea"
1 "^" dust 75 5 -1 1 0 0 0 "mountain"
2 "s" -1 0 127 -1 0 0 0 0 "sanctuary"
3 "\134" -1 0 0 -1 0 0 0 0 "wasteland"
4 "-" -1 0 1 0 0 0 0 0 "wilderness"
uid mnem prd peff val bui lcm hcm maint name ...
0 "." -1 0 0 0 0 0 0 "sea"
1 "^" dust 75 5 1 0 0 0 "mountain"
2 "s" -1 0 127 0 0 0 0 "sanctuary"
3 "\134" -1 0 0 0 0 0 0 "wasteland"
4 "-" -1 0 1 0 0 0 0 "wilderness"
# Uncomment one of the following two. The second one is for big cities.
5 "c" -1 0 30 0 1 0 0 1 "capital"
# 5 "c" -1 0 30 0 10 1 2 1 "city"
6 "u" rad 100 15 0 1 0 0 0 "uranium mine"
7 "p" hap 100 5 0 1 0 0 0 "park"
8 "d" gun 100 7 0 1 0 0 0 "defense plant"
9 "i" sh 100 6 0 1 0 0 0 "shell industry"
10 "m" iron 100 5 0 1 0 0 0 "mine"
11 "g" dust 100 8 0 1 0 0 0 "gold mine"
12 "h" -1 0 12 0 1 0 0 0 "harbor"
13 "w" -1 0 7 0 1 0 0 0 "warehouse"
14 "*" -1 0 12 0 1 0 0 0 "airfield"
15 "a" food 900 2 0 1 0 0 0 "agribusiness"
16 "o" oil 100 5 0 1 0 0 0 "oil field"
17 "j" lcm 100 3 0 1 0 0 0 "light manufacturing"
18 "k" hcm 100 4 0 1 0 0 0 "heavy manufacturing"
19 "f" -1 0 10 0 5 0 1 0 "fortress"
20 "t" tech 100 10 0 1 0 0 0 "technical center"
21 "r" med 100 9 0 1 0 0 0 "research lab"
22 "n" -1 0 10 0 1 0 0 0 "nuclear plant"
23 "l" edu 100 4 0 1 0 0 0 "library/school"
24 "+" -1 0 3 0 1 0 0 0 "highway"
25 ")" -1 0 4 0 1 0 0 0 "radar installation"
26 "!" -1 0 12 0 1 0 0 0 "headquarters"
27 "#" -1 0 3 0 1 0 0 0 "bridge head"
28 "=" -1 0 5 -1 1 0 0 0 "bridge span"
29 "b" bars 100 10 0 1 0 0 0 "bank"
30 "%" pet 1000 2 0 1 0 0 0 "refinery"
31 "e" -1 0 7 0 1 0 0 0 "enlistment center"
32 "~" -1 0 1 -1 1 0 0 0 "plains"
33 "@" -1 0 4 -1 1 0 0 0 "bridge tower"
5 "c" -1 0 30 1 0 0 1 "capital"
# 5 "c" -1 0 30 10 1 2 1 "city"
6 "u" rad 100 15 1 0 0 0 "uranium mine"
7 "p" hap 100 5 1 0 0 0 "park"
8 "d" gun 100 7 1 0 0 0 "defense plant"
9 "i" sh 100 6 1 0 0 0 "shell industry"
10 "m" iron 100 5 1 0 0 0 "mine"
11 "g" dust 100 8 1 0 0 0 "gold mine"
12 "h" -1 0 12 1 0 0 0 "harbor"
13 "w" -1 0 7 1 0 0 0 "warehouse"
14 "*" -1 0 12 1 0 0 0 "airfield"
15 "a" food 900 2 1 0 0 0 "agribusiness"
16 "o" oil 100 5 1 0 0 0 "oil field"
17 "j" lcm 100 3 1 0 0 0 "light manufacturing"
18 "k" hcm 100 4 1 0 0 0 "heavy manufacturing"
19 "f" -1 0 10 5 0 1 0 "fortress"
20 "t" tech 100 10 1 0 0 0 "technical center"
21 "r" med 100 9 1 0 0 0 "research lab"
22 "n" -1 0 10 1 0 0 0 "nuclear plant"
23 "l" edu 100 4 1 0 0 0 "library/school"
24 "+" -1 0 3 1 0 0 0 "highway"
25 ")" -1 0 4 1 0 0 0 "radar installation"
26 "!" -1 0 12 1 0 0 0 "headquarters"
27 "#" -1 0 3 1 0 0 0 "bridge head"
28 "=" -1 0 5 1 0 0 0 "bridge span"
29 "b" bars 100 10 1 0 0 0 "bank"
30 "%" pet 1000 2 1 0 0 0 "refinery"
31 "e" -1 0 7 1 0 0 0 "enlistment center"
32 "~" -1 0 1 1 0 0 0 "plains"
33 "@" -1 0 4 1 0 0 0 "bridge tower"
# Deity-defined sector types go here
/config
config sect-chr
uid mnem terra mob0 mob1 nav pkg ostr dstr maxpop
0 "." 0 -1 -1 sea norm 0.0 0.0 0
1 "^" 1 2.4 1.2 land norm 1.0 4.0 100
2 "s" 4 -1 -1 land norm 0.0 99.0 1000
3 "\134" 3 -1 -1 land norm 0.0 99.0 0
4 "-" 4 0.4 0.4 land norm 1.0 2.0 1000
uid mnem terra mob0 mob1 nav pkg ostr dstr maxpop flags
0 "." 0 -1 -1 sea norm 0.0 0.0 0 (deity)
1 "^" 1 2.4 1.2 land norm 1.0 4.0 100 (deity)
2 "s" 4 -1 -1 land norm 0.0 99.0 1000 (deity)
3 "\134" 3 -1 -1 land norm 0.0 99.0 0 (deity)
4 "-" 4 0.4 0.4 land norm 1.0 2.0 1000 ()
# Uncomment one of the following two. The second one is for big cities.
5 "c" 4 0.4 0.2 land norm 1.0 2.0 1000
# 5 "c" 4 0.4 0.2 cana urba 1.0 2.0 1000
6 "u" 4 0.4 0.2 land norm 1.0 2.0 1000
7 "p" 4 0.4 0.2 land norm 1.0 1.5 1000
8 "d" 4 0.4 0.2 land norm 1.0 1.5 1000
9 "i" 4 0.4 0.2 land norm 1.0 1.5 1000
10 "m" 4 0.4 0.2 land norm 1.0 2.0 1000
11 "g" 4 0.4 0.2 land norm 1.0 2.0 1000
12 "h" 4 0.4 0.2 harb ware 1.0 1.5 1000
13 "w" 4 0.4 0.2 land ware 1.0 1.5 1000
14 "*" 4 0.4 0.2 land norm 1.0 1.25 1000
15 "a" 4 0.4 0.2 land norm 1.0 1.5 1000
16 "o" 4 0.4 0.2 land norm 1.0 1.5 1000
17 "j" 4 0.4 0.2 land norm 1.0 1.5 1000
18 "k" 4 0.4 0.2 land norm 1.0 1.5 1000
19 "f" 4 0.4 0.2 land norm 2.0 4.0 1000
20 "t" 4 0.4 0.2 land norm 1.0 1.5 1000
21 "r" 4 0.4 0.2 land norm 1.0 1.5 1000
22 "n" 4 0.4 0.2 land norm 1.0 2.0 1000
23 "l" 4 0.4 0.2 land norm 1.0 1.5 1000
24 "+" 4 0.4 0.0 land norm 1.0 1.0 1000
25 ")" 4 0.4 0.2 land norm 1.0 1.5 1000
26 "!" 4 0.4 0.2 land norm 1.0 1.5 1000
27 "#" 4 0.4 0.0 land norm 1.0 1.0 1000
28 "=" 0 0.4 0.0 brid norm 1.0 1.0 100
29 "b" 4 0.4 0.2 land bank 1.0 2.25 1000
30 "%" 4 0.4 0.2 land norm 1.0 1.5 1000
31 "e" 4 0.4 0.2 land norm 1.0 2.0 1000
32 "~" 32 0.4 0.2 land norm 1.0 1.5 100
33 "@" 0 0.4 0.0 land norm 1.0 1.5 100
5 "c" 4 0.4 0.2 land norm 1.0 2.0 1000 ()
# 5 "c" 4 0.4 0.2 cana urba 1.0 2.0 1000 ()
6 "u" 4 0.4 0.2 land norm 1.0 2.0 1000 ()
7 "p" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
8 "d" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
9 "i" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
10 "m" 4 0.4 0.2 land norm 1.0 2.0 1000 ()
11 "g" 4 0.4 0.2 land norm 1.0 2.0 1000 ()
12 "h" 4 0.4 0.2 harb ware 1.0 1.5 1000 ()
13 "w" 4 0.4 0.2 land ware 1.0 1.5 1000 ()
14 "*" 4 0.4 0.2 land norm 1.0 1.25 1000 ()
15 "a" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
16 "o" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
17 "j" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
18 "k" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
19 "f" 4 0.4 0.2 land norm 2.0 4.0 1000 ()
20 "t" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
21 "r" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
22 "n" 4 0.4 0.2 land norm 1.0 2.0 1000 ()
23 "l" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
24 "+" 4 0.4 0.0 land norm 1.0 1.0 1000 ()
25 ")" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
26 "!" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
27 "#" 4 0.4 0.0 land norm 1.0 1.0 1000 ()
28 "=" 0 0.4 0.0 brid norm 1.0 1.0 100 (deity)
29 "b" 4 0.4 0.2 land bank 1.0 2.25 1000 ()
30 "%" 4 0.4 0.2 land norm 1.0 1.5 1000 ()
31 "e" 4 0.4 0.2 land norm 1.0 2.0 1000 ()
32 "~" 32 0.4 0.2 land norm 1.0 1.5 100 (deity)
33 "@" 0 0.4 0.0 land norm 1.0 1.5 100 (deity)
# Deity-defined sector types go here
/config

7
src/lib/global/symbol.c
View file

@ -27,7 +27,7 @@
* symbol.c: Empire symbol tables
*
* Known contributors to this file:
* Markus Armbruster, 2006-2015
* Markus Armbruster, 2006-2016
*/
#include <config.h>
@ -243,6 +243,11 @@ struct symbol retreat_flags[] = {
{0, NULL}
};
struct symbol sect_chr_flags[] = {
{D_DEITY, "deity"},
{0, NULL}
};
struct symbol sector_navigation[] = {
{NAV_NONE, "land"},
{NAVOK, "sea"},