[Freeciv-Dev] (PR#12148) granary shouldn't be shown (duplicate of pyramids)

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

Here's a patch to fix/improve the behavior:

- For default and history rulesets, pyramids behavior is changed.  It
gives a 25% bonus only but is cumulative with granary.  So instead of 70
food needed to grow from size 6 to 7, with granary alone you'll need 40
food.  With pyramids alone you'll need 55 food.  With both you'll need
25 food.

- For civ2 and civ1 rulesets, granary (and pyramids for civ2) is fixed.
 The % is changed to 50 and an nreq is added.

-jason

? freeciv-2.0.99-devel.tar.gz
Index: data/civ1/effects.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ1/effects.ruleset,v
retrieving revision 1.1
diff -u -r1.1 effects.ruleset
--- data/civ1/effects.ruleset   2 Feb 2005 02:44:32 -0000       1.1
+++ data/civ1/effects.ruleset   18 Feb 2005 07:42:51 -0000
@@ -200,7 +200,7 @@
 
 [effect_granary]
 name   = "Growth_Food"
-value  = 1
+value  = 50
 reqs   =
     { "type", "name", "range"
       "Building", "Granary", "City"
Index: data/civ2/effects.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ2/effects.ruleset,v
retrieving revision 1.1
diff -u -r1.1 effects.ruleset
--- data/civ2/effects.ruleset   2 Feb 2005 02:44:32 -0000       1.1
+++ data/civ2/effects.ruleset   18 Feb 2005 07:42:51 -0000
@@ -248,11 +248,15 @@
 
 [effect_granary]
 name   = "Growth_Food"
-value  = 1
+value  = 50
 reqs   =
     { "type", "name", "range"
       "Building", "Granary", "City"
     }
+nreqs   =
+    { "type", "name", "range"
+      "Building", "Pyramids", "Player"
+    }
 
 [effect_harbour]
 name   = "Food_Add_Tile"
@@ -889,7 +893,7 @@
 
 [effect_pyramids]
 name   = "Growth_Food"
-value  = 1
+value  = 50
 reqs   =
     { "type", "name", "range"
       "Building", "Pyramids", "Player"
Index: data/default/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/buildings.ruleset,v
retrieving revision 1.64
diff -u -r1.64 buildings.ruleset
--- data/default/buildings.ruleset      21 Dec 2004 03:36:19 -0000      1.64
+++ data/default/buildings.ruleset      18 Feb 2005 07:42:52 -0000
@@ -1770,7 +1770,9 @@
 sound          = "w_pyramids"
 sound_alt      = "w_generic"
 helptext       = _("\
-Counts as having a Granary in every city.\
+The amount of stored food lost when one of your cities grows or shrinks\
+ is reduced by 25%.  This helps a city to grow faster and more easily\
+ withstand famine.  Cumulative with Granary.\
 ")
 
 [building_seti_program]
Index: data/default/effects.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/effects.ruleset,v
retrieving revision 1.1
diff -u -r1.1 effects.ruleset
--- data/default/effects.ruleset        2 Feb 2005 02:44:32 -0000       1.1
+++ data/default/effects.ruleset        18 Feb 2005 07:42:52 -0000
@@ -956,7 +956,7 @@
 
 [effect_pyramids]
 name   = "Growth_Food"
-value  = 50
+value  = 25
 reqs   =
     { "type", "name", "range"
       "Building", "Pyramids", "Player"
Index: data/history/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/history/buildings.ruleset,v
retrieving revision 1.18
diff -u -r1.18 buildings.ruleset
--- data/history/buildings.ruleset      21 Dec 2004 03:36:19 -0000      1.18
+++ data/history/buildings.ruleset      18 Feb 2005 07:42:52 -0000
@@ -1718,7 +1718,9 @@
 sound          = "w_pyramids"
 sound_alt      = "w_generic"
 helptext       = _("\
-Counts as having a Granary in every city.\
+The amount of stored food lost when one of your cities grows or shrinks\
+ is reduced by 25%.  This helps a city to grow faster and more easily\
+ withstand famine.  Cumulative with Granary.\
 ")
 
 [building_seti_program]
Index: data/history/effects.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/history/effects.ruleset,v
retrieving revision 1.1
diff -u -r1.1 effects.ruleset
--- data/history/effects.ruleset        2 Feb 2005 02:44:32 -0000       1.1
+++ data/history/effects.ruleset        18 Feb 2005 07:42:53 -0000
@@ -248,7 +248,7 @@
 
 [effect_granary]
 name   = "Growth_Food"
-value  = 1
+value  = 50
 reqs   =
     { "type", "name", "range"
       "Building", "Granary", "City"
@@ -889,7 +889,7 @@
 
 [effect_pyramids]
 name   = "Growth_Food"
-value  = 1
+value  = 25
 reqs   =
     { "type", "name", "range"
       "Building", "Pyramids", "Player"