diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index 5a099553db..6f569ac64d 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -424,7 +424,7 @@ Container@PLAYER_WIDGETS: Background: stance-button DisableKeyRepeat: true TooltipText: Defend Stance - TooltipDesc: Set the selected units to Defend stance:\n - Units will attack enemy units and structures on sight\n - Units will not move or pursue enemies + TooltipDesc: Set the selected units to Defend stance:\n - Units will attack enemy units on sight\n - Units will not move or pursue enemies TooltipContainer: TOOLTIP_CONTAINER Children: Image@ICON: diff --git a/mods/cnc/maps/gdi06/rules.yaml b/mods/cnc/maps/gdi06/rules.yaml index ab32f25c54..5e47824ca6 100644 --- a/mods/cnc/maps/gdi06/rules.yaml +++ b/mods/cnc/maps/gdi06/rules.yaml @@ -94,6 +94,7 @@ RMBO.hard: Inherits: RMBO -AutoTarget: -AutoTargetPriority@DEFAULT: + -AutoTargetPriority@ATTACKANYTHING: -AttackMove: RenderSprites: Image: RMBO diff --git a/mods/cnc/maps/nod07c/rules.yaml b/mods/cnc/maps/nod07c/rules.yaml index f0f8c62a17..4803544812 100644 --- a/mods/cnc/maps/nod07c/rules.yaml +++ b/mods/cnc/maps/nod07c/rules.yaml @@ -154,3 +154,4 @@ ORCA.IN: Image: ORCA -AutoTarget: -AutoTargetPriority@DEFAULT: + -AutoTargetPriority@ATTACKANYTHING: diff --git a/mods/cnc/maps/nod09/rules.yaml b/mods/cnc/maps/nod09/rules.yaml index e4d2e2e9e3..ae7d5a81be 100644 --- a/mods/cnc/maps/nod09/rules.yaml +++ b/mods/cnc/maps/nod09/rules.yaml @@ -194,6 +194,7 @@ RMBO.hard: Inherits: RMBO -AutoTarget: -AutoTargetPriority@DEFAULT: + -AutoTargetPriority@ATTACKANYTHING: -AttackMove: RenderSprites: Image: RMBO diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 264581ca2c..8ae938e905 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -149,7 +149,13 @@ ^AutoTargetGround: AutoTarget: + AttackAnythingCondition: stance-attackanything AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything + ValidTargets: Infantry, Vehicle, Creep, Water, Defense + InvalidTargets: NoAutoTarget + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything ValidTargets: Infantry, Vehicle, Creep, Water, Structure, Defense InvalidTargets: NoAutoTarget @@ -161,7 +167,13 @@ ^AutoTargetAll: AutoTarget: + AttackAnythingCondition: stance-attackanything AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything + ValidTargets: Infantry, Vehicle, Creep, Water, Air, Defense + InvalidTargets: NoAutoTarget + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything ValidTargets: Infantry, Vehicle, Creep, Water, Air, Structure, Defense InvalidTargets: NoAutoTarget @@ -945,6 +957,8 @@ -GivesBuildableArea: MustBeDestroyed: RequiredForShortGame: false + Targetable: + TargetTypes: Ground, C4, Structure, Defense ^DisabledOverlay: WithColoredOverlay@IDISABLE: diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index aadb596fc3..73746827ee 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -122,13 +122,25 @@ ^AutoTargetGround: AutoTarget: + AttackAnythingCondition: stance-attackanything AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything + ValidTargets: Infantry, Vehicle, Creep, Water, Defense + InvalidTargets: NoAutoTarget + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything ValidTargets: Infantry, Vehicle, Creep, Water, Structure, Defense InvalidTargets: NoAutoTarget ^AutoTargetAll: AutoTarget: + AttackAnythingCondition: stance-attackanything AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything + ValidTargets: Infantry, Vehicle, Creep, Water, Air, Defense + InvalidTargets: NoAutoTarget + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything ValidTargets: Infantry, Vehicle, Creep, Water, Air, Structure, Defense InvalidTargets: NoAutoTarget diff --git a/mods/ra/chrome/ingame-player.yaml b/mods/ra/chrome/ingame-player.yaml index f156e6e783..61012ad40f 100644 --- a/mods/ra/chrome/ingame-player.yaml +++ b/mods/ra/chrome/ingame-player.yaml @@ -200,7 +200,7 @@ Container@PLAYER_WIDGETS: Background: command-button DisableKeyRepeat: true TooltipText: Defend Stance - TooltipDesc: Set the selected units to Defend stance:\n - Units will attack enemy units and structures on sight\n - Units will not move or pursue enemies + TooltipDesc: Set the selected units to Defend stance:\n - Units will attack enemy units on sight\n - Units will not move or pursue enemies TooltipContainer: TOOLTIP_CONTAINER Children: Image@ICON: diff --git a/mods/ra/maps/soviet-07/rules.yaml b/mods/ra/maps/soviet-07/rules.yaml index 5d51f271d0..cc88362955 100644 --- a/mods/ra/maps/soviet-07/rules.yaml +++ b/mods/ra/maps/soviet-07/rules.yaml @@ -52,3 +52,4 @@ FTUR: PBOX: -AutoTarget: -AutoTargetPriority@DEFAULT: + -AutoTargetPriority@ATTACKANYTHING: diff --git a/mods/ra/rules/campaign-rules.yaml b/mods/ra/rules/campaign-rules.yaml index 5b9e2d9109..07ad85c8cc 100644 --- a/mods/ra/rules/campaign-rules.yaml +++ b/mods/ra/rules/campaign-rules.yaml @@ -34,6 +34,7 @@ E7.noautotarget: Inherits: E7 -AutoTarget: -AutoTargetPriority@DEFAULT: + -AutoTargetPriority@ATTACKANYTHING: RenderSprites: Image: E7 diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index a3f5b1752a..4c4c35108b 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -159,7 +159,13 @@ ^AutoTargetGround: AutoTarget: + AttackAnythingCondition: stance-attackanything AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything + ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, Defense + InvalidTargets: NoAutoTarget + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, Structure, Defense InvalidTargets: NoAutoTarget @@ -171,7 +177,13 @@ ^AutoTargetAll: AutoTarget: + AttackAnythingCondition: stance-attackanything AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything + ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, Air, Defense + InvalidTargets: NoAutoTarget + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, Air, Structure, Defense InvalidTargets: NoAutoTarget diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index a0b624258b..64951e31e8 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -125,7 +125,13 @@ ^AutoTargetGround: AutoTarget: + AttackAnythingCondition: stance-attackanything AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything + ValidTargets: Infantry, Vehicle, Creep, Water, Defense + InvalidTargets: NoAutoTarget + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything ValidTargets: Infantry, Vehicle, Creep, Water, Structure, Defense InvalidTargets: NoAutoTarget @@ -137,7 +143,13 @@ ^AutoTargetAll: AutoTarget: + AttackAnythingCondition: stance-attackanything AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything + ValidTargets: Infantry, Vehicle, Creep, Water, Air, Defense + InvalidTargets: NoAutoTarget + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything ValidTargets: Infantry, Vehicle, Creep, Water, Air, Structure, Defense InvalidTargets: NoAutoTarget