[Freeciv-Dev] (PR#15644) Renaissance city style

["Christian Prochaska" <cp.ml.freeciv.dev@xxxxxxxxxxxxxx>]

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

> [dmarks - So 09. Apr 2006, 05:22:10]:
> 
> I'm still not happy with how the renaissance city style works and am
> opening this ticket again: Since no tilesets has graphics for
> renaissance, it always defaults to industrial upon the discovery of
> university which is IMHO too early.
> 
> Researching old commits shows that it was added to support Civ2 style
> citizen graphics which has separate renaissance citizen graphics. Our
> small.png only has one citizen style so I doubt this is widely used in
> Freeciv and isn't IMO worth supporting in the default ruleset.
> 
> This patch removes renaissance from default/cities.ruleset and adds a
> cities.ruleset to civ2/ with the city style intact - for those who want
> to emulate Civ2 as closely as possible.
> 
> -Daniel
> 

For some reason the "cities.ruleset" file in the S2_1 branch contains 3
times the same content. Here's a patch.

Index: data/civ2/cities.ruleset
===================================================================
--- data/civ2/cities.ruleset    (Revision 12038)
+++ data/civ2/cities.ruleset    (Arbeitskopie)
@@ -167,341 +167,3 @@
          "tech", "Superconductors", "Player"
        }
 replaced_by = "-"
-
-; Modifying this file:
-; You should not modify this file except to make bugfixes or
-; for other "maintenance".  If you want to make custom changes
-; you should create a new datadir subdirectory and copy this file
-; into that directory, and then modify that copy.  Then use the
-; command "rulesetdir <mysubdir>" in the server to have freeciv
-; use your new customized file.
-
-[datafile]
-description="Cities data for Freeciv"
-options="1.9"
-
-; A specialist is a city citizen who is not a tile worker.  Usually the
-; player can control what specialist each citizen is, so long as the
-; requirements for that specialist are met.
-;
-; Below are the entries for the specialists, one per specialist type.
-; The tag name (in [specialist_*]) doesn't matter so long as it's unique.
-; For each specialist the following fields may be set:
-;
-; 
-; name         = name as seen by user 
-; short_name    = one-character "short name" used (for instance) in cityrep
-; reqs         = requirements to have the specialist pick (see
-;                effects.ruleset and README.effects for help on requirements)
-
-[specialist_elvis]
-name           = _("elvis")
-short_name     = _("?Elvis:E")
-reqs           =
-    { "type", "name", "range"
-; Nothing
-    }
-
-[specialist_scientist]
-name           = _("scientist")
-short_name     = _("?Scientist:S")
-reqs           =
-    { "type", "name", "range"
-      "MinSize", "5", "City"
-    }
-
-[specialist_taxman]
-name           = _("taxman")
-short_name     = _("?Taxman:T")
-reqs           =
-    { "type", "name", "range"
-      "MinSize", "5", "City"
-    }
-
-[parameters]
-add_to_size_limit  = 8         ; cities >= this cannot be added to.
-angry_citizens = 1              ; set to zero to disable angry citizens
-celebrate_size_limit = 3        ; cities >= can celebrate
-
-changable_tax = 1              ; set to zero to disallow changing of tax rates
-
-;forced_science = 0            ; set these fields when changeable_tax is 
turned off
-;forced_luxury = 100
-;forced_gold = 0
-
-;
-; City styles define the way cities are drawn
-;
-; graphic     = group of tiles to use, see cities spec for
-;               more info on city tiles
-; citizens_graphic     = group of citizens tiles to use, see citizens/small
-;                        spec for more info on citizens tiles
-; reqs        = requirements for this city style (see README.effects)
-; replaced_by = which style replaced this one
-
-[citystyle_european]
-name        = _("?citystyle:European")
-graphic     = "city.european"
-graphic_alt = "-"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_classical]
-name        = _("?citystyle:Classical")
-graphic     = "city.classical"
-graphic_alt = "-"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_tropical]
-name        = _("?citystyle:Tropical")
-graphic     = "city.tropical"
-graphic_alt = "city.european"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_asian]
-name        = _("?citystyle:Asian")
-graphic     = "city.asian"
-graphic_alt = "city.classical"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_babylonian]
-name        = _("?citystyle:Babylonian")
-graphic     = "city.babylonian"
-graphic_alt = "city.classical"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_celtic]
-name        = _("?citystyle:Celtic")
-graphic     = "city.celtic"
-graphic_alt = "city.european"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_renaissance]
-name        = _("?citystyle:Renaissance")
-graphic     = "city.renaissance"
-graphic_alt = "city.industrial"
-citizens_graphic     = "renaissance"
-citizens_graphic_alt = "generic"
-reqs = { "type", "name", "range"
-         "tech", "University", "Player"
-       }
-replaced_by = "Industrial"
-
-[citystyle_industrial]
-name        = _("?citystyle:Industrial")
-graphic     = "city.industrial"
-graphic_alt = "-"
-citizens_graphic     = "industrial"
-citizens_graphic_alt = "generic"
-reqs = { "type", "name", "range"
-         "tech", "Railroad", "Player"
-       }
-replaced_by = "Modern"
-
-[citystyle_modern]
-name        = _("?citystyle:Modern")
-graphic     = "city.modern"
-graphic_alt = "-"
-citizens_graphic     = "modern"
-citizens_graphic_alt = "generic"
-reqs = { "type", "name", "range"
-         "tech", "Automobile", "Player"
-       }
-replaced_by = "PostModern"
-
-[citystyle_postmodern]
-name        = _("?citystyle:PostModern")
-graphic     = "city.postmodern"
-graphic_alt = "-"
-citizens_graphic     = "postmodern"
-citizens_graphic_alt = "generic"
-reqs = { "type", "name", "range"
-         "tech", "Superconductors", "Player"
-       }
-replaced_by = "-"
-
-; Modifying this file:
-; You should not modify this file except to make bugfixes or
-; for other "maintenance".  If you want to make custom changes
-; you should create a new datadir subdirectory and copy this file
-; into that directory, and then modify that copy.  Then use the
-; command "rulesetdir <mysubdir>" in the server to have freeciv
-; use your new customized file.
-
-[datafile]
-description="Cities data for Freeciv"
-options="1.9"
-
-; A specialist is a city citizen who is not a tile worker.  Usually the
-; player can control what specialist each citizen is, so long as the
-; requirements for that specialist are met.
-;
-; Below are the entries for the specialists, one per specialist type.
-; The tag name (in [specialist_*]) doesn't matter so long as it's unique.
-; For each specialist the following fields may be set:
-;
-; 
-; name         = name as seen by user 
-; short_name    = one-character "short name" used (for instance) in cityrep
-; reqs         = requirements to have the specialist pick (see
-;                effects.ruleset and README.effects for help on requirements)
-
-[specialist_elvis]
-name           = _("elvis")
-short_name     = _("?Elvis:E")
-reqs           =
-    { "type", "name", "range"
-; Nothing
-    }
-
-[specialist_scientist]
-name           = _("scientist")
-short_name     = _("?Scientist:S")
-reqs           =
-    { "type", "name", "range"
-      "MinSize", "5", "City"
-    }
-
-[specialist_taxman]
-name           = _("taxman")
-short_name     = _("?Taxman:T")
-reqs           =
-    { "type", "name", "range"
-      "MinSize", "5", "City"
-    }
-
-[parameters]
-add_to_size_limit  = 8         ; cities >= this cannot be added to.
-angry_citizens = 1              ; set to zero to disable angry citizens
-celebrate_size_limit = 3        ; cities >= can celebrate
-
-changable_tax = 1              ; set to zero to disallow changing of tax rates
-
-;forced_science = 0            ; set these fields when changeable_tax is 
turned off
-;forced_luxury = 100
-;forced_gold = 0
-
-;
-; City styles define the way cities are drawn
-;
-; graphic     = group of tiles to use, see cities spec for
-;               more info on city tiles
-; citizens_graphic     = group of citizens tiles to use, see citizens/small
-;                        spec for more info on citizens tiles
-; reqs        = requirements for this city style (see README.effects)
-; replaced_by = which style replaced this one
-
-[citystyle_european]
-name        = _("?citystyle:European")
-graphic     = "city.european"
-graphic_alt = "-"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_classical]
-name        = _("?citystyle:Classical")
-graphic     = "city.classical"
-graphic_alt = "-"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_tropical]
-name        = _("?citystyle:Tropical")
-graphic     = "city.tropical"
-graphic_alt = "city.european"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_asian]
-name        = _("?citystyle:Asian")
-graphic     = "city.asian"
-graphic_alt = "city.classical"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_babylonian]
-name        = _("?citystyle:Babylonian")
-graphic     = "city.babylonian"
-graphic_alt = "city.classical"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_celtic]
-name        = _("?citystyle:Celtic")
-graphic     = "city.celtic"
-graphic_alt = "city.european"
-citizens_graphic     = "ancient"
-citizens_graphic_alt = "generic"
-; No reqs
-replaced_by = "Renaissance"
-
-[citystyle_renaissance]
-name        = _("?citystyle:Renaissance")
-graphic     = "city.renaissance"
-graphic_alt = "city.industrial"
-citizens_graphic     = "renaissance"
-citizens_graphic_alt = "generic"
-reqs = { "type", "name", "range"
-         "tech", "University", "Player"
-       }
-replaced_by = "Industrial"
-
-[citystyle_industrial]
-name        = _("?citystyle:Industrial")
-graphic     = "city.industrial"
-graphic_alt = "-"
-citizens_graphic     = "industrial"
-citizens_graphic_alt = "generic"
-reqs = { "type", "name", "range"
-         "tech", "Railroad", "Player"
-       }
-replaced_by = "Modern"
-
-[citystyle_modern]
-name        = _("?citystyle:Modern")
-graphic     = "city.modern"
-graphic_alt = "-"
-citizens_graphic     = "modern"
-citizens_graphic_alt = "generic"
-reqs = { "type", "name", "range"
-         "tech", "Automobile", "Player"
-       }
-replaced_by = "PostModern"
-
-[citystyle_postmodern]
-name        = _("?citystyle:PostModern")
-graphic     = "city.postmodern"
-graphic_alt = "-"
-citizens_graphic     = "postmodern"
-citizens_graphic_alt = "generic"
-reqs = { "type", "name", "range"
-         "tech", "Superconductors", "Player"
-       }
-replaced_by = "-"