[Freeciv-Dev] Re: Isotrident 17 and morecities patch

[Daniel L Speyer <dspeyer@xxxxxxxxxxx>]

Oops!!!

Thanks for catching that.  I guess that's what comes of doing
modifications by script and not checking them by hand.

Here's the corrected verion.

--Daniel Speyer
If you *don't* consider sharing information to be morally equivalent to 
kidnapping and murder on the high seas, you probably shouldn't use the
phrase "software piracy."

On Sat, 19 Oct 2002, Jordi Negrevernis i Font wrote:

> 
>     Be aware that you patch erases the filipino nation!!!
> 
> En/na Daniel L Speyer ha escrit:
> 
> >bugs@xxxxxxxxxxxxxxxxxxx didn't forward this to freeciv-dev, so here it is
> >manually (apologies if duplicitive):
> >
> >Two related announcements:
> >
> >Isotrident 17 is now avaialble on freeciv's ftp.  It should look exactly
> >the same for current clients, but it contains eyecandy support (maybe now 
> >eyecandy can be included?), better messagewin support (yes, I am going to
> >clean up & re-submit that), and two additional city-styles.
> >
> >I have attatched here the changes to the data directory needed to use the
> >new city styles.  No code is altered, and it degrades gracefully under
> >non-supporting tilesets.  We need no longer suffer the embarissment of
> >calling Vietnam "European".
> >
> >Enjoy!
> >
> >--Daniel Speyer
> >If you *don't* consider sharing information to be morally equivalent to 
> >kidnapping and murder on the high seas, you probably shouldn't use the
> >phrase "software piracy."
> >  
> >
> >------------------------------------------------------------------------
> >
> >diff -ur data/default/cities.ruleset data-new/default/cities.ruleset
> >--- data/default/cities.ruleset      Mon Sep  2 16:36:02 2002
> >+++ data-new/default/cities.ruleset  Wed Oct 16 15:28:28 2002
> >@@ -32,6 +32,20 @@
> > [citystyle_classical]
> > name        = _("Classical")
> > graphic     = "city.classical"
> >+graphic_alt = "-"
> >+tech        = "None"
> >+replaced_by = "Industrial"
> >+
> >+[citystyle_tropical]
> >+name        = _("Tropical")
> >+graphic     = "city.tropical"
> >+graphic_alt = "-"
> >+tech        = "None"
> >+replaced_by = "Industrial"
> >+
> >+[citystyle_asian]
> >+name        = _("Asian")
> >+graphic     = "city.asian"
> > graphic_alt = "-"
> > tech        = "None"
> > replaced_by = "Industrial"
> >diff -ur data/nation/aztec.ruleset data-new/nation/aztec.ruleset
> >--- data/nation/aztec.ruleset        Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/aztec.ruleset    Wed Oct 16 15:30:00 2002
> >@@ -6,7 +6,7 @@
> > leader_sex="Male", "Male", "Male", "Male"
> > flag="f.mexico"
> > flag_alt = "-"
> >-city_style = "Classical"
> >+city_style = "Tropical"
> > 
> > attack=1
> > expand=0
> >diff -ur data/nation/brazilian.ruleset data-new/nation/brazilian.ruleset
> >--- data/nation/brazilian.ruleset    Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/brazilian.ruleset        Wed Oct 16 15:30:26 2002
> >@@ -7,7 +7,7 @@
> > leader_sex="Male", "Female", "Male", "Male", "Male", "Male"
> > flag = "f.brasil"
> > flag_alt = "-"
> >-city_style = "European"
> >+city_style = "Tropical"
> > 
> > ruler_titles = { "government",      "male_title",      "female_title"
> >                  "Despotism",       _("Dictator"),     _("Dictatrix")
> >diff -ur data/nation/chinese.ruleset data-new/nation/chinese.ruleset
> >--- data/nation/chinese.ruleset      Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/chinese.ruleset  Wed Oct 16 15:33:28 2002
> >@@ -8,7 +8,7 @@
> >            "Male", "Male", "Male"
> > flag="f.china"
> > flag_alt = "-"
> >-city_style = "Classical"
> >+city_style = "Asian"
> > ruler_titles = { "government",      "male_title",      "female_title"
> >                  "Monarchy",        _("Emperor"),      _("Dowager")
> >                  "Communism",       _("Chairman"),     _("Chairperson")
> >diff -ur data/nation/dunedain.ruleset data-new/nation/dunedain.ruleset
> >--- data/nation/dunedain.ruleset     Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/dunedain.ruleset Wed Oct 16 15:34:44 2002
> >@@ -10,7 +10,7 @@
> > leader_sex="Male", "Female", "Female", "Male", "Male", "Male"
> > flag = "f.dunedain"
> > flag_alt = "-"
> >-city_style = "European"
> >+city_style = "Classical"
> > 
> > ruler_titles = { "government",      "male_title",      "female_title"
> >                  "Monarchy",        _("King"),         _("Queen")
> >diff -ur data/nation/filipino.ruleset data-new/nation/filipino.ruleset
> >--- data/nation/filipino.ruleset     Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/filipino.ruleset Wed Oct 16 15:33:46 2002
> >@@ -1,25 +0,0 @@
> >-[nation_filipino]
> >-
> >-name=_("Filipino")
> >-plural=_("?plural:Filipinos")
> >-leader="Jose Rizal", "Luis Taruc", "Sergio Osmena", "Ferdinand Marcos"
> >-leader_sex="Male", "Male", "Male", "Male"
> >-flag="f.philippines"
> >-flag_alt = "-"
> >-city_style = "European"
> >-
> >-attack=1
> >-expand=1
> >-civilized=2
> >-advisors=100,100,100,100,100,100,100
> >-init_techs=""
> >-tech_goals = "The Republic", "Gunpowder", "Democracy"
> >-wonder="Hoover Dam"
> >-government="Communism"
> >-
> >-cities =
> >-  "Manila", "Cebu", "Makati", "Quezon", "Pasig", "Angeles", "Davao",
> >-  "San Fernando", "Puerto Princesa", "Cagayan de Oro", "Zamboanga",
> >-  "Bacolod", "Butuan", "Puerto Galera", "Olongapo", "Los Banos", "Lipa",
> >-  "Batangas", "Naga", "Bauang", "Agoo", "San Pablo", "Calamba",
> >-  "Iloilo", "Lucena", "Cabanatuan"
> >diff -ur data/nation/inca.ruleset data-new/nation/inca.ruleset
> >--- data/nation/inca.ruleset Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/inca.ruleset     Wed Oct 16 15:32:07 2002
> >@@ -6,7 +6,7 @@
> > leader_sex="Male", "Male", "Male", "Male"
> > flag="f.peru"
> > flag_alt = "-"
> >-city_style = "Classical"
> >+city_style = "Tropical"
> > 
> > ruler_titles = { "government",      "male_title",      "female_title"
> >                  "Despotism",       _("Warlord"),      _("Warlord")
> >diff -ur data/nation/indian.ruleset data-new/nation/indian.ruleset
> >--- data/nation/indian.ruleset       Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/indian.ruleset   Wed Oct 16 15:33:52 2002
> >@@ -6,7 +6,7 @@
> > leader_sex="Male", "Male", "Male", "Female"
> > flag="f.india"
> > flag_alt = "-"
> >-city_style = "European"
> >+city_style = "Asian"
> > 
> > ruler_titles = { "government",      "male_title",      "female_title"
> >                  "Monarchy",        _("Maharaja"),     _("Maharaja")
> >diff -ur data/nation/japanese.ruleset data-new/nation/japanese.ruleset
> >--- data/nation/japanese.ruleset     Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/japanese.ruleset Wed Oct 16 15:34:00 2002
> >@@ -6,7 +6,7 @@
> > leader_sex="Male", "Male", "Male", "Male"
> > flag="f.japan"
> > flag_alt = "-"
> >-city_style = "European"
> >+city_style = "Asian"
> > 
> > ruler_titles = { "government",      "male_title",      "female_title"
> >                  "Monarchy",        _("Shogun"),         _("Shogun")
> >diff -ur data/nation/kenyan.ruleset data-new/nation/kenyan.ruleset
> >--- data/nation/kenyan.ruleset       Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/kenyan.ruleset   Wed Oct 16 15:32:23 2002
> >@@ -6,7 +6,7 @@
> > leader_sex = "Male"
> > flag = "f.kenya"
> > flag_alt = "-"
> >-city_style = "European"
> >+city_style = "Tropical"
> > attack = 2
> > expand = 2
> > civilized = 1
> >diff -ur data/nation/korean.ruleset data-new/nation/korean.ruleset
> >--- data/nation/korean.ruleset       Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/korean.ruleset   Wed Oct 16 15:34:04 2002
> >@@ -6,7 +6,7 @@
> > leader_sex="Male", "Male", "Male", "Male"
> > flag="f.korea"
> > flag_alt = "-"
> >-city_style = "European"
> >+city_style = "Asian"
> > 
> > attack=0
> > expand=1
> >diff -ur data/nation/mongol.ruleset data-new/nation/mongol.ruleset
> >--- data/nation/mongol.ruleset       Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/mongol.ruleset   Wed Oct 16 15:34:11 2002
> >@@ -6,7 +6,7 @@
> > leader_sex="Male", "Male", "Male", "Male", "Male"
> > flag="f.mongolia"
> > flag_alt = "-"
> >-city_style = "European"
> >+city_style = "Asian"
> > ruler_titles = { "government",      "male_title",      "female_title"
> >                  "Despotism",       _("Khan"),         _("Khan")
> >                  "Monarchy",        _("Great Khan"),   _("Great Khan")
> >diff -ur data/nation/mordor.ruleset data-new/nation/mordor.ruleset
> >--- data/nation/mordor.ruleset       Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/mordor.ruleset   Wed Oct 16 15:32:32 2002
> >@@ -6,7 +6,7 @@
> > leader_sex="Male", "Male", "Male"
> > flag = "f.mordor"
> > flag_alt = "-"
> >-city_style = "Classical"
> >+city_style = "Tropical"
> > 
> > ruler_titles = { "government",      "male_title",      "female_title"
> >                  "Despotism",       _("Overlord"),     _("Overlord")
> >diff -ur data/nation/singaporean.ruleset data-new/nation/singaporean.ruleset
> >--- data/nation/singaporean.ruleset  Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/singaporean.ruleset      Wed Oct 16 15:34:20 2002
> >@@ -20,7 +20,7 @@
> >   "Male", "Male", "Male", "Male", "Female"
> > flag="f.singapore"
> > flag_alt = "-"
> >-city_style = "European"
> >+city_style = "Asian"
> > 
> > ruler_titles = { "government",      "male_title",           "female_title"
> >              "Despotism",   _("Ah"),                _("Ah")
> >diff -ur data/nation/thai.ruleset data-new/nation/thai.ruleset
> >--- data/nation/thai.ruleset Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/thai.ruleset     Wed Oct 16 15:34:26 2002
> >@@ -8,7 +8,7 @@
> >              "Male", "Male"
> > flag="f.thailand"
> > flag_alt = "-"
> >-city_style = "European"
> >+city_style = "Asian"
> > 
> > attack=1
> > expand=2
> >diff -ur data/nation/vietnamese.ruleset data-new/nation/vietnamese.ruleset
> >--- data/nation/vietnamese.ruleset   Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/vietnamese.ruleset       Wed Oct 16 15:34:32 2002
> >@@ -6,7 +6,7 @@
> > leader_sex="Male", "Male", "Male", "Male", "Male"
> > flag="f.vietnam"
> > flag_alt = "-"
> >-city_style = "European"
> >+city_style = "Asian"
> > 
> > attack=0
> > expand=0
> >diff -ur data/nation/zulu.ruleset data-new/nation/zulu.ruleset
> >--- data/nation/zulu.ruleset Mon Sep  2 16:36:04 2002
> >+++ data-new/nation/zulu.ruleset     Wed Oct 16 15:32:44 2002
> >@@ -6,7 +6,7 @@
> > leader_sex="Male"
> > flag="f.south_africa"
> > flag_alt = "f.rwanda"  ; used previously
> >-city_style = "European"
> >+city_style = "Tropical"
> > 
> > attack=2
> > expand=1
> >  
> >
> 
> 
>

morecities.diff
Description: Text document