Author: jtn
Date: Sat Feb 14 02:43:38 2015
New Revision: 28124

URL: http://svn.gna.org/viewcvs/freeciv?rev=28124&view=rev
Log:
Remove some rare tech/government interactions from civ2civ3:
Communism or Federation without Trade no longer leads to extra waste.

See gna patch #5814.

Modified:
    branches/S2_6/data/civ2civ3/effects.ruleset

Modified: branches/S2_6/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/effects.ruleset?rev=28124&r1=28123&r2=28124&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/effects.ruleset (original)
+++ branches/S2_6/data/civ2civ3/effects.ruleset Sat Feb 14 02:43:38 2015
@@ -459,6 +459,7 @@
       "OutputType", "Food", "Local"
     }
 
+; base -1% trade each tile
 [effect_corruption_distance]
 type    = "Output_Waste_By_Distance"
 value   = 1
@@ -467,7 +468,7 @@
       "OutputType", "Trade", "Local"
     }
 
-; 1 + 1 = 2
+; 1 + 1 => -2% each tile without advanced tech / govs
 [effect_corruption_distance_ancient]
 type    = "Output_Waste_By_Distance"
 value   = 1
@@ -478,7 +479,7 @@
       "Gov", "Communism", "Player", FALSE
     }
 
-; Total = 0
+; Total = 0 for Communism
 [effect_corruption_distance_communism]
 type    = "Output_Waste_By_Distance"
 value   = -1
@@ -488,7 +489,7 @@
       "OutputType", "Trade", "Local"
     }
 
-; Total = 0
+; Total = 0 for Federation with The Corporation, -1% for Federation alone
 [effect_corruption_distance_federation]
 type    = "Output_Waste_By_Distance"
 value   = -1
@@ -561,6 +562,7 @@
       "OutputType", "Trade", "Local"
     }
 
+; base -1% shields each tile
 [effect_waste_distance]
 type    = "Output_Waste_By_Distance"
 value   = 1
@@ -569,7 +571,7 @@
       "OutputType", "Shield", "Local"
     }
 
-; 1 + 1 = 2
+; 1 + 1 => -2% each tile without Trade or advanced govs
 [effect_waste_distance_ancient]
 type    = "Output_Waste_By_Distance"
 value   = 1
@@ -577,9 +579,11 @@
     { "type", "name", "range", "present"
       "OutputType", "Shield", "Local", TRUE
       "Tech", "Trade", "Player", FALSE
-    }
-
-; 1 - 1 = 0
+      "Gov", "Communism", "Player", FALSE
+      "Gov", "Federation", "Player", FALSE
+    }
+
+; 1 - 1 = 0% with Communism
 [effect_waste_distance_communism]
 type    = "Output_Waste_By_Distance"
 value   = -1
@@ -589,7 +593,7 @@
       "OutputType", "Shield", "Local"
     }
 
-; 1 - 1 = 0
+; 1 - 1 = 0% with Federation
 [effect_waste_distance_federation]
 type    = "Output_Waste_By_Distance"
 value   = -1


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

Reply via email to