Remove RenderBuilding

2015-07-15 07:29:45 +02:00
parent bf51e0600d
commit 9da56f51e2
42 changed files with 196 additions and 248 deletions
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -432,7 +432,9 @@
 		DamagedSounds: xplos.aud
 		DestroyedSounds: crumble.aud
 	QuantizeFacingsFromSequence:
-	RenderBuilding:
+	RenderSprites:
+	WithSpriteBody:
+	AutoSelectionSize:
 	WithBuildingExplosion:
 		Delay: 1
 	CaptureNotification:
@@ -489,7 +491,9 @@
 		Dimensions: 1,1
 		Footprint: x
 	QuantizeFacingsFromSequence:
-	RenderBuilding:
+	RenderSprites:
+	WithSpriteBody:
+	AutoSelectionSize:
 	Tooltip:
 		Name: Civilian Building (Destroyed)
 		GenericVisibility: None
@@ -518,8 +522,10 @@
 	-WithBuildingExplosion:
 	-TargetableBuilding:
 	-Demolishable:
-	RenderBuilding:
+	RenderSprites:
 		Palette: terrain
+	WithSpriteBody:
+	AutoSelectionSize:

 ^CivFieldHusk:
 	AppearsOnRadar:
@@ -601,8 +607,10 @@
 		Name: Blossom Tree
 	BodyOrientation:
 		QuantizedFacings: 1
-	RenderBuilding:
+	RenderSprites:
 		Palette: staticterrain
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
--- a/mods/cnc/rules/misc.yaml
+++ b/mods/cnc/rules/misc.yaml
@@ -47,7 +47,7 @@ waypoint:

 ^fact.colorpicker:
 	Inherits: FACT
-	RenderBuilding:
+	RenderSprites:
 		Image: fact
 		Palette: colorpicker

--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -72,7 +72,7 @@ FACT:

 FACT.GDI:
 	Inherits: FACT
-	RenderBuilding:
+	RenderSprites:
 		Image: fact
 	Buildable:
 		Queue: Building.GDI, Building.Nod
@@ -84,7 +84,7 @@ FACT.GDI:

 FACT.NOD:
 	Inherits: FACT
-	RenderBuilding:
+	RenderSprites:
 		Image: fact
 	Buildable:
 		Queue: Building.GDI, Building.Nod
@@ -218,7 +218,6 @@ SILO:
 		PipCount: 10
 		PipColor: Green
 		Capacity: 2000
-	-RenderBuilding:
 	-EmitInfantryOnSell:
 	Power:
 		Amount: -10
@@ -226,7 +225,6 @@ SILO:
 		RequiredForShortGame: false
 	SelectionDecorations:
 		VisualBounds: 49,30
-	-WithMakeAnimation:

 PYLE:
 	Inherits: ^BaseBuilding
@@ -463,8 +461,8 @@ HQ:
 	RequiresPower:
 	CanPowerDown:
 	DisabledOverlay:
-	RenderBuilding:
-		PauseOnLowPower: yes
+	WithSpriteBody:
+		PauseAnimationWhenDisabled: true
 	Health:
 		HP: 700
 	RevealsShroud:
@@ -549,8 +547,8 @@ EYE:
 	RequiresPower:
 	CanPowerDown:
 	DisabledOverlay:
-	RenderBuilding:
-		PauseOnLowPower: yes
+	WithSpriteBody:
+		PauseAnimationWhenDisabled: true
 	Health:
 		HP: 1200
 	RevealsShroud:
@@ -654,7 +652,7 @@ GUN:
 	Turreted:
 		ROT: 12
 		InitialFacing: 50
-	RenderSprites:
+	-WithSpriteBody:
 	WithTurretedSpriteBody:
 	Armament:
 		Weapon: TurretGun
@@ -662,13 +660,11 @@ GUN:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	-RenderBuilding:
 	-WithDeathAnimation:
 	DetectCloaked:
 		Range: 3
 	Power:
 		Amount: -20
-	-WithMakeAnimation:

 SAM:
 	Inherits: ^Defense
@@ -697,7 +693,7 @@ SAM:
 	Turreted:
 		ROT: 10
 		InitialFacing: 0
-	RenderSprites:
+	-WithSpriteBody:
 	WithTurretedSpriteBody:
 	AutoSelectionSize:
 	Armament:
@@ -705,11 +701,9 @@ SAM:
 		MuzzleSequence: muzzle
 	AttackPopupTurreted:
 	WithMuzzleFlash:
-	-RenderBuilding:
 	-RenderDetectionCircle:
 	Power:
 		Amount: -20
-	-WithMakeAnimation:

 OBLI:
 	Inherits: ^Defense
@@ -739,8 +733,6 @@ OBLI:
 		Range: 8c0
 	Bib:
 		HasMinibib: Yes
-	RenderSprites:
-	WithSpriteBody:
 	WithChargeAnimation:
 	Armament:
 		Weapon: Laser
@@ -750,13 +742,11 @@ OBLI:
 		ChargeAudio: obelpowr.aud
 		ReloadTime: 40
 		InitialChargeDelay: 50
-	-RenderBuilding:
 	-EmitInfantryOnSell:
 	DetectCloaked:
 		Range: 5
 	Power:
 		Amount: -150
-	-WithMakeAnimation:

 GTWR:
 	Inherits: ^Defense
--- a/mods/cnc/rules/tech.yaml
+++ b/mods/cnc/rules/tech.yaml
@@ -11,7 +11,6 @@ V19:

 V19.Husk:
 	Inherits: ^CivBuildingHusk
-	-RenderBuilding:
 	AutoSelectionSize:
 	RenderSprites:
 	BodyOrientation:
@@ -88,7 +87,6 @@ BIO.Husk:

 MISS:
 	Inherits: ^CivBuilding
-	RenderBuilding:
 	Building:
 		Footprint: xxx xxx
 		Dimensions: 3,2
--- a/mods/cnc/rules/trees.yaml
+++ b/mods/cnc/rules/trees.yaml
@@ -7,7 +7,7 @@ SPLIT2:

 SPLIT3:
 	Inherits: ^TibTree
-	RenderBuilding:
+	RenderSprites:
 		Image: split2
 	SeedsResource:
 		ResourceType: Tiberium
@@ -16,7 +16,7 @@ SPLIT3:

 SPLITBLUE:
 	Inherits: ^TibTree
-	RenderBuilding:
+	RenderSprites:
 		Image: split3
 	SeedsResource:
 		ResourceType: BlueTiberium
--- a/mods/d2k/rules/arrakis.yaml
+++ b/mods/d2k/rules/arrakis.yaml
@@ -1,6 +1,8 @@
 spicebloom:
 	HiddenUnderShroud:
-	RenderBuilding:
+	RenderSprites:
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -275,7 +275,9 @@
 		DamagedSounds: EXPLSML1.WAV
 		DestroyedSounds: EXPLHG1.WAV
 	QuantizeFacingsFromSequence:
-	RenderBuilding:
+	RenderSprites:
+	WithSpriteBody:
+	AutoSelectionSize:
 	WithBuildingExplosion:
 	RepairableBuilding:
 	EmitInfantryOnSell:
@@ -311,7 +313,7 @@
 	-GivesBuildableArea:
 	-WithCrumbleOverlay:
 	-WithMakeAnimation:
-	-RenderBuilding:
+	-WithSpriteBody:
 	RenderSprites:
 	WithWallSpriteBody:
 	AutoSelectionSize:
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -67,7 +67,7 @@ conyard:
 	ProductionBar:
 	Power:
 		Amount: 20
-	RenderBuilding:
+	RenderSprites:
 		Image: conyard.harkonnen
 		FactionImages:
 			atreides: conyard.atreides
@@ -99,7 +99,7 @@ power:
 		Type: Wood
 	RevealsShroud:
 		Range: 4c0
-	RenderBuilding:
+	RenderSprites:
 		Image: power.harkonnen
 		FactionImages:
 			atreides: power.atreides
@@ -160,7 +160,7 @@ barracks:
 		Factions: atreides, ordos
 	Power:
 		Amount: -20
-	RenderBuilding:
+	RenderSprites:
 		Image: barracks.harkonnen
 		FactionImages:
 			atreides: barracks.atreides
@@ -205,7 +205,7 @@ refinery:
 		DeliveryOffset: 2,2
 		DeliveringActor: carryall.reinforce
 		Facing: 160
-	RenderBuilding:
+	RenderSprites:
 		Image: refinery.harkonnen
 		FactionImages:
 			atreides: refinery.atreides
@@ -241,7 +241,6 @@ silo:
 		Type: Wood
 	RevealsShroud:
 		Range: 4c0
-	-RenderBuilding:
 	RenderSprites:
 		Image: silo.harkonnen
 		FactionImages:
@@ -258,7 +257,6 @@ silo:
 		Amount: -5
 	MustBeDestroyed:
 		RequiredForShortGame: false
-	-WithMakeAnimation:

 light:
 	Inherits: ^Building
@@ -283,7 +281,7 @@ light:
 		Type: Wood
 	RevealsShroud:
 		Range: 4c0
-	RenderBuilding:
+	RenderSprites:
 		Image: light.harkonnen
 		FactionImages:
 			atreides: light.atreides
@@ -361,7 +359,7 @@ heavy:
 	ProvidesPrerequisite@missiletank:
 		Prerequisite: heavy.missiletank
 		Factions: atreides, harkonnen
-	RenderBuilding:
+	RenderSprites:
 		Image: heavy.harkonnen
 		FactionImages:
 			atreides: heavy.atreides
@@ -407,7 +405,7 @@ radar:
 	DetectCloaked:
 		Range: 6
 	RenderDetectionCircle:
-	RenderBuilding:
+	RenderSprites:
 		Image: radar.harkonnen
 		FactionImages:
 			atreides: radar.atreides
@@ -452,7 +450,7 @@ starport:
 	ProductionAirdrop:
 		Produces: Starport
 		ActorType: frigate
-	RenderBuilding:
+	RenderSprites:
 		Image: starport.harkonnen
 		FactionImages:
 			atreides: starport.atreides
@@ -642,7 +640,7 @@ repair:
 		FinishRepairingNotification: UnitRepaired
 	RallyPoint:
 		Offset: 1,3
-	RenderBuilding:
+	RenderSprites:
 		Image: repair.harkonnen
 		FactionImages:
 			atreides: repair.atreides
@@ -681,7 +679,7 @@ hightech:
 		Type: Wood
 	RevealsShroud:
 		Range: 4c0
-	RenderBuilding:
+	RenderSprites:
 		Image: hightech.harkonnen
 		FactionImages:
 			atreides: hightech.atreides
@@ -742,7 +740,7 @@ research:
 		Type: Wood
 	RevealsShroud:
 		Range: 4c0
-	RenderBuilding:
+	RenderSprites:
 		Image: research.harkonnen
 		FactionImages:
 			atreides: research.atreides
@@ -779,7 +777,7 @@ palace:
 		Type: Wood
 	RevealsShroud:
 		Range: 8c0
-	RenderBuilding:
+	RenderSprites:
 		Image: palace.harkonnen
 		FactionImages:
 			atreides: palace.atreides
@@ -823,7 +821,7 @@ conyard.atreides:
 		BuildPaletteOrder: 1000
 		Prerequisites: ~disabled
 		ForceFaction: atreides
-	RenderBuilding:
+	RenderSprites:
 		Image: conyard.atreides
 		-FactionImages:

@@ -834,7 +832,7 @@ conyard.harkonnen:
 		BuildPaletteOrder: 1000
 		Prerequisites: ~disabled
 		ForceFaction: harkonnen
-	RenderBuilding:
+	RenderSprites:
 		Image: conyard.harkonnen
 		-FactionImages:

@@ -845,7 +843,7 @@ conyard.ordos:
 		BuildPaletteOrder: 1000
 		Prerequisites: ~disabled
 		ForceFaction: ordos
-	RenderBuilding:
+	RenderSprites:
 		Image: conyard.ordos
 		-FactionImages:

--- a/mods/ra/maps/allies-05a/map.yaml
+++ b/mods/ra/maps/allies-05a/map.yaml
@@ -1737,9 +1737,7 @@ Rules:
 			LocalOffset: 432,150,-30, 432,-150,-30
 		AttackTurreted:
 		AutoTarget:
-		-RenderBuilding:
 		-Selectable:
-		-WithMakeAnimation:
 	E1.Autotarget:
 		Inherits: E1
 		Buildable:
--- a/mods/ra/maps/bomber-john/map.yaml
+++ b/mods/ra/maps/bomber-john/map.yaml
@@ -877,6 +877,7 @@ Rules:
 			EndChargeSound: ironrdy1.aud
 			Range: 1
 			Upgrades: invulnerability
+			GrantUpgradeSequence: idle
 		Power:
 			Amount: 0
 	MINVV:
@@ -893,9 +894,10 @@ Rules:
 			Cost: 30
 		Health:
 			HP: 200
-		RenderBuilding:
+		RenderSprites:
 			Image: miner
-			HasMakeAnimation: false
+		WithSpriteBody:
+		AutoSelectionSize:
 		Tooltip:
 			Name: Bomb
 			Description: Bomb (Hotkey B)
@@ -943,6 +945,7 @@ Rules:
 			EndChargeSound: ironrdy1.aud
 			Range: 1
 			Upgrades: invulnerability
+			GrantUpgradeSequence: idle

 Sequences:
 	miner:
--- a/mods/ra/maps/center-of-attention-redux-2/map.yaml
+++ b/mods/ra/maps/center-of-attention-redux-2/map.yaml
@@ -891,13 +891,13 @@ Rules:
 		Inherits: OILB
 		Health:
 			HP: 6000
-		RenderBuilding:
+		RenderSprites:
 			Image: OILB
 	OILB.Weak:
 		Inherits: OILB
 		Health:
 			HP: 900
-		RenderBuilding:
+		RenderSprites:
 			Image: OILB

 Sequences:
--- a/mods/ra/maps/monster-tank-madness/map.yaml
+++ b/mods/ra/maps/monster-tank-madness/map.yaml
@@ -2238,7 +2238,7 @@ Rules:
 		Inherits: DOME
 		Buildable:
 			Prerequisites: ~disabled
-		RenderBuilding:
+		RenderSprites:
 			Image: DOME
 		-InfiltrateForExploration:
 		TargetableBuilding:
--- a/mods/ra/maps/soviet-05/map.yaml
+++ b/mods/ra/maps/soviet-05/map.yaml
@@ -721,7 +721,7 @@ Rules:
 			Prerequisites: ~disabled
 	DOME.IGNORE:
 		Inherits: DOME
-		RenderBuilding:
+		RenderSprites:
 			Image: DOME
 		AutoTargetIgnore:
 		Buildable:
--- a/mods/ra/maps/survival01/map.yaml
+++ b/mods/ra/maps/survival01/map.yaml
@@ -1273,7 +1273,7 @@ Rules:
 		-ParatroopersPower@paratroopers:
 		-AirstrikePower@parabombs:
 		-SupportPowerChargeBar:
-		RenderBuilding:
+		RenderSprites:
 			Image: AFLD
 	ATEK.mission:
 		Inherits: ATEK
@@ -1285,7 +1285,7 @@ Rules:
 		-TargetableBuilding:
 		-GivesBuildableArea:
 		-Huntable:
-		RenderBuilding:
+		RenderSprites:
 			Image: ATEK
 	GUN:
 		Valued:
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -232,7 +232,6 @@ V19.Husk:
 		ExcludeTilesets: DESERT
 	Tooltip:
 		Name: Husk (Oil Pump)
-	-RenderBuilding:
 	AutoSelectionSize:
 	RenderSprites:
 	BodyOrientation:
@@ -628,7 +627,7 @@ SNOWHUT:
 	Building:
 		Footprint: x x
 		Dimensions: 1,2
-	RenderBuilding:
+	RenderSprites:
 		Scale: 0.7

 LHUS:
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -396,7 +396,9 @@
 		DamagedSounds: kaboom1.aud
 		DestroyedSounds: kaboom22.aud
 	QuantizeFacingsFromSequence:
-	RenderBuilding:
+	RenderSprites:
+	AutoSelectionSize:
+	WithSpriteBody:
 	WithBuildingExplosion:
 	CaptureNotification:
 	ShakeOnDeath:
@@ -521,7 +523,7 @@

 ^CivBuilding:
 	Inherits: ^TechBuilding
-	RenderBuilding:
+	RenderSprites:
 		Palette: terrain
 	EditorTilesetFilter:
 		ExcludeTilesets: INTERIOR
@@ -664,7 +666,7 @@

 ^DesertCivBuilding:
 	Inherits: ^CivBuilding
-	RenderBuilding:
+	RenderSprites:
 		Palette: terrain
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
--- a/mods/ra/rules/fakes.yaml
+++ b/mods/ra/rules/fakes.yaml
@@ -15,7 +15,7 @@ FACF:
 		Footprint: xxx xxx xxx
 		Dimensions: 3,3
 	Bib:
-	RenderBuilding:
+	RenderSprites:
 		Image: FACT
 	Valued:
 		Cost: 250
@@ -37,7 +37,7 @@ WEAF:
 		Footprint: xxx xxx
 		Dimensions: 3,2
 	Bib:
-	RenderBuilding:
+	RenderSprites:
 		Image: WEAP
 	WithProductionDoorOverlay:
 		Sequence: build-top
@@ -64,7 +64,7 @@ SYRF:
 		Dimensions: 3,3
 		Adjacent: 8
 		TerrainTypes: Water
-	RenderBuilding:
+	RenderSprites:
 		Image: SYRD
 	Valued:
 		Cost: 100
@@ -91,7 +91,7 @@ SPEF:
 		Dimensions: 3,3
 		Adjacent: 8
 		TerrainTypes: Water
-	RenderBuilding:
+	RenderSprites:
 		Image: SPEN
 	Valued:
 		Cost: 100
@@ -115,7 +115,7 @@ DOMF:
 		Footprint: xx xx
 		Dimensions: 2,2
 	Bib:
-	RenderBuilding:
+	RenderSprites:
 		Image: DOME
 	Valued:
 		Cost: 180
@@ -139,7 +139,7 @@ ATEF:
 		Footprint: xx xx
 		Dimensions: 2,2
 	Bib:
-	RenderBuilding:
+	RenderSprites:
 		Image: ATEK
 	Valued:
 		Cost: 150
@@ -163,7 +163,7 @@ PDOF:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	RenderBuilding:
+	RenderSprites:
 		Image: PDOX
 	Bib:
 		HasMinibib: Yes
@@ -189,7 +189,7 @@ MSLF:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	RenderBuilding:
+	RenderSprites:
 		Image: MSLO
 	Valued:
 		Cost: 250
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -414,7 +414,7 @@ waypoint:

 ^fact.colorpicker:
 	Inherits: FACT
-	RenderBuilding:
+	RenderSprites:
 		Image: fact
 		Palette: colorpicker

--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -69,8 +69,8 @@ GAP:
 	RequiresPower:
 	CanPowerDown:
 	DisabledOverlay:
-	RenderBuilding:
-		PauseOnLowPower: yes
+	WithSpriteBody:
+		PauseAnimationWhenDisabled: true
 	Health:
 		HP: 1000
 	Armor:
@@ -401,8 +401,6 @@ TSLA:
 		Range: 8c0
 	Bib:
 		HasMinibib: Yes
-	RenderSprites:
-	WithSpriteBody:
 	WithChargeAnimation:
 	Armament:
 		Weapon: TeslaZap
@@ -411,13 +409,11 @@ TSLA:
 		ChargeAudio: tslachg2.aud
 		MaxCharges: 3
 		ReloadTime: 120
-	-RenderBuilding:
 	Power:
 		Amount: -100
 	DetectCloaked:
 		Range: 8
 	ProvidesPrerequisite@buildingname:
-	-WithMakeAnimation:

 AGUN:
 	Inherits: ^Defense
@@ -451,7 +447,7 @@ AGUN:
 	Turreted:
 		ROT: 15
 		InitialFacing: 224
-	RenderSprites:
+	-WithSpriteBody:
 	WithTurretedSpriteBody:
 	Armament:
 		Weapon: ZSU-23
@@ -459,14 +455,12 @@ AGUN:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	-RenderBuilding:
 	RenderRangeCircle:
 		RangeCircleType: aa
 	Power:
 		Amount: -50
 	DetectCloaked:
 		Range: 6
-	-WithMakeAnimation:

 DOME:
 	Inherits: ^Building
@@ -612,7 +606,7 @@ GUN:
 	Turreted:
 		ROT: 12
 		InitialFacing: 50
-	RenderSprites:
+	-WithSpriteBody:
 	WithTurretedSpriteBody:
 	Armament:
 		Weapon: TurretGun
@@ -620,12 +614,10 @@ GUN:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	-RenderBuilding:
 	Power:
 		Amount: -40
 	DetectCloaked:
 		Range: 7
-	-WithMakeAnimation:

 FTUR:
 	Inherits: ^Defense
@@ -690,21 +682,19 @@ SAM:
 	Turreted:
 		ROT: 30
 		InitialFacing: 0
-	RenderSprites:
+	-WithSpriteBody:
 	WithTurretedSpriteBody:
 	Armament:
 		Weapon: Nike
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	-RenderBuilding:
 	RenderRangeCircle:
 		RangeCircleType: aa
 	Power:
 		Amount: -40
 	DetectCloaked:
 		Range: 5
-	-WithMakeAnimation:

 ATEK:
 	Inherits: ^Building
@@ -988,17 +978,13 @@ SILO:
 		Range: 4c0
 	Bib:
 		HasMinibib: Yes
-	RenderSprites:
-	WithSpriteBody:
 	WithSiloAnimation:
 	StoresResources:
 		PipCount: 5
 		Capacity: 1500
-	-RenderBuilding:
 	-EmitInfantryOnSell:
 	Power:
 		Amount: -10
-	-WithMakeAnimation:

 HPAD:
 	Inherits: ^Building
--- a/mods/ts/rules/civilian-structures.yaml
+++ b/mods/ts/rules/civilian-structures.yaml
@@ -261,7 +261,7 @@ AMMOCRAT:
 		Type: none
 	Health:
 		HP: 1
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 BBOARD01:
@@ -625,7 +625,7 @@ CAARAY:
 		Type: concrete
 	Health:
 		HP: 400
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 CAARMR:
@@ -639,7 +639,7 @@ CAARMR:
 		Type: concrete
 	Health:
 		HP: 800
-	RenderBuilding:
+	RenderSprites:
 		Palette: player
 	ProvidesPrerequisite:
 		Prerequisite: barracks.upgraded
@@ -655,7 +655,7 @@ CABHUT:
 		Dimensions: 1, 1
 	Health:
 		HP: 2000
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 CACRSH01:
@@ -729,7 +729,7 @@ CAHOSP:
 		Type: concrete
 	Health:
 		HP: 800
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 CAPYR01:
@@ -1126,7 +1126,7 @@ GAKODK:
 		Type: heavy
 	Health:
 		HP: 1500
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 GAOLDCC1:
@@ -1140,7 +1140,7 @@ GAOLDCC1:
 		Type: heavy
 	Health:
 		HP: 400
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 GAOLDCC2:
@@ -1154,7 +1154,7 @@ GAOLDCC2:
 		Type: heavy
 	Health:
 		HP: 400
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 GAOLDCC3:
@@ -1168,7 +1168,7 @@ GAOLDCC3:
 		Type: heavy
 	Health:
 		HP: 400
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 GAOLDCC4:
@@ -1182,7 +1182,7 @@ GAOLDCC4:
 		Type: heavy
 	Health:
 		HP: 400
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 GAOLDCC5:
@@ -1196,7 +1196,7 @@ GAOLDCC5:
 		Type: heavy
 	Health:
 		HP: 400
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 GAOLDCC6:
@@ -1210,7 +1210,7 @@ GAOLDCC6:
 		Type: heavy
 	Health:
 		HP: 400
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 GASAND:
@@ -1273,7 +1273,7 @@ GALITE:
 		Cost: 200
 	Tooltip:
 		Name: Light Post
-	RenderBuilding:
+	RenderSprites:
 		Palette: terraindecoration
 	-WithMakeAnimation:
 	-WithDeathAnimation:
@@ -1330,7 +1330,7 @@ NAMNTK:
 		Type: heavy
 	Health:
 		HP: 1500
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 NTPYRA:
@@ -1346,7 +1346,7 @@ NTPYRA:
 		Type: heavy
 	Health:
 		HP: 1500
-	RenderBuilding:
+	RenderSprites:
 		Palette: player

 UFO:
@@ -1354,7 +1354,7 @@ UFO:
 	Building:
 		Dimensions: 6, 4
 		Footprint: xxxxxx xxxxxx xxxxxx xxxxxx
-	RenderBuilding:
+	RenderSprites:
 		Palette: terraindecoration
 	Selectable:
 		Bounds: 144, 72, 0, 0
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -63,7 +63,9 @@
 		DamagedSounds: expnew01.aud
 		DestroyedSounds: crmble2.aud
 	QuantizeFacingsFromSequence:
-	RenderBuilding:
+	RenderSprites:
+	WithSpriteBody:
+	AutoSelectionSize:
 	WithBuildingExplosion:
 		Sequences: building, large_bang, large_brnl, verylarge_clsn, large_tumu
 	EngineerRepairable:
@@ -115,7 +117,7 @@
 		Range: 4c0
 	Tooltip:
 		Description: Civilian Building
-	RenderBuilding:
+	RenderSprites:
 		Palette: terraindecoration

 ^CivBillboard:
@@ -530,8 +532,10 @@
 ^BlossomTree:
 	Tooltip:
 		Name: Blossom Tree
-	RenderBuilding:
+	RenderSprites:
 		Palette: player
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
@@ -636,7 +640,9 @@
 		Dimensions: 1,1
 		Footprint: x
 		TerrainTypes: Clear, Road, DirtRoad, Rough
-	RenderBuilding:
+	RenderSprites:
+	WithSpriteBody:
+	AutoSelectionSize:
 	WithMakeAnimation:
 	SelectionDecorations:
 		Palette: pips
--- a/mods/ts/rules/gdi-structures.yaml
+++ b/mods/ts/rules/gdi-structures.yaml
@@ -247,7 +247,7 @@ GADEPT:
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 98, 68, -6, -6
-	RenderBuilding:
+	RenderSprites:
 		Image: gadept.gdi
 		FactionImages:
 			gdi: gadept.gdi
@@ -348,7 +348,6 @@ GAPLUG:
 	CanPowerDown:
 		IndicatorPalette: mouse
 	DisabledOverlay:
-	RenderBuilding:
 	WithIdleOverlay@DISH:
 		Sequence: idle-dish
 	WithIdleOverlay@LIGHTS:
--- a/mods/ts/rules/gdi-support.yaml
+++ b/mods/ts/rules/gdi-support.yaml
@@ -25,6 +25,9 @@ GAWALL:

 GACTWR:
 	Inherits: ^Defense
+	-WithSpriteBody:
+	WithWallSpriteBody:
+		Type: wall
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -102,10 +105,6 @@ GACTWR:
 		Sequence: idle-lights
 	LineBuildNode:
 		Types: turret
-	-RenderBuilding:
-	RenderSprites:
-	WithWallSpriteBody:
-		Type: wall
 	Power@base:
 		Amount: -10
 	Power@turrets:
@@ -124,7 +123,6 @@ GACTWR:
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 48, 48, 0, -12
-	-WithMakeAnimation:

 GAVULC:
 	Inherits: ^BuildingPlug
--- a/mods/ts/rules/nod-support.yaml
+++ b/mods/ts/rules/nod-support.yaml
@@ -206,7 +206,6 @@ GAARTY:
 		MuzzleSequence: muzzle
 	BodyOrientation:
 		QuantizedFacings: 32
-	RenderBuilding:
 	RenderVoxels:
 		LightAmbientColor: 0.4, 0.4, 0.4
 	WithVoxelBarrel:
--- a/mods/ts/rules/shared-structures.yaml
+++ b/mods/ts/rules/shared-structures.yaml
@@ -97,7 +97,7 @@ PROC:
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 134, 122, 0, -18
-	RenderBuilding:
+	RenderSprites:
 		Image: proc.gdi
 		FactionImages:
 			gdi: proc.gdi
@@ -126,7 +126,6 @@ GASILO:
 		Type: Wood
 	RevealsShroud:
 		Range: 4c0
-	-RenderBuilding:
 	RenderSprites:
 		Image: gasilo.gdi
 		FactionImages:
@@ -145,7 +144,6 @@ GASILO:
 		Amount: -10
 	SelectionDecorations:
 		VisualBounds: 80, 48, -5, 0
-	-WithMakeAnimation:

 ANYPOWER:
 	AlwaysVisible:
--- a/mods/ts/rules/shared-support.yaml
+++ b/mods/ts/rules/shared-support.yaml
@@ -60,7 +60,7 @@ NAPULS:
 		Amount: -150
 	SelectionDecorations:
 		VisualBounds: 78, 54, 0, -12
-	RenderBuilding:
+	RenderSprites:
 		Image: napuls.gdi
 		FactionImages:
 			gdi: napuls.gdi
--- a/mods/ts/rules/trees.yaml
+++ b/mods/ts/rules/trees.yaml
@@ -11,7 +11,7 @@ BIGBLUE:
 	Inherits: ^BlossomTree
 	Tooltip:
 		Name: Large Blue Tiberium Crystal
-	RenderBuilding:
+	RenderSprites:
 		Palette: bluetiberium
 	RadarColorFromTerrain:
 		Terrain: BlueTiberium