Author: jtn
Date: Mon Jan 19 22:25:06 2015
New Revision: 27736

URL: http://svn.gna.org/viewcvs/freeciv?rev=27736&view=rev
Log:
Make civ2civ3 Output_Penalty_Tile effects consistent.

Now that wonders are only obsoleted by a player's own tech
(patch #5542), the cancellation of this penalty by the tech obsoleting
Pyramids (Railroad) should also be at player range.

Patch by David Fernandez (bardo@gna), requested by me.

See gna bug #23155.

Modified:
    trunk/data/civ2civ3/effects.ruleset
    trunk/doc/README.ruleset_civ2civ3

Modified: trunk/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=27736&r1=27735&r2=27736&view=diff
==============================================================================
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Mon Jan 19 22:25:06 2015
@@ -1397,36 +1397,35 @@
       "Gov", "Communism", "Player"
     }
 
+; Railroad because makes Pyramids obsolete
 [effect_gov_tile_penalty_anarchy]
 type    = "Output_Penalty_Tile"
 value   = 2
 reqs    =
-    { "type", "name", "range", "present", "survives"
-      "Gov", "Anarchy", "Player", TRUE, FALSE
-      "Building", "Pyramids", "Player", FALSE, FALSE
-      "Tech", "Railroad", "World", FALSE, TRUE
-    }
-
-; Railroad because makes Pyramids obsolete
+    { "type", "name", "range", "present"
+      "Gov", "Anarchy", "Player", TRUE
+      "Building", "Pyramids", "Player", FALSE
+      "Tech", "Railroad", "Player", FALSE
+    }
+
 [effect_gov_tile_penalty_tribal]
 type    = "Output_Penalty_Tile"
 value   = 2
 reqs    =
-    { "type", "name", "range", "present", "survives"
-      "Gov", "Tribal", "Player", TRUE, FALSE
-      "Building", "Pyramids", "Player", FALSE, FALSE
-      "Tech", "Railroad", "World", FALSE, TRUE
-    }
-
-; Railroad because makes Pyramids obsolete
+    { "type", "name", "range", "present"
+      "Gov", "Tribal", "Player", TRUE
+      "Building", "Pyramids", "Player", FALSE
+      "Tech", "Railroad", "Player", FALSE
+    }
+
 [effect_gov_tile_penalty_despotism]
 type    = "Output_Penalty_Tile"
 value   = 2
 reqs    =
-    { "type", "name", "range", "present", "survives"
-      "Gov", "Despotism", "Player", TRUE, FALSE
-      "Building", "Pyramids", "Player", FALSE, FALSE
-      "Tech", "Railroad", "World", FALSE, TRUE
+    { "type", "name", "range", "present"
+      "Gov", "Despotism", "Player", TRUE
+      "Building", "Pyramids", "Player", FALSE
+      "Tech", "Railroad", "Player", FALSE
     }
 
 [effect_gov_tile_bonus_republic]

Modified: trunk/doc/README.ruleset_civ2civ3
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.ruleset_civ2civ3?rev=27736&r1=27735&r2=27736&view=diff
==============================================================================
--- trunk/doc/README.ruleset_civ2civ3   (original)
+++ trunk/doc/README.ruleset_civ2civ3   Mon Jan 19 22:25:06 2015
@@ -186,7 +186,7 @@
 
 * Corruption by Distance is increased by 1 until The Corporation is researched 
by the player.
 ** Waste by Distance is increased by 1 until Trade is researched by the player.
-# This penalty is negated by The Pyramids wonder, and the penalty disappears 
for everybody when The Pyramids become obsolete.
+# This penalty is negated by The Pyramids wonder, or when Railroad is 
researched by the player.
 + Partisans appear in conquered cities (democratic or communist) if Guerrilla 
Warfare has been researched by any player.
 
 - Added Fundamentalism (available with Theology), Tribal (available at start) 
and Federation (available with Economics).


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to