From d641cec4e84f29d35389e2da393513bf8f94202c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 9 Jun 2023 19:10:16 +0300 Subject: [PATCH 40/40] Drop internal "NoVeteran" unit type flag Rulesets that need it, implement it as a user flag See osdn #48028 Signed-off-by: Marko Lindqvist --- client/helpdata.c | 3 +-- common/unittype.h | 6 +++--- data/alien/actions.ruleset | 1 - data/alien/units.ruleset | 3 --- data/civ1/units.ruleset | 4 +--- data/civ2/units.ruleset | 4 +--- data/civ2civ3/units.ruleset | 4 +--- data/classic/actions.ruleset | 1 - data/classic/effects.ruleset | 9 --------- data/classic/units.ruleset | 3 --- data/goldkeep/actions.ruleset | 1 - data/goldkeep/effects.ruleset | 11 ----------- data/goldkeep/units.ruleset | 3 --- data/granularity/actions.ruleset | 1 - data/granularity/units.ruleset | 3 --- data/multiplayer/actions.ruleset | 1 - data/multiplayer/effects.ruleset | 7 ------- data/multiplayer/units.ruleset | 3 --- data/ruledit/comments-3.3.txt | 3 --- data/sandbox/units.ruleset | 4 +--- data/stub/units.ruleset | 3 --- data/webperimental/actions.ruleset | 1 - data/webperimental/effects.ruleset | 9 --------- data/webperimental/units.ruleset | 3 --- 24 files changed, 8 insertions(+), 83 deletions(-) diff --git a/client/helpdata.c b/client/helpdata.c index 19b93d87f1..587afdb92c 100644 --- a/client/helpdata.c +++ b/client/helpdata.c @@ -3074,8 +3074,7 @@ char *helptext_unit(char *buf, size_t bufsz, struct player *pplayer, #endif /* FIXME: if we knew the raise chances on the client, we could be * more specific here about whether veteran status can be acquired - * through combat/missions/work. Should also take into account - * UTYF_NO_VETERAN when writing this text. (Gna patch #4794) */ + * through combat/missions/work. */ CATLSTR(buf, bufsz, _("%s May acquire veteran status.\n"), BULLET); if (utype_veteran_has_power_bonus(utype)) { if (utype_can_do_action(utype, ACTION_ATTACK) diff --git a/common/unittype.h b/common/unittype.h index 3c61c97f5f..b1b8620183 100644 --- a/common/unittype.h +++ b/common/unittype.h @@ -244,9 +244,9 @@ struct unit_class { /* Has no homecity */ #define SPECENUM_VALUE19 UTYF_NOHOME #define SPECENUM_VALUE19NAME N_("?unitflag:NoHome") -/* Cannot increase veteran level */ -#define SPECENUM_VALUE20 UTYF_NO_VETERAN -#define SPECENUM_VALUE20NAME N_("?unitflag:NoVeteran") +/* Unreserved - clean out */ +#define SPECENUM_VALUE20 UTYF_UNRESERVED +#define SPECENUM_VALUE20NAME "Unreserved" /* Gets double firepower against cities */ #define SPECENUM_VALUE21 UTYF_CITYBUSTER #define SPECENUM_VALUE21NAME N_("?unitflag:CityBuster") diff --git a/data/alien/actions.ruleset b/data/alien/actions.ruleset index a21a5c503e..7302136eb8 100644 --- a/data/alien/actions.ruleset +++ b/data/alien/actions.ruleset @@ -1018,5 +1018,4 @@ actor_reqs = action = "Gain Veterancy" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "NoVeteran", "Local", FALSE } diff --git a/data/alien/units.ruleset b/data/alien/units.ruleset index 6d7d970bd4..532dfc6d0b 100644 --- a/data/alien/units.ruleset +++ b/data/alien/units.ruleset @@ -354,9 +354,6 @@ flags = "Missile", "DoesntOccupyTile" ; "NoHome" = this unit is built with no homecity, free of all upkeep, and ; therefore will not revolt along with its city of origin should ; it be incited -; "NoVeteran" = this unit cannot gain veteran levels through experience -; (as if both base_raise_chance and work_raise_chance were zero); -; it can still gain veterancy through Veteran_Build, etc ; "CityBuster" = this unit has double firepower against cities ; "NoBuild" = this unit cannot be built ; "BadWallAttacker" = the firepower of this unit is set to 1 if diff --git a/data/civ1/units.ruleset b/data/civ1/units.ruleset index 858fe6d715..00a63a285b 100644 --- a/data/civ1/units.ruleset +++ b/data/civ1/units.ruleset @@ -28,6 +28,7 @@ flags = _("Nuclear") _("Cant_Fortify") _("OneAttack") + _("NoVeteran") } ; Names for custom unit class flags. There can be up to 25 of these. @@ -328,9 +329,6 @@ flags = "Missile", "Unreachable", "HutNothing" ; "NoHome" = this unit is built with no homecity, free of all upkeep, and ; therefore will not revolt along with its city of origin should ; it be incited -; "NoVeteran" = this unit cannot gain veteran levels through experience -; (as if both base_raise_chance and work_raise_chance were zero); -; it can still gain veterancy through Veteran_Build, etc ; "CityBuster" = this unit has double firepower against cities ; "NoBuild" = this unit cannot be built ; "BadWallAttacker" = the firepower of this unit is set to 1 if diff --git a/data/civ2/units.ruleset b/data/civ2/units.ruleset index 969994360a..88be6abfb5 100644 --- a/data/civ2/units.ruleset +++ b/data/civ2/units.ruleset @@ -37,6 +37,7 @@ flags = _("OneAttack") _("Fighter") _("Bomber") + _("NoVeteran") } ; Names for custom unit class flags. There can be up to 25 of these. @@ -346,9 +347,6 @@ flags = "Unreachable", "DoesntOccupyTile", "HutFrighten" ; "NoHome" = this unit is built with no homecity, free of all upkeep, and ; therefore will not revolt along with its city of origin should ; it be incited -; "NoVeteran" = this unit cannot gain veteran levels through experience -; (as if both base_raise_chance and work_raise_chance were zero); -; it can still gain veterancy through Veteran_Build, etc ; "CityBuster" = this unit has double firepower against cities ; "NoBuild" = this unit cannot be built ; "BadWallAttacker" = the firepower of this unit is set to 1 if diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset index f11463fdb2..6cccebf9f5 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -44,6 +44,7 @@ flags = _("Marines"), _("Can launch attack from non-native tiles.") _("Cant_Fortify") _("OneAttack") + _("NoVeteran") } ; Names for custom unit class flags. There can be up to 25 of these. @@ -387,9 +388,6 @@ flags = "Unreachable", "DoesntOccupyTile", "CanPillage", ; "NoHome" = this unit is built with no homecity, free of all upkeep, and ; therefore will not revolt along with its city of origin should ; it be incited -; "NoVeteran" = this unit cannot gain veteran levels through experience -; (as if both base_raise_chance and work_raise_chance were zero); -; it can still gain veterancy through Veteran_Build, etc ; "CityBuster" = this unit has double firepower against cities ; "NoBuild" = this unit cannot be built ; "BadWallAttacker" = the firepower of this unit is set to 1 if diff --git a/data/classic/actions.ruleset b/data/classic/actions.ruleset index 5004acd155..0b28b28a78 100644 --- a/data/classic/actions.ruleset +++ b/data/classic/actions.ruleset @@ -1334,5 +1334,4 @@ target_reqs = action = "Gain Veterancy" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "NoVeteran", "Local", FALSE } diff --git a/data/classic/effects.ruleset b/data/classic/effects.ruleset index 6642091c25..1fa2fafe36 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/classic/units.ruleset b/data/classic/units.ruleset index 7b39ee9a2e..66c6900353 100644 --- a/data/classic/units.ruleset +++ b/data/classic/units.ruleset @@ -357,9 +357,6 @@ flags = "Unreachable", "DoesntOccupyTile", "HutFrighten" ; "NoHome" = this unit is built with no homecity, free of all upkeep, and ; therefore will not revolt along with its city of origin should ; it be incited -; "NoVeteran" = this unit cannot gain veteran levels through experience -; (as if both base_raise_chance and work_raise_chance were zero); -; it can still gain veterancy through Veteran_Build, etc ; "CityBuster" = this unit has double firepower against cities ; "NoBuild" = this unit cannot be built ; "BadWallAttacker" = the firepower of this unit is set to 1 if diff --git a/data/goldkeep/actions.ruleset b/data/goldkeep/actions.ruleset index d4806fb164..fbcb2e993d 100644 --- a/data/goldkeep/actions.ruleset +++ b/data/goldkeep/actions.ruleset @@ -1401,5 +1401,4 @@ target_reqs = action = "Gain Veterancy" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "NoVeteran", "Local", FALSE } diff --git a/data/goldkeep/effects.ruleset b/data/goldkeep/effects.ruleset index c535e8ec4f..1c26439bf3 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/goldkeep/units.ruleset b/data/goldkeep/units.ruleset index 48b1048495..624ea07d5d 100644 --- a/data/goldkeep/units.ruleset +++ b/data/goldkeep/units.ruleset @@ -369,9 +369,6 @@ flags = "Unreachable", "DoesntOccupyTile", "HutFrighten" ; "NoHome" = this unit is built with no homecity, free of all upkeep, and ; therefore will not revolt along with its city of origin should ; it be incited -; "NoVeteran" = this unit cannot gain veteran levels through experience -; (as if both base_raise_chance and work_raise_chance were zero); -; it can still gain veterancy through Veteran_Build, etc ; "CityBuster" = this unit has double firepower against cities ; "NoBuild" = this unit cannot be built ; "BadWallAttacker" = the firepower of this unit is set to 1 if diff --git a/data/granularity/actions.ruleset b/data/granularity/actions.ruleset index 021f772233..4c3d6d8930 100644 --- a/data/granularity/actions.ruleset +++ b/data/granularity/actions.ruleset @@ -339,5 +339,4 @@ actor_reqs = action = "Gain Veterancy" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "NoVeteran", "Local", FALSE } diff --git a/data/granularity/units.ruleset b/data/granularity/units.ruleset index 049667b785..5536272845 100644 --- a/data/granularity/units.ruleset +++ b/data/granularity/units.ruleset @@ -295,9 +295,6 @@ flags = "TerrainSpeed" ; "NoHome" = this unit is built with no homecity, free of all upkeep, and ; therefore will not revolt along with its city of origin should ; it be incited -; "NoVeteran" = this unit cannot gain veteran levels through experience -; (as if both base_raise_chance and work_raise_chance were zero); -; it can still gain veterancy through Veteran_Build, etc ; "CityBuster" = this unit has double firepower against cities ; "NoBuild" = this unit cannot be built ; "BadWallAttacker" = the firepower of this unit is set to 1 if diff --git a/data/multiplayer/actions.ruleset b/data/multiplayer/actions.ruleset index f545b198bc..4a4f1ef697 100644 --- a/data/multiplayer/actions.ruleset +++ b/data/multiplayer/actions.ruleset @@ -1322,5 +1322,4 @@ target_reqs = action = "Gain Veterancy" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "NoVeteran", "Local", FALSE } diff --git a/data/multiplayer/effects.ruleset b/data/multiplayer/effects.ruleset index 04b6342924..50c712a9b7 100644 --- a/data/multiplayer/effects.ruleset +++ b/data/multiplayer/effects.ruleset @@ -792,7 +792,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Air", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_0a] @@ -803,7 +802,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Helicopter", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_0b] @@ -814,7 +812,6 @@ reqs = "Building", "Airport", "City", TRUE "UnitClass", "Missile", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_airport_1] @@ -892,7 +889,6 @@ reqs = "BuildingFlag", "Barracks", "City", TRUE "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_barracks_regen] @@ -1394,7 +1390,6 @@ reqs = "Building", "Port Facility", "City", TRUE "UnitClass", "Sea", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_port_facility_1] @@ -1414,7 +1409,6 @@ reqs = "Building", "Port Facility", "City", TRUE "UnitClass", "Trireme", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_port_facility_trireme_1] @@ -2122,7 +2116,6 @@ reqs = "Building", "Sun Tzu's War Academy", "Continent", TRUE "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE - "UnitFlag", "NoVeteran", "Local", FALSE } [effect_united_nations] diff --git a/data/multiplayer/units.ruleset b/data/multiplayer/units.ruleset index b744086c60..a50dc534e0 100644 --- a/data/multiplayer/units.ruleset +++ b/data/multiplayer/units.ruleset @@ -357,9 +357,6 @@ flags = "Unreachable", "DoesntOccupyTile", "HutFrighten" ; "NoHome" = this unit is built with no homecity, free of all upkeep, and ; therefore will not revolt along with its city of origin should ; it be incited -; "NoVeteran" = this unit cannot gain veteran levels through experience -; (as if both base_raise_chance and work_raise_chance were zero); -; it can still gain veterancy through Veteran_Build, etc ; "CityBuster" = this unit has double firepower against cities ; "NoBuild" = this unit cannot be built ; "BadWallAttacker" = the firepower of this unit is set to 1 if diff --git a/data/ruledit/comments-3.3.txt b/data/ruledit/comments-3.3.txt index f29c3c1e2f..40a1811ef8 100644 --- a/data/ruledit/comments-3.3.txt +++ b/data/ruledit/comments-3.3.txt @@ -471,9 +471,6 @@ utypes = "\ ; \"NoHome\" = this unit is built with no homecity, free of all upkeep, and\n\ ; therefore will not revolt along with its city of origin should\n\ ; it be incited\n\ -; \"NoVeteran\" = this unit cannot gain veteran levels through experience\n\ -; (as if both base_raise_chance and work_raise_chance were zero);\n\ -; it can still gain veterancy through Veteran_Build, etc\n\ ; \"CityBuster\" = this unit has double firepower against cities\n\ ; \"NoBuild\" = this unit cannot be built\n\ ; \"BadWallAttacker\" = the firepower of this unit is set to 1 if\n\ diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset index 8b7b093a1f..130144d00d 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -50,6 +50,7 @@ flags = _("Marines"), _("Can launch attack from non-native tiles.") _("Cant_Fortify") _("OneAttack") + _("NoVeteran") } ; Names for custom unit class flags. There can be up to 25 of these. @@ -400,9 +401,6 @@ flags = "Unreachable", "DoesntOccupyTile", "CanPillage", ; "NoHome" = this unit is built with no homecity, free of all upkeep, and ; therefore will not revolt along with its city of origin should ; it be incited -; "NoVeteran" = this unit cannot gain veteran levels through experience -; (as if both base_raise_chance and work_raise_chance were zero); -; it can still gain veterancy through Veteran_Build, etc ; "CityBuster" = this unit has double firepower against cities ; "NoBuild" = this unit cannot be built ; "BadWallAttacker" = the firepower of this unit is set to 1 if diff --git a/data/stub/units.ruleset b/data/stub/units.ruleset index 9216845dc8..f42c0e458d 100644 --- a/data/stub/units.ruleset +++ b/data/stub/units.ruleset @@ -277,9 +277,6 @@ flags = "" ; "NoHome" = this unit is built with no homecity, free of all upkeep, and ; therefore will not revolt along with its city of origin should ; it be incited -; "NoVeteran" = this unit cannot gain veteran levels through experience -; (as if both base_raise_chance and work_raise_chance were zero); -; it can still gain veterancy through Veteran_Build, etc ; "CityBuster" = this unit has double firepower against cities ; "NoBuild" = this unit cannot be built ; "BadWallAttacker" = the firepower of this unit is set to 1 if diff --git a/data/webperimental/actions.ruleset b/data/webperimental/actions.ruleset index d098031330..6283043393 100644 --- a/data/webperimental/actions.ruleset +++ b/data/webperimental/actions.ruleset @@ -1583,5 +1583,4 @@ target_reqs = action = "Gain Veterancy" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "NoVeteran", "Local", FALSE } diff --git a/data/webperimental/effects.ruleset b/data/webperimental/effects.ruleset index cedec60a2b..ef2d8e9d23 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] diff --git a/data/webperimental/units.ruleset b/data/webperimental/units.ruleset index 9792d466d6..01834a5565 100644 --- a/data/webperimental/units.ruleset +++ b/data/webperimental/units.ruleset @@ -361,9 +361,6 @@ flags = "Unreachable", "DoesntOccupyTile", "HutFrighten" ; "NoHome" = this unit is built with no homecity, free of all upkeep, and ; therefore will not revolt along with its city of origin should ; it be incited -; "NoVeteran" = this unit cannot gain veteran levels through experience -; (as if both base_raise_chance and work_raise_chance were zero); -; it can still gain veterancy through Veteran_Build, etc ; "CityBuster" = this unit has double firepower against cities ; "NoBuild" = this unit cannot be built ; "BadWallAttacker" = the firepower of this unit is set to 1 if -- 2.39.2