[Freeciv-Dev] (PR#8727) civ1 ruleset is broken

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=8727 >

The civ1 ruleset's use of the river terrain is broken.

River is no longer used in the code.  Civ1 does river correctly, 
however: river is only put on grassland, so the effect is the same as if 
it were its own terrain.  However the "river" terrain still exists in 
the civ1 terrain ruleset, incorrectly.  And two buildings list river as 
a terrain requirement instead of a special requirement.

jason

Index: data/civ1/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ1/buildings.ruleset,v
retrieving revision 1.32
diff -u -r1.32 buildings.ruleset
--- data/civ1/buildings.ruleset 30 Sep 2003 23:20:09 -0000      1.32
+++ data/civ1/buildings.ruleset 12 May 2004 22:59:15 -0000
@@ -471,8 +471,8 @@
 bldg_req       = "None"
 graphic                = "b.hydro_plant"
 graphic_alt    = "-"
-terr_gate      = "Mountains", "River"
-;spec_gate     =
+terr_gate      = "Mountains"
+spec_gate      = "River"
 equiv_range    = "City"
 ;equiv_dupl    =
 equiv_repl     = "Hoover Dam", "Power Plant", "Nuclear Plant"
@@ -1522,8 +1522,8 @@
 bldg_req       = "None"
 graphic                = "b.hoover_dam"
 graphic_alt    = "-"
-terr_gate      = "Mountains", "River"
-;spec_gate     =
+terr_gate      = "Mountains"
+spec_gate      = "River"
 equiv_range    = "Player"
 ;equiv_dupl    =
 ;equiv_repl    =
Index: data/civ1/terrain.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ1/terrain.ruleset,v
retrieving revision 1.21
diff -u -r1.21 terrain.ruleset
--- data/civ1/terrain.ruleset   23 Feb 2004 05:31:20 -0000      1.21
+++ data/civ1/terrain.ruleset   12 May 2004 22:59:15 -0000
@@ -484,21 +484,21 @@
  inconvenient.\
 ")
 
-[terrain_river]
-terrain_name         = _("River")
-graphic              = "t_river"
+[terrain_unused_0]
+terrain_name         = "unused"
+graphic              = "-"
 graphic_alt         = "-"
-movement_cost        = 1
-defense_bonus        = 15
-food                 = 2
+movement_cost        = 0
+defense_bonus        = 00
+food                 = 0
 shield               = 0
-trade                = 1
-special_1_name       = _("Resources")
-graphic_special_1    = "ts.river_resources"
+trade                = 0
+special_1_name       = "none"
+graphic_special_1    = "-"
 graphic_special_1a   = "-"
-food_special_1       = 2
-shield_special_1     = 1
-trade_special_1      = 1
+food_special_1       = 0
+shield_special_1     = 0
+trade_special_1      = 0
 special_2_name       = "none"
 graphic_special_2    = "-"
 graphic_special_2a   = "-"
@@ -507,22 +507,15 @@
 trade_special_2      = 0
 road_trade_incr      = 0
 road_time            = 2
-irrigation_result    = "yes"
-irrigation_food_incr = 1
-irrigation_time      = 5
+irrigation_result    = "no"
+irrigation_food_incr = 0
+irrigation_time      = 0
 mining_result        = "no"
 mining_shield_incr   = 0
 mining_time          = 0
 transform_result     = "no"
 transform_time       = 0
-flags                = "Starter"
-helptext            = _("\
-In addition to providing for fishing, Rivers make for excellent\
- lines of communications and trade.\
-\n\n\
-Roads and railroads can only be built on River squares if your\
- civilization has learned Bridge Building technology.\
-")
+helptext            = ""
 
 [terrain_swamp]
 terrain_name         = _("Swamp")