Complete.Org: Mailing Lists: Archives: freeciv-dev: April 2005:
[Freeciv-Dev] (PR#12789) update civ1/civ2/history buildings.ruleset
Home

[Freeciv-Dev] (PR#12789) update civ1/civ2/history buildings.ruleset

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Subject: [Freeciv-Dev] (PR#12789) update civ1/civ2/history buildings.ruleset
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Wed, 13 Apr 2005 17:41:22 -0700
Reply-to: bugs@xxxxxxxxxxx

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

This patch removes the unused effects and groups data in 
buildings.ruleset.  I will commit immediately.

-jason

Index: civ1/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ1/buildings.ruleset,v
retrieving revision 1.44
diff -u -r1.44 buildings.ruleset
--- civ1/buildings.ruleset      24 Mar 2005 16:41:41 -0000      1.44
+++ civ1/buildings.ruleset      14 Apr 2005 00:40:21 -0000
@@ -37,12 +37,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "type", "range", "aff_unit"
-       "Unit_Veteran", "City", "Air"
-       "Unit_Repair", "City", "Air"
-       "Airlift", "City"
-    }
 sound          = "b_airport"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -56,51 +50,6 @@
  some movement points left to be airlifted.\
 ")
 
-[group_factories]
-name           = "Factories"
-elements       =
-    { "building", "range"
-      "Mfg. Plant", "City"
-      "Factory", "City"
-    }
-
-[group_generators]
-name           = "Generators"
-elements       =
-    { "building", "range"
-      "Hoover Dam", "Player"
-      "Nuclear Plant", "City"
-      "Hydro Plant", "City"
-      "Power Plant", "City"
-    }
-
-[group_janitors]
-name            = "Janitors"
-elements       =
-    { "building", "range"
-      "Recycling Center", "City"
-      "Hoover Dam", "Player"
-      "Nuclear Plant", "City"
-      "Hydro Plant", "City"
-    }
-
-[group_defenders]
-name           = "Defenders"
-elements       =
-    { "building", "range"
-      "Great Wall", "Player"
-      "City Walls", "City"
-    }
-
-[group_purifiers]
-name           = "Purifiers"
-elements       =
-    { "building", "range"
-      "Palace", "City"
-      "Courthouse", "City"
-    }
-
-
 [building_aqueduct]
 name           = _("Aqueduct")
 genus           = "Improvement"
@@ -114,10 +63,6 @@
 build_cost     = 120
 upkeep         = 2
 sabotage       = 100
-effect          =
-    { "name"
-      "Size_Unlimit"
-    }
 sound          = "b_aqueduct"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -137,11 +82,6 @@
 build_cost     = 120
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Tax_Bonus", 50, "Building", "Marketplace"
-      "Luxury_Bonus", 50, "Building", "Marketplace"
-    }
 sound          = "b_bank"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -163,12 +103,6 @@
 build_cost     = 40
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name"
-      "Land_Veteran"
-      "Sea_Veteran"
-      "Air_Veteran"
-    }
 sound          = "b_barracks_i"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -192,12 +126,6 @@
 build_cost     = 40
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "name"
-      "Land_Veteran"
-      "Sea_Veteran"
-      "Air_Veteran"
-    }
 sound          = "b_barracks_ii"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -221,12 +149,6 @@
 build_cost     = 40
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name"
-      "Land_Veteran"
-      "Sea_Veteran"
-      "Air_Veteran"
-    }
 sound          = "b_barracks_iii"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -250,10 +172,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Make_Content", 4
-    }
 sound          = "b_cathedral"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -274,12 +192,6 @@
 build_cost     = 120
 upkeep         = 2
 sabotage       = 50
-effect         =
-    { "name", "value", "equiv"
-      "Land_Defend", 200, "Defenders"
-      "Sea_Defend", 200, "Defenders"
-      "Unit_No_Lose_Pop"
-    }
 sound          = "b_city_walls"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -303,10 +215,6 @@
 build_cost     = 100
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Make_Content", 3
-    }
 sound          = "b_colosseum"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -326,11 +234,6 @@
 build_cost     = 80
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Corrupt_Pct", 50, "Purifiers"
-      "Waste_Pct", 50, "Purifiers"
-    }
 sound          = "b_courthouse"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -353,10 +256,6 @@
 build_cost     = 200
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv"
-      "Prod_Bonus", 50, "Factories"
-    }
 sound          = "b_factory"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -377,10 +276,6 @@
 build_cost     = 60
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name"
-      "Growth_Food"
-    }
 sound          = "b_granary"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -405,11 +300,6 @@
 build_cost     = 240
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv"
-      "Prod_Bonus", 50, "Generators"
-      "Pollu_Prod_Pct", -50, "Janitors"
-    }
 sound          = "b_hydro_plant"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -438,10 +328,6 @@
 build_cost     = 80
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Science_Bonus", 50
-    }
 sound          = "b_library"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -462,11 +348,6 @@
 build_cost     = 80
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Tax_Bonus", 50
-      "Luxury_Bonus", 50
-    }
 sound          = "b_marketplace"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -487,10 +368,6 @@
 build_cost     = 160
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Pollu_Pop_Pct", -100
-    }
 sound          = "b_mass_transit"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -512,10 +389,6 @@
 build_cost     = 320
 upkeep         = 6
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv"
-      "Prod_Bonus", 100, "Factories"
-    }
 sound          = "b_mfg_plant"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -537,11 +410,6 @@
 build_cost     = 240
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv"
-      "Prod_Bonus", 50, "Generators"
-      "Pollu_Prod_Pct", -50, "Janitors"
-    }
 sound          = "b_nuclear_plant"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -572,14 +440,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value", "equiv"
-      "Corrupt_Pct", 50, "Purifiers"
-      "Waste_Pct", 50, "Purifiers"
-      "Spy_Resistant", 50
-      "No_Incite"
-      "Capital_City"
-    }
 sound          = "b_palace"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -608,10 +468,6 @@
 build_cost     = 160
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv"
-      "Prod_Bonus", 50, "Generators"
-    }
 sound          = "b_power_plant"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -639,10 +495,6 @@
 build_cost     = 200
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv"
-      "Pollu_Prod_Pct", -66, "Janitors"
-    }
 sound          = "b_recycling_center"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -664,10 +516,6 @@
 build_cost     = 200
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name"
-      "Nuke_Proof"
-    }
 sound          = "b_sdi_defense"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -691,10 +539,6 @@
 build_cost     = 120
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "type", "range", "amount", "cond_bldg"
-       "Size_Unlimit", "City", 12, "Aqueduct"
-    }
 sound          = "b_sewer_system"
 sound_alt      = "b_generic"
 ; helptext     = ""
@@ -742,10 +586,6 @@
 build_cost     = 160
 upkeep         = 0
 sabotage       = 100
-effect          =
-    { "name"
-      "SS_Component"
-    }
 sound          = "b_space_component"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -770,10 +610,6 @@
 build_cost     = 320
 upkeep         = 0
 sabotage       = 100
-effect          =
-    { "name"
-      "SS_Module"
-    }
 sound          = "b_space_module"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -807,10 +643,6 @@
 build_cost     = 80
 upkeep         = 0
 sabotage       = 100
-effect          =
-    { "name"
-      "SS_Structural"
-    }
 sound          = "b_space_structural"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -835,11 +667,6 @@
 build_cost     = 40
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Make_Content", 1
-      "Make_Content", 1, "Tech", "Mysticism"
-    }
 sound          = "b_temple"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -861,10 +688,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Science_Bonus", 50, "Building", "Library"
-    }
 sound          = "b_university"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -886,11 +709,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "survives"
-      "Reveal_Cities", "Player", 0
-      "Enable_Space", "World", 1
-    }
 helptext       = _("\
 All cities on the map become visible for the player who owns it. \
  It allows all players to start building spaceship parts (assuming\
@@ -910,10 +728,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value"
-      "Trade_Inc_Tile", 1
-    }
 sound          = "w_colossus"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -934,12 +748,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value", "req_type", "req"
-      "Science_Bonus", 50, "Building", "Library"
-      "Science_Bonus", 50, "Building", "University"
-      "Science_Bonus", 100
-    }
 sound          = "w_copernicus_observatory"
 sound_alt      = "w_generic"
 ; /* xgettext:no-c-format */
@@ -960,10 +768,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Force_Content", "Player", 1
-    }
 sound          = "w_cure_for_cancer"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -984,10 +788,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Give_Imm_Tech", "Player", 2
-    }
 sound          = "w_darwins_voyage"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1032,10 +832,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Tech_Parasite", "Player", 2
-    }
 sound          = "w_great_library"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1056,11 +852,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv"
-      "Land_Defend", "Player", 200, "Defenders"
-      "Sea_Defend", "Player", 200, "Defenders"
-    }
 sound          = "w_great_wall"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1082,10 +873,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Make_Happy", "Player", 1
-    }
 sound          = "w_hanging_gardens"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1109,11 +896,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv"
-      "Prod_Bonus", "Continent", 50, "Generators"
-      "Pollu_Prod_Pct", "Continent", -50, "Janitors"
-    }
 sound          = "w_hoover_dam"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1136,15 +918,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "req_type", "req"
-      "Science_Bonus", "Player", 50, "Building", "Library"
-      "Science_Bonus", "Player", 50, "Building", "University"
-    }
-effect         =
-    { "type", "range", "amount"
-       "Science_Bonus", "City", 100
-    }
 sound          = "w_isaac_newtons_college"
 sound_alt      = "w_generic"
 ; /* xgettext:no-c-format */
@@ -1165,10 +938,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Force_Content", "Continent", 2
-    }
 sound          = "w_js_bachs_cathedral"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1189,10 +958,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Sea_Move", "Player", 1
-    }
 sound          = "w_lighthouse"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1216,10 +981,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Sea_Move", "Player", 1
-    }
 sound          = "w_magellans_expedition"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1239,10 +1000,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "survives"
-      "Enable_Nuke", "World", 1
-    }
 sound          = "w_manhattan_project"
 sound_alt      = "w_generic"
 ;helptext is set in client/helpdata.c:helptext_wonder()
@@ -1261,10 +1018,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value", "req_type", "req"
-      "Make_Content", 4, "Building", "Cathedral"
-    }
 sound          = "w_michelangelos_chapel"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1284,12 +1037,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "req_type", "req"
-; BUG: this will give the wrong results if the player has oracle but not
-; Mysticism
-      "Make_Content", "Player", 2, "Building", "Temple"
-    }
 sound          = "w_oracle"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1309,11 +1056,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range"
-      "Any_Government", "Player"
-      "No_Anarchy", "Player"
-    }
 sound          = "w_pyramids"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1335,10 +1077,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Science_Bonus", "Player", 50
-    }
 sound          = "w_seti_program"
 sound_alt      = "w_generic"
 ; /* xgettext:no-c-format */
@@ -1359,10 +1097,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name"
-      "No_Unhappy"
-    }
 sound          = "w_shakespeares_theatre"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1382,11 +1116,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range"
-      "Any_Government", "Player"
-      "No_Anarchy", "Player"
-    }
 sound          = "w_united_nations"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1413,10 +1142,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Make_Content_Mil_Per", "Player", 1
-    }
 sound          = "w_womens_suffrage"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1438,10 +1163,6 @@
 build_cost     = 999
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name"
-      "Prod_To_Gold"
-    }
 helptext       = _("\
 This is not a normal improvement.  Instead, setting a city's\
  production to Capitalization means its shield production is\
Index: civ2/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ2/buildings.ruleset,v
retrieving revision 1.47
diff -u -r1.47 buildings.ruleset
--- civ2/buildings.ruleset      24 Mar 2005 16:41:42 -0000      1.47
+++ civ2/buildings.ruleset      14 Apr 2005 00:40:21 -0000
@@ -24,67 +24,6 @@
 ; /*** For details of this file's format, ***/
 ; /*** see the default buildings.ruleset. ***/
 
-[group_cathedrals]
-name           = "Cathedrals"
-elements       =
-    { "building", "range"
-      "Michelangelo's Chapel", "Player"
-      "Cathedral", "City"
-    }
-
-[group_labs]
-name           = "Labs"
-elements       =
-    { "building", "range"
-      "SETI Program", "Player"
-      "Research Lab", "City"
-    }
-
-[group_generators]
-name           = "Generators"
-elements       =
-    { "building", "range"
-      "Hoover Dam", "Player"
-      "Nuclear Plant", "City"
-      "Hydro Plant", "City"
-      "Power Plant", "City"
-    }
-
-[group_janitors]
-name            = "Janitors"
-elements       =
-    { "building", "range"
-      "Recycling Center", "City"
-      "Hoover Dam", "Player"
-      "Nuclear Plant", "City"
-      "Hydro Plant", "City"
-    }
-
-[group_defenders]
-name           = "Defenders"
-elements       =
-    { "building", "range"
-      "Great Wall", "Player"
-      "City Walls", "City"
-    }
-
-[group_peacekeepers]
-name           = "Peacekeepers"
-elements       =
-    { "building", "range"
-      "Women's Suffrage", "Player"
-      "Police Station", "City"
-    }
-
-[group_purifiers]
-name           = "Purifiers"
-elements       =
-    { "building", "range"
-      "Palace", "City"
-      "Courthouse", "City"
-    }
-
-
 [building_airport]
 name           = _("Airport")
 genus          = "Improvement"
@@ -98,12 +37,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name"
-      "Air_Veteran"
-      "Air_Regen"
-      "Airlift"
-    }
 sound          = "b_airport"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -130,10 +63,6 @@
 build_cost     = 80
 upkeep         = 2
 sabotage       = 100
-effect          =
-    { "name", "value"
-      "Size_Adj", 4
-    }
 sound          = "b_aqueduct"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -154,11 +83,6 @@
 build_cost     = 120
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Tax_Bonus", 50, "Building", "Marketplace"
-      "Luxury_Bonus", 50, "Building", "Marketplace"
-    }
 sound          = "b_bank"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -180,11 +104,6 @@
 build_cost     = 40
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name"
-      "Land_Veteran"
-      "Land_Regen"
-    }
 sound          = "b_barracks_i"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -208,11 +127,6 @@
 build_cost     = 40
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name"
-      "Land_Veteran"
-      "Land_Regen"
-    }
 sound          = "b_barracks_ii"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -236,11 +150,6 @@
 build_cost     = 40
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name"
-      "Land_Veteran"
-      "Land_Regen"
-    }
 sound          = "b_barracks_iii"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -264,12 +173,6 @@
 build_cost     = 120
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Make_Content", 3, "Cathedrals"
-      "Make_Content", 1, "Cathedrals", "Tech", "Theology"
-      "Make_Content", -1, "Cathedrals", "Tech", "Communism"
-    }
 sound          = "b_cathedral"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -294,11 +197,6 @@
 build_cost     = 80
 upkeep         = 0
 sabotage       = 50
-effect         =
-    { "name", "value", "equiv"
-      "Land_Defend", 200, "Defenders"
-      "Unit_No_Lose_Pop"
-    }
 sound          = "b_city_walls"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -322,10 +220,6 @@
 build_cost     = 80
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Sea_Defend", 100
-    }
 sound          = "b_coastal_defense"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -346,11 +240,6 @@
 build_cost     = 100
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Make_Content", 3
-      "Make_Content", 1, "Tech", "Electricity"
-    }
 sound          = "b_colosseum"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -371,13 +260,6 @@
 build_cost     = 80
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Corrupt_Pct", 50, "Purifiers"
-      "Waste_Pct", 50, "Purifiers"
-      "Make_Content", 1, "", "Gov", "Democracy"
-      "Incite_Dist_Pct", 75
-    }
 sound          = "b_courthouse"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -400,10 +282,6 @@
 build_cost     = 200
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Prod_Bonus", 50
-    }
 sound          = "b_factory"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -424,10 +302,6 @@
 build_cost     = 60
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name"
-      "Growth_Food"
-    }
 sound          = "b_granary"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -452,10 +326,6 @@
 build_cost     = 60
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-       "Food_Add_Tile", 1, "Terrain", "Ocean"
-    }
 sound          = "b_harbour"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -476,12 +346,6 @@
 build_cost     = 240
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Prod_Bonus", 25, "Generators", "Building", "Factory"
-      "Prod_Bonus", 25, "Generators", "Building", "Mfg. Plant"
-      "Pollu_Prod_Pct", -50, "Janitors"
-    }
 sound          = "b_hydro_plant"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -512,10 +376,6 @@
 build_cost     = 80
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Science_Bonus", 50
-    }
 sound          = "b_library"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -536,11 +396,6 @@
 build_cost     = 80
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Tax_Bonus", 50
-      "Luxury_Bonus", 50
-    }
 sound          = "b_marketplace"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -561,10 +416,6 @@
 build_cost     = 160
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Pollu_Pop_Pct", -100
-    }
 sound          = "b_mass_transit"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -586,10 +437,6 @@
 build_cost     = 320
 upkeep         = 6
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Prod_Bonus", 50, "Building", "Factory"
-    }
 sound          = "b_mfg_plant"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -611,12 +458,6 @@
 build_cost     = 160
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Prod_Bonus", 25, "Generators", "Building", "Factory"
-      "Prod_Bonus", 25, "Generators", "Building", "Mfg. Plant"
-      "Pollu_Prod_Pct", -50, "Janitors"
-    }
 sound          = "b_nuclear_plant"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -649,10 +490,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Prod_Add_Tile", 1, "Terrain", "Ocean"
-    }
 sound          = "b_offshore_platform"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -673,14 +510,6 @@
 build_cost     = 100
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value", "equiv"
-      "Corrupt_Pct", 50, "Purifiers"
-      "Waste_Pct", 50, "Purifiers"
-      "Spy_Resistant", 50
-      "No_Incite"
-      "Capital_City"
-    }
 sound          = "b_palace"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -709,11 +538,6 @@
 build_cost     = 60
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Make_Content_Mil", 1, "Peacekeepers", "Gov", "Republic"
-      "Make_Content_Mil", 2, "Peacekeepers", "Gov", "Democracy"
-    }
 sound          = "b_police_station"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -735,11 +559,6 @@
 build_cost     = 80
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name"
-      "Sea_Veteran"
-      "Sea_Regen"
-    }
 sound          = "b_port_facility"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -761,11 +580,6 @@
 build_cost     = 160
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Prod_Bonus", 25, "Generators", "Building", "Factory"
-      "Prod_Bonus", 25, "Generators", "Building", "Mfg. Plant"
-    }
 sound          = "b_power_plant"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -793,10 +607,6 @@
 build_cost     = 200
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv"
-      "Pollu_Prod_Pct", -66, "Janitors"
-    }
 sound          = "b_recycling_center"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -818,10 +628,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-       "Science_Bonus", 50, "Labs", "Building", "Library"
-    }
 sound          = "b_research_lab"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -844,10 +650,6 @@
 build_cost     = 100
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Air_Defend", 100
-    }
 sound          = "b_sam_battery"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -868,11 +670,6 @@
 build_cost     = 200
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Nuke_Proof"
-      "Missile_Defend", 100
-    }
 sound          = "b_sdi_defense"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -896,10 +693,6 @@
 build_cost     = 120
 upkeep         = 2
 sabotage       = 100
-effect          =
-    { "name", "req_type", "req"
-      "Size_Unlimit", "Building", "Aqueduct"
-    }
 sound          = "b_sewer_system"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -950,10 +743,6 @@
 build_cost     = 160
 upkeep         = 0
 sabotage       = 100
-effect          =
-    { "name"
-      "SS_Component"
-    }
 sound          = "b_space_component"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -978,10 +767,6 @@
 build_cost     = 320
 upkeep         = 0
 sabotage       = 100
-effect          =
-    { "name"
-      "SS_Module"
-    }
 sound          = "b_space_module"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -1015,10 +800,6 @@
 build_cost     = 80
 upkeep         = 0
 sabotage       = 100
-effect          =
-    { "name"
-      "SS_Structural"
-    }
 sound          = "b_space_structural"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -1043,11 +824,6 @@
 build_cost     = 160
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Tax_Bonus", 50, "Building", "Bank"
-      "Luxury_Bonus", 50, "Building", "Bank"
-    }
 sound          = "b_stock_exchange"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -1069,10 +845,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Trade_Per_Tile", 50, "Special", "Road"
-    }
 sound          = "b_super_highways"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -1094,10 +866,6 @@
 build_cost     = 120
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Food_Per_Tile", 50, "Special", "Farmland"
-    }
 sound          = "b_supermarket"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -1120,11 +888,6 @@
 build_cost     = 40
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Make_Content", 1
-      "Make_Content", 1, "Tech", "Mysticism"
-    }
 sound          = "b_temple"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -1146,10 +909,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Science_Bonus", 50, "Building", "Library"
-    }
 sound          = "b_university"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -1171,11 +930,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "survives"
-      "Reveal_Map", "Player", 0
-      "Enable_Space", "World", 1
-    }
 sound          = "w_apollo_program"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1197,10 +951,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Upkeep_Free", "Player", 1
-    }
 sound          = "w_asmiths_trading_co"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1221,10 +971,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value"
-      "Trade_Inc_Tile", 1
-    }
 sound          = "w_colossus"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1245,10 +991,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value"
-      "Science_Bonus", 50
-    }
 sound          = "w_copernicus_observatory"
 sound_alt      = "w_generic"
 ; /* xgettext:no-c-format */
@@ -1269,10 +1011,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Force_Content", "Player", 1
-    }
 sound          = "w_cure_for_cancer"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1293,10 +1031,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Give_Imm_Tech", "Player", 2
-    }
 sound          = "w_darwins_voyage"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1341,10 +1075,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Tech_Parasite", "Player", 2
-    }
 sound          = "w_great_library"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1365,11 +1095,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv"
-      "Land_Defend", "Player", 200, "Defenders"
-      "Unit_No_Lose_Pop", "Player"
-    }
 sound          = "w_great_wall"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1391,11 +1116,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Make_Happy", "Player", 1
-      "Make_Happy", "City", 2
-    }
 sound          = "w_hanging_gardens"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1419,12 +1139,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv", "req_type", "req"
-      "Prod_Bonus", "Player", 25, "Generators", "Building", "Factory"
-      "Prod_Bonus", "Player", 25, "Generators", "Building", "Mfg. Plant"
-      "Pollu_Prod_Pct", "Player", -50, "Janitors"
-    }
 sound          = "w_hoover_dam"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1445,10 +1159,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value"
-      "Science_Bonus", 100
-    }
 sound          = "w_isaac_newtons_college"
 sound_alt      = "w_generic"
 ; /* xgettext:no-c-format */
@@ -1469,10 +1179,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Force_Content", "Player", 2
-    }
 sound          = "w_js_bachs_cathedral"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1492,10 +1198,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value"
-      "Prod_Add_Tile", 1
-    }
 sound          = "w_king_richards_crusade"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1516,10 +1218,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Upgrade_Unit", "Player", 1
-    }
 sound          = "w_leonardos_workshop"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1539,12 +1237,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Sea_Move", "Player", 1
-      "No_Sink_Deep", "Player"
-      "Sea_Veteran", "Player"
-    }
 sound          = "w_lighthouse"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1566,10 +1258,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Sea_Move", "Player", 2
-    }
 sound          = "w_magellans_expedition"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1589,10 +1277,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "survives"
-      "Enable_Nuke", "World", 1
-    }
 sound          = "w_manhattan_project"
 sound_alt      = "w_generic"
 ;helptext is set in client/helpdata.c:helptext_wonder()
@@ -1611,10 +1295,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range"
-      "Have_Embassies", "Player"
-    }
 sound          = "w_marco_polos_embassy"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1634,12 +1314,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv", "req_type", "req"
-      "Make_Content", "Player", 3, "Cathedrals"
-      "Make_Content", "Player", 1, "Cathedrals", "Tech", "Theology"
-      "Make_Content", "Player", -1, "Cathedrals", "Tech", "Communism"
-    }
 sound          = "w_michelangelos_chapel"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1664,12 +1338,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "req_type", "req"
-; BUG: this will give the wrong results if the player has oracle but not
-; Mysticism
-      "Make_Content", "Player", 2, "Building", "Temple"
-    }
 sound          = "w_oracle"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1689,10 +1357,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range"
-      "Growth_Food", "Player"
-    }
 sound          = "w_pyramids"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1712,10 +1376,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv", "req_type", "req"
-      "Science_Bonus", "Player", 50, "Labs", "Building", "Library"
-    }
 sound          = "w_seti_program"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1736,10 +1396,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name"
-      "No_Unhappy"
-    }
 sound          = "w_shakespeares_theatre"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1759,11 +1415,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range"
-      "Any_Government", "Player"
-      "No_Anarchy", "Player"
-    }
 sound          = "w_statue_of_liberty"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1785,11 +1436,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Land_Veteran", "Player"
-      "Land_Vet_Combat", "Player", 100
-    }
 sound          = "w_sun_tzus_war_academy"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1811,10 +1457,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Unit_Recover", "Player", 2
-    }
 sound          = "w_united_nations"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1842,11 +1484,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv", "req_type", "req"
-      "Make_Content_Mil", "Player", 1, "Peacekeepers", "Gov", "Republic"
-      "Make_Content_Mil", "Player", 2, "Peacekeepers", "Gov", "Democracy"
-    }
 sound          = "w_womens_suffrage"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1869,10 +1506,6 @@
 build_cost     = 999
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name"
-      "Prod_To_Gold"
-    }
 helptext       = _("\
 This is not a normal improvement.  Instead, setting a city's\
  production to Capitalization means its shield production is\
Index: history/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/history/buildings.ruleset,v
retrieving revision 1.20
diff -u -r1.20 buildings.ruleset
--- history/buildings.ruleset   24 Mar 2005 16:41:42 -0000      1.20
+++ history/buildings.ruleset   14 Apr 2005 00:40:22 -0000
@@ -24,67 +24,6 @@
 ; /*** For details of this file's format, ***/
 ; /*** see the default buildings.ruleset. ***/
 
-[group_cathedrals]
-name           = "Cathedrals"
-elements       =
-    { "building", "range"
-      "Michelangelo's Chapel", "Player"
-      "Cathedral", "City"
-    }
-
-[group_labs]
-name           = "Labs"
-elements       =
-    { "building", "range"
-      "SETI Program", "Player"
-      "Research Lab", "City"
-    }
-
-[group_generators]
-name           = "Generators"
-elements       =
-    { "building", "range"
-      "Hoover Dam", "Player"
-      "Nuclear Plant", "City"
-      "Hydro Plant", "City"
-      "Power Plant", "City"
-    }
-
-[group_janitors]
-name            = "Janitors"
-elements       =
-    { "building", "range"
-      "Recycling Center", "City"
-      "Hoover Dam", "Player"
-      "Nuclear Plant", "City"
-      "Hydro Plant", "City"
-    }
-
-[group_defenders]
-name           = "Defenders"
-elements       =
-    { "building", "range"
-      "Great Wall", "Player"
-      "City Walls", "City"
-    }
-
-[group_peacekeepers]
-name           = "Peacekeepers"
-elements       =
-    { "building", "range"
-      "Women's Suffrage", "Player"
-      "Police Station", "City"
-    }
-
-[group_purifiers]
-name           = "Purifiers"
-elements       =
-    { "building", "range"
-      "Palace", "City"
-      "Courthouse", "City"
-    }
-
-
 [building_airport]
 name           = _("Airport")
 genus           = "Improvement"
@@ -98,12 +37,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name"
-      "Air_Veteran"
-      "Air_Regen"
-      "Airlift"
-    }
 sound          = "b_airport"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -130,10 +63,6 @@
 build_cost     = 80
 upkeep         = 2
 sabotage       = 100
-effect          =
-    { "name", "value"
-      "Size_Adj", 4
-    }
 sound          = "b_aqueduct"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -154,11 +83,6 @@
 build_cost     = 120
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Tax_Bonus", 50, "Building", "Marketplace"
-      "Luxury_Bonus", 50, "Building", "Marketplace"
-    }
 sound          = "b_bank"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -181,11 +105,6 @@
 build_cost     = 40
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name"
-      "Land_Veteran"
-      "Land_Regen"
-    }
 sound          = "b_barracks_i"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -210,11 +129,6 @@
 build_cost     = 40
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name"
-      "Land_Veteran"
-      "Land_Regen"
-    }
 sound          = "b_barracks_ii"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -238,11 +152,6 @@
 build_cost     = 40
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name"
-      "Land_Veteran"
-      "Land_Regen"
-    }
 sound          = "b_barracks_iii"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -266,12 +175,6 @@
 build_cost     = 120
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Make_Content", 3, "Cathedrals"
-      "Make_Content", 1, "Cathedrals", "Tech", "Theology"
-      "Make_Content", -1, "Cathedrals", "Tech", "Communism"
-    }
 sound          = "b_cathedral"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -296,11 +199,6 @@
 build_cost     = 80
 upkeep         = 0
 sabotage       = 50
-effect         =
-    { "name", "value", "equiv"
-      "Land_Defend", 200, "Defenders"
-      "Unit_No_Lose_Pop"
-    }
 sound          = "b_city_walls"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -324,10 +222,6 @@
 build_cost     = 80
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Sea_Defend", 100
-    }
 sound          = "b_coastal_defense"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -348,11 +242,6 @@
 build_cost     = 100
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Make_Content", 3
-      "Make_Content", 1, "Tech", "Electricity"
-    }
 sound          = "b_colosseum"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -375,13 +264,6 @@
 build_cost     = 80
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Corrupt_Pct", 50, "Purifiers"
-      "Waste_Pct", 50, "Purifiers"
-      "Make_Content", 1, "", "Gov", "Democracy"
-      "Incite_Dist_Pct", 75
-    }
 sound          = "b_courthouse"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -404,10 +286,6 @@
 build_cost     = 200
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Prod_Bonus", 50
-    }
 sound          = "b_factory"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -428,10 +306,6 @@
 build_cost     = 60
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name"
-      "Growth_Food"
-    }
 sound          = "b_granary"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -456,10 +330,6 @@
 build_cost     = 60
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-       "Food_Add_Tile", 1, "Terrain", "Ocean"
-    }
 sound          = "b_harbour"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -480,12 +350,6 @@
 build_cost     = 240
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Prod_Bonus", 25, "Generators", "Building", "Factory"
-      "Prod_Bonus", 25, "Generators", "Building", "Mfg. Plant"
-      "Pollu_Prod_Pct", -50, "Janitors"
-    }
 sound          = "b_hydro_plant"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -519,10 +383,6 @@
 build_cost     = 80
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Science_Bonus", 50
-    }
 sound          = "b_library"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -543,11 +403,6 @@
 build_cost     = 80
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Tax_Bonus", 50
-      "Luxury_Bonus", 50
-    }
 sound          = "b_marketplace"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -568,10 +423,6 @@
 build_cost     = 160
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Pollu_Pop_Pct", -100
-    }
 sound          = "b_mass_transit"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -593,10 +444,6 @@
 build_cost     = 320
 upkeep         = 6
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Prod_Bonus", 50, "Building", "Factory"
-    }
 sound          = "b_mfg_plant"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -618,12 +465,6 @@
 build_cost     = 160
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Prod_Bonus", 25, "Generators", "Building", "Factory"
-      "Prod_Bonus", 25, "Generators", "Building", "Mfg. Plant"
-      "Pollu_Prod_Pct", -50, "Janitors"
-    }
 sound          = "b_nuclear_plant"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -658,10 +499,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-       "Prod_Add_Tile", 1, "Terrain", "Ocean"
-    }
 sound          = "b_offshore_platform"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -682,14 +519,6 @@
 build_cost     = 100
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value", "equiv"
-      "Corrupt_Pct", 50, "Purifiers"
-      "Waste_Pct", 50, "Purifiers"
-      "Spy_Resistant", 50
-      "No_Incite"
-      "Capital_City"
-    }
 sound          = "b_palace"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -718,11 +547,6 @@
 build_cost     = 60
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Make_Content_Mil", 1, "Peacekeepers", "Gov", "Republic"
-      "Make_Content_Mil", 2, "Peacekeepers", "Gov", "Democracy"
-    }
 sound          = "b_police_station"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -747,11 +571,6 @@
 build_cost     = 80
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name"
-      "Sea_Veteran"
-      "Sea_Regen"
-    }
 sound          = "b_port_facility"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -773,11 +592,6 @@
 build_cost     = 160
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-      "Prod_Bonus", 25, "Generators", "Building", "Factory"
-      "Prod_Bonus", 25, "Generators", "Building", "Mfg. Plant"
-    }
 sound          = "b_power_plant"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -808,10 +622,6 @@
 build_cost     = 200
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv"
-      "Pollu_Prod_Pct", -66, "Janitors"
-    }
 sound          = "b_recycling_center"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -833,10 +643,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "equiv", "req_type", "req"
-       "Science_Bonus", 50, "Labs", "Building", "Library"
-    }
 sound          = "b_research_lab"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -859,10 +665,6 @@
 build_cost     = 100
 upkeep         = 2
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Air_Defend", 100
-    }
 sound          = "b_sam_battery"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -883,11 +685,6 @@
 build_cost     = 200
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value"
-      "Nuke_Proof"
-      "Missile_Defend", 100
-    }
 sound          = "b_sdi_defense"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -911,10 +708,6 @@
 build_cost     = 120
 upkeep         = 2
 sabotage       = 100
-effect          =
-    { "name", "req_type", "req"
-      "Size_Unlimit", "Building", "Aqueduct"
-    }
 sound          = "b_sewer_system"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -968,10 +761,6 @@
 build_cost     = 160
 upkeep         = 0
 sabotage       = 100
-effect          =
-    { "name"
-      "SS_Component"
-    }
 sound          = "b_space_component"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -996,10 +785,6 @@
 build_cost     = 320
 upkeep         = 0
 sabotage       = 100
-effect          =
-    { "name"
-      "SS_Module"
-    }
 sound          = "b_space_module"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -1033,10 +818,6 @@
 build_cost     = 80
 upkeep         = 0
 sabotage       = 100
-effect          =
-    { "name"
-      "SS_Structural"
-    }
 sound          = "b_space_structural"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -1061,11 +842,6 @@
 build_cost     = 160
 upkeep         = 4
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Tax_Bonus", 50, "Building", "Bank"
-      "Luxury_Bonus", 50, "Building", "Bank"
-    }
 sound          = "b_stock_exchange"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -1087,10 +863,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-       "Trade_Per_Tile", 50, "Special", "Road"
-    }
 sound          = "b_super_highways"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -1114,10 +886,6 @@
 build_cost     = 120
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-       "Food_Per_Tile", 50, "Special", "Farmland"
-    }
 sound          = "b_supermarket"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -1140,11 +908,6 @@
 build_cost     = 40
 upkeep         = 1
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Make_Content", 1
-      "Make_Content", 1, "Tech", "Mysticism"
-    }
 sound          = "b_temple"
 sound_alt      = "b_generic"
 helptext       = _("\
@@ -1166,10 +929,6 @@
 build_cost     = 160
 upkeep         = 3
 sabotage       = 100
-effect         =
-    { "name", "value", "req_type", "req"
-      "Science_Bonus", 50, "Building", "Library"
-    }
 sound          = "b_university"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
@@ -1191,11 +950,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "survives"
-      "Reveal_Map", "Player", 0
-      "Enable_Space", "World", 1
-    }
 sound          = "w_apollo_program"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1217,10 +971,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Upkeep_Free", "Player", 1
-    }
 sound          = "w_asmiths_trading_co"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1241,10 +991,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value"
-      "Trade_Inc_Tile", 1
-    }
 sound          = "w_colossus"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1265,10 +1011,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value"
-      "Science_Bonus", 50
-    }
 sound          = "w_copernicus_observatory"
 sound_alt      = "w_generic"
 ; /* xgettext:no-c-format */
@@ -1289,10 +1031,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Force_Content", "Player", 1
-    }
 sound          = "w_cure_for_cancer"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1315,10 +1053,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Give_Imm_Tech", "Player", 2
-    }
 sound          = "w_darwins_voyage"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1363,10 +1097,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Tech_Parasite", "Player", 2
-    }
 sound          = "w_great_library"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1387,11 +1117,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv"
-      "Land_Defend", "Player", 200, "Defenders"
-      "Unit_No_Lose_Pop", "Player"
-    }
 sound          = "w_great_wall"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1414,11 +1139,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Make_Happy", "Player", 1
-      "Make_Happy", "City", 2
-    }
 sound          = "w_hanging_gardens"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1442,12 +1162,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv", "req_type", "req"
-      "Prod_Bonus", "Player", 25, "Generators", "Building", "Factory"
-      "Prod_Bonus", "Player", 25, "Generators", "Building", "Mfg. Plant"
-      "Pollu_Prod_Pct", "Player", -50, "Janitors"
-    }
 sound          = "w_hoover_dam"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1468,10 +1182,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value"
-      "Science_Bonus", 100
-    }
 sound          = "w_isaac_newtons_college"
 sound_alt      = "w_generic"
 ; /* xgettext:no-c-format */
@@ -1492,10 +1202,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Force_Content", "Player", 2
-    }
 sound          = "w_js_bachs_cathedral"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1515,10 +1221,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "value"
-      "Prod_Add_Tile", 1
-    }
 sound          = "w_king_richards_crusade"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1539,10 +1241,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Upgrade_Unit", "Player", 1
-    }
 sound          = "w_leonardos_workshop"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1562,12 +1260,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Sea_Move", "Player", 1
-      "No_Sink_Deep", "Player"
-      "Sea_Veteran", "Player"
-    }
 sound          = "w_lighthouse"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1589,10 +1281,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Sea_Move", "Player", 2
-    }
 sound          = "w_magellans_expedition"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1612,10 +1300,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "survives"
-      "Enable_Nuke", "World", 1
-    }
 sound          = "w_manhattan_project"
 sound_alt      = "w_generic"
 ;helptext is set in client/helpdata.c:helptext_wonder()
@@ -1634,10 +1318,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range"
-      "Have_Embassies", "Player"
-    }
 sound          = "w_marco_polos_embassy"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1657,12 +1337,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv", "req_type", "req"
-      "Make_Content", "Player", 3, "Cathedrals"
-      "Make_Content", "Player", 1, "Cathedrals", "Tech", "Theology"
-      "Make_Content", "Player", -1, "Cathedrals", "Tech", "Communism"
-    }
 sound          = "w_michelangelos_chapel"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1687,11 +1361,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "req_type", "req"
-; Note this is not exactly the same as doubling the effect of temples
-      "Make_Content", "Player", 2, "Building", "Temple"
-    }
 sound          = "w_oracle"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1711,10 +1380,6 @@
 build_cost     = 200
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range"
-      "Growth_Food", "Player"
-    }
 sound          = "w_pyramids"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1736,10 +1401,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv", "req_type", "req"
-      "Science_Bonus", "Player", 50, "Labs", "Building", "Library"
-    }
 sound          = "w_seti_program"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1760,10 +1421,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name"
-      "No_Unhappy"
-    }
 sound          = "w_shakespeares_theatre"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1783,11 +1440,6 @@
 build_cost     = 400
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range"
-      "Any_Government", "Player"
-      "No_Anarchy", "Player"
-    }
 sound          = "w_statue_of_liberty"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1809,11 +1461,6 @@
 build_cost     = 300
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Land_Veteran", "Player"
-      "Land_Vet_Combat", "Player", 50
-    }
 sound          = "w_sun_tzus_war_academy"
 sound_alt      = "w_generic"
 helptext        = _("\
@@ -1835,10 +1482,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value"
-      "Unit_Recover", "Player", 2
-    }
 sound          = "w_united_nations"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1866,11 +1509,6 @@
 build_cost     = 600
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name", "range", "value", "equiv", "req_type", "req"
-      "Make_Content_Mil", "Player", 1, "Peacekeepers", "Gov", "Republic"
-      "Make_Content_Mil", "Player", 2, "Peacekeepers", "Gov", "Democracy"
-    }
 sound          = "w_womens_suffrage"
 sound_alt      = "w_generic"
 helptext       = _("\
@@ -1901,10 +1539,6 @@
 build_cost     = 999
 upkeep         = 0
 sabotage       = 0
-effect         =
-    { "name"
-      "Prod_To_Gold"
-    }
 ; FIXME: this is the real helptext; restore when have a subordnate analogue
 ; /* (ignore for gettext until fixed)
 ;helptext      = _("\

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#12789) update civ1/civ2/history buildings.ruleset, Jason Short <=