[Freeciv-Dev] (PR#15272) Transitional nations

["Daniel Markstedt" <himasaram@xxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=15272 >

Here's the patch to implement Soviet and Confederates as 'transitional'
nations.

They're placed solely in the Transitional group, which is set to
match=2, so they won't ever be randomly selected as an AI player.

-Daniel

Index: data/default/nations.ruleset
===================================================================
--- data/default/nations.ruleset        (revision 11517)
+++ data/default/nations.ruleset        (working copy)
@@ -40,6 +40,9 @@
 [ngroup_oceanian]
 name="Oceanian"
 match=0
+[ngroup_transitional]
+name="Transitional"
+match=2
 [ngroup_fictional]
 name="Fictional"
 match=0
@@ -82,6 +85,7 @@
 *include "nation/chilean.ruleset"
 *include "nation/chinese.ruleset"
 *include "nation/colombian.ruleset"
+*include "nation/confederate.ruleset"
 *include "nation/cornish.ruleset"
 *include "nation/croatian.ruleset"
 *include "nation/cuban.ruleset"
@@ -153,6 +157,7 @@
 *include "nation/slovakian.ruleset"
 *include "nation/slovenian.ruleset"
 *include "nation/southafrican.ruleset"
+*include "nation/soviet.ruleset"
 *include "nation/spanish.ruleset"
 *include "nation/sudanese.ruleset"
 *include "nation/sumerian.ruleset"
Index: data/nation/american.ruleset
===================================================================
--- data/nation/american.ruleset        (revision 11517)
+++ data/nation/american.ruleset        (working copy)
@@ -62,8 +62,8 @@
 init_government="Despotism"
 init_units=""
 
-conflicts_with = "texan"
-civilwar_nations = "iroquois", "sioux", "texan"
+conflicts_with = "confederate", "texan"
+civilwar_nations = "confederate"
 
 cities =
   "Washington (ocean, river, swamp, !desert)", 
Index: data/nation/soviet.ruleset
===================================================================
--- data/nation/soviet.ruleset  (revision 0)
+++ data/nation/soviet.ruleset  (revision 0)
@@ -0,0 +1,73 @@
+[nation_soviet]
+
+name=_("Soviet")
+plural=_("?plural:Soviets")
+groups=_("Transitional")
+legend=_("Soviet Union's history starts in November 1917,\
+ when under Lenin's leadership a Bolshevik revolution occurred.\
+ On December 31 1922, four Soviet republics integrated into one\
+ country. Soviet Union became one of most powerful states in\
+ the 20th century. But by the end of 1991 due to many social\
+ shocks it disintegrated into fifteen independent countries")
+leader=
+ "Vladimir Lenin",
+ "Iosif V. Stalin",
+ "Nikita Khruschov",
+ "Leonid Brezhnev",
+ "Yuriy Andropov",
+ "Nadezhda Krupskaya"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Female"
+flag="soviet"
+flag_alt = "-"
+city_style = "European"
+
+ruler_titles = { "government",    "male_title",       "female_title",
+                 "Republic",      _("Comrade"),       _("Comrade")
+                 "Communism",  _("General Secretary"), _("General Secretary")
+                "Monarchy",      _("Great Leader"),  _("Great Leader")
+               }
+
+init_techs=""
+init_buildings=""
+init_government="Despotism"
+init_units=""
+
+conflicts_with = "russian", "ukrainian", "lithuaninan", "latvian",
+ "estonian", "georgian", "armenian"
+civilwar_nations = "russian", "ukrainian", "lithuaninan", "latvian",
+ "estonian", "georgian", "armenian"
+
+cities =
+ "Leningrad",
+ "Stalingrad",
+ "Gorky",
+ "Sverdlovsk",
+ "Kuybyshev",
+ "Kalinin",
+ "Ulyanovsk",
+ "Kirov",
+ "Frunze",
+ "Molotov",
+ "Chkalov",
+ "Komsomolsk-na-Amure",
+ "Voroshilovgrad",
+ "Leninakan",
+ "Kirovabad",
+ "Stalinabad",
+ "Leninsk-Kuznetsky",
+ "Dzerzhinsk",
+ "Ivano-Frankovsk",
+ "Engels",
+ "Stalino",
+ "Kotovsk",
+ "Ordzhonikidze",
+ "Ustinov",
+ "Leninabad",
+ "Tselinograd",
+ "Artyom",
+ "Zhdanov",
+ "Dneprodzerzhinsk",
+ "Krasnogvardeysk",
+ "Stalinogorsk",
+ "Chapaevsk",
+ "Voroshilovsk"
Index: data/nation/confederate.ruleset
===================================================================
--- data/nation/confederate.ruleset     (revision 0)
+++ data/nation/confederate.ruleset     (revision 0)
@@ -0,0 +1,68 @@
+[nation_confederate]
+
+name=_("Confederate")
+plural=_("?plural:Confederates")
+groups=_("Transitional")
+legend=_("The Confederate States of America was a splinter nation of the\
+ United States during the American Civil War. It was formed in 1861 by six\
+ Southern states but had to abandon their claims of independence a few\
+ years later after several military defeats by United States troops.")
+leader=
+ "John Bell Hood",
+ "Robert E. Lee",
+ "John C. Calhoun",
+ "Stonewall Jackson",
+ "John Hunt Morgan",
+ "James Longstreet",
+ "Alexander Stephens",
+ "Jefferson Davis"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male"
+flag="southern_cross"
+flag_alt="-"
+city_style="European"
+
+init_techs=""
+init_buildings=""
+init_government="Despotism"
+init_units=""
+civilwar_nations="american", "texan"
+
+; Data from http://en.wikipedia.org/wiki/Confederate_States_of_America
+cities =
+; Capitals and was-to-be capitals
+ "Montgomery",
+ "Richmond",
+ "Danville",
+ "Atlanta",
+ "Columbia",
+; Major cities in order of population
+ "New Orleans",
+ "Charleston",
+ "Mobile",
+ "Memphis",
+ "Savannah",
+ "Petersburg",
+ "Nashville",
+ "Norfolk",
+ "Wheeling",
+ "Alexandria",
+ "Augusta",
+ "Columbus",
+ "Wilmington",
+; A few more cities
+ "Jacksonville",
+ "Louisville",
+ "St. Louis",
+ "Springfield",
+ "Little Rock",
+ "Vicksburg",
+ "Shreveport",
+ "Houston",
+ "Galveston",
+ "Austin",
+ "San Antonio",
+ "Corpus Christi",
+ "El Paso",
+ "Mesilla",
+ "Santa Fe",
+ "Tucson"
Index: data/nation/russian.ruleset
===================================================================
--- data/nation/russian.ruleset (revision 11517)
+++ data/nation/russian.ruleset (working copy)
@@ -56,8 +56,10 @@
 init_units=""
 
 ; Chain of similar flags: Previously "serbian"
-conflicts_with="slovenian", "slovakian"
-civilwar_nations = "ukrainian", "latvian", "polish"
+conflicts_with="slovenian", "slovakian",
+; Transitional state
+ "soviet"
+civilwar_nations = "soviet"
 
 cities =
  "Moskva",
Index: data/nation/Makefile.am
===================================================================
--- data/nation/Makefile.am     (revision 11517)
+++ data/nation/Makefile.am     (working copy)
@@ -36,6 +36,7 @@
                chilean.ruleset \
                chinese.ruleset \
                colombian.ruleset \
+               confederate.ruleset \
                cornish.ruleset \
                croatian.ruleset \
                cuban.ruleset \
@@ -107,6 +108,7 @@
                slovakian.ruleset \
                slovenian.ruleset \
                southafrican.ruleset \
+               soviet.ruleset \
                spanish.ruleset \
                sudanese.ruleset \
                sumerian.ruleset \
Index: data/misc/shields.spec
===================================================================
--- data/misc/shields.spec      (revision 11517)
+++ data/misc/shields.spec      (working copy)
@@ -121,6 +121,7 @@
                "f.shield.slovakia", "flags/slovakia-shield"
                "f.shield.slovenia", "flags/slovenia-shield"
                "f.shield.south_africa", "flags/south_africa-shield"
+               "f.shield.southern_cross", "flags/southern_cross-shield"
                "f.shield.soviet", "flags/soviet-shield"
                "f.shield.spain", "flags/spain-shield"
                "f.shield.srilanka", "flags/srilanka-shield"
Index: data/misc/flags.spec
===================================================================
--- data/misc/flags.spec        (revision 11517)
+++ data/misc/flags.spec        (working copy)
@@ -121,6 +121,7 @@
                "f.slovakia", "flags/slovakia"
                "f.slovenia", "flags/slovenia"
                "f.south_africa", "flags/south_africa"
+               "f.southern_cross", "flags/southern_cross" ; confederate battle 
flag
                "f.soviet", "flags/soviet"
                "f.spain", "flags/spain"
                "f.srilanka", "flags/srilanka"
Index: data/flags/Makefile.am
===================================================================
--- data/flags/Makefile.am      (revision 11517)
+++ data/flags/Makefile.am      (working copy)
@@ -111,6 +111,7 @@
                slovakia.png            \
                slovenia.png            \
                south_africa.png        \
+               southern_cross.png      \
                soviet.png              \
                spain.png               \
                srilanka.png            \
@@ -248,6 +249,7 @@
                slovakia-shield.png             \
                slovenia-shield.png             \
                south_africa-shield.png         \
+               southern_cross-shield.png       \
                soviet-shield.png               \
                spain-shield.png                \
                srilanka-shield.png             \
@@ -385,6 +387,7 @@
                slovakia.svg            \
                slovenia.svg            \
                south_africa.svg        \
+               southern_cross.svg      \
                soviet.svg              \
                spain.svg               \
                srilanka.svg            \
Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in      (revision 11517)
+++ po/POTFILES.in      (working copy)
@@ -219,6 +219,7 @@
 data/nation/chilean.ruleset
 data/nation/chinese.ruleset
 data/nation/colombian.ruleset
+data/nation/confederate.ruleset
 data/nation/cornish.ruleset
 data/nation/croatian.ruleset
 data/nation/cuban.ruleset
@@ -290,6 +291,7 @@
 data/nation/slovenian.ruleset
 data/nation/slovakian.ruleset
 data/nation/southafrican.ruleset
+data/nation/soviet.ruleset
 data/nation/spanish.ruleset
 data/nation/sudanese.ruleset
 data/nation/sumerian.ruleset