Author: cazfi
Date: Fri Oct 7 01:39:50 2016
New Revision: 34024
URL: http://svn.gna.org/viewcvs/freeciv?rev=34024&view=rev
Log:
Specified border colors for civ1 and civ2 ruleset nations and set plrcolormode
to "NATION_ORDER"
by default on those rulesets.
Requested by Jacob Nevins <jtn>
See patch #3927
Modified:
trunk/data/civ1/game.ruleset
trunk/data/civ1/nations.ruleset
trunk/data/civ2/game.ruleset
trunk/data/civ2/nations.ruleset
Modified: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=34024&r1=34023&r2=34024&view=diff
==============================================================================
--- trunk/data/civ1/game.ruleset (original)
+++ trunk/data/civ1/game.ruleset Fri Oct 7 01:39:50 2016
@@ -919,4 +919,5 @@
; Ruleset has no trait ranges, so player choosing EVEN would have
; no effect anyway
"traitdistribution", "FIXED", TRUE
- }
+ "plrcolormode", "NATION_ORDER", FALSE
+ }
Modified: trunk/data/civ1/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/nations.ruleset?rev=34024&r1=34023&r2=34024&view=diff
==============================================================================
--- trunk/data/civ1/nations.ruleset (original)
+++ trunk/data/civ1/nations.ruleset Fri Oct 7 01:39:50 2016
@@ -127,6 +127,10 @@
flag="usa"
flag_alt="-"
style = "Celtic"
+
+color.r = 115
+color.g = 255
+color.b = 255
init_techs=""
init_buildings=""
@@ -238,6 +242,10 @@
flag_alt="-"
style = "Tropical"
+color.r = 230
+color.g = 230
+color.b = 74
+
init_techs=""
init_buildings=""
init_units=""
@@ -335,6 +343,10 @@
flag_alt="-"
style = "Babylonian"
+color.r = 115
+color.g = 255
+color.b = 67
+
init_techs=""
init_buildings=""
init_units=""
@@ -401,6 +413,10 @@
flag="han"
flag_alt="-"
style = "Asian"
+
+color.r = 90
+color.g = 230
+color.b = 230
init_techs=""
init_buildings=""
@@ -542,6 +558,10 @@
flag_alt="-"
style = "Babylonian"
+color.r = 255
+color.g = 255
+color.b = 99
+
init_techs=""
init_buildings=""
init_units=""
@@ -618,6 +638,10 @@
flag="england"
flag_alt="-"
style = "European"
+
+color.r = 230
+color.g = 138
+color.b = 10
init_techs=""
init_buildings=""
@@ -728,6 +752,10 @@
flag="france_old"
flag_alt="-"
style = "Celtic"
+
+color.r = 90
+color.g = 42
+color.b = 230
init_techs=""
init_buildings=""
@@ -851,6 +879,10 @@
flag = "hre"
flag_alt = "-"
style = "European"
+
+color.r = 115
+color.g = 67
+color.b = 255
init_techs = ""
init_buildings=""
@@ -1000,6 +1032,10 @@
flag_alt="-"
style = "Classical"
+color.r = 255
+color.g = 163
+color.b = 35
+
init_techs=""
init_buildings=""
init_units=""
@@ -1150,6 +1186,10 @@
flag_alt="-"
style = "Asian"
+color.r = 255
+color.g = 51
+color.b = 255
+
init_techs=""
init_buildings=""
init_units=""
@@ -1244,6 +1284,10 @@
flag_alt="-"
style = "Asian"
+color.r = 230
+color.g = 26
+color.b = 230
+
init_techs=""
init_buildings=""
init_units=""
@@ -1308,6 +1352,10 @@
flag_alt="-"
style = "Classical"
+color.r = 255
+color.g = 255
+color.b = 255
+
init_techs=""
init_buildings=""
init_units=""
@@ -1363,6 +1411,10 @@
flag="kiev"
flag_alt = "-"
style = "European"
+
+color.r = 230
+color.g = 230
+color.b = 230
init_techs=""
init_buildings=""
@@ -1451,6 +1503,10 @@
flag_alt="-"
style = "Tropical"
+color.r = 90
+color.g = 230
+color.b = 42
+
init_techs=""
init_buildings=""
init_units=""
@@ -1516,6 +1572,10 @@
flag_alt = "-"
style = "European"
+color.r = 255
+color.g = 67
+color.b = 67
+
init_techs=""
init_buildings=""
init_units=""
@@ -1554,6 +1614,10 @@
flag_alt = "-"
style = "European"
+color.r = 255
+color.g = 67
+color.b = 67
+
init_techs=""
init_buildings=""
init_units=""
Modified: trunk/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=34024&r1=34023&r2=34024&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset (original)
+++ trunk/data/civ2/game.ruleset Fri Oct 7 01:39:50 2016
@@ -952,4 +952,5 @@
; Ruleset has no trait ranges, so player choosing EVEN would have
; no effect anyway
"traitdistribution", "FIXED", TRUE
- }
+ "plrcolormode", "NATION_ORDER", FALSE
+ }
Modified: trunk/data/civ2/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/nations.ruleset?rev=34024&r1=34023&r2=34024&view=diff
==============================================================================
--- trunk/data/civ2/nations.ruleset (original)
+++ trunk/data/civ2/nations.ruleset Fri Oct 7 01:39:50 2016
@@ -131,6 +131,10 @@
flag="usa"
flag_alt="-"
style = "Celtic"
+
+color.r = 115
+color.g = 255
+color.b = 255
init_techs=""
init_buildings=""
@@ -243,6 +247,10 @@
flag_alt="-"
style = "Tropical"
+color.r = 230
+color.g = 230
+color.b = 74
+
init_techs=""
init_buildings=""
init_units=""
@@ -341,6 +349,10 @@
flag_alt="-"
style = "Babylonian"
+color.r = 115
+color.g = 255
+color.b = 67
+
init_techs=""
init_buildings=""
init_units=""
@@ -398,6 +410,10 @@
flag_alt="-"
style = "Classical"
+color.r = 205
+color.g = 113
+color.b = 0
+
init_techs=""
init_buildings=""
init_units=""
@@ -442,6 +458,10 @@
flag="celtic"
flag_alt="-"
style = "Celtic"
+
+color.r = 205
+color.g = 205
+color.b = 205
init_techs=""
init_buildings=""
@@ -527,6 +547,10 @@
flag="han"
flag_alt="-"
style = "Asian"
+
+color.r = 90
+color.g = 230
+color.b = 230
init_techs=""
init_buildings=""
@@ -669,6 +693,10 @@
flag_alt="-"
style = "Babylonian"
+color.r = 255
+color.g = 255
+color.b = 99
+
init_techs=""
init_buildings=""
init_units=""
@@ -747,6 +775,10 @@
flag="england"
flag_alt="-"
style = "European"
+
+color.r = 230
+color.g = 138
+color.b = 10
init_techs=""
init_buildings=""
@@ -859,6 +891,10 @@
flag="france_old"
flag_alt="-"
style = "Celtic"
+
+color.r = 90
+color.g = 42
+color.b = 230
init_techs=""
init_buildings=""
@@ -984,6 +1020,10 @@
flag = "hre"
flag_alt = "-"
style = "European"
+
+color.r = 115
+color.g = 67
+color.b = 255
init_techs = ""
init_buildings=""
@@ -1134,6 +1174,10 @@
flag_alt="-"
style = "Classical"
+color.r = 255
+color.g = 163
+color.b = 35
+
init_techs=""
init_buildings=""
init_units=""
@@ -1286,6 +1330,10 @@
flag_alt="-"
style = "Asian"
+color.r = 255
+color.g = 51
+color.b = 255
+
init_techs=""
init_buildings=""
init_units=""
@@ -1379,6 +1427,10 @@
flag="japan"
flag_alt="-"
style = "Asian"
+
+color.r = 65
+color.g = 205
+color.b = 17
init_techs=""
init_buildings=""
@@ -1494,6 +1546,10 @@
flag_alt="-"
style = "Asian"
+color.r = 230
+color.g = 26
+color.b = 230
+
init_techs=""
init_buildings=""
init_units=""
@@ -1556,6 +1612,10 @@
flag_alt="-"
style = "Classical"
+color.r = 65
+color.g = 205
+color.b = 205
+
init_techs=""
init_buildings=""
init_units=""
@@ -1630,6 +1690,10 @@
flag_alt="-"
style = "Classical"
+color.r = 255
+color.g = 255
+color.b = 255
+
init_techs=""
init_buildings=""
init_units=""
@@ -1687,6 +1751,10 @@
flag="kiev"
flag_alt = "-"
style = "European"
+
+color.r = 230
+color.g = 230
+color.b = 230
init_techs=""
init_buildings=""
@@ -1775,6 +1843,10 @@
flag="cheyenne"
flag_alt="-"
style = "Celtic"
+
+color.r = 205
+color.g = 5
+color.b = 205
init_techs=""
init_buildings=""
@@ -1868,6 +1940,10 @@
flag_alt = "-"
style = "Classical"
+color.r = 205
+color.g = 205
+color.b = 49
+
init_techs=""
init_buildings=""
init_units=""
@@ -1937,6 +2013,10 @@
flag="viking"
flag_alt="-"
style = "European"
+
+color.r = 65
+color.g = 17
+color.b = 205
init_techs=""
init_buildings=""
@@ -2018,6 +2098,10 @@
flag_alt="-"
style = "Tropical"
+color.r = 90
+color.g = 230
+color.b = 42
+
init_techs=""
init_buildings=""
init_units=""
@@ -2083,6 +2167,10 @@
flag_alt = "-"
style = "European"
+color.r = 255
+color.g = 67
+color.b = 67
+
init_techs=""
init_buildings=""
init_units=""
@@ -2121,6 +2209,10 @@
flag_alt = "-"
style = "European"
+color.r = 255
+color.g = 67
+color.b = 67
+
init_techs=""
init_buildings=""
init_units=""
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
