Author: jtn
Date: Tue Nov 3 23:05:59 2015
New Revision: 30396
URL: http://svn.gna.org/viewcvs/freeciv?rev=30396&view=rev
Log:
Define AI trait ranges for the civ2civ3, classic, and multiplayer rulesets
(based on those for the experimental ruleset). This doesn't change
default behaviour but allows players to see an effect from changing the
'traitdistribution' setting.
civ1/civ2/alien rulesets do not define trait ranges, so disallow
changing 'traitdistribution' in those rulesets, since it would have no
effect.
See gna patch #6516.
Modified:
trunk/data/alien/game.ruleset
trunk/data/civ1/game.ruleset
trunk/data/civ2/game.ruleset
trunk/data/civ2civ3/nations.ruleset
trunk/data/classic/nations.ruleset
trunk/data/multiplayer/nations.ruleset
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=30396&r1=30395&r2=30396&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Tue Nov 3 23:05:59 2015
@@ -690,15 +690,18 @@
[settings]
; freeciv game settings for the alien ruleset
set =
- { "name", "value"
- "topology", "WRAPX|WRAPY|ISO|HEX"
- "mapsize", "PLAYER"
- "tilesperplayer", 300
- "aifill", 7
- "sciencebox", 150
- "foodbox", 150
- "revolen", 7
- "citymindist", 3
- "startunits", "cx"
- "plrcolormode", "NATION_ORDER"
+ { "name", "value", "lock"
+ "topology", "WRAPX|WRAPY|ISO|HEX", FALSE
+ "mapsize", "PLAYER", FALSE
+ "tilesperplayer", 300, FALSE
+ "aifill", 7, FALSE
+ "sciencebox", 150, FALSE
+ "foodbox", 150, FALSE
+ "revolen", 7, FALSE
+ "citymindist", 3, FALSE
+ "startunits", "cx", FALSE
+ "plrcolormode", "NATION_ORDER", FALSE
+ ; Ruleset has no trait ranges, so player choosing EVEN would have
+ ; no effect anyway
+ "traitdistribution", "FIXED", TRUE
}
Modified: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=30396&r1=30395&r2=30396&view=diff
==============================================================================
--- trunk/data/civ1/game.ruleset (original)
+++ trunk/data/civ1/game.ruleset Tue Nov 3 23:05:59 2015
@@ -739,4 +739,7 @@
"startunits", "c", FALSE
"borders", "DISABLED", FALSE
"citymindist", 1, FALSE
- }
+ ; Ruleset has no trait ranges, so player choosing EVEN would have
+ ; no effect anyway
+ "traitdistribution", "FIXED", TRUE
+ }
Modified: trunk/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=30396&r1=30395&r2=30396&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset (original)
+++ trunk/data/civ2/game.ruleset Tue Nov 3 23:05:59 2015
@@ -749,4 +749,7 @@
"sciencebox", 50, FALSE
"startunits", "cc", FALSE
"borders", "DISABLED", FALSE
- }
+ ; Ruleset has no trait ranges, so player choosing EVEN would have
+ ; no effect anyway
+ "traitdistribution", "FIXED", TRUE
+ }
Modified: trunk/data/civ2civ3/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/nations.ruleset?rev=30396&r1=30395&r2=30396&view=diff
==============================================================================
--- trunk/data/civ2civ3/nations.ruleset (original)
+++ trunk/data/civ2civ3/nations.ruleset Tue Nov 3 23:05:59 2015
@@ -30,15 +30,15 @@
default_government = "Despotism"
[default_traits]
-;expansionist_min = 50
-;expansionist_max = 50
-;expansionist_default = 50
-;trader_min = 50
-;trader_max = 50
-;trader_default = 50
-;aggressive_min = 50
-;aggressive_max = 50
-;aggressive_default = 50
+expansionist_min = 30
+expansionist_max = 90
+expansionist_default = 50
+trader_min = 30
+trader_max = 90
+trader_default = 50
+aggressive_min = 30
+aggressive_max = 90
+aggressive_default = 50
; Please keep [ruledit] section in sync with these includes
*include "default/nationlist.ruleset"
Modified: trunk/data/classic/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/nations.ruleset?rev=30396&r1=30395&r2=30396&view=diff
==============================================================================
--- trunk/data/classic/nations.ruleset (original)
+++ trunk/data/classic/nations.ruleset Tue Nov 3 23:05:59 2015
@@ -30,15 +30,15 @@
default_government = "Despotism"
[default_traits]
-;expansionist_min = 50
-;expansionist_max = 50
-;expansionist_default = 50
-;trader_min = 50
-;trader_max = 50
-;trader_default = 50
-;aggressive_min = 50
-;aggressive_max = 50
-;aggressive_default = 50
+expansionist_min = 30
+expansionist_max = 90
+expansionist_default = 50
+trader_min = 30
+trader_max = 90
+trader_default = 50
+aggressive_min = 30
+aggressive_max = 90
+aggressive_default = 50
; Please keep [ruledit] section in sync with these includes
*include "default/nationlist.ruleset"
Modified: trunk/data/multiplayer/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/nations.ruleset?rev=30396&r1=30395&r2=30396&view=diff
==============================================================================
--- trunk/data/multiplayer/nations.ruleset (original)
+++ trunk/data/multiplayer/nations.ruleset Tue Nov 3 23:05:59 2015
@@ -30,15 +30,15 @@
default_government = "Despotism"
[default_traits]
-;expansionist_min = 50
-;expansionist_max = 50
-;expansionist_default = 50
-;trader_min = 50
-;trader_max = 50
-;trader_default = 50
-;aggressive_min = 50
-;aggressive_max = 50
-;aggressive_default = 50
+expansionist_min = 30
+expansionist_max = 90
+expansionist_default = 50
+trader_min = 30
+trader_max = 90
+trader_default = 50
+aggressive_min = 30
+aggressive_max = 90
+aggressive_default = 50
; Please keep [ruledit] section in sync with these includes
*include "default/nationlist.ruleset"
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
