Author: cazfi
Date: Fri Oct 7 01:39:58 2016
New Revision: 34025
URL: http://svn.gna.org/viewcvs/freeciv?rev=34025&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:
branches/S2_6/data/civ1/game.ruleset
branches/S2_6/data/civ1/nations.ruleset
branches/S2_6/data/civ2/game.ruleset
branches/S2_6/data/civ2/nations.ruleset
Modified: branches/S2_6/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/game.ruleset?rev=34025&r1=34024&r2=34025&view=diff
==============================================================================
--- branches/S2_6/data/civ1/game.ruleset (original)
+++ branches/S2_6/data/civ1/game.ruleset Fri Oct 7 01:39:58 2016
@@ -655,4 +655,5 @@
; Ruleset has no trait ranges, so player choosing EVEN would have
; no effect anyway
"traitdistribution", "FIXED", TRUE
- }
+ "plrcolormode", "NATION_ORDER", FALSE
+ }
Modified: branches/S2_6/data/civ1/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/nations.ruleset?rev=34025&r1=34024&r2=34025&view=diff
==============================================================================
--- branches/S2_6/data/civ1/nations.ruleset (original)
+++ branches/S2_6/data/civ1/nations.ruleset Fri Oct 7 01:39:58 2016
@@ -126,6 +126,10 @@
flag="usa"
flag_alt="-"
style = "Celtic"
+
+color.r = 115
+color.g = 255
+color.b = 255
init_techs=""
init_buildings=""
@@ -237,6 +241,10 @@
flag_alt="-"
style = "Tropical"
+color.r = 230
+color.g = 230
+color.b = 74
+
init_techs=""
init_buildings=""
init_units=""
@@ -334,6 +342,10 @@
flag_alt="-"
style = "Babylonian"
+color.r = 115
+color.g = 255
+color.b = 67
+
init_techs=""
init_buildings=""
init_units=""
@@ -400,6 +412,10 @@
flag="han"
flag_alt="-"
style = "Asian"
+
+color.r = 90
+color.g = 230
+color.b = 230
init_techs=""
init_buildings=""
@@ -541,6 +557,10 @@
flag_alt="-"
style = "Babylonian"
+color.r = 255
+color.g = 255
+color.b = 99
+
init_techs=""
init_buildings=""
init_units=""
@@ -617,6 +637,10 @@
flag="england"
flag_alt="-"
style = "European"
+
+color.r = 230
+color.g = 138
+color.b = 10
init_techs=""
init_buildings=""
@@ -727,6 +751,10 @@
flag="france_old"
flag_alt="-"
style = "Celtic"
+
+color.r = 90
+color.g = 42
+color.b = 230
init_techs=""
init_buildings=""
@@ -850,6 +878,10 @@
flag = "hre"
flag_alt = "-"
style = "European"
+
+color.r = 115
+color.g = 67
+color.b = 255
init_techs = ""
init_buildings=""
@@ -999,6 +1031,10 @@
flag_alt="-"
style = "Classical"
+color.r = 255
+color.g = 163
+color.b = 35
+
init_techs=""
init_buildings=""
init_units=""
@@ -1149,6 +1185,10 @@
flag_alt="-"
style = "Asian"
+color.r = 255
+color.g = 51
+color.b = 255
+
init_techs=""
init_buildings=""
init_units=""
@@ -1243,6 +1283,10 @@
flag_alt="-"
style = "Asian"
+color.r = 230
+color.g = 26
+color.b = 230
+
init_techs=""
init_buildings=""
init_units=""
@@ -1307,6 +1351,10 @@
flag_alt="-"
style = "Classical"
+color.r = 255
+color.g = 255
+color.b = 255
+
init_techs=""
init_buildings=""
init_units=""
@@ -1362,6 +1410,10 @@
flag="kiev"
flag_alt = "-"
style = "European"
+
+color.r = 230
+color.g = 230
+color.b = 230
init_techs=""
init_buildings=""
@@ -1450,6 +1502,10 @@
flag_alt="-"
style = "Tropical"
+color.r = 90
+color.g = 230
+color.b = 42
+
init_techs=""
init_buildings=""
init_units=""
@@ -1515,6 +1571,10 @@
flag_alt = "-"
style = "European"
+color.r = 255
+color.g = 67
+color.b = 67
+
init_techs=""
init_buildings=""
init_units=""
@@ -1551,6 +1611,10 @@
flag_alt = "-"
style = "European"
+color.r = 255
+color.g = 67
+color.b = 67
+
init_techs=""
init_buildings=""
init_units=""
Modified: branches/S2_6/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/game.ruleset?rev=34025&r1=34024&r2=34025&view=diff
==============================================================================
--- branches/S2_6/data/civ2/game.ruleset (original)
+++ branches/S2_6/data/civ2/game.ruleset Fri Oct 7 01:39:58 2016
@@ -650,4 +650,5 @@
; Ruleset has no trait ranges, so player choosing EVEN would have
; no effect anyway
"traitdistribution", "FIXED", TRUE
- }
+ "plrcolormode", "NATION_ORDER", FALSE
+ }
Modified: branches/S2_6/data/civ2/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/nations.ruleset?rev=34025&r1=34024&r2=34025&view=diff
==============================================================================
--- branches/S2_6/data/civ2/nations.ruleset (original)
+++ branches/S2_6/data/civ2/nations.ruleset Fri Oct 7 01:39:58 2016
@@ -130,6 +130,10 @@
flag="usa"
flag_alt="-"
style = "Celtic"
+
+color.r = 115
+color.g = 255
+color.b = 255
init_techs=""
init_buildings=""
@@ -242,6 +246,10 @@
flag_alt="-"
style = "Tropical"
+color.r = 230
+color.g = 230
+color.b = 74
+
init_techs=""
init_buildings=""
init_units=""
@@ -340,6 +348,10 @@
flag_alt="-"
style = "Babylonian"
+color.r = 115
+color.g = 255
+color.b = 67
+
init_techs=""
init_buildings=""
init_units=""
@@ -397,6 +409,10 @@
flag_alt="-"
style = "Classical"
+color.r = 205
+color.g = 113
+color.b = 0
+
init_techs=""
init_buildings=""
init_units=""
@@ -441,6 +457,10 @@
flag="celtic"
flag_alt="-"
style = "Celtic"
+
+color.r = 205
+color.g = 205
+color.b = 205
init_techs=""
init_buildings=""
@@ -526,6 +546,10 @@
flag="han"
flag_alt="-"
style = "Asian"
+
+color.r = 90
+color.g = 230
+color.b = 230
init_techs=""
init_buildings=""
@@ -668,6 +692,10 @@
flag_alt="-"
style = "Babylonian"
+color.r = 255
+color.g = 255
+color.b = 99
+
init_techs=""
init_buildings=""
init_units=""
@@ -746,6 +774,10 @@
flag="england"
flag_alt="-"
style = "European"
+
+color.r = 230
+color.g = 138
+color.b = 10
init_techs=""
init_buildings=""
@@ -858,6 +890,10 @@
flag="france_old"
flag_alt="-"
style = "Celtic"
+
+color.r = 90
+color.g = 42
+color.b = 230
init_techs=""
init_buildings=""
@@ -983,6 +1019,10 @@
flag = "hre"
flag_alt = "-"
style = "European"
+
+color.r = 115
+color.g = 67
+color.b = 255
init_techs = ""
init_buildings=""
@@ -1133,6 +1173,10 @@
flag_alt="-"
style = "Classical"
+color.r = 255
+color.g = 163
+color.b = 35
+
init_techs=""
init_buildings=""
init_units=""
@@ -1285,6 +1329,10 @@
flag_alt="-"
style = "Asian"
+color.r = 255
+color.g = 51
+color.b = 255
+
init_techs=""
init_buildings=""
init_units=""
@@ -1378,6 +1426,10 @@
flag="japan"
flag_alt="-"
style = "Asian"
+
+color.r = 65
+color.g = 205
+color.b = 17
init_techs=""
init_buildings=""
@@ -1493,6 +1545,10 @@
flag_alt="-"
style = "Asian"
+color.r = 230
+color.g = 26
+color.b = 230
+
init_techs=""
init_buildings=""
init_units=""
@@ -1555,6 +1611,10 @@
flag_alt="-"
style = "Classical"
+color.r = 65
+color.g = 205
+color.b = 205
+
init_techs=""
init_buildings=""
init_units=""
@@ -1629,6 +1689,10 @@
flag_alt="-"
style = "Classical"
+color.r = 255
+color.g = 255
+color.b = 255
+
init_techs=""
init_buildings=""
init_units=""
@@ -1686,6 +1750,10 @@
flag="kiev"
flag_alt = "-"
style = "European"
+
+color.r = 230
+color.g = 230
+color.b = 230
init_techs=""
init_buildings=""
@@ -1774,6 +1842,10 @@
flag="cheyenne"
flag_alt="-"
style = "Celtic"
+
+color.r = 205
+color.g = 5
+color.b = 205
init_techs=""
init_buildings=""
@@ -1867,6 +1939,10 @@
flag_alt = "-"
style = "Classical"
+color.r = 205
+color.g = 205
+color.b = 49
+
init_techs=""
init_buildings=""
init_units=""
@@ -1936,6 +2012,10 @@
flag="viking"
flag_alt="-"
style = "European"
+
+color.r = 65
+color.g = 17
+color.b = 205
init_techs=""
init_buildings=""
@@ -2017,6 +2097,10 @@
flag_alt="-"
style = "Tropical"
+color.r = 90
+color.g = 230
+color.b = 42
+
init_techs=""
init_buildings=""
init_units=""
@@ -2082,6 +2166,10 @@
flag_alt = "-"
style = "European"
+color.r = 255
+color.g = 67
+color.b = 67
+
init_techs=""
init_buildings=""
init_units=""
@@ -2118,6 +2206,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
