Add assault move to RA.

This commit is contained in:
Paul Chote
2017-09-09 21:30:29 +00:00
committed by reaperrr
parent a81749e102
commit c46d1944d9
12 changed files with 62 additions and 33 deletions

Binary file not shown.

View File

@@ -55,8 +55,9 @@ Container@PLAYER_WIDGETS:
Key: AttackMove Key: AttackMove
DisableKeySound: true DisableKeySound: true
TooltipText: Attack Move 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 TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP
Children: Children:
Image@ICON: Image@ICON:
X: 5 X: 5

View File

@@ -218,8 +218,8 @@ Cursors:
Start: 4 Start: 4
Length: 4 Length: 4
assaultmove: assaultmove:
Start: 0 Start: 8
Length: 4 Length: 4
assaultmove-minimap: assaultmove-minimap:
Start: 4 Start: 12
Length: 4 Length: 4

View File

@@ -46,6 +46,7 @@ UNITCRATE:
Percentage: 0 Percentage: 0
APC: APC:
Inherits@AUTOTARGET: ^AutoTargetGround
Health: Health:
HP: 1000 HP: 1000
MustBeDestroyed: MustBeDestroyed:

View File

@@ -46,6 +46,7 @@ UNITCRATE:
Percentage: 0 Percentage: 0
APC: APC:
Inherits@AUTOTARGET: ^AutoTargetGround
Health: Health:
HP: 1000 HP: 1000
MustBeDestroyed: MustBeDestroyed:

View File

@@ -81,7 +81,7 @@ BADR.Bomber:
MIG: MIG:
Inherits: ^Plane Inherits: ^Plane
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Aircraft Queue: Aircraft
BuildAtProductionType: Plane BuildAtProductionType: Plane
@@ -141,7 +141,7 @@ MIG:
YAK: YAK:
Inherits: ^Plane Inherits: ^Plane
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Aircraft Queue: Aircraft
BuildAtProductionType: Plane BuildAtProductionType: Plane
@@ -258,7 +258,7 @@ TRAN:
HELI: HELI:
Inherits: ^Helicopter Inherits: ^Helicopter
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Buildable: Buildable:
Queue: Aircraft Queue: Aircraft
BuildAtProductionType: Helicopter BuildAtProductionType: Helicopter
@@ -318,7 +318,7 @@ HELI:
HIND: HIND:
Inherits: ^Helicopter Inherits: ^Helicopter
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Aircraft Queue: Aircraft
BuildAtProductionType: Helicopter BuildAtProductionType: Helicopter

View File

@@ -35,6 +35,8 @@ E7.noautotarget:
-AutoTarget: -AutoTarget:
-AutoTargetPriority@DEFAULT: -AutoTargetPriority@DEFAULT:
-AutoTargetPriority@ATTACKANYTHING: -AutoTargetPriority@ATTACKANYTHING:
AttackMove:
-AssaultMoveScanCondition:
RenderSprites: RenderSprites:
Image: E7 Image: E7

View File

@@ -169,6 +169,15 @@
ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, Structure, Defense ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, Structure, Defense
InvalidTargets: NoAutoTarget InvalidTargets: NoAutoTarget
^AutoTargetGroundAssaultMove:
Inherits: ^AutoTargetGround
AutoTargetPriority@DEFAULT:
RequiresCondition: !stance-attackanything && !assault-move
AutoTargetPriority@ATTACKANYTHING:
RequiresCondition: stance-attackanything || assault-move
AttackMove:
AssaultMoveScanCondition: assault-move
^AutoTargetAir: ^AutoTargetAir:
AutoTarget: AutoTarget:
AutoTargetPriority@DEFAULT: AutoTargetPriority@DEFAULT:
@@ -187,6 +196,15 @@
ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, Air, Structure, Defense ValidTargets: Infantry, Vehicle, Tank, Water, Underwater, Air, Structure, Defense
InvalidTargets: NoAutoTarget InvalidTargets: NoAutoTarget
^AutoTargetAllAssaultMove:
Inherits: ^AutoTargetAll
AutoTargetPriority@DEFAULT:
RequiresCondition: !stance-attackanything && !assault-move
AutoTargetPriority@ATTACKANYTHING:
RequiresCondition: stance-attackanything || assault-move
AttackMove:
AssaultMoveScanCondition: assault-move
^Vehicle: ^Vehicle:
Inherits@1: ^ExistsInWorld Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience Inherits@2: ^GainsExperience
@@ -428,7 +446,7 @@
Categories: Civilian infantry Categories: Civilian infantry
^ArmedCivilian: ^ArmedCivilian:
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Armament: Armament:
Weapon: Pistol Weapon: Pistol
AttackFrontal: AttackFrontal:

View File

@@ -50,7 +50,7 @@ DOG:
E1: E1:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Infantry Queue: Infantry
BuildAtProductionType: Soldier BuildAtProductionType: Soldier
@@ -88,7 +88,7 @@ E1R1:
E2: E2:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Infantry Queue: Infantry
BuildAtProductionType: Soldier BuildAtProductionType: Soldier
@@ -124,7 +124,7 @@ E2:
E3: E3:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Buildable: Buildable:
Queue: Infantry Queue: Infantry
BuildAtProductionType: Soldier BuildAtProductionType: Soldier
@@ -170,7 +170,7 @@ E3R1:
E4: E4:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Infantry Queue: Infantry
BuildAtProductionType: Soldier BuildAtProductionType: Soldier
@@ -224,7 +224,7 @@ E6:
SPY: SPY:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Infantry Queue: Infantry
BuildAtProductionType: Soldier BuildAtProductionType: Soldier
@@ -291,7 +291,7 @@ SPY.England:
E7: E7:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Infantry Queue: Infantry
BuildAtProductionType: Soldier BuildAtProductionType: Soldier
@@ -534,7 +534,7 @@ HIJACKER:
SHOK: SHOK:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Infantry Queue: Infantry
BuildAtProductionType: Soldier BuildAtProductionType: Soldier
@@ -626,7 +626,7 @@ SNIPER:
Zombie: Zombie:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 100 Cost: 100
Tooltip: Tooltip:
@@ -655,7 +655,7 @@ Zombie:
Ant: Ant:
Inherits: ^Infantry Inherits: ^Infantry
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 300 Cost: 300
Tooltip: Tooltip:

View File

@@ -50,6 +50,12 @@
G: 0 G: 0
B: 0 B: 0
A: 128 A: 128
PaletteFromRGBA@invuln2:
Name: invuln2
R: 0
G: 0
B: 128
A: 128
PaletteFromRGBA@disabled: PaletteFromRGBA@disabled:
Name: disabled Name: disabled
R: 0 R: 0

View File

@@ -62,7 +62,7 @@ SS:
MSUB: MSUB:
Inherits: ^Ship Inherits: ^Ship
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Buildable: Buildable:
Queue: Ship Queue: Ship
BuildAtProductionType: Submarine BuildAtProductionType: Submarine
@@ -128,7 +128,7 @@ MSUB:
DD: DD:
Inherits: ^Ship Inherits: ^Ship
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Buildable: Buildable:
Queue: Ship Queue: Ship
BuildAtProductionType: Boat BuildAtProductionType: Boat
@@ -177,7 +177,7 @@ DD:
CA: CA:
Inherits: ^Ship Inherits: ^Ship
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Ship Queue: Ship
BuildAtProductionType: Boat BuildAtProductionType: Boat
@@ -273,7 +273,7 @@ LST:
PT: PT:
Inherits: ^Ship Inherits: ^Ship
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Ship Queue: Ship
BuildAtProductionType: Boat BuildAtProductionType: Boat

View File

@@ -1,6 +1,6 @@
V2RL: V2RL:
Inherits: ^Vehicle Inherits: ^Vehicle
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 80 BuildPaletteOrder: 80
@@ -36,7 +36,7 @@ V2RL:
1TNK: 1TNK:
Inherits: ^Tank Inherits: ^Tank
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 50 BuildPaletteOrder: 50
@@ -76,7 +76,7 @@ V2RL:
2TNK: 2TNK:
Inherits: ^Tank Inherits: ^Tank
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 110 BuildPaletteOrder: 110
@@ -118,7 +118,7 @@ V2RL:
3TNK: 3TNK:
Inherits: ^Tank Inherits: ^Tank
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 120 BuildPaletteOrder: 120
@@ -160,7 +160,7 @@ V2RL:
4TNK: 4TNK:
Inherits: ^Tank Inherits: ^Tank
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 180 BuildPaletteOrder: 180
@@ -218,7 +218,7 @@ V2RL:
ARTY: ARTY:
Inherits: ^Tank Inherits: ^Tank
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 70 BuildPaletteOrder: 70
@@ -342,7 +342,7 @@ MCV:
JEEP: JEEP:
Inherits: ^Vehicle Inherits: ^Vehicle
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 30 BuildPaletteOrder: 30
@@ -385,7 +385,7 @@ JEEP:
APC: APC:
Inherits: ^Tank Inherits: ^Tank
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 40 BuildPaletteOrder: 40
@@ -561,7 +561,7 @@ MRJ:
TTNK: TTNK:
Inherits: ^Tank Inherits: ^Tank
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 170 BuildPaletteOrder: 170
@@ -598,7 +598,7 @@ TTNK:
FTRK: FTRK:
Inherits: ^Vehicle Inherits: ^Vehicle
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 60 BuildPaletteOrder: 60
@@ -672,7 +672,7 @@ DTRK:
CTNK: CTNK:
Inherits: ^Vehicle Inherits: ^Vehicle
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 200 BuildPaletteOrder: 200
@@ -743,7 +743,7 @@ QTNK:
STNK: STNK:
Inherits: ^Vehicle Inherits: ^Vehicle
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 130 BuildPaletteOrder: 130