Author: cazfi Date: Tue Feb 9 14:12:46 2016 New Revision: 31833 URL: http://svn.gna.org/viewcvs/freeciv?rev=31833&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: branches/S2_6/data/civ2civ3/effects.ruleset branches/S2_6/data/classic/effects.ruleset branches/S2_6/data/experimental/effects.ruleset branches/S2_6/data/multiplayer/effects.ruleset branches/S2_6/data/sandbox/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=31833&r1=31832&r2=31833&view=diff ============================================================================== --- branches/S2_6/data/civ2civ3/effects.ruleset (original) +++ branches/S2_6/data/civ2civ3/effects.ruleset Tue Feb 9 14:12:46 2016 @@ -1808,8 +1808,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 } @@ -1821,8 +1819,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 } @@ -1834,8 +1830,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] @@ -1845,8 +1839,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] @@ -1856,7 +1848,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 } @@ -1868,7 +1859,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 } @@ -1880,7 +1870,6 @@ { "type", "name", "range", "present" "Building", "Barracks II", "City", TRUE "UnitClass", "Land", "Local", TRUE - "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_b_hp] @@ -1890,7 +1879,6 @@ { "type", "name", "range", "present" "Building", "Barracks II", "City", TRUE "UnitClass", "Big Land", "Local", TRUE - "Building", "Barracks III", "City", FALSE } [effect_barracks_iii] Modified: branches/S2_6/data/classic/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/effects.ruleset?rev=31833&r1=31832&r2=31833&view=diff ============================================================================== --- branches/S2_6/data/classic/effects.ruleset (original) +++ branches/S2_6/data/classic/effects.ruleset Tue Feb 9 14:12:46 2016 @@ -824,8 +824,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] @@ -835,8 +833,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] @@ -848,7 +844,6 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_1] @@ -858,7 +853,6 @@ { "type", "name", "range", "present" "Building", "Barracks II", "City", TRUE "UnitClass", "Land", "Local", TRUE - "Building", "Barracks III", "City", FALSE } [effect_barracks_iii] Modified: branches/S2_6/data/experimental/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/effects.ruleset?rev=31833&r1=31832&r2=31833&view=diff ============================================================================== --- branches/S2_6/data/experimental/effects.ruleset (original) +++ branches/S2_6/data/experimental/effects.ruleset Tue Feb 9 14:12:46 2016 @@ -915,8 +915,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] @@ -928,8 +926,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] @@ -939,8 +935,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] @@ -950,8 +944,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] @@ -963,7 +955,6 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_bl] @@ -975,7 +966,6 @@ "UnitClass", "Big Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_1] @@ -985,7 +975,6 @@ { "type", "name", "range", "present" "Building", "Barracks II", "City", TRUE "UnitClass", "Land", "Local", TRUE - "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_bl_1] @@ -995,7 +984,6 @@ { "type", "name", "range", "present" "Building", "Barracks II", "City", TRUE "UnitClass", "Big Land", "Local", TRUE - "Building", "Barracks III", "City", FALSE } [effect_barracks_iii] Modified: branches/S2_6/data/multiplayer/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/effects.ruleset?rev=31833&r1=31832&r2=31833&view=diff ============================================================================== --- branches/S2_6/data/multiplayer/effects.ruleset (original) +++ branches/S2_6/data/multiplayer/effects.ruleset Tue Feb 9 14:12:46 2016 @@ -829,8 +829,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] @@ -840,8 +838,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] @@ -853,7 +849,6 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_1] @@ -863,7 +858,6 @@ { "type", "name", "range", "present" "Building", "Barracks II", "City", TRUE "UnitClass", "Land", "Local", TRUE - "Building", "Barracks III", "City", FALSE } [effect_barracks_iii] Modified: branches/S2_6/data/sandbox/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/effects.ruleset?rev=31833&r1=31832&r2=31833&view=diff ============================================================================== --- branches/S2_6/data/sandbox/effects.ruleset (original) +++ branches/S2_6/data/sandbox/effects.ruleset Tue Feb 9 14:12:46 2016 @@ -1808,8 +1808,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 } @@ -1821,8 +1819,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 } @@ -1834,8 +1830,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] @@ -1845,8 +1839,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] @@ -1856,7 +1848,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 } @@ -1868,7 +1859,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 } @@ -1880,7 +1870,6 @@ { "type", "name", "range", "present" "Building", "Barracks II", "City", TRUE "UnitClass", "Land", "Local", TRUE - "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_b_hp] @@ -1890,7 +1879,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