Author: cazfi
Date: Tue Feb  9 14:12:41 2016
New Revision: 31832

URL: http://svn.gna.org/viewcvs/freeciv?rev=31832&view=rev
Log:
Since supplied rulesets, except civ/2, now can and do prevent multiple barracks 
types from existing in the
city in any situation, it's unnecessary to protect about duplicate bonuses via 
effect requirements.
Removed such unnecessary requirements.

See patch #5650

Modified:
    trunk/data/civ2civ3/effects.ruleset
    trunk/data/classic/effects.ruleset
    trunk/data/experimental/effects.ruleset
    trunk/data/multiplayer/effects.ruleset
    trunk/data/sandbox/effects.ruleset

Modified: trunk/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=31832&r1=31831&r2=31832&view=diff
==============================================================================
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Tue Feb  9 14:12:41 2016
@@ -1809,8 +1809,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
     }
@@ -1822,8 +1820,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
     }
@@ -1835,8 +1831,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_b_hp]
@@ -1846,8 +1840,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii]
@@ -1857,7 +1849,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
     }
@@ -1869,7 +1860,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
     }
@@ -1881,7 +1871,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii_b_hp]
@@ -1891,7 +1880,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_iii]

Modified: trunk/data/classic/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/effects.ruleset?rev=31832&r1=31831&r2=31832&view=diff
==============================================================================
--- trunk/data/classic/effects.ruleset  (original)
+++ trunk/data/classic/effects.ruleset  Tue Feb  9 14:12:41 2016
@@ -825,8 +825,6 @@
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_1]
@@ -836,8 +834,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii]
@@ -849,7 +845,6 @@
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii_1]
@@ -859,7 +854,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_iii]

Modified: trunk/data/experimental/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/effects.ruleset?rev=31832&r1=31831&r2=31832&view=diff
==============================================================================
--- trunk/data/experimental/effects.ruleset     (original)
+++ trunk/data/experimental/effects.ruleset     Tue Feb  9 14:12:41 2016
@@ -916,8 +916,6 @@
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_bl]
@@ -929,8 +927,6 @@
       "UnitClass", "Big Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_1]
@@ -940,8 +936,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_bl_1]
@@ -951,8 +945,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii]
@@ -964,7 +956,6 @@
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii_bl]
@@ -976,7 +967,6 @@
       "UnitClass", "Big Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii_1]
@@ -986,7 +976,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii_bl_1]
@@ -996,7 +985,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_iii]

Modified: trunk/data/multiplayer/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/effects.ruleset?rev=31832&r1=31831&r2=31832&view=diff
==============================================================================
--- trunk/data/multiplayer/effects.ruleset      (original)
+++ trunk/data/multiplayer/effects.ruleset      Tue Feb  9 14:12:41 2016
@@ -830,8 +830,6 @@
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_1]
@@ -841,8 +839,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii]
@@ -854,7 +850,6 @@
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii_1]
@@ -864,7 +859,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_iii]

Modified: trunk/data/sandbox/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/effects.ruleset?rev=31832&r1=31831&r2=31832&view=diff
==============================================================================
--- trunk/data/sandbox/effects.ruleset  (original)
+++ trunk/data/sandbox/effects.ruleset  Tue Feb  9 14:12:41 2016
@@ -1809,8 +1809,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
     }
@@ -1822,8 +1820,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
     }
@@ -1835,8 +1831,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_b_hp]
@@ -1846,8 +1840,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
-      "Building", "Barracks II", "City", FALSE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii]
@@ -1857,7 +1849,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
     }
@@ -1869,7 +1860,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
       "UnitFlag", "NonMil", "Local", FALSE
       "UnitFlag", "NoVeteran", "Local", FALSE
     }
@@ -1881,7 +1871,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_ii_b_hp]
@@ -1891,7 +1880,6 @@
     { "type", "name", "range", "present"
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
-      "Building", "Barracks III", "City", FALSE
     }
 
 [effect_barracks_iii]


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

Reply via email to