diff --git a/mods/cnc/bits/mouse8.shp b/mods/cnc/bits/mouse8.shp new file mode 100644 index 0000000000..bff0a2b4ed Binary files /dev/null and b/mods/cnc/bits/mouse8.shp differ diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index a8a9f1f1f2..405e1b4cc3 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -303,8 +303,9 @@ Container@PLAYER_WIDGETS: Key: AttackMove DisableKeySound: true TooltipText: Attack Move - TooltipDesc: Selected units will move to the desired location\nand attack any enemies they encounter en route.\n\nLeft-click icon then right-click on target location. + TooltipDesc: Selected units will move to the desired location\nand attack any enemies they encounter en route.\n\nHold {(Ctrl)} while targeting to order an Assault Move\nthat attacks any units or structures encountered en route.\n\nLeft-click icon then right-click on target location. TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP Children: Image@ICON: X: 5 diff --git a/mods/cnc/cursors.yaml b/mods/cnc/cursors.yaml index f955af69b6..48782591c5 100644 --- a/mods/cnc/cursors.yaml +++ b/mods/cnc/cursors.yaml @@ -167,12 +167,6 @@ Cursors: attackmove-minimap: Start: 20 Length: 4 - assaultmove: - Start: 12 - Length: 8 - assaultmove-minimap: - Start: 20 - Length: 4 move-blocked: Start: 24 Length: 1 @@ -223,3 +217,10 @@ Cursors: Length: 8 attackoutsiderange-minimap: Start: 8 + mouse8.shp: cursor + assaultmove: + Start: 0 + Length: 8 + assaultmove-minimap: + Start: 8 + Length: 4 \ No newline at end of file diff --git a/mods/cnc/maps/nod07c/rules.yaml b/mods/cnc/maps/nod07c/rules.yaml index 0abfbe6b2e..92fdb504d1 100644 --- a/mods/cnc/maps/nod07c/rules.yaml +++ b/mods/cnc/maps/nod07c/rules.yaml @@ -150,3 +150,4 @@ ORCA.IN: -AutoTarget: -AutoTargetPriority@DEFAULT: -AutoTargetPriority@ATTACKANYTHING: + -AttackMove: diff --git a/mods/cnc/maps/the-hot-box/rules.yaml b/mods/cnc/maps/the-hot-box/rules.yaml index 178e293445..2f648ea4ef 100644 --- a/mods/cnc/maps/the-hot-box/rules.yaml +++ b/mods/cnc/maps/the-hot-box/rules.yaml @@ -37,6 +37,7 @@ UNITCRATE: Units: e3 APC: + Inherits@AUTOTARGET: ^AutoTargetAll Health: HP: 1000 MustBeDestroyed: diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 0cfe428793..5f42fbded8 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -54,7 +54,7 @@ TRAN: HELI: Inherits: ^Helicopter Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 1200 Tooltip: @@ -113,7 +113,7 @@ HELI: ORCA: Inherits: ^Helicopter Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 1200 Tooltip: diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 5a38389d5e..1706de231d 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -159,6 +159,15 @@ ValidTargets: Infantry, Vehicle, Creep, Water, Structure, Defense InvalidTargets: NoAutoTarget +^AutoTargetGroundAssaultMove: + Inherits: ^AutoTargetGround + AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything && !assault-move + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything || assault-move + AttackMove: + AssaultMoveScanCondition: assault-move + ^AutoTargetAir: AutoTarget: AutoTargetPriority@DEFAULT: @@ -177,6 +186,15 @@ ValidTargets: Infantry, Vehicle, Creep, Water, Air, Structure, Defense InvalidTargets: NoAutoTarget +^AutoTargetAllAssaultMove: + Inherits: ^AutoTargetAll + AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything && !assault-move + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything || assault-move + AttackMove: + AssaultMoveScanCondition: assault-move + ^AcceptsCloakCrate: Cloak: InitialDelay: 15 @@ -457,7 +475,7 @@ ^DINO: Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Huntable: Health: HP: 1000 @@ -518,7 +536,7 @@ ^Viceroid: Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Huntable: Health: HP: 300 diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index e2762d13ea..872965544d 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -1,7 +1,7 @@ E1: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 100 Tooltip: @@ -27,7 +27,7 @@ E1: E2: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 160 Tooltip: @@ -60,7 +60,7 @@ E2: E3: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 300 Tooltip: @@ -89,7 +89,7 @@ E3: E4: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 200 Tooltip: @@ -120,7 +120,7 @@ E4: E5: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 300 Tooltip: @@ -180,7 +180,7 @@ E6: RMBO: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 2000 Tooltip: diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index d3592431f9..899c6a3ca9 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -82,7 +82,7 @@ APC: Inherits: ^Tank Inherits@EXPERIENCE: ^GainsExperience Inherits@CLOAK: ^AcceptsCloakCrate - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 550 Tooltip: @@ -132,7 +132,7 @@ ARTY: Inherits: ^Tank Inherits@EXPERIENCE: ^GainsExperience Inherits@CLOAK: ^AcceptsCloakCrate - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 600 Tooltip: @@ -170,7 +170,7 @@ FTNK: Inherits: ^Tank Inherits@EXPERIENCE: ^GainsExperience Inherits@CLOAK: ^AcceptsCloakCrate - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 600 Tooltip: @@ -205,7 +205,7 @@ BGGY: Inherits: ^Vehicle Inherits@@EXPERIENCE: ^GainsExperience Inherits@CLOAK: ^AcceptsCloakCrate - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 300 Tooltip: @@ -241,7 +241,7 @@ BIKE: Inherits: ^Vehicle Inherits@EXPERIENCE: ^GainsExperience Inherits@CLOAK: ^AcceptsCloakCrate - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 500 Tooltip: @@ -279,7 +279,7 @@ JEEP: Inherits: ^Vehicle Inherits@EXPERIENCE: ^GainsExperience Inherits@CLOAK: ^AcceptsCloakCrate - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 400 Tooltip: @@ -315,7 +315,7 @@ LTNK: Inherits: ^Tank Inherits@EXPERIENCE: ^GainsExperience Inherits@CLOAK: ^AcceptsCloakCrate - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 650 Tooltip: @@ -354,7 +354,7 @@ MTNK: Inherits: ^Tank Inherits@EXPERIENCE: ^GainsExperience Inherits@CLOAK: ^AcceptsCloakCrate - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 800 Tooltip: @@ -392,7 +392,7 @@ HTNK: Inherits: ^Tank Inherits@EXPERIENCE: ^GainsExperience Inherits@CLOAK: ^AcceptsCloakCrate - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 1500 Tooltip: @@ -443,7 +443,7 @@ MSAM: Inherits: ^Tank Inherits@EXPERIENCE: ^GainsExperience Inherits@CLOAK: ^AcceptsCloakCrate - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 1000 Tooltip: @@ -525,7 +525,7 @@ MLRS: STNK: Inherits: ^Vehicle Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 900 Tooltip: