From 722d956960286dc51430dfbbf668b2c101f235cc Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Wed, 10 Feb 2021 12:29:25 +0100 Subject: [PATCH 2/3] auto_attack.attack_actions: remove impossible. Some rulesets has "Capture Units" and "Bombard" in their attack_actions even if those actions never are enabled. Remove them. See osdn #41542 --- data/civ1/game.ruleset | 2 +- data/civ2/game.ruleset | 2 +- data/classic/game.ruleset | 2 +- data/experimental/game.ruleset | 2 +- data/multiplayer/game.ruleset | 2 +- data/webperimental/game.ruleset | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index d8ab3cc371..d239639dbf 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -224,7 +224,7 @@ nuke_defender_survival_chance_pct = 0 ; if_attacker - this requirement vector must be true before a unit even ; considers to auto attack. -attack_actions= "Capture Units", "Bombard", "Attack", "Suicide Attack" +attack_actions = "Attack", "Suicide Attack" if_attacker = { "type", "name", "range", "present" diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index 0706b93705..7807f02ce0 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -220,7 +220,7 @@ nuke_defender_survival_chance_pct = 0 ; if_attacker - this requirement vector must be true before a unit even ; considers to auto attack. -attack_actions= "Capture Units", "Bombard", "Attack", "Suicide Attack" +attack_actions = "Attack", "Suicide Attack" if_attacker = { "type", "name", "range", "present" diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index 587aba20fe..9caa2f35fe 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -240,7 +240,7 @@ nuke_defender_survival_chance_pct = 0 ; if_attacker - this requirement vector must be true before a unit even ; considers to auto attack. -attack_actions= "Capture Units", "Bombard", "Attack", "Suicide Attack" +attack_actions = "Attack", "Suicide Attack" if_attacker = { "type", "name", "range", "present" diff --git a/data/experimental/game.ruleset b/data/experimental/game.ruleset index e38ed6b737..ff2a0267e0 100644 --- a/data/experimental/game.ruleset +++ b/data/experimental/game.ruleset @@ -248,7 +248,7 @@ nuke_defender_survival_chance_pct = 0 ; if_attacker - this requirement vector must be true before a unit even ; considers to auto attack. -attack_actions= "Capture Units", "Bombard", "Attack", "Suicide Attack" +attack_actions = "Attack", "Suicide Attack" if_attacker = { "type", "name", "range", "present" diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset index fb9448c3f0..1f3e3932f7 100644 --- a/data/multiplayer/game.ruleset +++ b/data/multiplayer/game.ruleset @@ -243,7 +243,7 @@ nuke_defender_survival_chance_pct = 0 ; if_attacker - this requirement vector must be true before a unit even ; considers to auto attack. -attack_actions= "Capture Units", "Bombard", "Attack", "Suicide Attack" +attack_actions = "Attack", "Suicide Attack" if_attacker = { "type", "name", "range", "present" diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset index d0c4829199..e1c84b1d8c 100644 --- a/data/webperimental/game.ruleset +++ b/data/webperimental/game.ruleset @@ -244,7 +244,7 @@ nuke_defender_survival_chance_pct = 0 ; if_attacker - this requirement vector must be true before a unit even ; considers to auto attack. -attack_actions= "Capture Units", "Bombard", "Attack", "Suicide Attack" +attack_actions = "Bombard", "Attack", "Suicide Attack" if_attacker = { "type", "name", "range", "present" -- 2.20.1