config: Increase mountain process efficiency from 75% to 100%

Each point of gold resource is worth 5d.  Except for mountains, where
it's just 3.75d.  This is because a mountain's process efficiency is
only 75%.  Has been that way since Empire 3 made mountains mine gold.

This is actually a needless complication: a sector with 75% process
efficiency produces just like one with 100% process efficiency and 75%
of the resource.

Increase mountain process efficiency to 100%.  Deities may want to
compensate by adjusting mountains' gold resources.

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

diff --git a/src/lib/global/sect.config b/src/lib/global/sect.config
index c353433d99d24246c161e1b6d89af3e8ad2d0198..9460a88672287325f9a829223cae657e03d51f89 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-2016
+#      Markus Armbruster, 2006-2021
 #
 #   Derived from sect.c; known contributors:
 #      Dave Pare, 1986
@@ -66,7 +66,7 @@
 config sect-chr
 uid mnem   prd peff l_b h_b bwork cost maint name ...
   0  "."    -1    0   0   0     0    0     0 "sea"
-  1  "^"  dust   75   0   0   100  100     0 "mountain"
+  1  "^"  dust  100   0   0   100  100     0 "mountain"
   2  "s"    -1    0   0   0   100    0     0 "sanctuary"
   3 "\134"  -1    0   0   0   100    0     0 "wasteland"
   4  "-"    -1    0   0   0   100    0     0 "wilderness"

diff --git a/tests/update/final.xdump b/tests/update/final.xdump
index 76024958a910e4a7b0bb3cd03c288a451b53c0f2..e98c8df7220fbc532a33ca81790f387f19857830 100644 (file)
--- a/tests/update/final.xdump
+++ b/tests/update/final.xdump
@@ -82,7 +82,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 -8 4 11 100 120 0 0 0 0 0 0 0 -8 4 9 0 100 0 11 0 8 0 0 0 1 130 1 0 0 0 0 7 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -6 4 11 100 120 0 0 0 0 0 0 0 -6 4 0 0 100 0 11 0 84 0 0 0 1 130 1 0 0 0 0 79 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -4 4 11 100 120 0 0 0 0 0 0 0 -4 4 701 0 100 0 11 0 0 0 0 0 1 1000 1 0 0 0 0 500 0 40 0 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
-1 -2 4 1 100 120 0 0 0 0 0 0 0 -2 4 0 0 100 0 1 0 88 0 0 0 1 100 1 0 0 0 0 45 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
+1 -2 4 1 100 120 0 0 0 0 0 0 0 -2 4 0 0 100 0 1 0 88 0 0 0 1 100 1 0 0 0 0 60 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 1 5 8 100 120 0 0 0 0 0 0 0 1 5 6 0 100 0 8 0 0 0 0 0 1 130 0 0 4 0 0 0 0 97 5 78 55 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 3 5 8 100 120 0 0 0 0 0 0 0 3 5 246 0 100 0 8 0 0 0 0 0 1 650 0 0 8 0 0 0 0 84 1 55 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 5 5 4 39 120 0 0 0 0 0 0 0 5 5 39 0 100 0 4 0 0 0 0 0 1 130 0 0 0 0 0 0 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0

diff --git a/tests/update/journal.log b/tests/update/journal.log
index d651b6a02c88007df931e29daddec0fe724c771b..16604d13f929daffe0b5c6e82d64f942018373b5 100644 (file)
--- a/tests/update/journal.log
+++ b/tests/update/journal.log
@@ -144,7 +144,7 @@
     Play#1 output Play#1 1   -8,4    g  10%    78    7d 1.00 $0                                        7
     Play#1 output Play#1 1   -6,4    g 100%    78   78d 1.00 $0                                       78
     Play#1 output Play#1 1   -4,4    g 100%  1200  500d 1.00 $0                                      500
-    Play#1 output Play#1 1   -2,4    ^ 100%    60   45d 0.75 $0                                       45
+    Play#1 output Play#1 1   -2,4    ^ 100%    60   60d 1.00 $0                                       60
     Play#1 output Play#1 1    0,4    a  10%    78   64f 8.25 $0                                       64
     Play#1 output Play#1 1    2,4    a 100%    80  660f 8.25 $0                                      660
     Play#1 output Play#1 1    4,4    a 100%   600  999f 8.25 $0                                      999
@@ -290,7 +290,7 @@
     Play#3 output Play#3 1 Thu Jan  1 00:00:00 1970
     Play#3 output Play#3 1 PRODUCTION SIMULATION
     Play#3 output Play#3 1    sect  des eff avail  make p.e. cost   use1 use2 use3  max1 max2 max3   max
-    Play#3 output Play#3 1    0,-2   ^   0%   114    0d 0.75 $0                                        0
+    Play#3 output Play#3 1    0,-2   ^   0%   114    0d 1.00 $0                                        0
     Play#3 output Play#3 1    5,-1   u 100%    78   66r 0.86 $154                                     66
     Play#3 output Play#3 1 2 sectors
     Play#3 output Play#3 6 0 99
@@ -714,7 +714,7 @@
     Play#0 output Play#0 1   1  -8,4    g .......... ..........   0   0    0    0    7   0    0    0    0   0
     Play#0 output Play#0 1   1  -6,4    g .......... ..........   0   0    0    0   79   0    0    0    0   0
     Play#0 output Play#0 1   1  -4,4    g .......... ..........   0   0    0    0  500   0    0    0    0   0
-    Play#0 output Play#0 1   1  -2,4    ^ .......... ..........   0   0    0    0   45   0    0    0    0   0
+    Play#0 output Play#0 1   1  -2,4    ^ .......... ..........   0   0    0    0   60   0    0    0    0   0
     Play#0 output Play#0 1   1   0,4    a .......... ..........   0   0    0    0    0   0    0    0    0   0
     Play#0 output Play#0 1   1   2,4    a .......... ..........   0   0    0    0    0   0    0   50   50   0
     Play#0 output Play#0 1   1   4,4    a .......... ..........   0   0    0    0    0   0    0    0    0   0

diff --git a/tests/version/journal.log b/tests/version/journal.log
index 59bcfe8383a1df34875699db974c47332202797c..b86894f0279b2bdc9119cec9cf85b103c46b3108 100644 (file)
--- a/tests/version/journal.log
+++ b/tests/version/journal.log
@@ -126,7 +126,7 @@
     Play#0 output Play#0 1 Printing for tech level '1000'
     Play#0 output Play#0 1   sector type             product  p.e.  capabilities
     Play#0 output Play#0 1 . sea                                    deity
-    Play#0 output Play#0 1 ^ mountain                dust      75%  deity
+    Play#0 output Play#0 1 ^ mountain                dust     100%  deity
     Play#0 output Play#0 1 s sanctuary                              deity
     Play#0 output Play#0 1 \\ wasteland                              deity
     Play#0 output Play#0 1 u uranium mine            rad      100%
@@ -1838,7 +1838,7 @@
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP sect-chr 0
     Play#0 output Play#0 1 0 "sea" "." 0 -1 0 -1.00000 -1.00000 1 1 0.00000 0.00000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
-    Play#0 output Play#0 1 1 "mountain" "^" 1 1 75 2.40000 1.20000 0 1 1.00000 4.00000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 100 0 100 1
+    Play#0 output Play#0 1 1 "mountain" "^" 1 1 100 2.40000 1.20000 0 1 1.00000 4.00000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 100 0 100 1
     Play#0 output Play#0 1 2 "sanctuary" "s" 4 -1 0 -1.00000 -1.00000 0 1 0.00000 99.0000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 0 0 1000 1
     Play#0 output Play#0 1 3 "wasteland" "\\134" 3 -1 0 -1.00000 -1.00000 0 1 0.00000 99.0000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 0 0 0 1
     Play#0 output Play#0 1 4 "wilderness" "-" 4 -1 0 0.400000 0.400000 0 1 1.00000 2.00000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 0 0 1000 0
@@ -2554,7 +2554,7 @@
     Play#1 command xdump
     Play#1 output Play#1 1 XDUMP sect-chr 0
     Play#1 output Play#1 1 0 "sea" "." 0 -1 0 -1.00000 -1.00000 1 1 0.00000 0.00000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
-    Play#1 output Play#1 1 1 "mountain" "^" 1 1 75 2.40000 1.20000 0 1 1.00000 4.00000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 100 0 100 1
+    Play#1 output Play#1 1 1 "mountain" "^" 1 1 100 2.40000 1.20000 0 1 1.00000 4.00000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 100 0 100 1
     Play#1 output Play#1 1 2 "sanctuary" "s" 4 -1 0 -1.00000 -1.00000 0 1 0.00000 99.0000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 0 0 1000 1
     Play#1 output Play#1 1 3 "wasteland" "\\134" 3 -1 0 -1.00000 -1.00000 0 1 0.00000 99.0000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 0 0 0 1
     Play#1 output Play#1 1 4 "wilderness" "-" 4 -1 0 0.400000 0.400000 0 1 1.00000 2.00000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 0 0 1000 0