[Freeciv-Dev] (PR#2545) Enhancement patch for nation data

["esr@xxxxxxxxxxx via RT" <rt@xxxxxxxxxxxxxx>]

Changes in this patch:

1. Add the nation of Barsoom.
2. Remove misleading comment about nation count limit from the
   default/nations.ruleset file.
3. Patch American, Babylonian, Barbarian, Danish, Dunedain, Egyptian, English, 
   Filipno, French, Greek, Irish, Roman, Viking and Zulu nations to add more 
   rulers.

Barsoom doesn't have its own flag.  I reused the Japanese one and gave
the unknown flag as an alternate.  My suggestion for a Barsoomian flag
is a red orb on blue, should be easy to make from the Japanese flag.
-- 
                <a href="http://www.tuxedo.org/~esr/";>Eric S. Raymond</a>

Diffs between last version checked in and current workfile(s):

--- data/default/nations.ruleset        2002/12/11 12:21:16     1.1
+++ data/default/nations.ruleset        2002/12/11 12:21:51
@@ -13,8 +13,7 @@
 
 ; Below: nations data in sections [nation_*] for
 ; all nations available. If you want to have more
-; nations just add one at the end. There is a maximum
-; of 63 nations however. I hope it is enough :-)
+; nations just add one at the end.
 ;
 ; Notes:
 ;
@@ -110,6 +109,7 @@
 *include "nation/croatian.ruleset"
 *include "nation/slovenian.ruleset"
 *include "nation/serbian.ruleset"
+*include "nation/barsoom.ruleset"
 
 ;
 ; barbarians MUST go last
--- data/helpdata.txt   2002/12/11 12:23:43     1.1
+++ data/helpdata.txt   2002/12/11 12:24:19
@@ -526,6 +526,9 @@
 in worklist or available list, PageUp/Down to move items up/down \
 in the worklist, Insert to insert items from the available list into \
 the worklist and Delete to delete the selected item from the worklist.\
+"), _("\
+If you want to buy the unit that's first on the list, you can do that\
+from the City Overview window.
 ")
 
 [help_strategy_and_tactics]
--- data/nation/Makefile.am     2002/12/11 12:37:23     1.1
+++ data/nation/Makefile.am     2002/12/11 12:37:59
@@ -11,6 +11,7 @@
        aztec.ruleset           \
        babylonian.ruleset      \
        barbarian.ruleset       \
+       barsoom.ruleset         \
        bavarian.ruleset        \
        boer.ruleset            \
        brazilian.ruleset       \
--- data/nation/american.ruleset        2002/12/11 12:26:07     1.1
+++ data/nation/american.ruleset        2002/12/11 12:26:27
@@ -2,9 +2,59 @@
 
 name=_("American")
 plural=_("?plural:Americans")
-leader="Lincoln", "Washington", "Franklin D. Roosevelt",
-       "J.F. Kennedy", "Eleonore Roosevelt"
-leader_sex="Male", "Male", "Male", "Male", "Female"
+leader="George Washington",
+       "John Adams",
+       "Thomas Jefferson", 
+       "James Madison",
+       "James Monroe",
+       "John Quincy Adams",
+       "Andrew Jackson",
+       "Martin Van Buren",
+       "William Henry Harrison",
+       "John Tyler",
+       "James Polk",
+       "Zachary Taylor",
+       "Millard Filmore",
+       "Franklin Pierce",
+       "James Buchanan",
+       "Abraham Lincoln",
+       "Andew Johnson", 
+       "Ulysses S. Grant",
+       "Rutherford Hayes",
+       "James Garfield",
+       "Chester Alan Arthur",
+       "Grover Cleveland",
+       "Benjamin Harrison",
+       "William McKinley",
+       "Theodore Roosevelt",
+       "William Howard Taft",
+       "Woodrow Wilson",
+       "Warren Harding",
+       "Calvin Coolidge",
+       "Herbert Hoover",
+       "Franklin D. Roosevelt",
+       "Harry S. Truman",
+       "Dwight Eisenhower",
+       "John F. Kennedy", 
+       "Lyndon Johnson",
+       "Richard Nixon",
+       "Gerald W. Ford",
+       "Jimmy Carter",
+       "Ronald Reagan",
+       "George H. W. Bush",
+       "Bill Clinton",
+       "George W. Bush",
+       "Eleanor Roosevelt"
+leader_sex="Male", "Male", "Male", "Male", "Male", 
+           "Male", "Male", "Male", "Male", "Male", 
+           "Male", "Male", "Male", "Male", "Male", 
+           "Male", "Male", "Male", "Male", "Male", 
+           "Male", "Male", "Male", "Male", "Male", 
+           "Male", "Male", "Male", "Male", "Male", 
+           "Male", "Male", "Male", "Male", "Male", 
+           "Male", "Male", "Male", "Male", "Male", 
+           "Male", "Male", "Male",
+           "Female"
 flag="f.usa"
 flag_alt = "-"
 city_style = "European"
--- data/nation/babylonian.ruleset      2002/12/11 12:26:07     1.1
+++ data/nation/babylonian.ruleset      2002/12/11 13:03:10
@@ -2,8 +2,8 @@
 
 name=_("Babylonian")
 plural=_("?plural:Babylonians")
-leader="Hammurabi", "Sargon", "Nabuchadnezzar"
-leader_sex="Male", "Male", "Male"
+leader="Hammurabi", "Sargon", "Nebuchadnezzar", "Tiglath-Pileser",
+leader_sex="Male", "Male", "Male", "Male"
 flag = "f.iraq_old"
 flag_alt = "-"
 city_style = "Classical"
--- data/nation/barbarian.ruleset       2002/12/11 12:26:07     1.1
+++ data/nation/barbarian.ruleset       2002/12/11 12:26:28
@@ -2,8 +2,8 @@
 
 name=_("Barbarian")
 plural=_("?plural:Barbarians")
-leader="Genseric", "Alaric", "Teodoric", "Herman"
-leader_sex="Male", "Male", "Male", "Male"
+leader="Genseric", "Alaric", "Theodoric", "Stilicho", "Attila",
+leader_sex="Male", "Male", "Male", "Male", "Male"
 flag="f.barbarian"
 flag_alt = "-"
 city_style = "European"
--- data/nation/barsoom.ruleset 2002/12/11 12:18:35     1.1
+++ data/nation/barsoom.ruleset 2002/12/11 13:13:05
@@ -0,0 +1,44 @@
+[nation_barsoom]
+; The Barsoomian civilization from Edgar Rice Burrough's Mars novels
+; Data from "A Guide to Barsoom" by John Flint Roy
+; by Eric S. Raymond, December 2002
+
+name=_("Barsoom")
+plural=_("?plural:Barsoomians")
+leader="John Carter", "Tars Tarkas", "Carthoris", "Vad Varo", 
+        "Tardos Mor", "Mors Kajak",  "Gahan", "Kar Komak",
+        "Dejah Thoris" "Llana", "Tara", "Thuvia"
+leader_sex="Male", "Male", "Male", "Male",
+           "Male", "Male", "Male", "Male",
+           "Female", "Female", "Female", "Female"
+
+# We really want a new flag.  
+# Say, red orb on a blue background?
+flag ="f.japan"
+flag_alt = "f.unknown"
+city_style = "Classical"
+
+ruler_titles = { "government",      "male_title",      "female_title"
+                 "Monarchy",        _("Jeddak"),       _("Jeddara")
+               }
+
+attack=2
+expand=1
+civilized=0
+advisors=100,100,100,100,100,100,100
+init_techs=""
+tech_goals="Monarchy", "Philosophy", "Trade", "Explosives", "Flight"
+wonder="Sun Tzu's War Academy"
+government="Monarchy"
+
+; Yes, Warhoon and Thark were *city* names of ancient Barsoom! 
+cities =
+   "Greater Helium", "Lesser Helium", "Gathol", "Exum", "Invak", "Onvak", 
+   "Dusar", "Toonol", "Phundahl", "Morbus", "Raxar", "Amhor", "Manator", 
+   "Manatos", "Manataj", "Kamtol", "Tjanath", "Ghasta", "Jhama", "Kobol", 
+   "Hastor", "Zor", "Zodanga", "Kaol", "Marentina", "Kadabra", "Illad", 
+   "Pankor", "Horz", "Lothar", "Aaanthor", "Korad", "Xanator", "Warhoon", 
+   "Thark"
+
+
+
--- data/nation/danish.ruleset  2002/12/11 12:26:07     1.1
+++ data/nation/danish.ruleset  2002/12/11 12:26:29
@@ -6,12 +6,12 @@
   "Gudfred", "Gorm den Gamle", "Harald Blåtand", "Svend Tveskæg",
   "Knud den Store", "Hardeknud", "Svend", "Knud", "Valdemar",
   "Valdemar den Store", "Valdemar Sejr", "Erik Klipping",
-  "Valdemar Atterdag", "Margrethe I", "Christian IV"
+  "Valdemar Atterdag", "Margrethe I", "Christian IV", "Dag Hammarskjold"
 leader_sex=
   "Male", "Male", "Male", "Male",
   "Male", "Male", "Male", "Male", "Male",
   "Male", "Male", "Male",
-  "Male", "Female", "Male"
+  "Male", "Female", "Male", "Male"
 flag="f.denmark"
 flag_alt = "-"
 city_style = "European"
--- data/nation/dunedain.ruleset        2002/12/11 12:26:07     1.1
+++ data/nation/dunedain.ruleset        2002/12/11 12:29:46
@@ -6,8 +6,10 @@
 
 name=_("Dunedain")
 plural=_("?plural:Dunedan")
-leader="Elros", "Tar-Ancalimë", "Míriel", "Elendil", "Isildur", "Aragorn"
-leader_sex="Male", "Female", "Female", "Male", "Male", "Male"
+leader="Elros", "Tar-Ancalimë", "Míriel", "Elendil", "Isildur", "Aragorn",
+       "Tarannon Falastur", "Thorongil", "Ar-Pharazon", "Beruthiel"
+leader_sex="Male", "Female", "Female", "Male", "Male", "Male",
+        "Male", "Male", "Male", "Female" 
 flag = "f.dunedain"
 flag_alt = "-"
 city_style = "European"
--- data/nation/egyptian.ruleset        2002/12/11 12:26:07     1.1
+++ data/nation/egyptian.ruleset        2002/12/11 12:26:30
@@ -2,8 +2,10 @@
 
 name=_("Egyptian")
 plural=_("?plural:Egyptians")
-leader="Ramesses", "Cleopatra", "Tutanhamon", "Hatshepsut", "Nefertiti", 
"Cheops"
-leader_sex="Male", "Female", "Male", "Female", "Female", "Male"
+leader="Rameses", "Cleopatra", "Tutankhamun", "Narmer", "Thutmose",
+       "Hatshepsut", "Nefertiti", "Cheops"
+leader_sex="Male", "Female", "Male", "Male", "Male",
+        "Female", "Female", "Male"
 flag="f.egypt"
 flag_alt = "-"
 city_style = "Classical"
--- data/nation/english.ruleset 2002/12/11 12:26:07     1.1
+++ data/nation/english.ruleset 2002/12/11 12:26:31
@@ -3,9 +3,9 @@
 name=_("English")
 plural=_("?plural:English")
 leader="Elizabeth", "William the Conqueror", "Richard Lionheart", "Henry VIII",
-       "Victoria", "Winston Churchill"
+       "Oliver Cromwell", "Victoria", "Winston Churchill"
 leader_sex="Female", "Male", "Male", "Male",
-           "Female", "Male"
+           "Male", "Female", "Male"
 flag="f.england"
 flag_alt = "f.united_kingdom"
 city_style = "European"
--- data/nation/filipino.ruleset        2002/12/11 12:26:07     1.1
+++ data/nation/filipino.ruleset        2002/12/11 12:26:36
@@ -2,8 +2,8 @@
 
 name=_("Filipino")
 plural=_("?plural:Filipinos")
-leader="Jose Rizal", "Luis Taruc", "Sergio Osmena", "Ferdinand Marcos"
-leader_sex="Male", "Male", "Male", "Male"
+leader="Ramon Magsagay","Jose Rizal", "Luis Taruc", "Sergio Osmena", 
"Ferdinand Marcos"
+leader_sex="Male", "Male", "Male", "Male", "Male"
 flag="f.philippines"
 flag_alt = "-"
 city_style = "European"
--- data/nation/french.ruleset  2002/12/11 12:26:07     1.1
+++ data/nation/french.ruleset  2002/12/11 12:26:38
@@ -2,8 +2,9 @@
 
 name=_("French")
 plural=_("?plural:French")
-leader="Napoleon", "Louis XIV", "Charles de Gaulle", "Vercingetorix", 
"Chlodwig"
-leader_sex="Male", "Male", "Male", "Male", "Male"
+leader="Napoleon", "Charlemagne", "Louis XIV", "Charles de Gaulle",
+       "Vercingetorix", "Chlodwig", "Charles Martel"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male"
 flag="f.france"
 flag_alt = "-"
 city_style = "European"
--- data/nation/greek.ruleset   2002/12/11 12:26:07     1.1
+++ data/nation/greek.ruleset   2002/12/11 12:26:39
@@ -2,8 +2,8 @@
 
 name=_("Greek")
 plural=_("?plural:Greeks")
-leader="Alexander", "Perikles", "Leonidas"
-leader_sex="Male", "Male", "Male"
+leader="Alexander", "Perikles", "Leonidas", "Solon",
+leader_sex="Male", "Male", "Male", "Male"
 flag="f.greece"
 flag_alt = "-"
 city_style = "Classical"
--- data/nation/irish.ruleset   2002/12/11 12:26:07     1.1
+++ data/nation/irish.ruleset   2002/12/11 12:26:40
@@ -2,8 +2,8 @@
 
 name = _("Irish")
 plural = _("?plural:Irish")
-leader = "Patrick", "Ollam Fodla", "Lugh"
-leader_sex = "Male", "Male", "Male"
+leader = "Brian Boru", "Cuchulain", "Patrick", "Ollam Fodla", "Lugh"
+leader_sex = "Male", "Male", "Male", "Male", "Male"
 flag="f.ireland"
 flag_alt = "-"
 city_style = "European"
--- data/nation/roman.ruleset   2002/12/11 12:26:07     1.1
+++ data/nation/roman.ruleset   2002/12/11 12:26:41
@@ -2,8 +2,11 @@
 
 name=_("Roman")
 plural=_("?plural:Romans")
-leader="Caesar", "August", "Livia", "Trajan", "Constantin"
-leader_sex="Male", "Male", "Female", "Male", "Male"
+leader="Caesar", "Augustus", "Vespasian", "Nero", "Trajan", "Marcus Aurelius",
+       "Tiberius", "Constantine"
+       "Livia", "Messalina"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male",
+           "Female", "Female"
 flag = "f.rome"
 flag_alt = "f.italy"
 city_style = "Classical"
--- data/nation/viking.ruleset  2002/12/11 12:26:07     1.1
+++ data/nation/viking.ruleset  2002/12/11 12:35:40
@@ -2,8 +2,10 @@
 
 name=_("Viking")
 plural=_("?plural:Vikings")
-leader="Erik Blodøks", "Harald Hårfagre", "Gro Harlem Brundtland", "Haakon VII"
-leader_sex="Male", "Male", "Female", "Male"
+leader="Erik Blodøks", "Harald Hårfagre", "Hrolf Gangr", "Rollo",
+       "Gro Harlem Brundtland", "Haakon VII", "Aud Ivarsdottr"
+leader_sex="Male", "Male", "Male", "Male", 
+           "Female", "Male", "Female"
 flag="f.norway"
 flag_alt = "f.denmark"  ; Now used by Danish
 city_style = "European"
--- data/nation/zulu.ruleset    2002/12/11 12:26:07     1.1
+++ data/nation/zulu.ruleset    2002/12/11 12:26:42
@@ -2,8 +2,18 @@
 
 name=_("Zulu")
 plural=_("?plural:Zulus")
-leader="Shaka"
-leader_sex="Male"
+; According to <http://www.anglo.50megs.com/zulu_kings.htm>, this is the
+; complete Zulu king list.  It's in regnal order, except that Utshaka
+; (Westernized "Shaka" or "Chaka"), the best known of the kings, has 
+; been moved from between Usenzangakona  and Udingana to the front.
+leader="Utshaka", "Umdhlani", "Umalandela", "Untombela", "Uzulu", 
+       "Unkosinkulu", "Umageba",  "Upunga", "Undaba", "Ujama", 
+       "Usenzangakona", "Udingana", "Umpande", "Ucetywayo", "Udinuzulu", 
+       "Usolomona",
+leader_sex="Male", "Male", "Male", "Male", "Male", 
+           "Male", "Male", "Male", "Male", "Male", 
+           "Male", "Male", "Male", "Male", "Male", 
+           "Male"
 flag="f.south_africa"
 flag_alt = "f.rwanda"  ; used previously
 city_style = "European"
--- po/POTFILES.in      2002/12/11 12:40:38     1.1
+++ po/POTFILES.in      2002/12/11 12:40:56
@@ -201,6 +201,7 @@
 data/nation/aztec.ruleset
 data/nation/babylonian.ruleset
 data/nation/barbarian.ruleset
+data/nation/barsoom.ruleset
 data/nation/bavarian.ruleset
 data/nation/boer.ruleset
 data/nation/brazilian.ruleset

End of diffs.