From 582d0bc0afa87b1dd12bb1c7872dc50e1b8ecf09 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 27 Aug 2023 07:00:56 +0300
Subject: [PATCH 10/10] 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 <cazfi74@gmail.com>
---
 data/civ2civ3/effects.ruleset      | 13 -------------
 data/classic/effects.ruleset       | 11 -----------
 data/experimental/effects.ruleset  | 15 ---------------
 data/sandbox/effects.ruleset       | 13 -------------
 data/webperimental/effects.ruleset | 11 -----------
 5 files changed, 63 deletions(-)

diff --git a/data/civ2civ3/effects.ruleset b/data/civ2civ3/effects.ruleset
index 3de7eb0c4c..22cb44adb6 100644
--- a/data/civ2civ3/effects.ruleset
+++ b/data/civ2civ3/effects.ruleset
@@ -1529,7 +1529,6 @@ reqs    =
       "Gov", "Tribal", "Player", TRUE, TRUE
       "UnitClass", "Land", "Local", TRUE, FALSE
       "UnitFlag", "NonMil", "Local", FALSE, FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE, FALSE
     }
 
 [effect_revolution_republic]
@@ -1660,7 +1659,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Air", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0a]
@@ -1671,7 +1669,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Helicopter", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0b]
@@ -1682,7 +1679,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Missile", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_1]
@@ -1797,7 +1793,6 @@ reqs    =
       "Building",      "Barracks",  "City",  TRUE
       "UnitClassFlag", "Barracks",  "Local", TRUE
       "UnitFlag",      "NonMil",    "Local", FALSE
-      "UnitFlag",      "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_hp]
@@ -1817,7 +1812,6 @@ reqs    =
       "Building",      "Barracks II", "City",  TRUE
       "UnitClassFlag", "Barracks",    "Local", TRUE
       "UnitFlag",      "NonMil",      "Local", FALSE
-      "UnitFlag",      "NoVeteran",   "Local", FALSE
     }
 
 [effect_barracks_ii_hp]
@@ -1837,7 +1831,6 @@ reqs    =
       "Building",      "Barracks III", "City",  TRUE
       "UnitClassFlag", "Barracks",     "Local", TRUE
       "UnitFlag",      "NonMil",       "Local", FALSE
-      "UnitFlag",      "NoVeteran",    "Local", FALSE
     }
 
 [effect_barracks_iii_hp]
@@ -2524,7 +2517,6 @@ reqs    =
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_1]
@@ -2544,7 +2536,6 @@ reqs    =
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_trireme_1]
@@ -3337,7 +3328,6 @@ reqs    =
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -3375,7 +3365,6 @@ reqs    =
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -3404,7 +3393,6 @@ reqs    =
       "Building", "Magellan's Expedition", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_magellans_expedition_culture]
@@ -3664,7 +3652,6 @@ reqs    =
       "Building",      "Sun Tzu's War Academy", "Player", TRUE
       "UnitClassFlag", "Barracks",              "Local",  TRUE
       "UnitFlag",      "NonMil",                "Local",  FALSE
-      "UnitFlag",      "NoVeteran",             "Local",  FALSE
     }
 
 [effect_sun_tzus_war_academy_culture]
diff --git a/data/classic/effects.ruleset b/data/classic/effects.ruleset
index 48dd716781..c7188503d3 100644
--- a/data/classic/effects.ruleset
+++ b/data/classic/effects.ruleset
@@ -729,7 +729,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Air", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0a]
@@ -740,7 +739,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Helicopter", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0b]
@@ -751,7 +749,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Missile", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_1]
@@ -829,7 +826,6 @@ reqs	=
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_1]
@@ -849,7 +845,6 @@ reqs	=
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_ii_1]
@@ -869,7 +864,6 @@ reqs	=
       "Building", "Barracks III", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_iii_1]
@@ -1361,7 +1355,6 @@ reqs	=
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_1]
@@ -1381,7 +1374,6 @@ reqs	=
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_trireme_1]
@@ -1975,7 +1967,6 @@ reqs	=
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -1996,7 +1987,6 @@ reqs	=
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -2127,7 +2117,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/experimental/effects.ruleset b/data/experimental/effects.ruleset
index 69f4b3aaea..8104a8f667 100644
--- a/data/experimental/effects.ruleset
+++ b/data/experimental/effects.ruleset
@@ -816,7 +816,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Air", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0a]
@@ -827,7 +826,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Helicopter", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0b]
@@ -838,7 +836,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Missile", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_1]
@@ -925,7 +922,6 @@ reqs	=
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_bl]
@@ -936,7 +932,6 @@ reqs    =
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_1]
@@ -965,7 +960,6 @@ reqs	=
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_ii_bl]
@@ -976,7 +970,6 @@ reqs    =
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_ii_1]
@@ -1005,7 +998,6 @@ reqs	=
       "Building", "Barracks III", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_iii_bl]
@@ -1016,7 +1008,6 @@ reqs    =
       "Building", "Barracks III", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_iii_1]
@@ -1577,7 +1568,6 @@ reqs	=
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_1]
@@ -1597,7 +1587,6 @@ reqs	=
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_trireme_1]
@@ -2217,7 +2206,6 @@ reqs	=
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -2238,7 +2226,6 @@ reqs	=
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -2361,7 +2348,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]
@@ -2372,7 +2358,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/sandbox/effects.ruleset b/data/sandbox/effects.ruleset
index 80ceff089c..4e9e032193 100644
--- a/data/sandbox/effects.ruleset
+++ b/data/sandbox/effects.ruleset
@@ -1563,7 +1563,6 @@ reqs    =
       "Gov", "Tribal", "Player", TRUE, TRUE
       "UnitClass", "Land", "Local", TRUE, FALSE
       "UnitFlag", "NonMil", "Local", FALSE, FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE, FALSE
     }
 
 [effect_revolution_republic]
@@ -1694,7 +1693,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Air", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0a]
@@ -1705,7 +1703,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Helicopter", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0b]
@@ -1716,7 +1713,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Missile", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_1]
@@ -1839,7 +1835,6 @@ reqs    =
       "Building",      "Barracks",  "City",  TRUE
       "UnitClassFlag", "Barracks",  "Local", TRUE
       "UnitFlag",      "NonMil",    "Local", FALSE
-      "UnitFlag",      "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_hp]
@@ -1859,7 +1854,6 @@ reqs    =
       "Building",      "Barracks II", "City",  TRUE
       "UnitClassFlag", "Barracks",    "Local", TRUE
       "UnitFlag",      "NonMil",      "Local", FALSE
-      "UnitFlag",      "NoVeteran",   "Local", FALSE
     }
 
 [effect_barracks_ii_hp]
@@ -1879,7 +1873,6 @@ reqs    =
       "Building",      "Barracks III", "City",  TRUE
       "UnitClassFlag", "Barracks",     "Local", TRUE
       "UnitFlag",      "NonMil",       "Local", FALSE
-      "UnitFlag",      "NoVeteran",    "Local", FALSE
     }
 
 [effect_barracks_iii_hp]
@@ -2566,7 +2559,6 @@ reqs    =
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_1]
@@ -2586,7 +2578,6 @@ reqs    =
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_trireme_1]
@@ -3387,7 +3378,6 @@ reqs    =
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -3425,7 +3415,6 @@ reqs    =
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -3454,7 +3443,6 @@ reqs    =
       "Building", "Magellan's Expedition", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_magellans_expedition_culture]
@@ -3714,7 +3702,6 @@ reqs    =
       "Building",      "Sun Tzu's War Academy", "Player", TRUE
       "UnitClassFlag", "Barracks",              "Local",  TRUE
       "UnitFlag",      "NonMil",                "Local",  FALSE
-      "UnitFlag",      "NoVeteran",             "Local",  FALSE
     }
 
 [effect_sun_tzus_war_academy_culture]
diff --git a/data/webperimental/effects.ruleset b/data/webperimental/effects.ruleset
index 33fb8954e1..de72b51636 100644
--- a/data/webperimental/effects.ruleset
+++ b/data/webperimental/effects.ruleset
@@ -739,7 +739,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Air", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0a]
@@ -750,7 +749,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Helicopter", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0b]
@@ -761,7 +759,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Missile", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_1]
@@ -847,7 +844,6 @@ reqs	=
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_1]
@@ -867,7 +863,6 @@ reqs	=
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_ii_1]
@@ -887,7 +882,6 @@ reqs	=
       "Building", "Barracks III", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_iii_1]
@@ -1379,7 +1373,6 @@ reqs	=
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_1]
@@ -1399,7 +1392,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 +1993,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 +2013,6 @@ reqs	=
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -2153,7 +2143,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