[Freeciv-Dev] Re: (PR#3594) viking.ruleset

["andrearo@xxxxxxxxxxxx" <andrearo@xxxxxxxxxxxx>]

esr@xxxxxxxxxxx wrote:

>andrearo@xxxxxxxxxxxx <andrearo@xxxxxxxxxxxx>:
>  
>
>>The viking ruleset has both the names "Rollo" and "Hrolf Gangr".
>>So they are duplicates?
>>    
>>
>
>Might be.  I'll check my sources.
>  
>
I'm pretty sure that they are the same person.
http://freepages.genealogy.rootsweb.com/~jamesdow/s038/f070063.htm
and a google search confirms this.

I've attatched an updated patch to the ruleset, with "Rollo" removed.

Andreas Røsdal

diff -Nur -Xfreeciv/diff_ignore freeciv-civ-Mar-02/data/nation/viking.ruleset 
freeciv/data/nation/viking.ruleset
--- freeciv-civ-Mar-02/data/nation/viking.ruleset       2003-03-04 
12:02:49.000000000 +0100
+++ freeciv/data/nation/viking.ruleset  2003-03-04 12:10:51.000000000 +0100
@@ -6,10 +6,25 @@
 legend=_("The Vikings raided and traded along the coasts of Europe \
 between 800AD and 1100AD. Viking raids eventually became the rulers of \
 Normandy, Russia, and a short-lived kingdom in Sicily.")
-leader="Erik Blodøks", "Harald Hårfagre", "Hrolf Gangr", "Rollo",
-       "Gro Harlem Brundtland", "Haakon VII", "Aud Ivarsdottr"
+leader="Erik Blodøks",
+       "Harald Hårfagre",
+       "Sigurd Jorsalfar",
+       "Magnus Berrføtt",
+       "Halvdan Svarte",
+       "Aud Ivarsdottir",
+       "Hrolf Gangr",
+       "Magnus Lagabøter",
+       "Olav den Hellige",
+       "Haakon VII",
+       "Gro Harlem Brundtland",
+       "Jens Stoltenberg",
+       "Kjell Magne Bondevik"
+
 leader_sex="Male", "Male", "Male", "Male", 
-           "Female", "Male", "Female"
+           "Male", "Female", "Male", "Male", 
+           "Male", "Male", "Female", "Male",
+           "Male"
+           
 flag="f.norway"
 flag_alt = "f.denmark"  ; Now used by Danish
 city_style = "European"
@@ -29,19 +44,65 @@
 government="Republic"
 
 ;Norwegian (and Icelandic) names.
-;Norwegian places listed up in the order it struck my mind.
 ;Thorshavn and Hedeby (Haithabu) were Viking cities in the premodern period.
 
 cities =
- "Oslo", "Bergen", "Kaupang", "Stavanger", "Nidaros", "Narvik", "Tromsø",
- "Reykjavik", "Harstad", "Fagernes", "Tønsberg", "Kirkenes", "Hamar",
- "Fredrikstad", "Kristansand", "Kristiansund", "Christiania", "Drammen",
- "Sandnes", "Arendal", "Vardø", "Vadsø", "Haugesund", "Sarpsborg",
- "Kongsberg", "Kongsvinger", "Gjøvik", "Bardufoss", "Skjold", "Setermoen",
- "Lillehammer", "Lillestrøm", "Strømmen", "Fredrikborg", "Halden", "Karmøy",
- "Kragerø", "Fauske", "Bodø", "Andenes", "Stokkmarknes", "Svolvær",
- "Sortland", "Moss", "Honningsvåg", "Hammerfest", "Ås", "Os", "Tynset",
- "Longyearbyen", "Mandal"
+  "Oslo (grassland, !mountains)",
+  "Bergen (ocean)",
+  "Kaupang (plains, hills, river)",
+  "Stavanger (ocean)",
+  "Nidaros (ocean, river)",
+  "Narvik (tundra, ocean)",
+  "Tromsø (plains, hills, river)",
+  "Reykjavik (ocean)",
+  "Harstad (plains, hills)",
+  "Fagernes (ocean)",
+  "Tønsberg (plains, hills)",
+  "Kirkenes (ocean, hills)",
+  "Hamar (river, grassland)",
+  "Fredrikstad",
+  "Kristansand (ocean)",
+  "Kristiansund (ocean)",
+  "Christiania",
+  "Drammen",
+  "Sandnes",
+  "Arendal (ocean)",
+  "Vardø (ocean)",
+  "Vadsø (ocean)",
+  "Haugesund (ocean)",
+  "Sarpsborg",
+  "Kongsberg (hills)",
+  "Kongsvinger (hills, mountains)",
+  "Gjøvik (river)",
+  "Bardufoss (tundra)",
+  "Skjold (tundra)",
+  "Setermoen (tundra)",
+  "Lillehammer (river)",
+  "Lillestrøm",
+  "Strømmen",
+  "Fredrikborg",
+  "Halden",
+  "Karmøy",
+  "Kragerø",
+  "Fauske",
+  "Bodø (ocean)",
+  "Andenes (ocean)",
+  "Stokkmarknes",
+  "Svolvær (ocean)",
+  "Sortland",
+  "Moss (ocean)",
+  "Honningsvåg (ocean)",
+  "Hammerfest (ocean)",
+  "Ås (hills)",
+  "Os",
+  "Tynset",
+  "Longyearbyen (ocean)",
+  "Mandal",
+  "Molde (ocean)",
+  "Ålesund (ocean)",
+  "Oppdal (mountains)",
+  "Rjukan (mountains)",
+  "Porsgrunn (ocean)"
 
 ; Eg skal ikkje gløyme kvelden, det var ein augustikveld,
 ; Vårherre heldt fest for folket i Fjaler prestegjeld,