Cleaned up TD yaml rules.

Streamlined defaults, removed duplications.

mods/cnc/rules/aircraft.yaml

@@ -22,7 +22,6 @@ TRAN:
 		Type: Light
 	RevealsShroud:
 		Range: 10c0
-	WithFacingSpriteBody:
 	WithRotor@PRIMARY:
 		Offset: -597,0,171
 		Sequence: rotor2
@@ -38,8 +37,6 @@ TRAN:
 	Explodes:
 		Weapon: HeliExplode
 		EmptyWeapon: HeliExplode
-	AutoSelectionSize:
-	RenderSprites:
 	SelectionDecorations:
 		VisualBounds: 41,41
 
@@ -81,7 +78,6 @@ HELI:
 		SelfReloads: true
 		ReloadCount: 10
 		SelfReloadTicks: 200
-	WithFacingSpriteBody:
 	WithRotor:
 		Offset: 0,0,85
 	WithMuzzleFlash:
@@ -91,8 +87,6 @@ HELI:
 	Explodes:
 		Weapon: HeliExplode
 		EmptyWeapon: HeliExplode
-	AutoSelectionSize:
-	RenderSprites:
 	SelectionDecorations:
 		VisualBounds: 30,24
 
@@ -131,24 +125,21 @@ ORCA:
 		SelfReloads: true
 		ReloadCount: 2
 		SelfReloadTicks: 100
-	RenderSprites:
-	WithFacingSpriteBody:
 	LeavesHusk:
 		HuskActor: ORCA.Husk
 	AutoTarget:
 	Explodes:
 		Weapon: HeliExplode
 		EmptyWeapon: HeliExplode
-	AutoSelectionSize:
 	WithMoveAnimation:
 		MoveSequence: move
 	SelectionDecorations:
 		VisualBounds: 30,24
 
 C17:
+	Inherits: ^Plane
 	ParaDrop:
 		LZRange: 1
-	Inherits: ^Plane
 	Tooltip:
 		Name: Supply Aircraft
 		Description: Drops vehicle reinforcements on Airstrips
@@ -164,17 +155,10 @@ C17:
 		Type: Heavy
 	HiddenUnderFog:
 		AlwaysVisibleStances: None
-	WithFacingSpriteBody:
 	Cargo:
 		MaxWeight: 10
 		PipCount: 10
 	Invulnerable:
-	-Selectable:
-	-Voiced:
-	-TargetableUnit:
-	-GainsExperience:
-	FlyAwayOnIdle:
-	RejectsOrders:
 	Contrail@1:
 		Offset: -261,-650,0
 		TrailLength: 15
@@ -187,8 +171,6 @@ C17:
 	Contrail@4:
 		Offset: -261,650,0
 		TrailLength: 15
-	AutoSelectionSize:
-	RenderSprites:
 
 A10:
 	Inherits: ^Plane
@@ -205,7 +187,6 @@ A10:
 		HP: 150
 	Armor:
 		Type: Heavy
-	WithFacingSpriteBody:
 	AttackBomber:
 		Armaments: gun, bombs
 		Guns: gun
@@ -219,20 +200,12 @@ A10:
 		Name: bombs
 		Weapon: Napalm
 		LocalOffset: 0,-256,-43, 0,256,-43
-	-Selectable:
-	-Voiced:
-	-TargetableUnit:
-	-GainsExperience:
-	FlyAwayOnIdle:
-	RejectsOrders:
 	Contrail@1:
 		Offset: -640,171,0
 		TrailLength: 15
 	Contrail@2:
 		Offset: -640,-171,0
 		TrailLength: 15
-	AutoSelectionSize:
-	RenderSprites:
 
 TRAN.Husk:
 	Inherits: ^HelicopterHusk
@@ -247,8 +220,6 @@ TRAN.Husk:
 		Offset: -597,0,171
 	WithRotor@SECONDARY:
 		Offset: 597,0,85
-	WithFacingSpriteBody:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: tran
 
@@ -263,8 +234,6 @@ HELI.Husk:
 		Range: 10c0
 	WithRotor:
 		Offset: 0,0,85
-	WithFacingSpriteBody:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: heli
 
@@ -277,8 +246,6 @@ ORCA.Husk:
 		Speed: 186
 	RevealsShroud:
 		Range: 10c0
-	WithFacingSpriteBody:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: orca
 

mods/cnc/rules/civilian.yaml

@@ -420,65 +420,9 @@ C10:
 		VoiceSet: CivilianFemaleVoice
 
 VICE:
-	AppearsOnRadar:
+	Inherits: ^Viceroid
-	Health:
-		Radius: 427
-		HP: 300
-	Armor:
-		Type: Wood
-	RevealsShroud:
-		Range: 6c0
-	Mobile:
-		Speed: 71
-		TerrainSpeeds:
-			Clear: 70
-			Rough: 60
-			Road: 70
-			Tiberium: 100
-			BlueTiberium: 100
-			Beach: 60
-		Voice: Move
-	SelectionDecorations:
-		VisualBounds: 24,24
-	Selectable:
-		Bounds: 24,24
-	TargetableUnit:
-		TargetTypes: Ground
-	AutoTarget:
-		ScanRadius: 5
-	AttackMove:
-		Voice: Attack
-	HiddenUnderFog:
-	GivesExperience:
-	Valued:
-		Cost: 1000
-	Tooltip:
-		Name: Visceroid
-	Armament:
-		Weapon: Chemspray
-		LocalOffset: 384,0,0
-		MuzzleSequence: muzzle
-		MuzzleSplitFacings: 8
-	AttackFrontal:
-		Voice: Attack
 	AttackWander:
 		WanderMoveRadius: 2
 		MinMoveDelayInTicks: 25
 		MaxMoveDelayInTicks: 45
-	WithFacingSpriteBody:
-	WithMuzzleFlash:
-		SplitFacings: true
-	CombatDebugOverlay:
-	Guard:
-		Voice: Move
-	Guardable:
-	UpdatesPlayerStatistics:
-	BodyOrientation:
-		QuantizedFacings: 8
-	PoisonedByTiberium:
-		Weapon: Heal
-	Voiced:
-		VoiceSet: DinoVoice
-	AutoSelectionSize:
-	RenderSprites:
 

mods/cnc/rules/defaults.yaml

@@ -1,3 +1,13 @@
+^ExistsInWorld:
+	AppearsOnRadar:
+	UpdatesPlayerStatistics:
+	CombatDebugOverlay:
+	GivesExperience:
+	BodyOrientation:
+	ScriptTriggers:
+	UpgradeManager:
+	Huntable:
+
 ^GainsExperience:
 	GainsExperience:
 	GainsStatUpgrades:
@@ -20,8 +30,8 @@
 		UpgradeMaxAcceptedLevel: 4
 
 ^Vehicle:
-	Inherits: ^GainsExperience
+	Inherits@1: ^ExistsInWorld
-	AppearsOnRadar:
+	Inherits@2: ^GainsExperience
 	Mobile:
 		Crushes: crate
 		TerrainSpeeds:
@@ -40,19 +50,21 @@
 	Repairable:
 	Passenger:
 		CargoType: Vehicle
-	HiddenUnderFog:
-	GivesExperience:
-	DrawLineToTarget:
 	ActorLostNotification:
+	HiddenUnderFog:
 	AttackMove:
+	DrawLineToTarget:
 	WithSmoke:
-	CombatDebugOverlay:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
+	Explodes:
+		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
 	Guard:
 	Guardable:
-	BodyOrientation:
 	Tooltip:
 		GenericName: Vehicle
-	UpdatesPlayerStatistics:
 	Cloak:
 		UpgradeTypes: cloak
 		UpgradeMinEnabledLevel: 1
@@ -60,16 +72,12 @@
 		CloakDelay: 90
 		CloakSound: trans1.aud
 		UncloakSound: trans1.aud
-	Huntable:
-	ScriptTriggers:
-	UpgradeManager:
 	MustBeDestroyed:
 	Voiced:
 		VoiceSet: VehicleVoice
 
 ^Tank:
-	Inherits: ^GainsExperience
+	Inherits: ^Vehicle
-	AppearsOnRadar:
 	Mobile:
 		Crushes: wall, crate, infantry
 		TerrainSpeeds:
@@ -80,46 +88,12 @@
 			BlueTiberium: 70
 			Beach: 70
 		ROT: 5
-	SelectionDecorations:
-	Selectable:
-		Bounds: 24,24
-	TargetableUnit:
-		TargetTypes: Ground, Vehicle
-	Repairable:
-	Passenger:
-		CargoType: Vehicle
-	HiddenUnderFog:
-	GivesExperience:
-	DrawLineToTarget:
-	ActorLostNotification:
-	AttackMove:
-	WithSmoke:
-	Explodes:
-		Weapon: UnitExplodeSmall
-		EmptyWeapon: UnitExplodeSmall
-	CombatDebugOverlay:
-	Guard:
-	Guardable:
-	BodyOrientation:
 	Tooltip:
 		GenericName: Tank
-	UpdatesPlayerStatistics:
-	Cloak:
-		UpgradeTypes: cloak
-		UpgradeMinEnabledLevel: 1
-		InitialDelay: 15
-		CloakDelay: 90
-		CloakSound: trans1.aud
-		UncloakSound: trans1.aud
-	Huntable:
-	ScriptTriggers:
-	UpgradeManager:
-	MustBeDestroyed:
-	Voiced:
-		VoiceSet: VehicleVoice
 
 ^Helicopter:
-	Inherits: ^GainsExperience
+	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^GainsExperience
 	AppearsOnRadar:
 		UseLocation: yes
 	TargetableAircraft:
@@ -133,23 +107,19 @@
 		RearmBuildings:
 		LandWhenIdle: false
 	HiddenUnderFog:
-	GivesExperience:
-	DrawLineToTarget:
 	ActorLostNotification:
 	Explodes:
 		Weapon: HeliExplode
 		EmptyWeapon: HeliExplode
-	CombatDebugOverlay:
 	AttackMove:
+	DrawLineToTarget:
 	Guard:
 	Guardable:
-	BodyOrientation:
-	UpdatesPlayerStatistics:
-	Huntable:
-	ScriptTriggers:
 	Tooltip:
 		GenericName: Helicopter
-	UpgradeManager:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
 	WithShadow:
 	Hovers:
 	MustBeDestroyed:
@@ -157,16 +127,14 @@
 		VoiceSet: VehicleVoice
 
 ^Infantry:
-	Inherits: ^GainsExperience
+	Inherits@1: ^ExistsInWorld
-	AppearsOnRadar:
+	Inherits@2: ^GainsExperience
 	Health:
 		Radius: 128
 	Armor:
 		Type: None
 	RevealsShroud:
 		Range: 5c0
-	AutoTarget:
-		ScanRadius: 4
 	Mobile:
 		Crushes: crate
 		SharesCell: true
@@ -184,11 +152,6 @@
 		Bounds: 12,17,0,-6
 	TargetableUnit:
 		TargetTypes: Ground, Infantry
-	TakeCover:
-		SpeedModifier: 60
-		DamageModifiers:
-			Prone50Percent: 50
-		DamageTriggers: TriggerProne
 	RenderSprites:
 	WithInfantryBody:
 	WithDeathAnimation:
@@ -201,24 +164,18 @@
 			TiberiumDeath: 6
 		CrushedSequence: die-crushed
 	AttackMove:
+	DrawLineToTarget:
 	Passenger:
 		CargoType: Infantry
 	HiddenUnderFog:
 	PoisonedByTiberium:
-	GivesExperience:
-	DrawLineToTarget:
 	ActorLostNotification:
 	SpawnViceroid:
 		Probability: 10
 	Crushable:
 		WarnProbability: 67
 		CrushSound: squish2.aud
-	CombatDebugOverlay:
-	Guard:
 	Guardable:
-	BodyOrientation:
-	Tooltip:
-		GenericName: Soldier
 	SelfHealing@HOSPITAL:
 		Step: 5
 		Ticks: 100
@@ -229,11 +186,8 @@
 	GlobalUpgradable:
 		Upgrades: hospitalheal
 		Prerequisites: hosp
-	UpdatesPlayerStatistics:
-	Huntable:
 	DetectCloaked:
 		Range: 1
-	ScriptTriggers:
 	DeathSounds@NORMAL:
 		DeathTypes: DefaultDeath, BulletDeath, SmallExplosionDeath, ExplosionDeath
 	DeathSounds@BURNED:
@@ -242,16 +196,28 @@
 	DeathSounds@POISONED:
 		Voice: Poisoned
 		DeathTypes: TiberiumDeath
-	UpgradeManager:
-	MustBeDestroyed:
 	Voiced:
 		VoiceSet: GenericVoice
 
+^Soldier:
+	Inherits: ^Infantry
+	MustBeDestroyed:
+	Tooltip:
+		GenericName: Soldier
+	Guard:
+	AutoTarget:
+		ScanRadius: 4
+	TakeCover:
+		SpeedModifier: 60
+		DamageModifiers:
+			Prone50Percent: 50
+		DamageTriggers: TriggerProne
+	WithInfantryBody:
+		IdleSequences: idle1, idle2
+		StandSequences: stand, stand2
+
 ^CivInfantry:
 	Inherits: ^Infantry
-	-AutoTarget:
-	-TakeCover:
-	AppearsOnRadar:
 	Valued:
 		Cost: 70
 	Tooltip:
@@ -278,7 +244,7 @@
 		AttackSequence: shoot
 
 ^DINO:
-	AppearsOnRadar:
+	Inherits: ^ExistsInWorld
 	Health:
 		Radius: 128
 		HP: 1000
@@ -310,54 +276,96 @@
 	TargetableUnit:
 		TargetTypes: Ground, Infantry
 	HiddenUnderFog:
-	GivesExperience:
 	WithInfantryBody:
 		AttackSequence: attack
 	WithDeathAnimation:
 		UseDeathTypeSuffix: false
-	BodyOrientation:
-	DrawLineToTarget:
 	AutoTarget:
 		ScanRadius: 4
 	AttackMove:
 		Voice: Attack
 	AttackFrontal:
 		Voice: Attack
-	UpdatesPlayerStatistics:
+	DrawLineToTarget:
-	Huntable:
-	ScriptTriggers:
 	DeathSounds:
 	RenderSprites:
 		Palette: terrain
 	Voiced:
 		VoiceSet: DinoVoice
 
-^Plane:
+^Viceroid:
-	Inherits: ^GainsExperience
+	Inherits: ^ExistsInWorld
-	AppearsOnRadar:
+	Health:
-		UseLocation: yes
+		Radius: 427
+		HP: 300
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 6c0
+	Mobile:
+		Voice: Move
+		Speed: 71
+		TerrainSpeeds:
+			Clear: 70
+			Rough: 60
+			Road: 70
+			Tiberium: 100
+			BlueTiberium: 100
+			Beach: 60
 	SelectionDecorations:
 	Selectable:
 		Bounds: 24,24
 	TargetableUnit:
-		TargetTypes: Air
+		TargetTypes: Ground
-	HiddenUnderFog:
+	AutoTarget:
-	GivesExperience:
+		ScanRadius: 5
-	DrawLineToTarget:
-	ActorLostNotification:
-	CombatDebugOverlay:
-	BodyOrientation:
-	Huntable:
 	AttackMove:
-	ScriptTriggers:
+		Voice: Attack
-	UpgradeManager:
+	DrawLineToTarget:
-	WithShadow:
+	HiddenUnderFog:
+	Valued:
+		Cost: 1000
+	Tooltip:
+		Name: Visceroid
+	Armament:
+		Weapon: Chemspray
+		LocalOffset: 384,0,0
+		MuzzleSequence: muzzle
+		MuzzleSplitFacings: 8
+	AttackFrontal:
+		Voice: Attack
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
+	WithMuzzleFlash:
+		SplitFacings: true
+	Guard:
+		Voice: Move
+	Guardable:
+	BodyOrientation:
+		QuantizedFacings: 8
+	PoisonedByTiberium:
+		Weapon: Heal
 	Voiced:
-		VoiceSet: GenericVoice
+		VoiceSet: DinoVoice
+
+^Plane:
+	Inherits: ^ExistsInWorld
+	AppearsOnRadar:
+		UseLocation: yes
+	HiddenUnderFog:
+	ActorLostNotification:
+	AttackMove:
+	WithShadow:
+	WithFacingSpriteBody:
+	RenderSprites:
+	AutoSelectionSize:
+	FlyAwayOnIdle:
+	RejectsOrders:
 
 ^Ship:
-	Inherits: ^GainsExperience
+	Inherits@1: ^ExistsInWorld
-	AppearsOnRadar:
+	Inherits@2: ^GainsExperience
 	Mobile:
 		Crushes: crate
 		TerrainSpeeds:
@@ -367,23 +375,16 @@
 	TargetableUnit:
 		TargetTypes: Ground, Water
 	HiddenUnderFog:
-	GivesExperience:
-	DrawLineToTarget:
 	ActorLostNotification:
 	AttackMove:
-	CombatDebugOverlay:
+	DrawLineToTarget:
 	Guard:
 	Guardable:
-	BodyOrientation:
-	UpdatesPlayerStatistics:
-	Huntable:
-	ScriptTriggers:
-	UpgradeManager:
 	Voiced:
 		VoiceSet: VehicleVoice
 
 ^Building:
-	AppearsOnRadar:
+	Inherits: ^ExistsInWorld
 	SelectionDecorations:
 	Selectable:
 		Priority: 3
@@ -392,42 +393,34 @@
 	Armor:
 		Type: Wood
 	Building:
-		Adjacent: 4
-		RequiresBaseProvider: true
 		Dimensions: 1,1
 		Footprint: x
-		BuildSounds: constru2.aud, hvydoor1.aud
-		TerrainTypes: Clear,Road
 	SoundOnDamageTransition:
 		DamagedSounds: xplos.aud
 		DestroyedSounds: crumble.aud
 	RenderBuilding:
 	WithBuildingExplosion:
 		Delay: 1
-	EmitInfantryOnSell:
-		ActorTypes: e6,e1
-	GivesExperience:
 	CaptureNotification:
 		Notification: BuildingCaptured
 		NewOwnerVoice: no
 	ActorLostNotification:
 		Notification: BuildingLost
 	ShakeOnDeath:
-	CombatDebugOverlay:
 	Guardable:
 		Range: 3
-	BodyOrientation:
 	Tooltip:
 		GenericName: Structure
 	FrozenUnderFog:
-	UpdatesPlayerStatistics:
-	Huntable:
 	Demolishable:
-	ScriptTriggers:
-	WithMakeAnimation:
 
 ^BaseBuilding:
 	Inherits: ^Building
+	Building:
+		Adjacent: 4
+		RequiresBaseProvider: true
+		BuildSounds: constru2.aud, hvydoor1.aud
+		TerrainTypes: Clear,Road
 	MustBeDestroyed:
 		RequiredForShortGame: true
 	RepairableBuilding:
@@ -437,24 +430,24 @@
 		DeathSequence: dead
 		UseDeathTypeSuffix: false
 	GivesBuildableArea:
+	EmitInfantryOnSell:
+		ActorTypes: e6,e1,e1,e1
 	EngineerRepairable:
 	Sellable:
 		SellSounds: cashturn.aud
 	Capturable:
+	WithMakeAnimation:
 
 ^CivBuilding:
 	Inherits: ^Building
+	-UpgradeManager:
 	Health:
 		HP: 400
-	Armor:
-		Type: Wood
-	Building:
 	Tooltip:
 		Name: Civilian Building
 		GenericVisibility: None
 	FrozenUnderFog:
 		StartsRevealed: true
-	-WithMakeAnimation:
 
 ^CivBuildingHusk:
 	AppearsOnRadar:
@@ -593,43 +586,49 @@
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
 
-^Husk:
+^CommonHuskDefaults:
 	Health:
 		HP: 140
 	Armor:
 		Type: Light
+	HiddenUnderFog:
+	AutoTargetIgnore:
+	BodyOrientation:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
+
+^Husk:
+	Inherits: ^CommonHuskDefaults
 	Husk:
 		AllowedTerrain: Clear, Rough, Road, Tiberium, BlueTiberium, Beach
-	HiddenUnderFog:
 	Burns:
 		Interval: 2
 	TargetableUnit:
 		RequiresForceFire: yes
 		TargetTypes: Ground
-	AutoTargetIgnore:
 	Capturable:
 		Type: husk
 		AllowAllies: yes
 		CaptureThreshold: 1.0
 	TransformOnCapture:
 		ForceHealthPercentage: 25
-	BodyOrientation:
 	Tooltip:
 		GenericName: Destroyed Vehicle
 	DisabledOverlay:
 	ScriptTriggers:
+	Explodes:
+		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
 
 ^HelicopterHusk:
-	Inherits: ^Husk
+	Inherits: ^CommonHuskDefaults
-	-Husk:
-	-Burns:
 	FallsToEarth:
 		Spins: True
 		Moves: False
 		Explosion: HeliCrash
-	-Capturable:
+	Tooltip:
-	-TransformOnCapture:
+		GenericName: Destroyed Helicopter
-	-TargetableUnit:
 
 ^Bridge:
 	HiddenUnderShroud:

mods/cnc/rules/husks.yaml

@@ -3,10 +3,8 @@ MCV.Husk:
 	Tooltip:
 		Name: Mobile Construction Vehicle (Destroyed)
 		Icon: mcvicnh
-	WithFacingSpriteBody:
 	TransformOnCapture:
 		IntoActor: mcv
-	AutoSelectionSize:
 	RenderSprites:
 		Image: mcv.destroyed
 
@@ -15,10 +13,8 @@ HARV.Husk:
 	Tooltip:
 		Name: Harvester (Destroyed)
 		Icon: harvicnh
-	WithFacingSpriteBody:
 	TransformOnCapture:
 		IntoActor: harv
-	AutoSelectionSize:
 	RenderSprites:
 		Image: harv.destroyed
 
@@ -27,10 +23,8 @@ APC.Husk:
 	Tooltip:
 		Name: APC (Destroyed)
 		Icon: apcicnh
-	WithFacingSpriteBody:
 	TransformOnCapture:
 		IntoActor: apc
-	AutoSelectionSize:
 	RenderSprites:
 		Image: apc.destroyed
 
@@ -39,10 +33,8 @@ FTNK.Husk:
 	Tooltip:
 		Name: Flame Tank (Destroyed)
 		Icon: ftnkicnh
-	WithFacingSpriteBody:
 	TransformOnCapture:
 		IntoActor: ftnk
-	AutoSelectionSize:
 	RenderSprites:
 		Image: ftnk.destroyed
 
@@ -51,10 +43,8 @@ ARTY.Husk:
 	Tooltip:
 		Name: Artillery (Destroyed)
 		Icon: artyicnh
-	WithFacingSpriteBody:
 	TransformOnCapture:
 		IntoActor: arty
-	AutoSelectionSize:
 	RenderSprites:
 		Image: arty.destroyed
 
@@ -63,10 +53,8 @@ BGGY.Husk:
 	Tooltip:
 		Name: Nod Buggy (Destroyed)
 		Icon: bggyicnh
-	WithFacingSpriteBody:
 	TransformOnCapture:
 		IntoActor: bggy
-	AutoSelectionSize:
 	RenderSprites:
 		Image: bggy.destroyed
 
@@ -75,10 +63,8 @@ BIKE.Husk:
 	Tooltip:
 		Name: Recon Bike (Destroyed)
 		Icon: bikeicnh
-	WithFacingSpriteBody:
 	TransformOnCapture:
 		IntoActor: bike
-	AutoSelectionSize:
 	RenderSprites:
 		Image: bike.destroyed
 
@@ -87,10 +73,8 @@ JEEP.Husk:
 	Tooltip:
 		Name: Hum-Vee (Destroyed)
 		Icon: jeepicnh
-	WithFacingSpriteBody:
 	TransformOnCapture:
 		IntoActor: jeep
-	AutoSelectionSize:
 	RenderSprites:
 		Image: jeep.destroyed
 
@@ -99,12 +83,10 @@ LTNK.Husk:
 	Tooltip:
 		Name: Light Tank (Destroyed)
 		Icon: ltnkicnh
-	WithFacingSpriteBody:
 	ThrowsParticle@turret:
 		Anim: turret
 	TransformOnCapture:
 		IntoActor: ltnk
-	AutoSelectionSize:
 	RenderSprites:
 		Image: ltnk.destroyed
 
@@ -113,12 +95,10 @@ MTNK.Husk:
 	Tooltip:
 		Name: Medium Tank (Destroyed)
 		Icon: mtnkicnh
-	WithFacingSpriteBody:
 	ThrowsParticle@turret:
 		Anim: turret
 	TransformOnCapture:
 		IntoActor: mtnk
-	AutoSelectionSize:
 	RenderSprites:
 		Image: mtnk.destroyed
 
@@ -127,12 +107,10 @@ HTNK.Husk:
 	Tooltip:
 		Name: Mammoth Tank (Destroyed)
 		Icon: htnkicnh
-	WithFacingSpriteBody:
 	ThrowsParticle@turret:
 		Anim: turret
 	TransformOnCapture:
 		IntoActor: htnk
-	AutoSelectionSize:
 	RenderSprites:
 		Image: htnk.destroyed
 
@@ -141,12 +119,10 @@ MSAM.Husk:
 	Tooltip:
 		Name: Rocket Launcher (Destroyed)
 		Icon: msamicnh
-	WithFacingSpriteBody:
 	ThrowsParticle@turret:
 		Anim: turret
 	TransformOnCapture:
 		IntoActor: msam
-	AutoSelectionSize:
 	RenderSprites:
 		Image: msam.destroyed
 
@@ -155,12 +131,10 @@ MLRS.Husk:
 	Tooltip:
 		Name: Mobile S.A.M. (Destroyed)
 		Icon: mlrsicnh
-	WithFacingSpriteBody:
 	ThrowsParticle@turret:
 		Anim: turret
 	TransformOnCapture:
 		IntoActor: mlrs
-	AutoSelectionSize:
 	RenderSprites:
 		Image: mlrs.destroyed
 
@@ -169,10 +143,8 @@ STNK.Husk:
 	Tooltip:
 		Name: Stealth Tank (Destroyed)
 		Icon: stnkicnh
-	WithFacingSpriteBody:
 	TransformOnCapture:
 		IntoActor: stnk
-	AutoSelectionSize:
 	RenderSprites:
 		Image: stnk.destroyed
 

mods/cnc/rules/infantry.yaml

@@ -1,5 +1,5 @@
 E1:
-	Inherits: ^Infantry
+	Inherits: ^Soldier
 	Valued:
 		Cost: 100
 	Tooltip:
@@ -15,14 +15,12 @@ E1:
 	Armament:
 		Weapon: M16
 	AttackFrontal:
-	TakeCover:
 	WithInfantryBody:
 		IdleSequences: idle1,idle2,idle3,idle4
-		StandSequences: stand, stand2
 		AttackSequence: shoot
 
 E2:
-	Inherits: ^Infantry
+	Inherits: ^Soldier
 	Valued:
 		Cost: 160
 	Tooltip:
@@ -41,18 +39,15 @@ E2:
 		LocalOffset: 0,0,427
 		FireDelay: 15
 	AttackFrontal:
-	TakeCover:
 	WithInfantryBody:
 		AttackSequence: throw
-		IdleSequences: idle1,idle2
-		StandSequences: stand, stand2
 	Explodes:
 		Weapon: GrenadierExplode
 		EmptyWeapon: GrenadierExplode
 		Chance: 50
 
 E3:
-	Inherits: ^Infantry
+	Inherits: ^Soldier
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -72,14 +67,11 @@ E3:
 		LocalOffset: 256,43,341
 		FireDelay: 5
 	AttackFrontal:
-	TakeCover:
 	WithInfantryBody:
 		AttackSequence: shoot
-		IdleSequences: idle1,idle2
-		StandSequences: stand, stand2
 
 E4:
-	Inherits: ^Infantry
+	Inherits: ^Soldier
 	Valued:
 		Cost: 200
 	Tooltip:
@@ -102,14 +94,11 @@ E4:
 	AttackFrontal:
 	WithMuzzleFlash:
 		SplitFacings: true
-	TakeCover:
 	WithInfantryBody:
 		AttackSequence: shoot
-		IdleSequences: idle1,idle2
-		StandSequences: stand, stand2
 
 E5:
-	Inherits: ^Infantry
+	Inherits: ^Soldier
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -138,14 +127,11 @@ E5:
 	WithMuzzleFlash:
 		SplitFacings: true
 	-PoisonedByTiberium:
-	TakeCover:
 	WithInfantryBody:
-		IdleSequences: idle1,idle2
-		StandSequences: stand, stand2
 		AttackSequence: shoot
 
 E6:
-	Inherits: ^Infantry
+	Inherits: ^Soldier
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -165,14 +151,10 @@ E6:
 	Captures:
 		CaptureTypes: building, husk
 	-AutoTarget:
-	TakeCover:
-	WithInfantryBody:
-		IdleSequences: idle1,idle2
-		StandSequences: stand, stand2
 	-GainsExperience:
 
 RMBO:
-	Inherits: ^Infantry
+	Inherits: ^Soldier
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -205,19 +187,16 @@ RMBO:
 		Voice: Attack
 	AttackMove:
 		Voice: Attack
-	TakeCover:
 	WithInfantryBody:
 		AttackSequence: shoot
 		IdleSequences: idle1,idle2,idle3
-		StandSequences: stand, stand2
 	AnnounceOnBuild:
 	AnnounceOnKill:
 	Voiced:
 		VoiceSet: CommandoVoice
 
 PVICE:
-	Inherits: VICE
+	Inherits: ^Viceroid
-	-AttackWander:
 	Mobile:
 		Crushes: crate
 	Buildable:
@@ -225,8 +204,6 @@ PVICE:
 		BuildPaletteOrder: 40
 	Tooltip:
 		Description: Mutated abomination that spits liquid tiberium.\n  Strong vs Infantry, Buildings\n  Weak vs Aircraft
-	DrawLineToTarget:
-	SelectionDecorations:
 	ActorLostNotification:
 
 STEG:

mods/cnc/rules/vehicles.yaml

@@ -26,7 +26,6 @@ MCV:
 		Facing: 108
 		TransformSounds: constru2.aud, hvydoor1.aud
 		NoTransformNotification: BuildingCannotPlaceAudio
-	WithFacingSpriteBody:
 	MustBeDestroyed:
 		RequiredForShortGame: true
 	BaseBuilding:
@@ -34,11 +33,6 @@ MCV:
 		HuskActor: MCV.Husk
 	-GainsExperience:
 	-Cloak:
-	Explodes:
-		Weapon: UnitExplodeSmall
-		EmptyWeapon: UnitExplodeSmall
-	AutoSelectionSize:
-	RenderSprites:
 	SelectionDecorations:
 		VisualBounds: 36,36
 
@@ -76,6 +70,9 @@ HARV:
 	LeavesHusk:
 		HuskActor: HARV.Husk
 	-GainsExperience:
+	-RenderSprites:
+	-WithFacingSpriteBody:
+	-AutoSelectionSize:
 	RenderHarvester:
 	Explodes:
 		Weapon: TiberiumExplosion
@@ -119,7 +116,6 @@ APC:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	WithFacingSpriteBody:
 	WithTurret:
 	AutoTarget:
 	Cargo:
@@ -128,8 +124,6 @@ APC:
 		PipCount: 5
 	LeavesHusk:
 		HuskActor: APC.Husk
-	AutoSelectionSize:
-	RenderSprites:
 
 ARTY:
 	Inherits: ^Tank
@@ -157,13 +151,10 @@ ARTY:
 		MuzzleSequence: muzzle
 	AttackFrontal:
 	WithMuzzleFlash:
-	WithFacingSpriteBody:
 	AutoTarget:
 		InitialStance: Defend
 	LeavesHusk:
 		HuskActor: ARTY.Husk
-	AutoSelectionSize:
-	RenderSprites:
 
 FTNK:
 	Inherits: ^Tank
@@ -191,7 +182,6 @@ FTNK:
 		MuzzleSequence: muzzle
 		MuzzleSplitFacings: 8
 	AttackFrontal:
-	WithFacingSpriteBody:
 	AutoTarget:
 	WithMuzzleFlash:
 		SplitFacings: true
@@ -200,8 +190,6 @@ FTNK:
 		EmptyWeapon: FlametankExplode
 	LeavesHusk:
 		HuskActor: FTNK.Husk
-	AutoSelectionSize:
-	RenderSprites:
 
 BGGY:
 	Inherits: ^Vehicle
@@ -232,13 +220,10 @@ BGGY:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	WithFacingSpriteBody:
 	WithTurret:
 	AutoTarget:
 	LeavesHusk:
 		HuskActor: BGGY.Husk
-	AutoSelectionSize:
-	RenderSprites:
 
 BIKE:
 	Inherits: ^Vehicle
@@ -272,12 +257,9 @@ BIKE:
 		LocalOffset: -128, -170, 170, -128, 170, 170
 		LocalYaw: 100, -100
 	AttackFrontal:
-	WithFacingSpriteBody:
 	AutoTarget:
 	LeavesHusk:
 		HuskActor: BIKE.Husk
-	AutoSelectionSize:
-	RenderSprites:
 
 JEEP:
 	Inherits: ^Vehicle
@@ -308,13 +290,10 @@ JEEP:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	WithFacingSpriteBody:
 	WithTurret:
 	AutoTarget:
 	LeavesHusk:
 		HuskActor: JEEP.Husk
-	AutoSelectionSize:
-	RenderSprites:
 
 LTNK:
 	Inherits: ^Tank
@@ -346,16 +325,10 @@ LTNK:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	WithFacingSpriteBody:
 	WithTurret:
 	AutoTarget:
 	LeavesHusk:
 		HuskActor: LTNK.Husk
-	Explodes:
-		Weapon: UnitExplodeSmall
-		EmptyWeapon: UnitExplodeSmall
-	AutoSelectionSize:
-	RenderSprites:
 
 MTNK:
 	Inherits: ^Tank
@@ -386,16 +359,10 @@ MTNK:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	WithFacingSpriteBody:
 	WithTurret:
 	AutoTarget:
 	LeavesHusk:
 		HuskActor: MTNK.Husk
-	Explodes:
-		Weapon: UnitExplodeSmall
-		EmptyWeapon: UnitExplodeSmall
-	AutoSelectionSize:
-	RenderSprites:
 	SelectionDecorations:
 		VisualBounds: 28,28
 
@@ -437,7 +404,6 @@ HTNK:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	WithFacingSpriteBody:
 	WithTurret:
 	AutoTarget:
 	SelfHealing:
@@ -446,11 +412,6 @@ HTNK:
 		DamageCooldown: 200
 	LeavesHusk:
 		HuskActor: HTNK.Husk
-	Explodes:
-		Weapon: UnitExplodeSmall
-		EmptyWeapon: UnitExplodeSmall
-	AutoSelectionSize:
-	RenderSprites:
 	SelectionDecorations:
 		VisualBounds: 34,34,0,-3
 
@@ -484,14 +445,11 @@ MSAM:
 		Weapon: 227mm
 		LocalOffset: 213,-128,0, 213,128,0
 	AttackFrontal:
-	WithFacingSpriteBody:
 	WithTurret:
 		AimSequence: aim
 	AutoTarget:
 	LeavesHusk:
 		HuskActor: MSAM.Husk
-	AutoSelectionSize:
-	RenderSprites:
 
 MLRS:
 	Inherits: ^Tank
@@ -521,19 +479,13 @@ MLRS:
 		Weapon: Patriot
 		LocalOffset: 0,-171,0, 0,171,0
 	AttackTurreted:
-	WithFacingSpriteBody:
 	WithTurret:
 		AimSequence: aim
 	AutoTarget:
 		InitialStance: Defend
-	Explodes:
-		Weapon: UnitExplodeSmall
-		EmptyWeapon: UnitExplodeSmall
 	RenderRangeCircle:
 	LeavesHusk:
 		HuskActor: MLRS.Husk
-	AutoSelectionSize:
-	RenderSprites:
 
 STNK:
 	Inherits: ^Vehicle
@@ -566,15 +518,12 @@ STNK:
 		Weapon: 227mm.stnk
 		LocalOffset: 213,43,128, 213,-43,128
 	AttackFrontal:
-	WithFacingSpriteBody:
 	AutoTarget:
 		InitialStance: HoldFire
 	TargetableUnit:
 	LeavesHusk:
 		HuskActor: STNK.Husk
 	-MustBeDestroyed:
-	AutoSelectionSize:
-	RenderSprites:
 
 MHQ:
 	Inherits: ^Vehicle
@@ -582,7 +531,7 @@ MHQ:
 		Cost: 1000
 	Tooltip:
 		Name: Mobile HQ
-		Description: Base of operations
+		Description: Mobile base of operations
 	Health:
 		HP: 200
 	Armor:
@@ -591,13 +540,7 @@ MHQ:
 		Speed: 85
 	RevealsShroud:
 		Range: 6c0
-	WithFacingSpriteBody:
 	WithIdleOverlay@SPINNER:
 		Sequence: spinner
 		Offset: -256,0,256
-	Explodes:
-		Weapon: UnitExplodeSmall
-		EmptyWeapon: UnitExplodeSmall
-	AutoSelectionSize:
-	RenderSprites: