From 36c778f37e69d333911c9e12c24d87ad48ba163b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 27 Aug 2023 06:47:44 +0300 Subject: [PATCH 13/13] Rulesets: Drop deprecated NoVeteran requirements Rulesets with no unit with NoVeteran flag never need to check against it. Requested by Sveinung Kvilhaugsvik See osdn #41796 Signed-off-by: Marko Lindqvist --- data/classic/effects.ruleset | 9 --------- data/goldkeep/effects.ruleset | 11 ----------- data/webperimental/effects.ruleset | 9 --------- 3 files changed, 29 deletions(-) diff --git a/data/classic/effects.ruleset b/data/classic/effects.ruleset index 015236a1c8..6cf54a2ded 100644 --- a/data/classic/effects.ruleset +++ b/data/classic/effects.ruleset @@ -787,7 +787,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Air", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_0a] @@ -798,7 +797,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Helicopter", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_0b] @@ -809,7 +807,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Missile", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_1] @@ -887,7 +884,6 @@ reqs = "BuildingFlag", "Barracks", "City", TRUE "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_barracks_regen] @@ -1387,7 +1383,6 @@ reqs = "Building", "Port Facility", "City", TRUE "UnitClass", "Sea", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_port_facility_1] @@ -1407,7 +1402,6 @@ reqs = "Building", "Port Facility", "City", TRUE "UnitClass", "Trireme", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_port_facility_trireme_1] @@ -2001,7 +1995,6 @@ reqs = "Building", "Lighthouse", "Player", TRUE "UnitClass", "Sea", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE "Building", "Port Facility", "City", FALSE } @@ -2022,7 +2015,6 @@ reqs = "Building", "Lighthouse", "Player", TRUE "UnitClass", "Trireme", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE "Building", "Port Facility", "City", FALSE } @@ -2161,7 +2153,6 @@ reqs = "Building", "Sun Tzu's War Academy", "Player", TRUE "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_sun_tzus_war_academy_1] diff --git a/data/goldkeep/effects.ruleset b/data/goldkeep/effects.ruleset index 6a23a8675c..49340e44cd 100644 --- a/data/goldkeep/effects.ruleset +++ b/data/goldkeep/effects.ruleset @@ -874,7 +874,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Air", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_0a] @@ -885,7 +884,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Helicopter", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_0b] @@ -896,7 +894,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Missile", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_1] @@ -983,7 +980,6 @@ reqs = "BuildingFlag", "Barracks", "City", TRUE "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_barracks_bland] @@ -994,7 +990,6 @@ reqs = "BuildingFlag", "Barracks", "City", TRUE "UnitClass", "Big Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_barracks_regen_land] @@ -1563,7 +1558,6 @@ reqs = "Building", "Port Facility", "City", TRUE "UnitClass", "Sea", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_port_facility_1] @@ -1583,7 +1577,6 @@ reqs = "Building", "Port Facility", "City", TRUE "UnitClass", "Trireme", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_port_facility_trireme_1] @@ -2203,7 +2196,6 @@ reqs = "Building", "Lighthouse", "Player", TRUE "UnitClass", "Sea", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE "Building", "Port Facility", "City", FALSE } @@ -2224,7 +2216,6 @@ reqs = "Building", "Lighthouse", "Player", TRUE "UnitClass", "Trireme", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE "Building", "Port Facility", "City", FALSE } @@ -2355,7 +2346,6 @@ reqs = "Building", "Sun Tzu's War Academy", "Player", TRUE "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_sun_tzus_big_land_veteran] @@ -2366,7 +2356,6 @@ reqs = "Building", "Sun Tzu's War Academy", "Player", TRUE "UnitClass", "Big Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_sun_tzus_land_combat_vet] diff --git a/data/webperimental/effects.ruleset b/data/webperimental/effects.ruleset index db31c65d5e..dc4e1ee1b2 100644 --- a/data/webperimental/effects.ruleset +++ b/data/webperimental/effects.ruleset @@ -797,7 +797,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Air", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_0a] @@ -808,7 +807,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Helicopter", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_0b] @@ -819,7 +817,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Missile", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_1] @@ -905,7 +902,6 @@ reqs = "BuildingFlag", "Barracks", "City", TRUE "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_barracks_regen] @@ -1405,7 +1401,6 @@ reqs = "Building", "Port Facility", "City", TRUE "UnitClass", "Sea", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_port_facility_1] @@ -1425,7 +1420,6 @@ reqs = "Building", "Port Facility", "City", TRUE "UnitClass", "Trireme", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_port_facility_trireme_1] @@ -2027,7 +2021,6 @@ reqs = "Building", "Lighthouse", "Player", TRUE "UnitClass", "Sea", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE "Building", "Port Facility", "City", FALSE } @@ -2048,7 +2041,6 @@ reqs = "Building", "Lighthouse", "Player", TRUE "UnitClass", "Trireme", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE "Building", "Port Facility", "City", FALSE } @@ -2187,7 +2179,6 @@ reqs = "Building", "Sun Tzu's War Academy", "Alliance", TRUE "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_sun_tzus_war_academy_1] -- 2.40.1