Update cnc AutoTarget definitions.

mods/cnc/maps/gdi06/rules.yaml

@@ -93,6 +93,7 @@ RMBO.easy:
 RMBO.hard:
 	Inherits: RMBO
 	-AutoTarget:
+	-AutoTargetPriority@DEFAULT:
 	-AttackMove:
 	RenderSprites:
 		Image: RMBO

mods/cnc/maps/nod07a/rules.yaml

@@ -19,7 +19,8 @@ Player:
 		Modifier: 0
 
 ^CivBuilding:
-	AutoTargetIgnore:
+	Targetable:
+		TargetTypes: Ground, C4, Structure, NoAutoTarget
 
 CYCL:
 	Buildable:

mods/cnc/maps/nod07c/rules.yaml

@@ -153,3 +153,4 @@ ORCA.IN:
 	RenderSprites:
 		Image: ORCA
 	-AutoTarget:
+	-AutoTargetPriority@DEFAULT:

mods/cnc/maps/nod09/rules.yaml

@@ -193,6 +193,7 @@ RMBO.easy:
 RMBO.hard:
 	Inherits: RMBO
 	-AutoTarget:
+	-AutoTargetPriority@DEFAULT:
 	-AttackMove:
 	RenderSprites:
 		Image: RMBO

mods/cnc/rules/aircraft.yaml

@@ -54,6 +54,7 @@ TRAN:
 HELI:
 	Inherits: ^Helicopter
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Valued:
 		Cost: 1200
 	Tooltip:
@@ -103,7 +104,6 @@ HELI:
 	WithMuzzleOverlay:
 	SpawnActorOnDeath:
 		Actor: HELI.Husk
-	AutoTarget:
 	Explodes:
 		Weapon: HeliExplode
 		EmptyWeapon: HeliExplode
@@ -113,6 +113,7 @@ HELI:
 ORCA:
 	Inherits: ^Helicopter
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Valued:
 		Cost: 1200
 	Tooltip:
@@ -150,7 +151,6 @@ ORCA:
 		SelfReloadDelay: 100
 	SpawnActorOnDeath:
 		Actor: ORCA.Husk
-	AutoTarget:
 	Explodes:
 		Weapon: HeliExplode
 		EmptyWeapon: HeliExplode

mods/cnc/rules/defaults.yaml

@@ -119,6 +119,24 @@
 		RequiresCondition: rank-elite
 		ZOffset: 256
 
+^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
+
 ^AcceptsCloakCrate:
 	Cloak:
 		InitialDelay: 15
@@ -344,8 +362,6 @@
 	Tooltip:
 		GenericName: Soldier
 	Guard:
-	AutoTarget:
-		ScanRadius: 4
 	TakeCover:
 		SpeedModifier: 60
 		DamageModifiers:
@@ -391,6 +407,7 @@
 ^DINO:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^SpriteActor
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Huntable:
 	Health:
 		HP: 1000
@@ -449,6 +466,7 @@
 ^Viceroid:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^SpriteActor
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Huntable:
 	Health:
 		HP: 300
@@ -710,7 +728,6 @@
 		Palette: staticterrain
 	WithWallSpriteBody:
 	GivesExperience:
-	AutoTargetIgnore:
 	Sellable:
 		SellSounds: cashturn.aud
 	Guardable:
@@ -758,7 +775,6 @@
 		Image: burn-l
 		MinimumDamageState: Heavy
 		MaximumDamageState: Dead
-	AutoTargetIgnore:
 	HiddenUnderShroud:
 	ScriptTriggers:
 	HitShape:
@@ -820,7 +836,6 @@
 		Type: Light
 	HiddenUnderFog:
 		Type: CenterPosition
-	AutoTargetIgnore:
 	WithFacingSpriteBody:
 	HitShape:
 
@@ -901,7 +916,6 @@
 
 ^Defense:
 	Inherits: ^BaseBuilding
-	AutoTarget:
 	RenderRangeCircle:
 	RenderDetectionCircle:
 	-GivesBuildableArea:

mods/cnc/rules/infantry.yaml

@@ -1,6 +1,7 @@
 E1:
 	Inherits: ^Soldier
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 100
 	Tooltip:
@@ -13,6 +14,8 @@ E1:
 		Speed: 56
 	Health:
 		HP: 50
+	AutoTarget:
+		ScanRadius: 4
 	Armament:
 		Weapon: M16
 	AttackFrontal:
@@ -23,6 +26,7 @@ E1:
 E2:
 	Inherits: ^Soldier
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 160
 	Tooltip:
@@ -36,6 +40,8 @@ E2:
 		Speed: 71
 	Health:
 		HP: 50
+	AutoTarget:
+		ScanRadius: 4
 	Armament:
 		Weapon: Grenade
 		LocalOffset: 0,0,427
@@ -53,6 +59,7 @@ E2:
 E3:
 	Inherits: ^Soldier
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -80,6 +87,7 @@ E3:
 E4:
 	Inherits: ^Soldier
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 200
 	Tooltip:
@@ -93,6 +101,8 @@ E4:
 		Speed: 56
 	Health:
 		HP: 90
+	AutoTarget:
+		ScanRadius: 4
 	Armament:
 		Weapon: Flamethrower
 		LocalOffset: 341,0,256
@@ -108,6 +118,7 @@ E4:
 E5:
 	Inherits: ^Soldier
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -126,6 +137,8 @@ E5:
 				PathingCost: 90
 	Health:
 		HP: 90
+	AutoTarget:
+		ScanRadius: 4
 	Armament:
 		Weapon: Chemspray
 		LocalOffset: 341,0,256
@@ -160,11 +173,11 @@ E6:
 	Captures:
 		CaptureTypes: building, husk
 		PlayerExperience: 50
-	-AutoTarget:
 
 RMBO:
 	Inherits: ^Soldier
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 2000
 	Tooltip:

mods/cnc/rules/ships.yaml

@@ -1,6 +1,7 @@
 BOAT:
 	Inherits: ^Ship
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Valued:
 		Cost: 300
 	Tooltip:

mods/cnc/rules/structures.yaml

@@ -655,6 +655,7 @@ TMPL:
 
 GUN:
 	Inherits: ^Defense
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -697,6 +698,7 @@ GUN:
 SAM:
 	Inherits: ^Defense
 	Inherits@IDISABLE: ^DisabledOverlay
+	Inherits@AUTOTARGET: ^AutoTargetAir
 	Valued:
 		Cost: 650
 	Tooltip:
@@ -739,6 +741,7 @@ SAM:
 OBLI:
 	Inherits: ^Defense
 	Inherits@IDISABLE: ^DisabledOverlay
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 1500
 	Tooltip:
@@ -782,6 +785,7 @@ OBLI:
 
 GTWR:
 	Inherits: ^Defense
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -818,6 +822,7 @@ GTWR:
 ATWR:
 	Inherits: ^Defense
 	Inherits@IDISABLE: ^DisabledOverlay
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Valued:
 		Cost: 1000
 	Tooltip:

mods/cnc/rules/vehicles.yaml

@@ -82,6 +82,7 @@ APC:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@CLOAK: ^AcceptsCloakCrate
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Valued:
 		Cost: 550
 	Tooltip:
@@ -119,7 +120,6 @@ APC:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 5
@@ -132,6 +132,7 @@ ARTY:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@CLOAK: ^AcceptsCloakCrate
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -169,6 +170,7 @@ FTNK:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@CLOAK: ^AcceptsCloakCrate
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -192,7 +194,6 @@ FTNK:
 		LocalOffset: 512,128,42, 512,-128,42
 		MuzzleSequence: muzzle
 	AttackFrontal:
-	AutoTarget:
 	WithMuzzleOverlay:
 	Explodes:
 		Weapon: FlametankExplode
@@ -204,6 +205,7 @@ BGGY:
 	Inherits: ^Vehicle
 	Inherits@@EXPERIENCE: ^GainsExperience
 	Inherits@CLOAK: ^AcceptsCloakCrate
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -232,7 +234,6 @@ BGGY:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: BGGY.Husk
 
@@ -240,6 +241,7 @@ BIKE:
 	Inherits: ^Vehicle
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@CLOAK: ^AcceptsCloakCrate
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -270,7 +272,6 @@ BIKE:
 		LocalOffset: -128, -170, 170, -128, 170, 170
 		LocalYaw: 100, -100
 	AttackFrontal:
-	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: BIKE.Husk
 
@@ -278,6 +279,7 @@ JEEP:
 	Inherits: ^Vehicle
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@CLOAK: ^AcceptsCloakCrate
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 400
 	Tooltip:
@@ -306,7 +308,6 @@ JEEP:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: JEEP.Husk
 
@@ -314,6 +315,7 @@ LTNK:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@CLOAK: ^AcceptsCloakCrate
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 650
 	Tooltip:
@@ -345,7 +347,6 @@ LTNK:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: LTNK.Husk
 
@@ -353,6 +354,7 @@ MTNK:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@CLOAK: ^AcceptsCloakCrate
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -381,7 +383,6 @@ MTNK:
 	AttackTurreted:
 	WithMuzzleOverlay:
 	WithSpriteTurret:
-	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: MTNK.Husk
 	SelectionDecorations:
@@ -391,6 +392,7 @@ HTNK:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@CLOAK: ^AcceptsCloakCrate
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Valued:
 		Cost: 1500
 	Tooltip:
@@ -428,7 +430,6 @@ HTNK:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	AutoTarget:
 	SelfHealing:
 		Delay: 10
 		HealIfBelow: 50
@@ -442,6 +443,7 @@ MSAM:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@CLOAK: ^AcceptsCloakCrate
+	Inherits@AUTOTARGET: ^AutoTargetAir
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -472,7 +474,6 @@ MSAM:
 	AttackFrontal:
 	WithSpriteTurret:
 		AimSequence: aim
-	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: MSAM.Husk
 
@@ -480,6 +481,7 @@ MLRS:
 	Inherits: ^Tank
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@CLOAK: ^AcceptsCloakCrate
+	Inherits@AUTOTARGET: ^AutoTargetGround
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -523,6 +525,7 @@ MLRS:
 STNK:
 	Inherits: ^Vehicle
 	Inherits@EXPERIENCE: ^GainsExperience
+	Inherits@AUTOTARGET: ^AutoTargetAll
 	Valued:
 		Cost: 900
 	Tooltip: