From f4480687880a7a54f4a041178759e9c39ee2ade0 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 27 Aug 2023 06:57:00 +0300
Subject: [PATCH 11/11] 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 35a3ad4de1..35ab721565 100644
--- a/data/civ2civ3/effects.ruleset
+++ b/data/civ2civ3/effects.ruleset
@@ -1573,7 +1573,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]
@@ -1704,7 +1703,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Air", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0a]
@@ -1715,7 +1713,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Helicopter", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0b]
@@ -1726,7 +1723,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Missile", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_1]
@@ -1841,7 +1837,6 @@ reqs    =
       "Building",      "Barracks",  "City",  TRUE
       "UnitClassFlag", "Barracks",  "Local", TRUE
       "UnitFlag",      "NonMil",    "Local", FALSE
-      "UnitFlag",      "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_hp]
@@ -1861,7 +1856,6 @@ reqs    =
       "Building",      "Barracks II", "City",  TRUE
       "UnitClassFlag", "Barracks",    "Local", TRUE
       "UnitFlag",      "NonMil",      "Local", FALSE
-      "UnitFlag",      "NoVeteran",   "Local", FALSE
     }
 
 [effect_barracks_ii_hp]
@@ -1881,7 +1875,6 @@ reqs    =
       "Building",      "Barracks III", "City",  TRUE
       "UnitClassFlag", "Barracks",     "Local", TRUE
       "UnitFlag",      "NonMil",       "Local", FALSE
-      "UnitFlag",      "NoVeteran",    "Local", FALSE
     }
 
 [effect_barracks_iii_hp]
@@ -2553,7 +2546,6 @@ reqs    =
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_1]
@@ -2573,7 +2565,6 @@ reqs    =
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_trireme_1]
@@ -3366,7 +3357,6 @@ reqs    =
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -3404,7 +3394,6 @@ reqs    =
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -3433,7 +3422,6 @@ reqs    =
       "Building", "Magellan's Expedition", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_magellans_expedition_culture]
@@ -3693,7 +3681,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 25d6eaf5c9..5215edb749 100644
--- a/data/classic/effects.ruleset
+++ b/data/classic/effects.ruleset
@@ -772,7 +772,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Air", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0a]
@@ -783,7 +782,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Helicopter", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0b]
@@ -794,7 +792,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Missile", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_1]
@@ -872,7 +869,6 @@ reqs	=
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_1]
@@ -892,7 +888,6 @@ reqs	=
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_ii_1]
@@ -912,7 +907,6 @@ reqs	=
       "Building", "Barracks III", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_iii_1]
@@ -1404,7 +1398,6 @@ reqs	=
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_1]
@@ -1424,7 +1417,6 @@ reqs	=
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_trireme_1]
@@ -2018,7 +2010,6 @@ reqs	=
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -2039,7 +2030,6 @@ reqs	=
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -2170,7 +2160,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 9710de43a2..d6078c1c15 100644
--- a/data/experimental/effects.ruleset
+++ b/data/experimental/effects.ruleset
@@ -859,7 +859,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Air", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0a]
@@ -870,7 +869,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Helicopter", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0b]
@@ -881,7 +879,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Missile", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_1]
@@ -968,7 +965,6 @@ reqs	=
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_bl]
@@ -979,7 +975,6 @@ reqs    =
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_1]
@@ -1008,7 +1003,6 @@ reqs	=
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_ii_bl]
@@ -1019,7 +1013,6 @@ reqs    =
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_ii_1]
@@ -1048,7 +1041,6 @@ reqs	=
       "Building", "Barracks III", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_iii_bl]
@@ -1059,7 +1051,6 @@ reqs    =
       "Building", "Barracks III", "City", TRUE
       "UnitClass", "Big Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_iii_1]
@@ -1620,7 +1611,6 @@ reqs	=
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_1]
@@ -1640,7 +1630,6 @@ reqs	=
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_trireme_1]
@@ -2260,7 +2249,6 @@ reqs	=
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -2281,7 +2269,6 @@ reqs	=
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -2404,7 +2391,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]
@@ -2415,7 +2401,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 9888efba1b..b49717361a 100644
--- a/data/sandbox/effects.ruleset
+++ b/data/sandbox/effects.ruleset
@@ -1681,7 +1681,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]
@@ -1812,7 +1811,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Air", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0a]
@@ -1823,7 +1821,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Helicopter", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0b]
@@ -1834,7 +1831,6 @@ reqs    =
       "Building", "Airport", "City", TRUE
       "UnitClass", "Missile", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_1]
@@ -1957,7 +1953,6 @@ reqs    =
       "Building",      "Barracks",  "City",  TRUE
       "UnitClassFlag", "Barracks",  "Local", TRUE
       "UnitFlag",      "NonMil",    "Local", FALSE
-      "UnitFlag",      "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_hp]
@@ -1977,7 +1972,6 @@ reqs    =
       "Building",      "Barracks II", "City",  TRUE
       "UnitClassFlag", "Barracks",    "Local", TRUE
       "UnitFlag",      "NonMil",      "Local", FALSE
-      "UnitFlag",      "NoVeteran",   "Local", FALSE
     }
 
 [effect_barracks_ii_hp]
@@ -1997,7 +1991,6 @@ reqs    =
       "Building",      "Barracks III", "City",  TRUE
       "UnitClassFlag", "Barracks",     "Local", TRUE
       "UnitFlag",      "NonMil",       "Local", FALSE
-      "UnitFlag",      "NoVeteran",    "Local", FALSE
     }
 
 [effect_barracks_iii_hp]
@@ -2669,7 +2662,6 @@ reqs    =
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_1]
@@ -2689,7 +2681,6 @@ reqs    =
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_trireme_1]
@@ -3498,7 +3489,6 @@ reqs    =
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -3536,7 +3526,6 @@ reqs    =
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -3565,7 +3554,6 @@ reqs    =
       "Building", "Magellan's Expedition", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_magellans_expedition_culture]
@@ -3825,7 +3813,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 96bcddaed9..427e770ea8 100644
--- a/data/webperimental/effects.ruleset
+++ b/data/webperimental/effects.ruleset
@@ -782,7 +782,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Air", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0a]
@@ -793,7 +792,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Helicopter", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_0b]
@@ -804,7 +802,6 @@ reqs	=
       "Building", "Airport", "City", TRUE
       "UnitClass", "Missile", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_airport_1]
@@ -890,7 +887,6 @@ reqs	=
       "Building", "Barracks", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_1]
@@ -910,7 +906,6 @@ reqs	=
       "Building", "Barracks II", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_ii_1]
@@ -930,7 +925,6 @@ reqs	=
       "Building", "Barracks III", "City", TRUE
       "UnitClass", "Land", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_barracks_iii_1]
@@ -1422,7 +1416,6 @@ reqs	=
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_1]
@@ -1442,7 +1435,6 @@ reqs	=
       "Building", "Port Facility", "City", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
     }
 
 [effect_port_facility_trireme_1]
@@ -2044,7 +2036,6 @@ reqs	=
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Sea", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -2065,7 +2056,6 @@ reqs	=
       "Building", "Lighthouse", "Player", TRUE
       "UnitClass", "Trireme", "Local", TRUE
       "UnitFlag", "NonMil", "Local", FALSE
-      "UnitFlag", "NoVeteran", "Local", FALSE
       "Building", "Port Facility", "City", FALSE
     }
 
@@ -2196,7 +2186,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