From a41c74967d1b224a1b42a33eace41f6b28a0631f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 25 Jan 2013 19:30:18 +0100 Subject: [PATCH] edit: Limit resources to 100 instead of 127 Back in Empire 1, resources were limited consistently: fertility to 120, all others to 100. When Chainsaw added setresource, consistency was lost: fertility got limited to 100 there. Chainsaw 3 changed edit to limit all resources to 127. Commit 3fcee8dd and commit 8e430ae2 (both v4.3.11) changed fairland and setsector to limit fertility to 100, matching setresource. Now only edit remains different. Change it to finally make things consistent again. Signed-off-by: Markus Armbruster --- src/lib/commands/edit.c | 10 +++--- tests/actofgod/actofgod.xdump | 4 +-- tests/actofgod/geninput.pl | 11 +++---- tests/actofgod/journal.log | 60 +++++++++++++++++------------------ 4 files changed, 42 insertions(+), 43 deletions(-) diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c index 6353c4c21..fd286a8ab 100644 --- a/src/lib/commands/edit.c +++ b/src/lib/commands/edit.c @@ -466,27 +466,27 @@ edit_sect(struct sctstr *sect, char *key, int arg, char *p) sect->sct_mobil = new; break; case 'i': - new = LIMIT_TO(arg, 0, 127); + new = LIMIT_TO(arg, 0, 100); noise(sect, "Iron ore content", sect->sct_min, new); sect->sct_min = (unsigned char)new; break; case 'g': - new = LIMIT_TO(arg, 0, 127); + new = LIMIT_TO(arg, 0, 100); noise(sect, "Gold content", sect->sct_gmin, new); sect->sct_gmin = (unsigned char)new; break; case 'f': - new = LIMIT_TO(arg, 0, 127); + new = LIMIT_TO(arg, 0, 100); noise(sect, "Fertility", sect->sct_fertil, new); sect->sct_fertil = (unsigned char)new; break; case 'c': - new = LIMIT_TO(arg, 0, 127); + new = LIMIT_TO(arg, 0, 100); noise(sect, "Oil content", sect->sct_oil, new); sect->sct_oil = (unsigned char)new; break; case 'u': - new = LIMIT_TO(arg, 0, 127); + new = LIMIT_TO(arg, 0, 100); noise(sect, "Uranium content", sect->sct_uran, new); sect->sct_uran = (unsigned char)new; break; diff --git a/tests/actofgod/actofgod.xdump b/tests/actofgod/actofgod.xdump index 343b92ebd..c24b973e6 100644 --- a/tests/actofgod/actofgod.xdump +++ b/tests/actofgod/actofgod.xdump @@ -14,8 +14,8 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd 0 -2 0 0 0 0 0 0 0 0 0 0 0 -2 0 0 0 0 1 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 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 1 4 0 -127 0 0 0 0 0 0 0 1 1 0 0 0 1 4 0 0 0 0 0 1 1 1 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 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 1 3 1 4 0 -127 0 0 0 0 0 0 0 3 1 0 0 0 1 4 0 0 0 0 0 1 1 1 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 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 -1 5 1 4 100 127 0 127 0 0 0 0 0 5 1 9999 0 100 1 4 127 127 127 127 127 1 1 1 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 0 0 0 0 0 0 32767 exposed 32767 255 0 9999 0 100 100 100 -1 7 1 4 100 127 0 127 0 0 0 0 0 7 1 9999 0 100 1 4 127 127 127 127 127 1 1 1 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 0 0 0 0 0 0 32767 exposed 32767 255 0 9999 0 100 100 100 +1 5 1 4 100 127 0 127 0 0 0 0 0 5 1 9999 0 100 1 4 100 100 100 100 100 1 1 1 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 0 0 0 0 0 0 32767 exposed 32767 255 0 9999 0 100 100 100 +1 7 1 4 100 127 0 127 0 0 0 0 0 7 1 9999 0 100 1 4 100 100 100 100 100 1 1 1 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 0 0 0 0 0 0 32767 exposed 32767 255 0 9999 0 100 100 100 1 9 1 4 0 0 0 0 0 0 0 0 0 9 1 0 0 100 1 4 0 0 0 0 0 1 1 1 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 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 1 11 1 4 0 0 0 0 0 0 0 0 0 11 1 0 0 100 1 4 0 0 0 0 0 1 1 1 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 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 2 -11 1 4 0 0 0 0 0 0 0 0 0 -11 1 0 0 100 1 4 0 0 0 0 0 2 1 1 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 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 diff --git a/tests/actofgod/geninput.pl b/tests/actofgod/geninput.pl index 1abc1bd1b..f5f168ff3 100755 --- a/tests/actofgod/geninput.pl +++ b/tests/actofgod/geninput.pl @@ -154,7 +154,6 @@ sub sect_int { edit_int1('sect', '1,1', $key, $lob, $upb); my $rkey = $edit2setres{$key}; if (defined $rkey) { - $upb = 100; setres('2,2', $rkey, $lob); setres('4,2', $rkey, $lob - 1); setres('6,2', $rkey, $upb); @@ -172,11 +171,11 @@ sub sect_int { sect_int( ['e', 0, 100], ['m', -127, 127], - ['i', 0, 127], - ['g', 0, 127], - ['f', 0, 127], - ['c', 0, 127], - ['u', 0, 127], + ['i', 0, 100], + ['g', 0, 100], + ['f', 0, 100], + ['c', 0, 100], + ['u', 0, 100], ['w', 0, 100], ['l', 0, 127], ['x', 0, 255], diff --git a/tests/actofgod/journal.log b/tests/actofgod/journal.log index 5fe1e1ddc..55b93449a 100644 --- a/tests/actofgod/journal.log +++ b/tests/actofgod/journal.log @@ -208,13 +208,13 @@ Play#0 command edit Play#0 output Play#0 1 Iron ore content of 3,1 changed from 0 to 0 Play#0 output Play#0 6 0 640 - Play#0 input edit l 5,1 i 127 + Play#0 input edit l 5,1 i 100 Play#0 command edit - Play#0 output Play#0 1 Iron ore content of 5,1 changed from 0 to 127 + Play#0 output Play#0 1 Iron ore content of 5,1 changed from 0 to 100 Play#0 output Play#0 6 0 640 - Play#0 input edit l 7,1 i 128 + Play#0 input edit l 7,1 i 101 Play#0 command edit - Play#0 output Play#0 1 Iron ore content of 7,1 changed from 0 to 127 + Play#0 output Play#0 1 Iron ore content of 7,1 changed from 0 to 100 Play#0 output Play#0 6 0 640 Play#0 input setres i 2,2 0 Play#0 command setresource @@ -258,13 +258,13 @@ Play#0 command edit Play#0 output Play#0 1 Gold content of 3,1 changed from 0 to 0 Play#0 output Play#0 6 0 640 - Play#0 input edit l 5,1 g 127 + Play#0 input edit l 5,1 g 100 Play#0 command edit - Play#0 output Play#0 1 Gold content of 5,1 changed from 0 to 127 + Play#0 output Play#0 1 Gold content of 5,1 changed from 0 to 100 Play#0 output Play#0 6 0 640 - Play#0 input edit l 7,1 g 128 + Play#0 input edit l 7,1 g 101 Play#0 command edit - Play#0 output Play#0 1 Gold content of 7,1 changed from 0 to 127 + Play#0 output Play#0 1 Gold content of 7,1 changed from 0 to 100 Play#0 output Play#0 6 0 640 Play#0 input setres g 2,2 0 Play#0 command setresource @@ -308,13 +308,13 @@ Play#0 command edit Play#0 output Play#0 1 Fertility of 3,1 changed from 0 to 0 Play#0 output Play#0 6 0 640 - Play#0 input edit l 5,1 f 127 + Play#0 input edit l 5,1 f 100 Play#0 command edit - Play#0 output Play#0 1 Fertility of 5,1 changed from 0 to 127 + Play#0 output Play#0 1 Fertility of 5,1 changed from 0 to 100 Play#0 output Play#0 6 0 640 - Play#0 input edit l 7,1 f 128 + Play#0 input edit l 7,1 f 101 Play#0 command edit - Play#0 output Play#0 1 Fertility of 7,1 changed from 0 to 127 + Play#0 output Play#0 1 Fertility of 7,1 changed from 0 to 100 Play#0 output Play#0 6 0 640 Play#0 input setres f 2,2 0 Play#0 command setresource @@ -358,13 +358,13 @@ Play#0 command edit Play#0 output Play#0 1 Oil content of 3,1 changed from 0 to 0 Play#0 output Play#0 6 0 640 - Play#0 input edit l 5,1 c 127 + Play#0 input edit l 5,1 c 100 Play#0 command edit - Play#0 output Play#0 1 Oil content of 5,1 changed from 0 to 127 + Play#0 output Play#0 1 Oil content of 5,1 changed from 0 to 100 Play#0 output Play#0 6 0 640 - Play#0 input edit l 7,1 c 128 + Play#0 input edit l 7,1 c 101 Play#0 command edit - Play#0 output Play#0 1 Oil content of 7,1 changed from 0 to 127 + Play#0 output Play#0 1 Oil content of 7,1 changed from 0 to 100 Play#0 output Play#0 6 0 640 Play#0 input setres o 2,2 0 Play#0 command setresource @@ -408,13 +408,13 @@ Play#0 command edit Play#0 output Play#0 1 Uranium content of 3,1 changed from 0 to 0 Play#0 output Play#0 6 0 640 - Play#0 input edit l 5,1 u 127 + Play#0 input edit l 5,1 u 100 Play#0 command edit - Play#0 output Play#0 1 Uranium content of 5,1 changed from 0 to 127 + Play#0 output Play#0 1 Uranium content of 5,1 changed from 0 to 100 Play#0 output Play#0 6 0 640 - Play#0 input edit l 7,1 u 128 + Play#0 input edit l 7,1 u 101 Play#0 command edit - Play#0 output Play#0 1 Uranium content of 7,1 changed from 0 to 127 + Play#0 output Play#0 1 Uranium content of 7,1 changed from 0 to 100 Play#0 output Play#0 6 0 640 Play#0 input setres u 2,2 0 Play#0 command setresource @@ -1510,8 +1510,8 @@ Play#0 output Play#0 1 Mobility in 3,1 was changed from 0 to -127 by an act of POGO Play#0 output Play#0 1 Mobility in 5,1 was changed from 0 to 127 by an act of POGO Play#0 output Play#0 1 Mobility in 7,1 was changed from 0 to 127 by an act of POGO - Play#0 output Play#0 1 Iron ore content in 5,1 was changed from 0 to 127 by an act of POGO - Play#0 output Play#0 1 Iron ore content in 7,1 was changed from 0 to 127 by an act of POGO + Play#0 output Play#0 1 Iron ore content in 5,1 was changed from 0 to 100 by an act of POGO + Play#0 output Play#0 1 Iron ore content in 7,1 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Iron ore content in 6,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Iron ore content in 8,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Iron ore content in 3,3 was changed from 0 to 1 by an act of POGO @@ -1519,8 +1519,8 @@ Play#0 output Play#0 1 Iron ore content in 7,3 was changed from 0 to 1 by an act of POGO Play#0 output Play#0 1 Iron ore content in 5,3 was changed from 1 to 0 by an act of POGO Play#0 output Play#0 1 Iron ore content in 7,3 was changed from 1 to 0 by an act of POGO - Play#0 output Play#0 1 Gold content in 5,1 was changed from 0 to 127 by an act of POGO - Play#0 output Play#0 1 Gold content in 7,1 was changed from 0 to 127 by an act of POGO + Play#0 output Play#0 1 Gold content in 5,1 was changed from 0 to 100 by an act of POGO + Play#0 output Play#0 1 Gold content in 7,1 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Gold content in 6,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Gold content in 8,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Gold content in 3,3 was changed from 0 to 1 by an act of POGO @@ -1528,8 +1528,8 @@ Play#0 output Play#0 1 Gold content in 7,3 was changed from 0 to 1 by an act of POGO Play#0 output Play#0 1 Gold content in 5,3 was changed from 1 to 0 by an act of POGO Play#0 output Play#0 1 Gold content in 7,3 was changed from 1 to 0 by an act of POGO - Play#0 output Play#0 1 Fertility in 5,1 was changed from 0 to 127 by an act of POGO - Play#0 output Play#0 1 Fertility in 7,1 was changed from 0 to 127 by an act of POGO + Play#0 output Play#0 1 Fertility in 5,1 was changed from 0 to 100 by an act of POGO + Play#0 output Play#0 1 Fertility in 7,1 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Fertility content in 6,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Fertility content in 8,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Fertility content in 3,3 was changed from 0 to 1 by an act of POGO @@ -1537,8 +1537,8 @@ Play#0 output Play#0 1 Fertility content in 7,3 was changed from 0 to 1 by an act of POGO Play#0 output Play#0 1 Fertility content in 5,3 was changed from 1 to 0 by an act of POGO Play#0 output Play#0 1 Fertility content in 7,3 was changed from 1 to 0 by an act of POGO - Play#0 output Play#0 1 Oil content in 5,1 was changed from 0 to 127 by an act of POGO - Play#0 output Play#0 1 Oil content in 7,1 was changed from 0 to 127 by an act of POGO + Play#0 output Play#0 1 Oil content in 5,1 was changed from 0 to 100 by an act of POGO + Play#0 output Play#0 1 Oil content in 7,1 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Oil content in 6,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Oil content in 8,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Oil content in 3,3 was changed from 0 to 1 by an act of POGO @@ -1546,8 +1546,8 @@ Play#0 output Play#0 1 Oil content in 7,3 was changed from 0 to 1 by an act of POGO Play#0 output Play#0 1 Oil content in 5,3 was changed from 1 to 0 by an act of POGO Play#0 output Play#0 1 Oil content in 7,3 was changed from 1 to 0 by an act of POGO - Play#0 output Play#0 1 Uranium content in 5,1 was changed from 0 to 127 by an act of POGO - Play#0 output Play#0 1 Uranium content in 7,1 was changed from 0 to 127 by an act of POGO + Play#0 output Play#0 1 Uranium content in 5,1 was changed from 0 to 100 by an act of POGO + Play#0 output Play#0 1 Uranium content in 7,1 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Uranium content in 6,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Uranium content in 8,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Uranium content in 3,3 was changed from 0 to 1 by an act of POGO -- 2.43.0