config: Split table sect-chr for legibility

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

diff --git a/src/lib/global/sect.config b/src/lib/global/sect.config
index 28ed751d7b33c2c1871d69f2e23de2cac9f2260a..2a5b087c3b9a43148f7008084772e5a099d670c7 100644 (file)
--- a/src/lib/global/sect.config
+++ b/src/lib/global/sect.config
@@ -27,7 +27,7 @@
 #   sect.config: Sector characteristics
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2006-2011
+#      Markus Armbruster, 2006-2016
 #
 #   Derived from sect.c; known contributors:
 #      Dave Pare, 1986
@@ -51,11 +51,11 @@
 # 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 maxp), or else players can abuse
+# 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 maxp applies at 0% efficiency.  The limit at 100% is ten
+# Column maxpop applies at 0% efficiency.  The limit at 100% is ten
 # times as large, up to the general item limit 9999.
 
 # Do not edit this file to customize a game!  Create your own custom
@@ -63,42 +63,83 @@
 # econfig key custom_tables.
 
 config sect-chr
-uid mnem terra prd peff mob0 mob1  nav  pkg ostr dstr val cost bui lcm hcm maint maxp name
-  0  "."    0   -1    0   -1   -1  sea norm  0.0  0.0   0   -1   0   0   0     0    0 "sea"
-  1  "^"    1 dust   75  2.4  1.2 land norm  1.0  4.0   5   -1   1   0   0     0  100 "mountain"
-  2  "s"    4   -1    0   -1   -1 land norm  0.0 99.0 127   -1   0   0   0     0 1000 "sanctuary"
-  3 "\134"  3   -1    0   -1   -1 land norm  0.0 99.0   0   -1   0   0   0     0    0 "wasteland"
-  4  "-"    4   -1    0  0.4  0.4 land norm  1.0  2.0   1    0   0   0   0     0 1000 "wilderness"
+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"
 # Uncomment one of the following two.  The second one is for big cities.
-  5  "c"    4   -1    0  0.4  0.2 land norm  1.0  2.0  30    0   1   0   0     1 1000 "capital"
-# 5  "c"    4   -1    0  0.4  0.2 cana urba  1.0  2.0  30    0  10   1   2     1 1000 "city"
-  6  "u"    4  rad  100  0.4  0.2 land norm  1.0  2.0  15    0   1   0   0     0 1000 "uranium mine"
-  7  "p"    4  hap  100  0.4  0.2 land norm  1.0  1.5   5    0   1   0   0     0 1000 "park"
-  8  "d"    4  gun  100  0.4  0.2 land norm  1.0  1.5   7    0   1   0   0     0 1000 "defense plant"
-  9  "i"    4   sh  100  0.4  0.2 land norm  1.0  1.5   6    0   1   0   0     0 1000 "shell industry"
- 10  "m"    4 iron  100  0.4  0.2 land norm  1.0  2.0   5    0   1   0   0     0 1000 "mine"
- 11  "g"    4 dust  100  0.4  0.2 land norm  1.0  2.0   8    0   1   0   0     0 1000 "gold mine"
- 12  "h"    4   -1    0  0.4  0.2 harb ware  1.0  1.5  12    0   1   0   0     0 1000 "harbor"
- 13  "w"    4   -1    0  0.4  0.2 land ware  1.0  1.5   7    0   1   0   0     0 1000 "warehouse"
- 14  "*"    4   -1    0  0.4  0.2 land norm  1.0  1.25 12    0   1   0   0     0 1000 "airfield"
- 15  "a"    4 food  900  0.4  0.2 land norm  1.0  1.5   2    0   1   0   0     0 1000 "agribusiness"
- 16  "o"    4  oil  100  0.4  0.2 land norm  1.0  1.5   5    0   1   0   0     0 1000 "oil field"
- 17  "j"    4  lcm  100  0.4  0.2 land norm  1.0  1.5   3    0   1   0   0     0 1000 "light manufacturing"
- 18  "k"    4  hcm  100  0.4  0.2 land norm  1.0  1.5   4    0   1   0   0     0 1000 "heavy manufacturing"
- 19  "f"    4   -1    0  0.4  0.2 land norm  2.0  4.0  10    0   5   0   1     0 1000 "fortress"
- 20  "t"    4 tech  100  0.4  0.2 land norm  1.0  1.5  10    0   1   0   0     0 1000 "technical center"
- 21  "r"    4  med  100  0.4  0.2 land norm  1.0  1.5   9    0   1   0   0     0 1000 "research lab"
- 22  "n"    4   -1    0  0.4  0.2 land norm  1.0  2.0  10    0   1   0   0     0 1000 "nuclear plant"
- 23  "l"    4  edu  100  0.4  0.2 land norm  1.0  1.5   4    0   1   0   0     0 1000 "library/school"
- 24  "+"    4   -1    0  0.4  0.0 land norm  1.0  1.0   3    0   1   0   0     0 1000 "highway"
- 25  ")"    4   -1    0  0.4  0.2 land norm  1.0  1.5   4    0   1   0   0     0 1000 "radar installation"
- 26  "!"    4   -1    0  0.4  0.2 land norm  1.0  1.5  12    0   1   0   0     0 1000 "headquarters"
- 27  "#"    4   -1    0  0.4  0.0 land norm  1.0  1.0   3    0   1   0   0     0 1000 "bridge head"
- 28  "="    0   -1    0  0.4  0.0 brid norm  1.0  1.0   5   -1   1   0   0     0  100 "bridge span"
- 29  "b"    4 bars  100  0.4  0.2 land bank  1.0  2.25 10    0   1   0   0     0 1000 "bank"
- 30  "%"    4  pet 1000  0.4  0.2 land norm  1.0  1.5   2    0   1   0   0     0 1000 "refinery"
- 31  "e"    4   -1    0  0.4  0.2 land norm  1.0  2.0   7    0   1   0   0     0 1000 "enlistment center"
- 32  "~"   32   -1    0  0.4  0.2 land norm  1.0  1.5   1   -1   1   0   0     0  100 "plains"
- 33  "@"    0   -1    0  0.4  0.0 land norm  1.0  1.5   4   -1   1   0   0     0  100 "bridge tower"
+  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"
+# 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
+# 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
 # Deity-defined sector types go here
 /config

diff --git a/tests/test-common.sh b/tests/test-common.sh
index ab87856357e8af1be4483f5eb95f8b261ac17b8d..9fef696396864796f11ceed72e5242a441a16a7c 100644 (file)
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -82,7 +82,7 @@ customize()
        case $key in
        big-city)
            copy_tables sect
-           sed_i '/"c" .* norm/d;/^#.*"c" .* cana/s/^#/ /' sandbox/etc/empire/sect.config
+           sed_i '/"c" .* "capital"/d;/^#.*"c" .* "city"/s/^#/ /;/"c" .* norm/d;/^#.*"c" .* cana/s/^#/ /' sandbox/etc/empire/sect.config
            ;;
        trade-ship)
            copy_tables ship