Add assault move to TS.

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

Binary file not shown.

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

Binary file not shown.

View File

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

View File

@@ -102,18 +102,6 @@ Cursors:
attackoutsiderange-minimap:
Start: 63
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:
Start: 53
Length: 5
@@ -230,3 +218,29 @@ Cursors:
Start: 385
joystick-tl-blocked:
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

View File

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

View File

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

View File

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

View File

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

View File

@@ -136,6 +136,15 @@
ValidTargets: Infantry, Vehicle, Creep, Water, Building, 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:
@@ -154,6 +163,15 @@
ValidTargets: Infantry, Vehicle, Creep, Water, Air, Building, Defense
InvalidTargets: NoAutoTarget
^AutoTargetAllAssaultMove:
Inherits: ^AutoTargetAll
AutoTargetPriority@DEFAULT:
RequiresCondition: !stance-attackanything && !assault-move
AutoTargetPriority@ATTACKANYTHING:
RequiresCondition: stance-attackanything || assault-move
AttackMove:
AssaultMoveScanCondition: assault-move
^2x1Shape:
HitShape:
Type: Rectangle

View File

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

View File

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

View File

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

View File

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

View File

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