[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 >

Mateusz Stefek wrote:
> <URL: http://bugs.freeciv.org/Ticket/Display.html?id=13399 >
> 
>>[jasoltow@xxxxxxxxxxx - Tue Jul 19 03:46:27 2005]:
>>
>>      Just confirmed that I'm running server version 2.0.3, and client
>>version 2.0.3.  I also am using the civ2.serv file that came with 2.0.3.
>>Restarted the game, built pyramid, on city size increase, food goes back
>>to 0.  Unless you know of something that I may have missed, ????
>>
>>      John
>>
> 
> Pyramids are also missing the value field in the civ2 ruleset. However I
> don't know how can I change it to make it civ2 compatible. (Pyramids
> aren't cumulative with granary).

I'm very confused.

The attached patch adds the missing value to the civ2 ruleset for
pyramids.  But since there is no group for granaries it seems that in
the default ruleset granaries and pyramids should be cumulative...but
surely this would have been reported long ago (they aren't supposed to
be cumulative!).  The second attached patch adds the group for granaries
(untested).

-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 16:41:34 -0000
@@ -1874,7 +1874,7 @@ upkeep            = 0
 sabotage       = 0
 effect         =
     { "name", "range"
-      "Growth_Food", "Player"
+      "Growth_Food", 50, "Player"
     }
 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 16:41:54 -0000
@@ -91,6 +91,14 @@ elements     =
       "Cathedral", "City"
     }
 
+[group_granaries]
+name = "Granaries"
+elements =
+    { "building", "range"
+      "Pyramids", "Player"
+      "Granary", "City"
+    }
+
 [group_generators]
 name           = "Generators"
 elements       =
@@ -520,7 +528,7 @@ upkeep              = 1
 sabotage       = 100
 effect         =
     { "name", "value"
-      "Growth_Food", 50
+      "Growth_Food", 50, "Granaries"
     }
 sound          = "b_granary"
 sound_alt      = "b_generic"
@@ -1956,7 +1964,7 @@ upkeep            = 0
 sabotage       = 0
 effect         =
     { "name", "value", "range"
-      "Growth_Food", 50, "Player"
+      "Growth_Food", 50, "Player", "Granaries"
     }
 sound          = "w_pyramids"
 sound_alt      = "w_generic"