Author: cazfi
Date: Fri Jun 27 00:31:37 2014
New Revision: 25285
URL: http://svn.gna.org/viewcvs/freeciv?rev=25285&view=rev
Log:
civ2civ3: Granary reduces food waste by 50%.
Patch by David Fernandez <bardo>
See bug #22191
Modified:
trunk/data/civ2civ3/buildings.ruleset
trunk/data/civ2civ3/effects.ruleset
trunk/doc/README.ruleset_civ2civ3
Modified: trunk/data/civ2civ3/buildings.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/buildings.ruleset?rev=25285&r1=25284&r2=25285&view=diff
==============================================================================
--- trunk/data/civ2civ3/buildings.ruleset (original)
+++ trunk/data/civ2civ3/buildings.ruleset Fri Jun 27 00:31:37 2014
@@ -425,10 +425,10 @@
Whenever a city with a Granary shrinks or grows, the foodbox keeps\
10 stored food. This helps a city to grow faster and more easily\
withstand famine.\
-")
-; NOTE:
-; In Civ2, city size reduction does not generate food like this.
-; Dare I ask where this food comes from?? :-)
+"), _("\
+Granary also halves the waste of food caused by distance to Palace. \
+ Together with a Courthouse, it eliminates completely the waste of food.\
+")
[building_harbour]
name = _("Harbor")
Modified: trunk/data/civ2civ3/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=25285&r1=25284&r2=25285&view=diff
==============================================================================
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Fri Jun 27 00:31:37 2014
@@ -1941,7 +1941,6 @@
"OutputType", "Shield", "local"
}
-; Total -1% food each 4 tiles
[effect_courthouse_2]
type = "Output_Waste_Pct"
value = 25
@@ -1982,6 +1981,15 @@
reqs =
{ "type", "name", "range"
"Building", "Factory", "City"
+ }
+
+[effect_granary]
+type = "Output_Waste_Pct"
+value = 25
+reqs =
+ { "type", "name", "range"
+ "Building", "Granary", "City"
+ "OutputType", "Food", "local"
}
; Free Granary effect
Modified: trunk/doc/README.ruleset_civ2civ3
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.ruleset_civ2civ3?rev=25285&r1=25284&r2=25285&view=diff
==============================================================================
--- trunk/doc/README.ruleset_civ2civ3 (original)
+++ trunk/doc/README.ruleset_civ2civ3 Fri Jun 27 00:31:37 2014
@@ -1,6 +1,6 @@
==========================================================
-Civ2Civ3 Ruleset for Freeciv v2.6 (Updated 16-Jun-2014)
+Civ2Civ3 Ruleset for Freeciv v2.6 (Updated 27-Jun-2014)
==========================================================
@@ -244,6 +244,7 @@
- Courthouse: Make_Content = 1, and reduces to half any kind of waste (Trade,
Shields or Food).
Added new effect: Food wasted by distance to Palace = -1% Food each 2 tiles.
For example, cities at distance 20 of the Palace lose -10% Food (-5% with
courthouse), so they lose -1 Food when their production reaches 10 Food per
turn (20 Food per turn with courthouse), noticeable when city reaches size 5 or
so (around city size 10 with courthouse).
+- Granary halves the waste of food caused by distance to Palace. Together with
a Courthouse, it eliminates completely the waste of food.
- Police Station: Make_Content = 2, and reduces unhappiness caused by 1
Military unit.
- Science bonus by buildings (Library, University and Research Lab) restored
to civ2 values (+50%). There are wonders that double the effect later.
- Production bonus by Factory and Mfg Plant reduced to +25% each (was +50%),
so the Power Plants are as important as the Factories. Mfg Plants allows the
construction of 2 items per turn.
@@ -442,6 +443,7 @@
- Disabled happyborders: Units cause military unhappiness if they end the turn
outside cities or fortresses, no matter if they are inside national borders.
- Readjusted effect of some wonders: Mausoleum of Mausolos, Statue of Liberty,
and those related to military unhappiness. Marco Polo's Embassy obsolete by
Democracy.
- Fixed Aqueducts (same as Barracks) to avoid duplicated bonuses when there
are two of them in the same ciy.
+- Granary halves the waste of food caused by distance to Palace.
- Swapped Empire Size values for Fundamentalism (now 20) and Monarchy (now 12).
- Pollution may appear in ocean tiles. Transports can clean it without the
need of Workers\Engineers.
- Enabled random disasters, and readjusted effects. Plague renamed to Flood.
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
