Don't autotarget structures in Defend stance.

This commit is contained in:
Paul Chote
2017-06-18 16:26:36 +00:00
committed by Oliver Brakmann
parent 2e2e1cae7f
commit 300a7222f3
11 changed files with 57 additions and 2 deletions

View File

@@ -424,7 +424,7 @@ Container@PLAYER_WIDGETS:
Background: stance-button Background: stance-button
DisableKeyRepeat: true DisableKeyRepeat: true
TooltipText: Defend Stance 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 TooltipContainer: TOOLTIP_CONTAINER
Children: Children:
Image@ICON: Image@ICON:

View File

@@ -94,6 +94,7 @@ RMBO.hard:
Inherits: RMBO Inherits: RMBO
-AutoTarget: -AutoTarget:
-AutoTargetPriority@DEFAULT: -AutoTargetPriority@DEFAULT:
-AutoTargetPriority@ATTACKANYTHING:
-AttackMove: -AttackMove:
RenderSprites: RenderSprites:
Image: RMBO Image: RMBO

View File

@@ -154,3 +154,4 @@ ORCA.IN:
Image: ORCA Image: ORCA
-AutoTarget: -AutoTarget:
-AutoTargetPriority@DEFAULT: -AutoTargetPriority@DEFAULT:
-AutoTargetPriority@ATTACKANYTHING:

View File

@@ -194,6 +194,7 @@ RMBO.hard:
Inherits: RMBO Inherits: RMBO
-AutoTarget: -AutoTarget:
-AutoTargetPriority@DEFAULT: -AutoTargetPriority@DEFAULT:
-AutoTargetPriority@ATTACKANYTHING:
-AttackMove: -AttackMove:
RenderSprites: RenderSprites:
Image: RMBO Image: RMBO

View File

@@ -149,7 +149,13 @@
^AutoTargetGround: ^AutoTargetGround:
AutoTarget: AutoTarget:
AttackAnythingCondition: stance-attackanything
AutoTargetPriority@DEFAULT: 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 ValidTargets: Infantry, Vehicle, Creep, Water, Structure, Defense
InvalidTargets: NoAutoTarget InvalidTargets: NoAutoTarget
@@ -161,7 +167,13 @@
^AutoTargetAll: ^AutoTargetAll:
AutoTarget: AutoTarget:
AttackAnythingCondition: stance-attackanything
AutoTargetPriority@DEFAULT: 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 ValidTargets: Infantry, Vehicle, Creep, Water, Air, Structure, Defense
InvalidTargets: NoAutoTarget InvalidTargets: NoAutoTarget
@@ -945,6 +957,8 @@
-GivesBuildableArea: -GivesBuildableArea:
MustBeDestroyed: MustBeDestroyed:
RequiredForShortGame: false RequiredForShortGame: false
Targetable:
TargetTypes: Ground, C4, Structure, Defense
^DisabledOverlay: ^DisabledOverlay:
WithColoredOverlay@IDISABLE: WithColoredOverlay@IDISABLE:

View File

@@ -122,13 +122,25 @@
^AutoTargetGround: ^AutoTargetGround:
AutoTarget: AutoTarget:
AttackAnythingCondition: stance-attackanything
AutoTargetPriority@DEFAULT: 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 ValidTargets: Infantry, Vehicle, Creep, Water, Structure, Defense
InvalidTargets: NoAutoTarget InvalidTargets: NoAutoTarget
^AutoTargetAll: ^AutoTargetAll:
AutoTarget: AutoTarget:
AttackAnythingCondition: stance-attackanything
AutoTargetPriority@DEFAULT: 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 ValidTargets: Infantry, Vehicle, Creep, Water, Air, Structure, Defense
InvalidTargets: NoAutoTarget InvalidTargets: NoAutoTarget

View File

@@ -200,7 +200,7 @@ Container@PLAYER_WIDGETS:
Background: command-button Background: command-button
DisableKeyRepeat: true DisableKeyRepeat: true
TooltipText: Defend Stance 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 TooltipContainer: TOOLTIP_CONTAINER
Children: Children:
Image@ICON: Image@ICON:

View File

@@ -52,3 +52,4 @@ FTUR:
PBOX: PBOX:
-AutoTarget: -AutoTarget:
-AutoTargetPriority@DEFAULT: -AutoTargetPriority@DEFAULT:
-AutoTargetPriority@ATTACKANYTHING:

View File

@@ -34,6 +34,7 @@ E7.noautotarget:
Inherits: E7 Inherits: E7
-AutoTarget: -AutoTarget:
-AutoTargetPriority@DEFAULT: -AutoTargetPriority@DEFAULT:
-AutoTargetPriority@ATTACKANYTHING:
RenderSprites: RenderSprites:
Image: E7 Image: E7

View File

@@ -159,7 +159,13 @@
^AutoTargetGround: ^AutoTargetGround:
AutoTarget: AutoTarget:
AttackAnythingCondition: stance-attackanything
AutoTargetPriority@DEFAULT: 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 ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, Structure, Defense
InvalidTargets: NoAutoTarget InvalidTargets: NoAutoTarget
@@ -171,7 +177,13 @@
^AutoTargetAll: ^AutoTargetAll:
AutoTarget: AutoTarget:
AttackAnythingCondition: stance-attackanything
AutoTargetPriority@DEFAULT: 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 ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, Air, Structure, Defense
InvalidTargets: NoAutoTarget InvalidTargets: NoAutoTarget

View File

@@ -125,7 +125,13 @@
^AutoTargetGround: ^AutoTargetGround:
AutoTarget: AutoTarget:
AttackAnythingCondition: stance-attackanything
AutoTargetPriority@DEFAULT: 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 ValidTargets: Infantry, Vehicle, Creep, Water, Structure, Defense
InvalidTargets: NoAutoTarget InvalidTargets: NoAutoTarget
@@ -137,7 +143,13 @@
^AutoTargetAll: ^AutoTargetAll:
AutoTarget: AutoTarget:
AttackAnythingCondition: stance-attackanything
AutoTargetPriority@DEFAULT: 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 ValidTargets: Infantry, Vehicle, Creep, Water, Air, Structure, Defense
InvalidTargets: NoAutoTarget InvalidTargets: NoAutoTarget