[Freeciv-Dev] Re: (PR#13399) Granary Not Working - FreeCiv 2.02 (Fedora Core 4)

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

And, I believe this patch fixes the ruleset issues.  It's only tested
for the default ruleset.  Civ2, default, and history rulesets should all
have the same behavior here (civ1 pyramids are completely different).

-jason


Index: data/civ2/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ2/buildings.ruleset,v
retrieving revision 1.42.2.2
diff -p -u -r1.42.2.2 buildings.ruleset
--- data/civ2/buildings.ruleset 4 Jul 2005 06:52:06 -0000       1.42.2.2
+++ data/civ2/buildings.ruleset 19 Jul 2005 17:59:52 -0000
@@ -32,6 +32,14 @@ elements     =
       "Cathedral", "City"
     }
 
+[group_granaries]
+name = "Granaries"
+elements =
+    { "building", "range"
+      "Pyramids", "Player"
+      "Granary", "City"
+    }
+
 [group_labs]
 name           = "Labs"
 elements       =
@@ -464,8 +472,8 @@ build_cost  = 60
 upkeep         = 1
 sabotage       = 100
 effect         =
-    { "name", "value"
-      "Growth_Food", 50
+    { "name", "value", "equiv"
+      "Growth_Food", 50, "Granaries"
     }
 sound          = "b_granary"
 sound_alt      = "b_generic"
@@ -1873,8 +1881,8 @@ build_cost        = 200
 upkeep         = 0
 sabotage       = 0
 effect         =
-    { "name", "range"
-      "Growth_Food", "Player"
+    { "name", "value", "range", "equiv"
+      "Growth_Food", 50, "Player", "Granaries"
     }
 sound          = "w_pyramids"
 sound_alt      = "w_generic"
Index: data/default/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/buildings.ruleset,v
retrieving revision 1.57.2.4
diff -p -u -r1.57.2.4 buildings.ruleset
--- data/default/buildings.ruleset      30 Jan 2005 23:32:07 -0000      1.57.2.4
+++ data/default/buildings.ruleset      19 Jul 2005 17:59:52 -0000
@@ -91,6 +91,14 @@ elements     =
       "Cathedral", "City"
     }
 
+[group_granaries]
+name = "Granaries"
+elements =
+    { "building", "range"
+      "Pyramids", "Player"
+      "Granary", "City"
+    }
+
 [group_generators]
 name           = "Generators"
 elements       =
@@ -519,8 +527,8 @@ build_cost  = 40
 upkeep         = 1
 sabotage       = 100
 effect         =
-    { "name", "value"
-      "Growth_Food", 50
+    { "name", "value", "equiv"
+      "Growth_Food", 50, "Granaries"
     }
 sound          = "b_granary"
 sound_alt      = "b_generic"
@@ -1955,8 +1963,8 @@ build_cost        = 200
 upkeep         = 0
 sabotage       = 0
 effect         =
-    { "name", "value", "range"
-      "Growth_Food", 50, "Player"
+    { "name", "value", "range", "equiv"
+      "Growth_Food", 50, "Player", "Granaries"
     }
 sound          = "w_pyramids"
 sound_alt      = "w_generic"
Index: data/history/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/history/buildings.ruleset,v
retrieving revision 1.14.2.2
diff -p -u -r1.14.2.2 buildings.ruleset
--- data/history/buildings.ruleset      4 Jul 2005 06:52:06 -0000       1.14.2.2
+++ data/history/buildings.ruleset      19 Jul 2005 17:59:53 -0000
@@ -32,6 +32,14 @@ elements     =
       "Cathedral", "City"
     }
 
+[group_granaries]
+name = "Granaries"
+elements =
+    { "building", "range"
+      "Pyramids", "Player"
+      "Granary", "City"
+    }
+
 [group_labs]
 name           = "Labs"
 elements       =
@@ -468,8 +476,8 @@ build_cost  = 60
 upkeep         = 1
 sabotage       = 100
 effect         =
-    { "name", "value"
-      "Growth_Food", 50
+    { "name", "value", "equiv"
+      "Growth_Food", 50, "Granaries"
     }
 sound          = "b_granary"
 sound_alt      = "b_generic"
@@ -1895,8 +1903,8 @@ build_cost        = 200
 upkeep         = 0
 sabotage       = 0
 effect         =
-    { "name", "range"
-      "Growth_Food", "Player"
+    { "name", "value", "range", "equiv"
+      "Growth_Food", 50, "Player", "Granaries"
     }
 sound          = "w_pyramids"
 sound_alt      = "w_generic"