Merge pull request #9189 from reaperrr/bye-rendersimple3

Remove RenderBuilding
2015-09-02 19:21:01 +03:00
parent 032bef7d71 0785bdbcf1
commit 2042fccefd
53 changed files with 559 additions and 408 deletions
--- a/mods/cnc/rules/civilian.yaml
+++ b/mods/cnc/rules/civilian.yaml
@@ -287,7 +287,7 @@ BARB:
 		NodeTypes: barbwire
 	LineBuildNode:
 		Types: barbwire
-	RenderBuildingWall:
+	WithWallSpriteBody:
 		Type: barbwire

 WOOD:
@@ -303,7 +303,7 @@ WOOD:
 		NodeTypes: woodfence
 	LineBuildNode:
 		Types: woodfence
-	RenderBuildingWall:
+	WithWallSpriteBody:
 		Type: woodfence

 BRIDGE1:
--- 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:
@@ -560,8 +566,10 @@
 		Types: wall
 	BodyOrientation:
 		QuantizedFacings: 1
-	RenderBuildingWall:
+	RenderSprites:
 		Palette: staticterrain
+	WithWallSpriteBody:
+	AutoSelectionSize:
 	GivesExperience:
 	AutoTargetIgnore:
 	Sellable:
@@ -599,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
@@ -210,12 +210,14 @@ SILO:
 		Range: 4c0
 	Bib:
 		HasMinibib: Yes
-	RenderBuildingSilo:
+	RenderSprites:
+	WithSpriteBody:
+	AutoSelectionSize:
+	WithSiloAnimation:
 	StoresResources:
 		PipCount: 10
 		PipColor: Green
 		Capacity: 2000
-	-RenderBuilding:
 	-EmitInfantryOnSell:
 	Power:
 		Amount: -10
@@ -459,8 +461,8 @@ HQ:
 	RequiresPower:
 	CanPowerDown:
 	DisabledOverlay:
-	RenderBuilding:
-		PauseOnLowPower: yes
+	WithSpriteBody:
+		PauseAnimationWhenDisabled: true
 	Health:
 		HP: 700
 	RevealsShroud:
@@ -545,8 +547,8 @@ EYE:
 	RequiresPower:
 	CanPowerDown:
 	DisabledOverlay:
-	RenderBuilding:
-		PauseOnLowPower: yes
+	WithSpriteBody:
+		PauseAnimationWhenDisabled: true
 	Health:
 		HP: 1200
 	RevealsShroud:
@@ -650,14 +652,14 @@ GUN:
 	Turreted:
 		ROT: 12
 		InitialFacing: 50
-	RenderBuildingTurreted:
+	-WithSpriteBody:
+	WithTurretedSpriteBody:
 	Armament:
 		Weapon: TurretGun
 		LocalOffset: 512,0,112
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	-RenderBuilding:
 	-WithDeathAnimation:
 	DetectCloaked:
 		Range: 3
@@ -691,13 +693,14 @@ SAM:
 	Turreted:
 		ROT: 10
 		InitialFacing: 0
-	RenderBuildingTurreted:
+	-WithSpriteBody:
+	WithTurretedSpriteBody:
+	AutoSelectionSize:
 	Armament:
 		Weapon: SAMMissile
 		MuzzleSequence: muzzle
 	AttackPopupTurreted:
 	WithMuzzleFlash:
-	-RenderBuilding:
 	-RenderDetectionCircle:
 	Power:
 		Amount: -20
@@ -732,7 +735,7 @@ OBLI:
 		Range: 8c0
 	Bib:
 		HasMinibib: Yes
-	RenderBuildingCharge:
+	WithChargeAnimation:
 	Armament:
 		Weapon: Laser
 		LocalOffset: 0,0,725
@@ -741,7 +744,6 @@ OBLI:
 		ChargeAudio: obelpowr.aud
 		ReloadTime: 40
 		InitialChargeDelay: 50
-	-RenderBuilding:
 	-EmitInfantryOnSell:
 	DetectCloaked:
 		Range: 5
@@ -854,7 +856,7 @@ SBAG:
 		NodeTypes: sandbag
 	LineBuildNode:
 		Types: sandbag
-	RenderBuildingWall:
+	WithWallSpriteBody:
 		Type: sandbag

 CYCL:
@@ -879,7 +881,7 @@ CYCL:
 		NodeTypes: chain
 	LineBuildNode:
 		Types: chain
-	RenderBuildingWall:
+	WithWallSpriteBody:
 		Type: chain

 BRIK:
@@ -909,7 +911,7 @@ BRIK:
 		NodeTypes: concrete
 	LineBuildNode:
 		Types: concrete
-	RenderBuildingWall:
+	WithWallSpriteBody:
 		Type: concrete

 BARRACKS:
--- 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