Update RA AutoTarget definitions.

mods/ra/maps/allies-01/rules.yaml

@@ -42,7 +42,6 @@ EINSTEIN:
 
 C8:
 	Inherits@2: ^ArmedCivilian
-	AutoTarget:
 
 JEEP:
 	Cargo:

mods/ra/maps/infiltration/rules.yaml

@@ -24,9 +24,8 @@ World:
 		Color: FE1100
 
 MISS:
-	AutoTargetIgnore:
 	Targetable:
-		TargetTypes: Ground, C4, DetonateAttack, Structure, MissionObjective
+		TargetTypes: Ground, C4, DetonateAttack, Structure, MissionObjective, NoAutoTarget
 
 LST.Unselectable.UnloadOnly:
 	Inherits: LST
@@ -38,7 +37,8 @@ LST.Unselectable.UnloadOnly:
 	Cargo:
 		MaxWeight: 0
 		PipCount: 0
-	AutoTargetIgnore:
+	Targetable:
+		TargetTypes: Ground, Water, Repair, NoAutoTarget
 
 SPY.Strong:
 	Inherits: SPY
@@ -77,7 +77,8 @@ TRUK.Hijackable:
 		PipCount: 5
 		PassengerConditions:
 			spy.strong: mobile
-	AutoTargetIgnore:
+	Targetable:
+		TargetTypes: Ground, Repair, Vehicle, NoAutoTarget
 	-Huntable:
 	ExternalCapturable:
 		Type: MissionObjective

mods/ra/maps/monster-tank-madness/rules.yaml

@@ -109,6 +109,7 @@ PBOX:
 
 5TNK:
 	Inherits: ^Tank
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Valued:
 		Cost: 10000
 	Tooltip:
@@ -148,7 +149,6 @@ PBOX:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	Explodes:
 		Weapon: MiniNuke
 		EmptyWeapon: MiniNuke

mods/ra/maps/soviet-03/rules.yaml

@@ -17,7 +17,8 @@ World:
 		Default: easy
 
 ^TechBuilding:
-	AutoTargetIgnore:
+	Targetable:
+		TargetTypes: Ground, C4, DetonateAttack, Structure, NoAutoTarget
 
 ^Infantry:
 	-GivesBounty:

mods/ra/maps/soviet-05/rules.yaml

@@ -85,8 +85,11 @@ APC:
 DOME:
 	ExternalCondition@lua:
 		Condition: captured
-	AutoTargetIgnore:
+	Targetable:
+		RequiresCondition: captured		
+	Targetable@NOAUTOTARGET:
 		RequiresCondition: !captured
+		TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate, NoAutoTarget
 
 powerproxy.paratroopers:
 	ParatroopersPower:

mods/ra/maps/soviet-07/rules.yaml

@@ -51,3 +51,4 @@ FTUR:
 
 PBOX:
 	-AutoTarget:
+	-AutoTargetPriority@DEFAULT:

mods/ra/rules/aircraft.yaml

@@ -81,6 +81,7 @@ BADR.Bomber:
 
 MIG:
 	Inherits: ^Plane
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Aircraft
 		BuildAtProductionType: Plane
@@ -140,6 +141,7 @@ MIG:
 
 YAK:
 	Inherits: ^Plane
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Aircraft
 		BuildAtProductionType: Plane
@@ -257,6 +259,7 @@ TRAN:
 
 HELI:
 	Inherits: ^Helicopter
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Buildable:
 		Queue: Aircraft
 		BuildAtProductionType: Helicopter
@@ -315,6 +318,7 @@ HELI:
 
 HIND:
 	Inherits: ^Helicopter
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Aircraft
 		BuildAtProductionType: Helicopter

mods/ra/rules/campaign-rules.yaml

@@ -33,6 +33,7 @@ E7:
 E7.noautotarget:
 	Inherits: E7
 	-AutoTarget:
+	-AutoTargetPriority@DEFAULT:
 	RenderSprites:
 		Image: E7
 

mods/ra/rules/civilian.yaml

@@ -1,7 +1,6 @@
 C1:
 	Inherits@1: ^CivInfantry
 	Inherits@2: ^ArmedCivilian
-	AutoTarget:
 
 C2:
 	Inherits: ^CivInfantry
@@ -33,7 +32,6 @@ C6:
 C7:
 	Inherits@1: ^CivInfantry
 	Inherits@2: ^ArmedCivilian
-	AutoTarget:
 	RenderSprites:
 		Image: C1
 
@@ -59,7 +57,6 @@ C10:
 TECN:
 	Inherits@1: ^CivInfantry
 	Inherits@2: ^ArmedCivilian
-	AutoTarget:
 	Tooltip:
 		Name: Technician
 	RenderSprites:
@@ -265,7 +262,8 @@ V19:
 	-SpawnActorOnDeath@3:
 	SpawnActorOnDeath:
 		Actor: V19.Husk
-	AutoTargetIgnore:
+	Targetable:
+		TargetTypes: Ground, C4, DetonateAttack, Structure, NoAutoTarget
 
 V19.Husk:
 	Inherits: ^CivBuilding
@@ -298,11 +296,10 @@ BARL:
 	Tooltip:
 		Name: Explosive Barrel
 		ShowOwnerRow: False
-	AutoTargetIgnore:
 	Armor:
 		Type: None
 	Targetable:
-		TargetTypes: Ground, DemoTruck, Barrel
+		TargetTypes: Ground, DemoTruck, Barrel, NoAutoTarget
 	-ShakeOnDeath:
 	-SoundOnDamageTransition:
 	-Demolishable:
@@ -321,11 +318,10 @@ BRL3:
 	Tooltip:
 		Name: Explosive Barrel
 		ShowOwnerRow: False
-	AutoTargetIgnore:
 	Armor:
 		Type: None
 	Targetable:
-		TargetTypes: Ground, DemoTruck, Barrel
+		TargetTypes: Ground, DemoTruck, Barrel, NoAutoTarget
 	-ShakeOnDeath:
 	-SoundOnDamageTransition:
 	-Demolishable:

mods/ra/rules/defaults.yaml

@@ -157,6 +157,24 @@
 	ExternalCondition@INVULNERABILITY:
 		Condition: invulnerability
 
+^AutoTargetGround:
+	AutoTarget:
+	AutoTargetPriority@DEFAULT:
+		ValidTargets: Infantry, Vehicle, Water, Structure, Defense
+		InvalidTargets: NoAutoTarget
+
+^AutoTargetAir:
+	AutoTarget:
+	AutoTargetPriority@DEFAULT:
+		ValidTargets: Air
+		InvalidTargets: NoAutoTarget
+
+^AutoTargetAll:
+	AutoTarget:
+	AutoTargetPriority@DEFAULT:
+		ValidTargets: Infantry, Vehicle, Water, Air, Structure, Defense
+		InvalidTargets: NoAutoTarget
+
 ^Vehicle:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
@@ -359,7 +377,6 @@
 	Inherits: ^Infantry
 	UpdatesPlayerStatistics:
 	MustBeDestroyed:
-	AutoTarget:
 	ProximityCaptor:
 		Types: Infantry
 	TakeCover:
@@ -393,6 +410,7 @@
 		MaxMoveDelay: 750
 
 ^ArmedCivilian:
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Armament:
 		Weapon: Pistol
 	AttackFrontal:
@@ -584,7 +602,6 @@
 		TargetTypes: Ground, C4, DetonateAttack, Structure, Defense
 	MustBeDestroyed:
 		RequiredForShortGame: false
-	AutoTarget:
 	-GivesBuildableArea:
 	-AcceptsDeliveredCash:
 	DrawLineToTarget:
@@ -614,11 +631,10 @@
 	LineBuildNode:
 		Types: wall
 	Targetable:
-		TargetTypes: Ground, DetonateAttack, Wall
+		TargetTypes: Ground, DetonateAttack, Wall, NoAutoTarget
 	RenderSprites:
 		Palette: effect
 	WithWallSpriteBody:
-	AutoTargetIgnore:
 	Sellable:
 		SellSounds: cashturn.aud
 	Guardable:
@@ -704,7 +720,8 @@
 		Weapon: UnitExplode
 	Tooltip:
 		Name: Ammo Box
-	AutoTargetIgnore:
+	Targetable:
+		TargetTypes: Ground, C4, DetonateAttack, Structure, NoAutoTarget
 	Armor:
 		Type: Light
 	Targetable:
@@ -775,7 +792,6 @@
 		Image: burn-l
 		MinimumDamageState: Heavy
 		MaximumDamageState: Dead
-	AutoTargetIgnore:
 	HiddenUnderShroud:
 	ScriptTriggers:
 	EditorTilesetFilter:
@@ -802,7 +818,6 @@
 		Type: Heavy
 	HiddenUnderFog:
 		Type: CenterPosition
-	AutoTargetIgnore:
 	ScriptTriggers:
 	WithFacingSpriteBody:
 	HitShape:
@@ -822,7 +837,7 @@
 	WithColoredOverlay@IDISABLE:
 		Palette: disabled
 	Targetable:
-		TargetTypes: Ground, Husk
+		TargetTypes: Ground, Husk, NoAutoTarget
 		RequiresForceFire: true
 	Chronoshiftable:
 	Tooltip:
@@ -874,7 +889,6 @@
 		HP: 1000
 	Armor:
 		Type: Concrete
-	AutoTargetIgnore:
 	ScriptTriggers:
 	BodyOrientation:
 		QuantizedFacings: 1

mods/ra/rules/infantry.yaml

@@ -34,6 +34,8 @@ DOG:
 		Voice: Move
 	AutoTarget:
 		InitialStance: AttackAnything
+	AutoTargetPriority@DEFAULT:
+		Types: Infantry
 	Targetable:
 		TargetTypes: Ground, Infantry
 	WithInfantryBody:
@@ -48,6 +50,7 @@ DOG:
 
 E1:
 	Inherits: ^Soldier
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Infantry
 		BuildAtProductionType: Soldier
@@ -85,6 +88,7 @@ E1R1:
 
 E2:
 	Inherits: ^Soldier
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Infantry
 		BuildAtProductionType: Soldier
@@ -120,6 +124,7 @@ E2:
 
 E3:
 	Inherits: ^Soldier
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Buildable:
 		Queue: Infantry
 		BuildAtProductionType: Soldier
@@ -165,6 +170,7 @@ E3R1:
 
 E4:
 	Inherits: ^Soldier
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Infantry
 		BuildAtProductionType: Soldier
@@ -211,7 +217,6 @@ E6:
 	ExternalCaptures:
 		Type: building
 		PlayerExperience: 25
-	-AutoTarget:
 	Voiced:
 		VoiceSet: EngineerVoice
 	Selectable:
@@ -219,6 +224,7 @@ E6:
 
 SPY:
 	Inherits: ^Soldier
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Infantry
 		BuildAtProductionType: Soldier
@@ -285,6 +291,7 @@ SPY.England:
 
 E7:
 	Inherits: ^Soldier
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Infantry
 		BuildAtProductionType: Soldier
@@ -360,6 +367,9 @@ MEDI:
 		DefaultAttackSequence: heal
 	Voiced:
 		VoiceSet: MedicVoice
+	AutoTarget:
+	AutoTargetPriority@DEFAULT:
+		Types: Infantry
 
 MECH:
 	Inherits: ^Soldier
@@ -398,6 +408,9 @@ MECH:
 		StandSequences: stand
 	Voiced:
 		VoiceSet: MechanicVoice
+	AutoTarget:
+	AutoTargetPriority@DEFAULT:
+		Types: Vehicle
 
 EINSTEIN:
 	Inherits: ^CivInfantry
@@ -463,7 +476,6 @@ THF:
 	Infiltrates:
 		InfiltrateTypes: Cash
 		PlayerExperience: 50
-	-AutoTarget:
 	Voiced:
 		VoiceSet: ThiefVoice
 	WithInfantryBody:
@@ -493,7 +505,6 @@ HIJACKER:
 	Captures:
 		CaptureTypes: vehicle
 		PlayerExperience: 50
-	-AutoTarget:
 	Voiced:
 		VoiceSet: ThiefVoice
 	-TakeCover:
@@ -517,6 +528,7 @@ HIJACKER:
 
 SHOK:
 	Inherits: ^Soldier
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Infantry
 		BuildAtProductionType: Soldier
@@ -577,6 +589,8 @@ SNIPER:
 	AutoTarget:
 		InitialStance: HoldFire
 		InitialStanceAI: ReturnFire
+	AutoTargetPriority@DEFAULT:
+		Types: Infantry
 	Armament@PRIMARY:
 		Weapon: Sniper
 	Armament@GARRISONED:
@@ -606,6 +620,7 @@ SNIPER:
 
 Zombie:
 	Inherits: ^Soldier
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 100
 	Tooltip:
@@ -634,6 +649,7 @@ Zombie:
 
 Ant:
 	Inherits: ^Infantry
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 300
 	Tooltip:

mods/ra/rules/misc.yaml

@@ -207,7 +207,6 @@ MINE:
 	AppearsOnRadar:
 	RadarColorFromTerrain:
 		Terrain: Ore
-	AutoTargetIgnore:
 	SeedsResource:
 
 GMINE:
@@ -224,7 +223,6 @@ GMINE:
 	AppearsOnRadar:
 	RadarColorFromTerrain:
 		Terrain: Gems
-	AutoTargetIgnore:
 	SeedsResource:
 		ResourceType: Gems
 
@@ -239,7 +237,6 @@ RAILMINE:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	AutoTargetIgnore:
 	EditorTilesetFilter:
 		ExcludeTilesets: INTERIOR
 

mods/ra/rules/ships.yaml

@@ -50,6 +50,8 @@ SS:
 	AutoTarget:
 		InitialStance: HoldFire
 		InitialStanceAI: ReturnFire
+	AutoTargetPriority@DEFAULT:
+		Types: Water
 	DetectCloaked:
 		CloakTypes: Underwater
 		Range: 4c0
@@ -61,6 +63,7 @@ SS:
 
 MSUB:
 	Inherits: ^Ship
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Buildable:
 		Queue: Ship
 		BuildAtProductionType: Submarine
@@ -126,6 +129,7 @@ MSUB:
 
 DD:
 	Inherits: ^Ship
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Buildable:
 		Queue: Ship
 		BuildAtProductionType: Boat
@@ -167,7 +171,6 @@ DD:
 	SelectionDecorations:
 		VisualBounds: 38,38
 	WithSpriteTurret:
-	AutoTarget:
 	DetectCloaked:
 		CloakTypes: Underwater
 		Range: 4c0
@@ -175,6 +178,7 @@ DD:
 
 CA:
 	Inherits: ^Ship
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Ship
 		BuildAtProductionType: Boat
@@ -228,7 +232,6 @@ CA:
 		Turret: primary
 	WithSpriteTurret@SECONDARY:
 		Turret: secondary
-	AutoTarget:
 
 LST:
 	Inherits: ^Ship
@@ -270,6 +273,7 @@ LST:
 
 PT:
 	Inherits: ^Ship
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Ship
 		BuildAtProductionType: Boat
@@ -308,7 +312,6 @@ PT:
 	SelectionDecorations:
 		VisualBounds: 36,36
 	WithSpriteTurret:
-	AutoTarget:
 	DetectCloaked:
 		CloakTypes: Underwater
 		Range: 4c0

mods/ra/rules/structures.yaml

@@ -448,6 +448,7 @@ PDOX:
 TSLA:
 	Inherits: ^Defense
 	Inherits@IDISABLE: ^DisabledOverlay
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 80
@@ -493,6 +494,7 @@ TSLA:
 AGUN:
 	Inherits: ^Defense
 	Inherits@IDISABLE: ^DisabledOverlay
+	Inherits@AUTOTARGET: ^AutoTargetAir
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 90
@@ -592,6 +594,7 @@ DOME:
 
 PBOX:
 	Inherits: ^Defense
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Tooltip:
 		Name: Pillbox
 	Building:
@@ -640,6 +643,7 @@ PBOX:
 
 HBOX:
 	Inherits: ^Defense
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Tooltip:
 		Name: Camo Pillbox
 	Building:
@@ -695,6 +699,7 @@ HBOX:
 
 GUN:
 	Inherits: ^Defense
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 70
@@ -736,6 +741,7 @@ GUN:
 
 FTUR:
 	Inherits: ^Defense
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 60
@@ -780,6 +786,7 @@ SAM:
 	Inherits: ^Defense
 	Inherits@IDISABLE: ^DisabledOverlay
 	Inherits@shape: ^2x1Shape
+	Inherits@AUTOTARGET: ^AutoTargetAir
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 100

mods/ra/rules/vehicles.yaml

@@ -1,5 +1,6 @@
 V2RL:
 	Inherits: ^Vehicle
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 80
@@ -25,7 +26,6 @@ V2RL:
 	AttackFrontal:
 	SelectionDecorations:
 		VisualBounds: 28,28
-	AutoTarget:
 	Explodes:
 		Weapon: V2Explode
 	WithAttackAnimation:
@@ -36,6 +36,7 @@ V2RL:
 
 1TNK:
 	Inherits: ^Tank
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 50
@@ -68,7 +69,6 @@ V2RL:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 1TNK.Husk
 	ProducibleWithLevel:
@@ -76,6 +76,7 @@ V2RL:
 
 2TNK:
 	Inherits: ^Tank
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 110
@@ -108,7 +109,6 @@ V2RL:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 2TNK.Husk
 	SelectionDecorations:
@@ -118,6 +118,7 @@ V2RL:
 
 3TNK:
 	Inherits: ^Tank
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 120
@@ -150,7 +151,6 @@ V2RL:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 3TNK.Husk
 	SelectionDecorations:
@@ -160,6 +160,7 @@ V2RL:
 
 4TNK:
 	Inherits: ^Tank
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 180
@@ -201,7 +202,6 @@ V2RL:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 4TNK.Husk
 	SelfHealing:
@@ -216,6 +216,7 @@ V2RL:
 
 ARTY:
 	Inherits: ^Tank
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 70
@@ -247,7 +248,6 @@ ARTY:
 		Weapon: ArtilleryExplode
 		EmptyWeapon: UnitExplodeSmall
 		LoadedChance: 75
-	AutoTarget:
 	ProducibleWithLevel:
 		Prerequisites: vehicles.upgraded
 
@@ -340,6 +340,7 @@ MCV:
 
 JEEP:
 	Inherits: ^Vehicle
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
@@ -371,7 +372,6 @@ JEEP:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 1
@@ -382,6 +382,7 @@ JEEP:
 
 APC:
 	Inherits: ^Tank
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 40
@@ -410,7 +411,6 @@ APC:
 		MuzzleSequence: muzzle
 	AttackFrontal:
 	WithMuzzleOverlay:
-	AutoTarget:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 5
@@ -556,6 +556,7 @@ MRJ:
 
 TTNK:
 	Inherits: ^Tank
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 170
@@ -586,12 +587,12 @@ TTNK:
 		Sequence: spinner
 	SelectionDecorations:
 		VisualBounds: 30,30
-	AutoTarget:
 	ProducibleWithLevel:
 		Prerequisites: vehicles.upgraded
 
 FTRK:
 	Inherits: ^Vehicle
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 60
@@ -629,7 +630,6 @@ FTRK:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	SelectionDecorations:
 		VisualBounds: 28,28
 	ProducibleWithLevel:
@@ -666,6 +666,7 @@ DTRK:
 
 CTNK:
 	Inherits: ^Vehicle
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 200
@@ -689,7 +690,6 @@ CTNK:
 		RevealGeneratedShroud: False
 	RevealsShroud@GAPGEN:
 		Range: 4c0
-	AutoTarget:
 	Armament@PRIMARY:
 		Weapon: APTusk
 		LocalOffset: -160,-276,232
@@ -736,6 +736,7 @@ QTNK:
 
 STNK:
 	Inherits: ^Vehicle
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 130