diff --git a/mods/ra/bits/attackmove.shp b/mods/ra/bits/attackmove.shp index 9ef5a03603..e0dfbc1d3f 100644 Binary files a/mods/ra/bits/attackmove.shp and b/mods/ra/bits/attackmove.shp differ diff --git a/mods/ra/chrome/ingame-player.yaml b/mods/ra/chrome/ingame-player.yaml index cf00c561fb..619133769e 100644 --- a/mods/ra/chrome/ingame-player.yaml +++ b/mods/ra/chrome/ingame-player.yaml @@ -55,8 +55,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/ra/cursors.yaml b/mods/ra/cursors.yaml index fd2bf91cf2..2e8ef2b62c 100644 --- a/mods/ra/cursors.yaml +++ b/mods/ra/cursors.yaml @@ -218,8 +218,8 @@ Cursors: Start: 4 Length: 4 assaultmove: - Start: 0 + Start: 8 Length: 4 assaultmove-minimap: - Start: 4 + Start: 12 Length: 4 diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml index 8b30550d0c..c4608282b8 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml @@ -46,6 +46,7 @@ UNITCRATE: Percentage: 0 APC: + Inherits@AUTOTARGET: ^AutoTargetGround Health: HP: 1000 MustBeDestroyed: diff --git a/mods/ra/maps/drop-zone/rules.yaml b/mods/ra/maps/drop-zone/rules.yaml index 8b30550d0c..c4608282b8 100644 --- a/mods/ra/maps/drop-zone/rules.yaml +++ b/mods/ra/maps/drop-zone/rules.yaml @@ -46,6 +46,7 @@ UNITCRATE: Percentage: 0 APC: + Inherits@AUTOTARGET: ^AutoTargetGround Health: HP: 1000 MustBeDestroyed: diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index eb39aacd7f..97142499c2 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -81,7 +81,7 @@ BADR.Bomber: MIG: Inherits: ^Plane - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Aircraft BuildAtProductionType: Plane @@ -141,7 +141,7 @@ MIG: YAK: Inherits: ^Plane - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Aircraft BuildAtProductionType: Plane @@ -258,7 +258,7 @@ TRAN: HELI: Inherits: ^Helicopter - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Buildable: Queue: Aircraft BuildAtProductionType: Helicopter @@ -318,7 +318,7 @@ HELI: HIND: Inherits: ^Helicopter - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Aircraft BuildAtProductionType: Helicopter diff --git a/mods/ra/rules/campaign-rules.yaml b/mods/ra/rules/campaign-rules.yaml index 07ad85c8cc..4dd6af4cde 100644 --- a/mods/ra/rules/campaign-rules.yaml +++ b/mods/ra/rules/campaign-rules.yaml @@ -35,6 +35,8 @@ E7.noautotarget: -AutoTarget: -AutoTargetPriority@DEFAULT: -AutoTargetPriority@ATTACKANYTHING: + AttackMove: + -AssaultMoveScanCondition: RenderSprites: Image: E7 diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index aafdd927e6..9e8df38080 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -169,6 +169,15 @@ ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, 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: @@ -187,6 +196,15 @@ ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, 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 + ^Vehicle: Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience @@ -428,7 +446,7 @@ Categories: Civilian infantry ^ArmedCivilian: - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Armament: Weapon: Pistol AttackFrontal: diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 2341282596..780659bce7 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -50,7 +50,7 @@ DOG: E1: Inherits: ^Soldier - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -88,7 +88,7 @@ E1R1: E2: Inherits: ^Soldier - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -124,7 +124,7 @@ E2: E3: Inherits: ^Soldier - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -170,7 +170,7 @@ E3R1: E4: Inherits: ^Soldier - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -224,7 +224,7 @@ E6: SPY: Inherits: ^Soldier - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -291,7 +291,7 @@ SPY.England: E7: Inherits: ^Soldier - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -534,7 +534,7 @@ HIJACKER: SHOK: Inherits: ^Soldier - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -626,7 +626,7 @@ SNIPER: Zombie: Inherits: ^Soldier - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 100 Tooltip: @@ -655,7 +655,7 @@ Zombie: Ant: Inherits: ^Infantry - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 300 Tooltip: diff --git a/mods/ra/rules/palettes.yaml b/mods/ra/rules/palettes.yaml index 60024ebb62..336aa3b3fd 100644 --- a/mods/ra/rules/palettes.yaml +++ b/mods/ra/rules/palettes.yaml @@ -50,6 +50,12 @@ G: 0 B: 0 A: 128 + PaletteFromRGBA@invuln2: + Name: invuln2 + R: 0 + G: 0 + B: 128 + A: 128 PaletteFromRGBA@disabled: Name: disabled R: 0 diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index e5fff57673..7ba9f7ba62 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -62,7 +62,7 @@ SS: MSUB: Inherits: ^Ship - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Buildable: Queue: Ship BuildAtProductionType: Submarine @@ -128,7 +128,7 @@ MSUB: DD: Inherits: ^Ship - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Buildable: Queue: Ship BuildAtProductionType: Boat @@ -177,7 +177,7 @@ DD: CA: Inherits: ^Ship - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Ship BuildAtProductionType: Boat @@ -273,7 +273,7 @@ LST: PT: Inherits: ^Ship - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Ship BuildAtProductionType: Boat diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 61867752df..4f3d73fb64 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -1,6 +1,6 @@ V2RL: Inherits: ^Vehicle - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 80 @@ -36,7 +36,7 @@ V2RL: 1TNK: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 50 @@ -76,7 +76,7 @@ V2RL: 2TNK: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 110 @@ -118,7 +118,7 @@ V2RL: 3TNK: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 120 @@ -160,7 +160,7 @@ V2RL: 4TNK: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 180 @@ -218,7 +218,7 @@ V2RL: ARTY: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 70 @@ -342,7 +342,7 @@ MCV: JEEP: Inherits: ^Vehicle - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 30 @@ -385,7 +385,7 @@ JEEP: APC: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 40 @@ -561,7 +561,7 @@ MRJ: TTNK: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 170 @@ -598,7 +598,7 @@ TTNK: FTRK: Inherits: ^Vehicle - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 60 @@ -672,7 +672,7 @@ DTRK: CTNK: Inherits: ^Vehicle - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 200 @@ -743,7 +743,7 @@ QTNK: STNK: Inherits: ^Vehicle - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 130