[Freeciv-Dev] Re: (PR#2876) Consolidated nations class/legend and updates patch

["nath@xxxxxxxx via RT" <rt@xxxxxxxxxxxxxx>]

> Index: dunedain.ruleset
> ===================================================================
> RCS file: /home/freeciv/CVS/freeciv/data/nation/dunedain.ruleset,v
> retrieving revision 1.6
> diff -u -r1.6 dunedain.ruleset
> --- dunedain.ruleset  2002/11/18 19:46:25     1.6
> +++ dunedain.ruleset  2003/01/22 05:22:33
> @@ -6,8 +6,12 @@
>  
>  name=_("Dunedain")
>  plural=_("?plural:Dunedan")
> -leader="Elros", "Tar-Ancalimë", "Míriel", "Elendil", "Isildur", "Aragorn"
> -leader_sex="Male", "Female", "Female", "Male", "Male", "Male"
> +class=_("Fictional")
> +legend=_("The Men of the West from J.R.R. Tolkien's Middle Earth fantasies.")
> +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 = "Classical"
> @@ -29,7 +33,7 @@
>    "Armenelos", "Romenna", "Meneltarma (mountains)", "Andúnië",
>    "Eldalondë (ocean)", "Nindamos", "Vinyalondë (ocean)", "Lond Daer (ocean)",
>    "Emerië", "Hyarastorni", "Osgiliath", "Minas Anor", "Minas Ithil",
> -  "Pelargir", "Erech (hills)", "Umbar", "Aglarond", "Angrenost", "Annúminas",
> +  "Pelargir", "Erech (hills)", "Umbar", "Aglarond", "Annúminas",
>    "Amon Sûl (hills)", "Fornost", "Ethring (river)", "Dol Amroth",
>    "Edhellond (ocean)", "Linhir", "Calembel", "Tharbad", "Elostirion (hills)",
>    "Isengard (hills)", "Belfalas", "Anórien", "Bree (hills)", "Staddle",
Why do you move Angrenost to Mordor? As it is just another name for
Isengard, I think it should belong to the same country.

> Index: irish.ruleset
> ===================================================================
> RCS file: /home/freeciv/CVS/freeciv/data/nation/irish.ruleset,v
> retrieving revision 1.5
> diff -u -r1.5 irish.ruleset
> --- irish.ruleset     2002/12/17 20:10:19     1.5
> +++ irish.ruleset     2003/01/22 05:22:59
> @@ -2,6 +2,7 @@
>  
>  name = _("Irish")
>  plural = _("?plural:Irish")
> +class=_("Historical")
>  leader = "Brian Boru", "Cuchulain", "Patrick", "Ollam Fodla", "Lugh"
>  leader_sex = "Male", "Male", "Male", "Male", "Male"
>  flag="f.ireland"
Why is Ireland historical instead of modern?

> Index: mordor.ruleset
> ===================================================================
> RCS file: /home/freeciv/CVS/freeciv/data/nation/mordor.ruleset,v
> retrieving revision 1.4
> diff -u -r1.4 mordor.ruleset
> --- mordor.ruleset    2002/11/18 19:46:26     1.4
> +++ mordor.ruleset    2003/01/22 05:23:15
> @@ -2,8 +2,11 @@
>  
>  name=_("Mordor")
>  plural=_("?plural:Mordors")
> -leader="Sauron", "Angmar", "Gorthaur"
> -leader_sex="Male", "Male", "Male"
> +class=_("Fictional")
> +legend=_("The armies of the Dark Lord Sauron, from J.R.R. Tolkien's \
> +Middle Earth fantasies.")
> +leader="Sauron", "Angmar", "Gorthaur", "Melkor"
> +leader_sex="Male", "Male", "Male", "Male"
>  flag = "f.mordor"
>  flag_alt = "-"
>  city_style = "Tropical"
> @@ -27,5 +30,7 @@
>    "Minas Morgul", "Cirith Ungol", "Moria", "Angmar", "Gorgoroth",
>    "Morgai", "Nurn", "Khand", "Rhûn", "Harad", "Dagorlad", "Ephel Dúath",
>    "Ered Lithui", "Emyn Muil", "Núrnen", "Poros", "Harnen", "Lugbúrz",
> -  "Angband", "Carn Dûm", "Utumno", "Amon Amarth", "Uruk-hai", "Olog-hai",
> -  "Azog", "Bolg", "Gorbag", "Shagrat", "Grishnákh", "Glamhoth"
> +  "Angband", "Carn Dûm", "Utumno", "Amon Amarth",  "Thangorodrim", 
> +  "Orthanc", "Angrenost", "Mount Fang", "Cirith Gorgor", "Moontower", 
> +  "Hells of Iron", "Udûn", "Havens of Umbar", "Phurunargian", "Khand", 
> +  "Rhûn", "Sammath Naur"
Good adding of cities, but why Angrenost, Orthanc and Moontower?

> Index: scottish.ruleset
> ===================================================================
> RCS file: /home/freeciv/CVS/freeciv/data/nation/scottish.ruleset,v
> retrieving revision 1.7
> diff -u -r1.7 scottish.ruleset
> --- scottish.ruleset  2002/04/30 12:52:57     1.7
> +++ scottish.ruleset  2003/01/22 05:23:25
> @@ -2,6 +2,9 @@
>  
>  name=_("Scottish")
>  plural=_("?plural:Scots")
> +class=_("Modern")
> +legend=_("Scotland was an independent kingdom before the Union of Crowns \
> +with England in 1701.")
>  leader="Henry McLeish", "Donald Dewar", "Charles", "James",
>         "Robert the Bruce", "William Wallace", "Mary Stuart"
>  leader_sex="Male", "Male", "Male", "Male",
Shouldn't that be historical instead of modern?

-- 
Niels Weber <nath@xxxxxxxx>

signature.asc
Description: signature.asc