Merge pull request #9241 from reaperrr/streamline-bo-yaml

Added ^SpriteActor and fixed remaining BodyOrientation regressions

mods/cnc/rules/defaults.yaml

@@ -3,11 +3,16 @@
 	UpdatesPlayerStatistics:
 	CombatDebugOverlay:
 	GivesExperience:
-	BodyOrientation:
 	ScriptTriggers:
 	UpgradeManager:
 	Huntable:
 
+^SpriteActor:
+	BodyOrientation:
+	QuantizeFacingsFromSequence:
+	AutoSelectionSize:
+	RenderSprites:
+
 ^GainsExperience:
 	GainsExperience:
 		Upgrades:
@@ -51,6 +56,7 @@
 ^Vehicle:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
+	Inherits@3: ^SpriteActor
 	Mobile:
 		Crushes: crate
 		TerrainSpeeds:
@@ -74,10 +80,7 @@
 	AttackMove:
 	DrawLineToTarget:
 	WithSmoke:
-	RenderSprites:
-	QuantizeFacingsFromSequence:
 	WithFacingSpriteBody:
-	AutoSelectionSize:
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
@@ -114,6 +117,7 @@
 ^Helicopter:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
+	Inherits@3: ^SpriteActor
 	AppearsOnRadar:
 		UseLocation: yes
 	Targetable@GROUND:
@@ -144,10 +148,7 @@
 	Guardable:
 	Tooltip:
 		GenericName: Helicopter
-	QuantizeFacingsFromSequence:
 	WithFacingSpriteBody:
-	AutoSelectionSize:
-	RenderSprites:
 	WithShadow:
 	Hovers:
 	MustBeDestroyed:
@@ -157,6 +158,7 @@
 ^Infantry:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
+	Inherits@3: ^SpriteActor
 	Health:
 		Radius: 128
 	Armor:
@@ -180,7 +182,6 @@
 		Bounds: 12,17,0,-6
 	Targetable:
 		TargetTypes: Ground, Infantry
-	RenderSprites:
 	QuantizeFacingsFromSequence:
 		Sequence: stand
 	WithInfantryBody:
@@ -279,7 +280,8 @@
 		AttackSequence: shoot
 
 ^DINO:
-	Inherits: ^ExistsInWorld
+	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^SpriteActor
 	Health:
 		Radius: 128
 		HP: 1000
@@ -311,6 +313,8 @@
 	Targetable:
 		TargetTypes: Ground
 	HiddenUnderFog:
+	RenderSprites:
+		Palette: terrain
 	QuantizeFacingsFromSequence:
 		Sequence: stand
 	WithInfantryBody:
@@ -325,13 +329,12 @@
 		Voice: Attack
 	DrawLineToTarget:
 	DeathSounds:
-	RenderSprites:
-		Palette: terrain
 	Voiced:
 		VoiceSet: DinoVoice
 
 ^Viceroid:
-	Inherits: ^ExistsInWorld
+	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^SpriteActor
 	Health:
 		Radius: 427
 		HP: 300
@@ -374,8 +377,6 @@
 	BodyOrientation:
 		QuantizedFacings: 8
 	WithSpriteBody:
-	AutoSelectionSize:
-	RenderSprites:
 	WithMuzzleFlash:
 		SplitFacings: true
 	Guard:
@@ -387,7 +388,8 @@
 		VoiceSet: DinoVoice
 
 ^Plane:
-	Inherits: ^ExistsInWorld
+	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^SpriteActor
 	AppearsOnRadar:
 		UseLocation: yes
 	HiddenUnderFog:
@@ -395,16 +397,14 @@
 	ActorLostNotification:
 	AttackMove:
 	WithShadow:
-	QuantizeFacingsFromSequence:
 	WithFacingSpriteBody:
-	RenderSprites:
-	AutoSelectionSize:
 	FlyAwayOnIdle:
 	RejectsOrders:
 
 ^Ship:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
+	Inherits@3: ^SpriteActor
 	Mobile:
 		Crushes: crate
 		TerrainSpeeds:
@@ -423,7 +423,8 @@
 		VoiceSet: VehicleVoice
 
 ^Building:
-	Inherits: ^ExistsInWorld
+	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^SpriteActor
 	SelectionDecorations:
 	Selectable:
 		Priority: 3
@@ -437,10 +438,7 @@
 	SoundOnDamageTransition:
 		DamagedSounds: xplos.aud
 		DestroyedSounds: crumble.aud
-	QuantizeFacingsFromSequence:
-	RenderSprites:
 	WithSpriteBody:
-	AutoSelectionSize:
 	WithBuildingExplosion:
 		Delay: 1
 	CaptureNotification:
@@ -492,18 +490,15 @@
 		StartsRevealed: true
 
 ^CivBuildingHusk:
+	Inherits@1: ^SpriteActor
 	AppearsOnRadar:
 	Building:
 		Dimensions: 1,1
 		Footprint: x
-	QuantizeFacingsFromSequence:
-	RenderSprites:
 	WithSpriteBody:
-	AutoSelectionSize:
 	Tooltip:
 		Name: Civilian Building (Destroyed)
 		GenericVisibility: None
-	BodyOrientation:
 	FrozenUnderFog:
 		StartsRevealed: true
 	ScriptTriggers:
@@ -530,10 +525,9 @@
 	-Demolishable:
 	RenderSprites:
 		Palette: terrain
-	WithSpriteBody:
-	AutoSelectionSize:
 
 ^CivFieldHusk:
+	Inherits@1: ^SpriteActor
 	AppearsOnRadar:
 	Building:
 		Dimensions: 1,1
@@ -541,17 +535,15 @@
 	Tooltip:
 		Name: Field (Destroyed)
 		GenericVisibility: None
-	BodyOrientation:
-		QuantizedFacings: 1
 	RenderSprites:
 		Palette: terrain
 	WithSpriteBody:
-	AutoSelectionSize:
 	FrozenUnderFog:
 		StartsRevealed: true
 	ScriptTriggers:
 
 ^Wall:
+	Inherits@1: ^SpriteActor
 	AppearsOnRadar:
 	Building:
 		Dimensions: 1,1
@@ -570,12 +562,9 @@
 		NodeTypes: wall
 	LineBuildNode:
 		Types: wall
-	BodyOrientation:
-		QuantizedFacings: 1
 	RenderSprites:
 		Palette: staticterrain
 	WithWallSpriteBody:
-	AutoSelectionSize:
 	GivesExperience:
 	AutoTargetIgnore:
 	Sellable:
@@ -585,14 +574,12 @@
 	ScriptTriggers:
 
 ^Tree:
+	Inherits@1: ^SpriteActor
 	Tooltip:
 		Name: Tree
-	BodyOrientation:
-		QuantizedFacings: 1
 	RenderSprites:
 		Palette: staticterrain
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
@@ -609,14 +596,12 @@
 	ScriptTriggers:
 
 ^TibTree:
+	Inherits@1: ^SpriteActor
 	Tooltip:
 		Name: Blossom Tree
-	BodyOrientation:
-		QuantizedFacings: 1
 	RenderSprites:
 		Palette: staticterrain
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
@@ -628,14 +613,12 @@
 	WithMakeAnimation:
 
 ^Rock:
+	Inherits@1: ^SpriteActor
 	Tooltip:
 		Name: Rock
-	BodyOrientation:
-		QuantizedFacings: 1
 	RenderSprites:
 		Palette: staticterrain
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
@@ -649,6 +632,7 @@
 		RequireTilesets: DESERT
 
 ^CommonHuskDefaults:
+	Inherits@1: ^SpriteActor
 	Health:
 		HP: 140
 	Armor:
@@ -656,11 +640,7 @@
 	HiddenUnderFog:
 		Type: CenterPosition
 	AutoTargetIgnore:
-	BodyOrientation:
-	QuantizeFacingsFromSequence:
 	WithFacingSpriteBody:
-	AutoSelectionSize:
-	RenderSprites:
 
 ^Husk:
 	Inherits: ^CommonHuskDefaults
@@ -687,6 +667,7 @@
 
 ^HelicopterHusk:
 	Inherits: ^CommonHuskDefaults
+	WithShadow:
 	FallsToEarth:
 		Spins: True
 		Moves: False
@@ -706,25 +687,21 @@
 	SoundOnDamageTransition:
 		DamagedSounds: xplos.aud
 		DestroyedSounds: xplobig4.aud
-	BodyOrientation:
-		QuantizedFacings: 1
 	ScriptTriggers:
 
 ^Crate:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
 	Tooltip:
 		Name: Crate
 		GenericName: Crate
 	Crate:
 		TerrainTypes: Clear, Rough, Road, Tiberium, BlueTiberium, Beach
-	QuantizeFacingsFromSequence:
 	RenderSprites:
 		Palette: effect
 		Image: crate
 	WithCrateBody:
 		XmasImages: xcratea, xcrateb, xcratec, xcrated
-	CustomSelectionSize:
-		CustomBounds: 20,20
 
 ^Defense:
 	Inherits: ^BaseBuilding

mods/cnc/rules/misc.yaml

@@ -60,7 +60,6 @@ CAMERA:
 	RevealsShroud:
 		Range: 10c0
 		Type: CenterPosition
-	BodyOrientation:
 
 CAMERA.small:
 	AlwaysVisible:
@@ -71,7 +70,6 @@ CAMERA.small:
 	RevealsShroud:
 		Range: 6c0
 		Type: CenterPosition
-	BodyOrientation:
 
 FLARE:
 	Immobile:

mods/cnc/rules/ships.yaml

@@ -22,7 +22,7 @@ BOAT:
 		Weapon: BoatMissile
 		LocalOffset: 85,-85,0, 85,85,0
 	AttackTurreted:
-	RenderSprites:
+	-QuantizeFacingsFromSequence:
 	BodyOrientation:
 		QuantizedFacings: 2
 	WithGunboatBody:
@@ -66,7 +66,6 @@ LST:
 		Type: Heavy
 	RevealsShroud:
 		Range: 7c0
-	QuantizeFacingsFromSequence:
 	WithFacingSpriteBody:
 	WithRoof:
 	WithCargo:
@@ -77,6 +76,4 @@ LST:
 		MaxWeight: 5
 		PipCount: 5
 		PassengerFacing: 0
-	AutoSelectionSize:
-	RenderSprites:
 

mods/cnc/rules/tech.yaml

@@ -11,10 +11,6 @@ V19:
 
 V19.Husk:
 	Inherits: ^CivBuildingHusk
-	AutoSelectionSize:
-	RenderSprites:
-	BodyOrientation:
-		QuantizedFacings: 1
 	WithSpriteBody:
 	WithIdleOverlay:
 		StartSequence: fire-start

mods/d2k/rules/arrakis.yaml

@@ -1,8 +1,7 @@
 spicebloom:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
-	RenderSprites:
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
@@ -15,11 +14,10 @@ spicebloom:
 	WithActiveAnimation:
 	RadarColorFromTerrain:
 		Terrain: Spice
-	BodyOrientation:
-		QuantizedFacings: 1
 	WithMakeAnimation:
 
 sandworm:
+	Inherits@1: ^SpriteActor
 	Tooltip:
 		Name: Sandworm
 		Description: Attracted by vibrations in the sand.\nWill eat units whole and has a large appetite.
@@ -39,8 +37,6 @@ sandworm:
 	WithFacingSpriteBody:
 	WithAttackOverlay:
 		Sequence: sand
-	BodyOrientation:
-	QuantizeFacingsFromSequence:
 	HiddenUnderFog:
 	AppearsOnRadar:
 		UseLocation: yes
@@ -55,8 +51,6 @@ sandworm:
 	AnnounceOnSeen:
 		Notification: WormSign
 		PingRadar: True
-	RenderSprites:
-	AutoSelectionSize:
 
 sietch:
 	Inherits: ^Building

mods/d2k/rules/defaults.yaml

@@ -3,11 +3,16 @@
 	UpdatesPlayerStatistics:
 	CombatDebugOverlay:
 	GivesExperience:
-	BodyOrientation:
 	ScriptTriggers:
 	UpgradeManager:
 	Huntable:
 
+^SpriteActor:
+	BodyOrientation:
+	QuantizeFacingsFromSequence:
+	AutoSelectionSize:
+	RenderSprites:
+
 ^GainsExperience:
 	GainsExperience:
 		Upgrades:
@@ -51,6 +56,7 @@
 ^Vehicle:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
+	Inherits@3: ^SpriteActor
 	Mobile:
 		Crushes: crate
 		TerrainSpeeds:
@@ -79,7 +85,6 @@
 	Guard:
 		Voice: Guard
 	Guardable:
-	QuantizeFacingsFromSequence:
 	WithFacingSpriteBody:
 	Demolishable:
 	TemporaryOwnerManager:
@@ -91,8 +96,6 @@
 		Image: pips
 		Sequence: pickup-indicator
 		Offset: -12, -12
-	AutoSelectionSize:
-	RenderSprites:
 
 ^Tank:
 	Inherits: ^Vehicle
@@ -108,6 +111,7 @@
 			Dune: 70
 
 ^Husk:
+	Inherits@1: ^SpriteActor
 	Health:
 		HP: 75
 	Armor:
@@ -116,13 +120,9 @@
 		Type: CenterPosition
 	Tooltip:
 		Name: Wreck
-	BodyOrientation:
 	AutoTargetIgnore:
 	ScriptTriggers:
-	QuantizeFacingsFromSequence:
 	WithFacingSpriteBody:
-	AutoSelectionSize:
-	RenderSprites:
 
 ^VehicleHusk:
 	Inherits: ^Husk
@@ -161,12 +161,12 @@
 		Interval: 2
 	Tooltip:
 		Name: Destroyed Tower
-	BodyOrientation:
 	ScriptTriggers:
 
 ^Infantry:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
+	Inherits@3: ^SpriteActor
 	Health:
 		Radius: 96
 	Armor:
@@ -192,7 +192,6 @@
 		TargetTypes: Ground, Infantry
 		UpgradeTypes: parachute
 		UpgradeMaxEnabledLevel: 0
-	RenderSprites:
 	QuantizeFacingsFromSequence:
 		Sequence: stand
 	WithInfantryBody:
@@ -239,6 +238,7 @@
 
 ^Plane:
 	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^SpriteActor
 	AppearsOnRadar:
 		UseLocation: yes
 	HiddenUnderFog:
@@ -249,14 +249,12 @@
 	DrawLineToTarget:
 	Voiced:
 		VoiceSet: GenericVoice
-	QuantizeFacingsFromSequence:
 	WithFacingSpriteBody:
-	AutoSelectionSize:
-	RenderSprites:
 	WithShadow:
 
 ^Building:
 	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^SpriteActor
 	SelectionDecorations:
 	Selectable:
 		Priority: 2
@@ -274,10 +272,7 @@
 	SoundOnDamageTransition:
 		DamagedSounds: EXPLSML1.WAV
 		DestroyedSounds: EXPLHG1.WAV
-	QuantizeFacingsFromSequence:
-	RenderSprites:
 	WithSpriteBody:
-	AutoSelectionSize:
 	WithBuildingExplosion:
 	RepairableBuilding:
 	EmitInfantryOnSell:
@@ -314,9 +309,7 @@
 	-WithCrumbleOverlay:
 	-WithMakeAnimation:
 	-WithSpriteBody:
-	RenderSprites:
 	WithWallSpriteBody:
-	AutoSelectionSize:
 	LineBuildNode:
 		Types: turret
 	MustBeDestroyed:

mods/d2k/rules/misc.yaml

@@ -147,8 +147,6 @@ camera:
 	RevealsShroud:
 		Range: 8c0
 		Type: CenterPosition
-	BodyOrientation:
-		QuantizedFacings: 1
 
 wormspawner:
 	AlwaysVisible:

mods/d2k/rules/structures.yaml

@@ -477,6 +477,7 @@ starport:
 	ProvidesPrerequisite@buildingname:
 
 wall:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
 	Buildable:
 		Queue: Building
@@ -511,14 +512,11 @@ wall:
 		Types: wall
 	Targetable:
 		TargetTypes: Ground, Wall
-	RenderSprites:
 	WithWallSpriteBody:
-	AutoSelectionSize:
 	AutoTargetIgnore:
 	Sellable:
 		SellSounds: CHUNG.WAV
 	Guardable:
-	BodyOrientation:
 	ThrowsShrapnel:
 		Weapons: shrapnel
 		Pieces: 3, 7

mods/ra/maps/allies-03b/map.yaml

@@ -1325,7 +1325,6 @@ Rules:
 			TerrainSpeeds:
 		RevealsShroud:
 			Range: 4c0
-		BodyOrientation:
 		ScriptTriggers:
 	MONEYCRATE:
 		Tooltip:
@@ -1378,7 +1377,6 @@ Rules:
 			ShowOwnerRow: false
 	JEEP.mission:
 		Inherits: JEEP
-		WithFacingSpriteBody:
 		-Selectable:
 		-Demolishable:
 		-Huntable:
@@ -1389,7 +1387,6 @@ Rules:
 			Types: ~disabled
 		RevealsShroud:
 			Range: 0c0
-		AutoSelectionSize:
 		RenderSprites:
 			Image: JEEP
 	E3:

mods/ra/maps/allies-05a/map.yaml

@@ -1634,7 +1634,6 @@ Rules:
 			TerrainSpeeds:
 		RevealsShroud:
 			Range: 4c0
-		BodyOrientation:
 		ScriptTriggers:
 	FTUR:
 		DetectCloaked:
@@ -1686,7 +1685,6 @@ Rules:
 		WithFacingSpriteBody:
 		-SpawnActorOnDeath:
 		-EjectOnDeath:
-		AutoSelectionSize:
 		RenderSprites:
 			Image: TRUK
 	SPY:

mods/ra/maps/bomber-john/map.yaml

@@ -830,7 +830,6 @@ Rules:
 			ROT: 900
 		RevealsShroud:
 			Range: 40c0
-		WithFacingSpriteBody:
 		MustBeDestroyed:
 			RequiredForShortGame: true
 		Transforms:
@@ -840,7 +839,6 @@ Rules:
 		CashTrickler:
 			Period: 150
 			Amount: 20
-		AutoSelectionSize:
 		RenderSprites:
 			Image: MNLY
 	FTUR:
@@ -881,6 +879,7 @@ Rules:
 		Power:
 			Amount: 0
 	MINVV:
+		Inherits@1: ^SpriteActor
 		HiddenUnderFog:
 		Building:
 			Adjacent: 99
@@ -897,7 +896,6 @@ Rules:
 		RenderSprites:
 			Image: miner
 		WithSpriteBody:
-		AutoSelectionSize:
 		Tooltip:
 			Name: Bomb
 			Description: Bomb (Hotkey B)
@@ -911,7 +909,6 @@ Rules:
 		Explodes:
 			Weapon: CrateNuke
 			EmptyWeapon: CrateNuke
-		BodyOrientation:
 	T17:
 		Health:
 			HP: 999999999

mods/ra/maps/survival01/map.yaml

@@ -1264,9 +1264,6 @@ Rules:
 		Inherits: CAMERA
 		RevealsShroud:
 			Range: 1000
-	ARTY:
-		UpgradeManager:
-		BodyOrientation:
 	AFLD.mission:
 		Inherits: AFLD
 		-AirstrikePower@spyplane:

mods/ra/rules/civilian.yaml

@@ -232,10 +232,7 @@ V19.Husk:
 		ExcludeTilesets: DESERT
 	Tooltip:
 		Name: Husk (Oil Pump)
-	AutoSelectionSize:
 	RenderSprites:
-	BodyOrientation:
-		QuantizedFacings: 1
 	WithSpriteBody:
 	WithIdleOverlay:
 		StartSequence: fire-start

mods/ra/rules/defaults.yaml

@@ -1,14 +1,17 @@
 ^ExistsInWorld:
 	AppearsOnRadar:
-	UpdatesPlayerStatistics:
 	CombatDebugOverlay:
-	DrawLineToTarget:
 	GivesExperience:
-	BodyOrientation:
 	ScriptTriggers:
 	UpgradeManager:
 	Huntable:
 
+^SpriteActor:
+	BodyOrientation:
+	QuantizeFacingsFromSequence:
+	AutoSelectionSize:
+	RenderSprites:
+
 ^GainsExperience:
 	GainsExperience:
 		Upgrades:
@@ -63,6 +66,9 @@
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
 	Inherits@3: ^IronCurtainable
+	Inherits@4: ^SpriteActor
+	DrawLineToTarget:
+	UpdatesPlayerStatistics:
 	Mobile:
 		Crushes: mine, crate
 		TerrainSpeeds:
@@ -123,10 +129,7 @@
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
-	QuantizeFacingsFromSequence:
 	WithFacingSpriteBody:
-	AutoSelectionSize:
-	RenderSprites:
 	WithParachute:
 		UpgradeTypes: parachute
 		UpgradeMinEnabledLevel: 1
@@ -159,6 +162,8 @@
 ^Infantry:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
+	Inherits@3: ^SpriteActor
+	DrawLineToTarget:
 	Health:
 		Radius: 128
 		HP: 25
@@ -187,7 +192,6 @@
 		UpgradeMaxEnabledLevel: 0
 	QuantizeFacingsFromSequence:
 		Sequence: stand
-	RenderSprites:
 	WithInfantryBody:
 	WithDeathAnimation:
 		DeathTypes:
@@ -252,6 +256,7 @@
 
 ^Soldier:
 	Inherits: ^Infantry
+	UpdatesPlayerStatistics:
 	MustBeDestroyed:
 	AutoTarget:
 	ProximityCaptor:
@@ -292,6 +297,9 @@
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
 	Inherits@3: ^IronCurtainable
+	Inherits@4: ^SpriteActor
+	DrawLineToTarget:
+	UpdatesPlayerStatistics:
 	Mobile:
 		Crushes: crate
 		TerrainSpeeds:
@@ -325,15 +333,15 @@
 		ExcludeTilesets: INTERIOR
 	Voiced:
 		VoiceSet: VehicleVoice
-	QuantizeFacingsFromSequence:
-	AutoSelectionSize:
-	RenderSprites:
 	WithFacingSpriteBody:
 
 ^Plane:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
 	Inherits@3: ^IronCurtainable
+	Inherits@4: ^SpriteActor
+	DrawLineToTarget:
+	UpdatesPlayerStatistics:
 	AppearsOnRadar:
 		UseLocation: true
 	SelectionDecorations:
@@ -368,10 +376,7 @@
 	Tooltip:
 		GenericName: Plane
 	WithShadow:
-	QuantizeFacingsFromSequence:
-	RenderSprites:
 	WithFacingSpriteBody:
-	AutoSelectionSize:
 	MustBeDestroyed:
 	Voiced:
 		VoiceSet: GenericVoice
@@ -387,6 +392,7 @@
 ^BasicBuilding:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^IronCurtainable
+	Inherits@3: ^SpriteActor
 	SelectionDecorations:
 	Selectable:
 		Priority: 3
@@ -400,9 +406,6 @@
 	SoundOnDamageTransition:
 		DamagedSounds: kaboom1.aud
 		DestroyedSounds: kaboom22.aud
-	QuantizeFacingsFromSequence:
-	RenderSprites:
-	AutoSelectionSize:
 	WithSpriteBody:
 	WithBuildingExplosion:
 	CaptureNotification:
@@ -420,6 +423,7 @@
 
 ^Building:
 	Inherits: ^BasicBuilding
+	UpdatesPlayerStatistics:
 	GivesBuildableArea:
 	RepairableBuilding:
 	EngineerRepairable:
@@ -449,7 +453,8 @@
 	RenderRangeCircle:
 
 ^Wall:
-	AppearsOnRadar:
+	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^SpriteActor
 	Building:
 		Dimensions: 1,1
 		Footprint: x
@@ -472,18 +477,14 @@
 	RenderSprites:
 		Palette: effect
 	WithWallSpriteBody:
-	GivesExperience:
 	AutoTargetIgnore:
 	ProximityCaptor:
 		Types: Wall
 	Sellable:
 		SellSounds: cashturn.aud
 	Guardable:
-	BodyOrientation:
-		QuantizedFacings: 1
 	FrozenUnderFog:
 	GpsRemoveFrozenActor:
-	ScriptTriggers:
 
 ^TechBuilding:
 	Inherits: ^BasicBuilding
@@ -546,12 +547,12 @@
 		ExcludeTilesets: INTERIOR
 
 ^Tree:
+	Inherits@1: ^SpriteActor
 	Tooltip:
 		Name: Tree
 	RenderSprites:
 		Palette: terrain
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
@@ -565,8 +566,6 @@
 	Armor:
 		Type: Wood
 	AutoTargetIgnore:
-	BodyOrientation:
-		QuantizedFacings: 1
 	FrozenUnderFog:
 		StartsRevealed: true
 	ScriptTriggers:
@@ -574,19 +573,16 @@
 		ExcludeTilesets: INTERIOR
 
 ^BasicHusk:
+	Inherits@1: ^SpriteActor
 	Health:
 		HP: 280
 	Armor:
 		Type: Heavy
 	HiddenUnderFog:
 		Type: CenterPosition
-	QuantizeFacingsFromSequence:
-	BodyOrientation:
 	AutoTargetIgnore:
 	ScriptTriggers:
-	RenderSprites:
 	WithFacingSpriteBody:
-	AutoSelectionSize:
 
 ^Husk:
 	Inherits: ^BasicHusk
@@ -643,17 +639,15 @@
 	Armor:
 		Type: Concrete
 	AutoTargetIgnore:
-	BodyOrientation:
-		QuantizedFacings: 1
 	ScriptTriggers:
 
 ^Rock:
+	Inherits@1: ^SpriteActor
 	Tooltip:
 		Name: Rock
 	RenderSprites:
 		Palette: terrain
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
@@ -662,8 +656,6 @@
 		Terrain: Tree
 	ProximityCaptor:
 		Types: Tree
-	BodyOrientation:
-		QuantizedFacings: 1
 	FrozenUnderFog:
 		StartsRevealed: true
 	ScriptTriggers:
@@ -678,6 +670,7 @@
 		RequireTilesets: DESERT
 
 ^Crate:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
 	Tooltip:
 		Name: Crate
@@ -696,8 +689,6 @@
 		FallRate: 26
 		KilledOnImpassableTerrain: false
 	Passenger:
-	CustomSelectionSize:
-		CustomBounds: 20,20
 	WithParachute:
 		UpgradeTypes: parachute
 		UpgradeMinEnabledLevel: 1
@@ -707,6 +698,4 @@
 		ShadowImage: parach-shadow
 		ShadowSequence: idle
 	UpgradeManager:
-	BodyOrientation:
-		QuantizedFacings: 1
 

mods/ra/rules/misc.yaml

@@ -180,10 +180,10 @@ CAMERA:
 		Type: CenterPosition
 	ProximityCaptor:
 		Types: Camera
-	BodyOrientation:
-		QuantizedFacings: 1
 	DetectCloaked:
 		Range: 10
+	BodyOrientation:
+		QuantizedFacings: 1
 	WithSpriteBody:
 	RenderSpritesEditorOnly:
 		Image: camera
@@ -199,8 +199,6 @@ camera.paradrop:
 		Type: CenterPosition
 	ProximityCaptor:
 		Types: Camera
-	BodyOrientation:
-		QuantizedFacings: 1
 
 SONAR:
 	AlwaysVisible:
@@ -210,7 +208,6 @@ SONAR:
 		HP: 1000
 	ProximityCaptor:
 		Types: Sonar
-	BodyOrientation:
 	DetectCloaked:
 		Range: 10
 		CloakTypes: Underwater
@@ -225,22 +222,22 @@ FLARE:
 		Image: smokland
 	WithSpriteBody:
 		StartSequence: open
+	BodyOrientation:
+		QuantizedFacings: 1
 	HiddenUnderFog:
 		Type: CenterPosition
 	Tooltip:
 		Name: Flare
 		ShowOwnerRow: false
-	BodyOrientation:
-		QuantizedFacings: 1
 
 MINE:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
 	Tooltip:
 		Name: Ore Mine
 	RenderSprites:
 		Palette: terrain
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
@@ -248,18 +245,16 @@ MINE:
 	RadarColorFromTerrain:
 		Terrain: Ore
 	AutoTargetIgnore:
-	BodyOrientation:
-		QuantizedFacings: 1
 	SeedsResource:
 
 GMINE:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
 	Tooltip:
 		Name: Gem Mine
 	RenderSprites:
 		Palette: player
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
@@ -267,45 +262,39 @@ GMINE:
 	RadarColorFromTerrain:
 		Terrain: Gems
 	AutoTargetIgnore:
-	BodyOrientation:
-		QuantizedFacings: 1
 	SeedsResource:
 		ResourceType: Gems
 
 RAILMINE:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
 	Tooltip:
 		Name: Abandoned Mine
 	RenderSprites:
 		Palette: player
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
 	AutoTargetIgnore:
-	BodyOrientation:
-		QuantizedFacings: 1
 	EditorTilesetFilter:
 		ExcludeTilesets: INTERIOR
 
 QUEE:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
 	Tooltip:
 		Name: Queen Ant
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	RenderSprites:
 	WithSpriteBody:
-	AutoSelectionSize:
 	AppearsOnRadar:
-	BodyOrientation:
-		QuantizedFacings: 1
 	EditorTilesetFilter:
 		RequireTilesets: INTERIOR
 
 LAR1:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
 	Tooltip:
 		Name: Ant Larva
@@ -315,29 +304,14 @@ LAR1:
 	RenderSprites:
 		Palette: terrain
 	WithSpriteBody:
-	AutoSelectionSize:
 	AppearsOnRadar:
-	BodyOrientation:
-		QuantizedFacings: 1
 	EditorTilesetFilter:
 		RequireTilesets: INTERIOR
 
 LAR2:
-	HiddenUnderShroud:
+	Inherits@1: LAR1
 	Tooltip:
 		Name: Ant Larvae
-	Building:
-		Footprint: x
-		Dimensions: 1,1
-	RenderSprites:
-		Palette: terrain
-	WithSpriteBody:
-	AutoSelectionSize:
-	AppearsOnRadar:
-	BodyOrientation:
-		QuantizedFacings: 1
-	EditorTilesetFilter:
-		RequireTilesets: INTERIOR
 
 powerproxy.parabombs:
 	AlwaysVisible:

mods/ra/rules/structures.yaml

@@ -519,6 +519,7 @@ PBOX:
 		HasMinibib: Yes
 	Turreted:
 		ROT: 255
+	-QuantizeFacingsFromSequence:
 	BodyOrientation:
 		QuantizedFacings: 8
 	Cargo:
@@ -562,6 +563,7 @@ HBOX:
 		CloakDelay: 60
 	Turreted:
 		ROT: 255
+	-QuantizeFacingsFromSequence:
 	BodyOrientation:
 		QuantizedFacings: 8
 	Cargo:
@@ -646,6 +648,7 @@ FTUR:
 		Weapon: FireballLauncher
 		LocalOffset: 512,0,0
 	AttackTurreted:
+	-QuantizeFacingsFromSequence:
 	BodyOrientation:
 		QuantizedFacings: 8
 	Power:

mods/ts/rules/defaults.yaml

@@ -3,12 +3,17 @@
 	UpdatesPlayerStatistics:
 	CombatDebugOverlay:
 	GivesExperience:
-	BodyOrientation:
-		UseClassicPerspectiveFudge: False
 	ScriptTriggers:
 	UpgradeManager:
 	Huntable:
 
+^SpriteActor:
+	BodyOrientation:
+		UseClassicPerspectiveFudge: False
+	QuantizeFacingsFromSequence:
+	AutoSelectionSize:
+	RenderSprites:
+
 ^GainsExperience:
 	GainsExperience:
 		Upgrades:
@@ -66,7 +71,8 @@
 		UpgradeMinEnabledLevel: 1
 
 ^BasicBuilding:
-	Inherits: ^ExistsInWorld
+	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^SpriteActor
 	SelectionDecorations:
 		Palette: pips
 	Selectable:
@@ -83,10 +89,7 @@
 	SoundOnDamageTransition:
 		DamagedSounds: expnew01.aud
 		DestroyedSounds: crmble2.aud
-	QuantizeFacingsFromSequence:
-	RenderSprites:
 	WithSpriteBody:
-	AutoSelectionSize:
 	WithBuildingExplosion:
 		Sequences: building, large_bang, large_brnl, verylarge_clsn, large_tumu
 	EngineerRepairable:
@@ -168,6 +171,7 @@
 		CustomBounds: 24,24
 
 ^Wall:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
 	AppearsOnRadar:
 	Building:
@@ -189,8 +193,6 @@
 		Types: wall
 	Targetable:
 		TargetTypes: Ground, Wall, C4
-	RenderSprites:
-	AutoSelectionSize:
 	WithWallSpriteBody:
 		Type: wall
 	GivesExperience:
@@ -198,9 +200,6 @@
 	Sellable:
 		SellSounds: cashturn.aud
 	UpdatesPlayerStatistics:
-	BodyOrientation:
-		UseClassicPerspectiveFudge: False
-		QuantizedFacings: 1
 	Demolishable:
 	ScriptTriggers:
 	UpgradeManager:
@@ -222,6 +221,7 @@
 ^Infantry:
 	Inherits@1: ^GainsExperience
 	Inherits@2: ^ExistsInWorld
+	Inherits@3: ^SpriteActor
 	DrawLineToTarget:
 	Health:
 		Radius: 128
@@ -256,7 +256,6 @@
 		TargetTypes: Ground, Infantry
 	QuantizeFacingsFromSequence:
 		Sequence: stand
-	RenderSprites:
 	WithInfantryBody:
 	WithDeathAnimation@normal:
 		DeathTypes:
@@ -503,7 +502,8 @@
 	ReturnOnIdle:
 
 ^Viceroid:
-	Inherits: ^ExistsInWorld
+	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^SpriteActor
 	DrawLineToTarget:
 	Health:
 		Radius: 256
@@ -534,28 +534,21 @@
 	PoisonedByTiberium:
 		Weapon: TiberiumHeal
 	Guardable:
-	BodyOrientation:
-		QuantizedFacings: 1
-	RenderSprites:
 	WithSpriteBody:
-	AutoSelectionSize:
 
 ^BlossomTree:
+	Inherits@1: ^SpriteActor
 	Tooltip:
 		Name: Blossom Tree
 	RenderSprites:
 		Palette: player
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
 	AppearsOnRadar:
 	RadarColorFromTerrain:
 		Terrain: Tiberium
-	BodyOrientation:
-		UseClassicPerspectiveFudge: False
-		QuantizedFacings: 1
 	FrozenUnderFog:
 		StartsRevealed: true
 	SeedsResource:
@@ -564,14 +557,11 @@
 	WithActiveAnimation:
 
 ^Tree:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
-	BodyOrientation:
-		UseClassicPerspectiveFudge: False
-		QuantizedFacings: 1
 	RenderSprites:
 		Palette: terraindecoration
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1, 1
@@ -582,14 +572,11 @@
 		Name: Tree
 
 ^Rock:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
-	BodyOrientation:
-		UseClassicPerspectiveFudge: False
-		QuantizedFacings: 1
 	RenderSprites:
 		Palette: terraindecoration
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1, 1
@@ -600,16 +587,14 @@
 		Name: Rock
 
 ^Decoration:
+	Inherits@1: ^SpriteActor
 	HiddenUnderShroud:
 	RenderSprites:
 		Palette: terraindecoration
 	WithSpriteBody:
-	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1, 1
-	BodyOrientation:
-		UseClassicPerspectiveFudge: False
 
 ^Box:
 	Inherits: ^Decoration
@@ -640,6 +625,7 @@
 ^DeployedVehicle:
 	Inherits@1: ^GainsExperience
 	Inherits@2: ^ExistsInWorld
+	Inherits@3: ^SpriteActor
 	Voiced:
 		VoiceSet: Vehicle
 	AttackTurreted:
@@ -651,9 +637,7 @@
 		Dimensions: 1,1
 		Footprint: x
 		TerrainTypes: Clear, Road, DirtRoad, Rough
-	RenderSprites:
 	WithSpriteBody:
-	AutoSelectionSize:
 	WithMakeAnimation:
 	SelectionDecorations:
 		Palette: pips

mods/ts/rules/misc.yaml

@@ -40,7 +40,6 @@ CAMERA:
 	RevealsShroud:
 		Range: 10c0
 		Type: CenterPosition
-	BodyOrientation:
 	DetectCloaked:
 		Range: 10