epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add assault move to TS.

Browse Source
This commit is contained in:
Paul Chote
2017-09-10 17:44:20 +00:00
committed by reaperrr
parent 646a6aa1e8
commit 049ed086f9
14 changed files with 80 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mods/ts/bits/assaultmove.shp Normal file
View File

Binary file not shown.

BIN
mods/ts/bits/attackmove.shp Normal file
View File

Binary file not shown.

3
mods/ts/chrome/ingame-player.yaml
View File

@@ -43,8 +43,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:
Logic: AddFactionSuffixLogic Logic: AddFactionSuffixLogic

38
mods/ts/cursors.yaml
View File

@@ -102,18 +102,6 @@ Cursors:
attackoutsiderange-minimap: attackoutsiderange-minimap:
Start: 63 Start: 63
Length: 5 Length: 5
attackmove:
Start: 58
Length: 5
attackmove-minimap:
Start: 68
Length: 5
assaultmove:
Start: 58
Length: 5
assaultmove-minimap:
Start: 68
Length: 5
harvest: harvest:
Start: 53 Start: 53
Length: 5 Length: 5
@@ -230,3 +218,29 @@ Cursors:
Start: 385 Start: 385
joystick-tl-blocked: joystick-tl-blocked:
Start: 386 Start: 386
attackmove.shp: cursor
attackmove:
Start: 0
Length: 10
attackmove-blocked:
Start: 10
Length: 1
attackmove-minimap:
Start: 11
Length: 10
attackmove-minimap-blocked:
Start: 21
Length: 1
assaultmove.shp: cursor
assaultmove:
Start: 0
Length: 10
assaultmove-blocked:
Start: 10
Length: 1
assaultmove-minimap:
Start: 11
Length: 10
assaultmove-minimap-blocked:
Start: 21
Length: 1

10
mods/ts/rules/aircraft.yaml
View File

@@ -1,6 +1,6 @@
DPOD: DPOD:
Inherits: ^Helicopter Inherits: ^Helicopter
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 10 Cost: 10
Tooltip: Tooltip:
@@ -65,7 +65,7 @@ DSHP:
ORCA: ORCA:
Inherits: ^Helicopter Inherits: ^Helicopter
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 1000 Cost: 1000
Tooltip: Tooltip:
@@ -107,7 +107,7 @@ ORCA:
ORCAB: ORCAB:
Inherits: ^Aircraft Inherits: ^Aircraft
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 1600 Cost: 1600
Tooltip: Tooltip:
@@ -230,7 +230,7 @@ TRNSPORT:
SCRIN: SCRIN:
Inherits: ^Aircraft Inherits: ^Aircraft
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 1500 Cost: 1500
Tooltip: Tooltip:
@@ -280,7 +280,7 @@ SCRIN:
APACHE: APACHE:
Inherits: ^Helicopter Inherits: ^Helicopter
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 1000 Cost: 1000
Tooltip: Tooltip:

12
mods/ts/rules/civilian-infantry.yaml
View File

@@ -29,7 +29,7 @@ UMAGON:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@2: ^HealsOnTiberium Inherits@2: ^HealsOnTiberium
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 400 Cost: 400
Tooltip: Tooltip:
@@ -86,7 +86,7 @@ MUTANT:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@2: ^HealsOnTiberium Inherits@2: ^HealsOnTiberium
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 100 Cost: 100
Tooltip: Tooltip:
@@ -112,7 +112,7 @@ MWMN:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@2: ^HealsOnTiberium Inherits@2: ^HealsOnTiberium
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 100 Cost: 100
Tooltip: Tooltip:
@@ -138,7 +138,7 @@ MUTANT3:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@2: ^HealsOnTiberium Inherits@2: ^HealsOnTiberium
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 100 Cost: 100
Tooltip: Tooltip:
@@ -214,7 +214,7 @@ SLAV:
CIV1: CIV1:
Inherits: ^CivilianInfantry Inherits: ^CivilianInfantry
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
WithInfantryBody: WithInfantryBody:
DefaultAttackSequence: attack DefaultAttackSequence: attack
Armament: Armament:
@@ -227,7 +227,7 @@ CIV2:
CIV3: CIV3:
Inherits: ^CivilianInfantry Inherits: ^CivilianInfantry
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
WithInfantryBody: WithInfantryBody:
DefaultAttackSequence: attack DefaultAttackSequence: attack
Armament: Armament:

2
mods/ts/rules/civilian-vehicles.yaml
View File

@@ -2,7 +2,7 @@
Inherits: ^Tank Inherits: ^Tank
Inherits@VOXELS: ^VoxelActor Inherits@VOXELS: ^VoxelActor
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Valued: Valued:
Cost: 1700 Cost: 1700
Tooltip: Tooltip:

6
mods/ts/rules/critters.yaml
View File

@@ -2,7 +2,7 @@ DOGGIE:
Inherits@1: ^Infantry Inherits@1: ^Infantry
Inherits@2: ^RegularInfantryDeath Inherits@2: ^RegularInfantryDeath
Inherits@3: ^HealsOnTiberium Inherits@3: ^HealsOnTiberium
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Tooltip: Tooltip:
Name: Tiberian Fiend Name: Tiberian Fiend
Health: Health:
@@ -54,7 +54,7 @@ VISC_SML:
VISC_LRG: VISC_LRG:
Inherits: ^Visceroid Inherits: ^Visceroid
Inherits@CRATESTATS: ^CrateStatModifiers Inherits@CRATESTATS: ^CrateStatModifiers
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Tooltip: Tooltip:
Name: Adult Visceroid Name: Adult Visceroid
Health: Health:
@@ -84,7 +84,7 @@ VISC_LRG:
JFISH: JFISH:
Inherits: ^Visceroid Inherits: ^Visceroid
Inherits@CRATESTATS: ^CrateStatModifiers Inherits@CRATESTATS: ^CrateStatModifiers
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Tooltip: Tooltip:
Name: Tiberium Floater Name: Tiberium Floater
Health: Health:

18
mods/ts/rules/defaults.yaml
View File

@@ -136,6 +136,15 @@
ValidTargets: Infantry, Vehicle, Creep, Water, Building, Defense ValidTargets: Infantry, Vehicle, Creep, Water, Building, 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:
@@ -154,6 +163,15 @@
ValidTargets: Infantry, Vehicle, Creep, Water, Air, Building, Defense ValidTargets: Infantry, Vehicle, Creep, Water, Air, Building, 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
^2x1Shape: ^2x1Shape:
HitShape: HitShape:
Type: Rectangle Type: Rectangle

6
mods/ts/rules/gdi-infantry.yaml
View File

@@ -1,7 +1,7 @@
E2: E2:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Infantry Queue: Infantry
BuildPaletteOrder: 20 BuildPaletteOrder: 20
@@ -72,7 +72,7 @@ MEDIC:
JUMPJET: JUMPJET:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 600 Cost: 600
Tooltip: Tooltip:
@@ -193,7 +193,7 @@ GHOST:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@2: ^HealsOnTiberium Inherits@2: ^HealsOnTiberium
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 1750 Cost: 1750
Tooltip: Tooltip:

12
mods/ts/rules/gdi-vehicles.yaml
View File

@@ -51,7 +51,7 @@ HVR:
Inherits: ^Vehicle Inherits: ^Vehicle
Inherits@VOXELS: ^VoxelActor Inherits@VOXELS: ^VoxelActor
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Valued: Valued:
Cost: 900 Cost: 900
Tooltip: Tooltip:
@@ -106,7 +106,7 @@ HVR:
SMECH: SMECH:
Inherits: ^Vehicle Inherits: ^Vehicle
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 500 Cost: 500
Tooltip: Tooltip:
@@ -149,7 +149,7 @@ SMECH:
MMCH: MMCH:
Inherits: ^Tank Inherits: ^Tank
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 800 Cost: 800
Tooltip: Tooltip:
@@ -208,7 +208,7 @@ HMEC:
Inherits: ^Tank Inherits: ^Tank
Inherits@VOXELS: ^VoxelActor Inherits@VOXELS: ^VoxelActor
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Valued: Valued:
Cost: 3000 Cost: 3000
Tooltip: Tooltip:
@@ -252,7 +252,7 @@ SONIC:
Inherits: ^Tank Inherits: ^Tank
Inherits@VOXELS: ^VoxelActor Inherits@VOXELS: ^VoxelActor
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 1300 Cost: 1300
Tooltip: Tooltip:
@@ -295,7 +295,7 @@ JUGG:
Inherits: ^Tank Inherits: ^Tank
Inherits@SPRITES: ^SpriteActor Inherits@SPRITES: ^SpriteActor
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 950 Cost: 950
Tooltip: Tooltip:

6
mods/ts/rules/nod-infantry.yaml
View File

@@ -1,7 +1,7 @@
E3: E3:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Buildable: Buildable:
Queue: Infantry Queue: Infantry
BuildPaletteOrder: 30 BuildPaletteOrder: 30
@@ -34,7 +34,7 @@ E3:
CYBORG: CYBORG:
Inherits: ^Cyborg Inherits: ^Cyborg
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Armor: Armor:
Type: Light Type: Light
Valued: Valued:
@@ -69,7 +69,7 @@ CYBORG:
CYC2: CYC2:
Inherits: ^Cyborg Inherits: ^Cyborg
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Armor: Armor:
Type: Heavy Type: Heavy
Valued: Valued:

12
mods/ts/rules/nod-vehicles.yaml
View File

@@ -2,7 +2,7 @@ BGGY:
Inherits: ^Vehicle Inherits: ^Vehicle
Inherits@VOXELS: ^VoxelActor Inherits@VOXELS: ^VoxelActor
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 500 Cost: 500
Tooltip: Tooltip:
@@ -39,7 +39,7 @@ BIKE:
Inherits: ^Vehicle Inherits: ^Vehicle
Inherits@VOXELS: ^VoxelActor Inherits@VOXELS: ^VoxelActor
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Valued: Valued:
Cost: 600 Cost: 600
Tooltip: Tooltip:
@@ -79,7 +79,7 @@ TTNK:
Inherits: ^Tank Inherits: ^Tank
Inherits@VOXELS: ^VoxelActor Inherits@VOXELS: ^VoxelActor
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 800 Cost: 800
Tooltip: Tooltip:
@@ -190,7 +190,7 @@ ART2:
Inherits: ^Tank Inherits: ^Tank
Inherits@VOXELS: ^VoxelActor Inherits@VOXELS: ^VoxelActor
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 975 Cost: 975
Tooltip: Tooltip:
@@ -390,7 +390,7 @@ SUBTANK:
Inherits: ^Tank Inherits: ^Tank
Inherits@VOXELS: ^VoxelActor Inherits@VOXELS: ^VoxelActor
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Valued: Valued:
Cost: 750 Cost: 750
Tooltip: Tooltip:
@@ -434,7 +434,7 @@ STNK:
Inherits: ^Tank Inherits: ^Tank
Inherits@VOXELS: ^VoxelActor Inherits@VOXELS: ^VoxelActor
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetAll Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
Valued: Valued:
Cost: 1100 Cost: 1100
Tooltip: Tooltip:

2
mods/ts/rules/shared-infantry.yaml
View File

@@ -1,7 +1,7 @@
E1: E1:
Inherits: ^Soldier Inherits: ^Soldier
Inherits@EXPERIENCE: ^GainsExperience Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGround Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Buildable: Buildable:
Queue: Infantry Queue: Infantry
BuildPaletteOrder: 10 BuildPaletteOrder: 10