From ac36ec7d491063987f2d3c4c3e96b2d88af5bd80 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Fri, 19 Feb 2021 22:25:34 +0100 Subject: [PATCH] Remove EvacuateFirst where it is unused. The rulesets civ1, civ2 and alien doesn't give the EvacuateFirst unit type flag to any unit type. Stop referring to it. See osdn #41617 --- data/alien/cities.ruleset | 6 ++---- data/alien/game.ruleset | 5 ----- data/civ1/cities.ruleset | 6 ++---- data/civ1/game.ruleset | 5 ----- data/civ2/cities.ruleset | 6 ++---- data/civ2/game.ruleset | 5 ----- 6 files changed, 6 insertions(+), 27 deletions(-) diff --git a/data/alien/cities.ruleset b/data/alien/cities.ruleset index 115f094834..ef979bb9bc 100644 --- a/data/alien/cities.ruleset +++ b/data/alien/cities.ruleset @@ -122,16 +122,14 @@ conquest_convert_pct = 0 ; percentage which converts to the new nation ; X_wipe - wipe the unit if it survived performing the actions listed ; above. -food_protected = "EvacuateFirst" +; food_protected = "EvacuateFirst" ; food_unit_act = food_wipe = TRUE -; TODO: Should missing gold upkeep really be able to kill units with the -; EvacuateFirst unit type flag? ; gold_protected = ; gold_unit_act = gold_wipe = TRUE -shield_protected = "EvacuateFirst" +; shield_protected = "EvacuateFirst" shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" shield_wipe = FALSE diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index aee9e4675e..762adfb396 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -648,7 +648,6 @@ target_reqs = action = "Recycle Unit" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "EvacuateFirst", "Local", FALSE "DiplRel", "War", "Local", FALSE "DiplRel", "Cease-fire", "Local", FALSE "DiplRel", "Armistice", "Local", FALSE @@ -657,10 +656,6 @@ actor_reqs = [actionenabler_disband_unit] action = "Disband Unit" -actor_reqs = - { "type", "name", "range", "present" - "UnitFlag", "EvacuateFirst", "Local", FALSE - } [actionenabler_capture] action = "Capture Units" diff --git a/data/civ1/cities.ruleset b/data/civ1/cities.ruleset index bb0664f66d..8f5cb7058d 100644 --- a/data/civ1/cities.ruleset +++ b/data/civ1/cities.ruleset @@ -122,16 +122,14 @@ conquest_convert_pct = 0 ; percentage which converts to the new nation ; X_wipe - wipe the unit if it survived performing the actions listed ; above. -food_protected = "EvacuateFirst" +; food_protected = "EvacuateFirst" ; food_unit_act = food_wipe = TRUE -; TODO: Should missing gold upkeep really be able to kill units with the -; EvacuateFirst unit type flag? ; gold_protected = ; gold_unit_act = gold_wipe = TRUE -shield_protected = "EvacuateFirst" +; shield_protected = "EvacuateFirst" shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" shield_wipe = FALSE diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index 372a7ff097..4e02eb2912 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -630,7 +630,6 @@ target_reqs = action = "Recycle Unit" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "EvacuateFirst", "Local", FALSE "DiplRel", "War", "Local", FALSE "DiplRel", "Cease-fire", "Local", FALSE "DiplRel", "Armistice", "Local", FALSE @@ -639,10 +638,6 @@ actor_reqs = [actionenabler_disband_unit] action = "Disband Unit" -actor_reqs = - { "type", "name", "range", "present" - "UnitFlag", "EvacuateFirst", "Local", FALSE - } [actionenabler_build_city_pioneer] action = "Found City" diff --git a/data/civ2/cities.ruleset b/data/civ2/cities.ruleset index bb0664f66d..8f5cb7058d 100644 --- a/data/civ2/cities.ruleset +++ b/data/civ2/cities.ruleset @@ -122,16 +122,14 @@ conquest_convert_pct = 0 ; percentage which converts to the new nation ; X_wipe - wipe the unit if it survived performing the actions listed ; above. -food_protected = "EvacuateFirst" +; food_protected = "EvacuateFirst" ; food_unit_act = food_wipe = TRUE -; TODO: Should missing gold upkeep really be able to kill units with the -; EvacuateFirst unit type flag? ; gold_protected = ; gold_unit_act = gold_wipe = TRUE -shield_protected = "EvacuateFirst" +; shield_protected = "EvacuateFirst" shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" shield_wipe = FALSE diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index 3299e5c755..2b53a2119f 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -802,7 +802,6 @@ target_reqs = action = "Recycle Unit" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "EvacuateFirst", "Local", FALSE "DiplRel", "War", "Local", FALSE "DiplRel", "Cease-fire", "Local", FALSE "DiplRel", "Armistice", "Local", FALSE @@ -811,10 +810,6 @@ actor_reqs = [actionenabler_disband_unit] action = "Disband Unit" -actor_reqs = - { "type", "name", "range", "present" - "UnitFlag", "EvacuateFirst", "Local", FALSE - } [actionenabler_build_city_pioneer] action = "Found City" -- 2.20.1