chinabuildings mostly finished

mods/ca/rules/china/structures.yaml

@@ -153,10 +153,6 @@ chpower:
 		HP: 70000
 	Power:
 		Amount: 100
-	WithDeathAnimation:
-		DeathSequence: dead
-		DeathSequencePalette: overlayplayertd
-		UseDeathTypeSuffix: false
 	LaysMinefield@minefield:
 		Locations: 0,-1, 1,-1, -1,0, -1,1, 2,0, 2,1, 0,2, 1,2
 	Voiced:
@@ -317,16 +313,14 @@ chgatling:
 
 chbunker:
 	Inherits: ^DefenseTD
-	Inherits@shape: ^2x2Shape
-	Inherits@AUTOTARGET: ^AutoTargetAll
-	Inherits@sRT: ^Transport
-	Inherits@CARGO: ^AttackingCargo
-	Inherits@mines: ^MinefieldUpgrade
+	Inherits: ^RA2Sprite
+	Inherits: ^2x2Building
+	Inherits: ^AutoTargetAll
+	Inherits: ^Transport
+	Inherits: ^AttackingCargo
+	Inherits: ^MinefieldUpgrade
 	Tooltip:
 		Name: Bunker
-	Building:
-		Footprint: xx xx
-		Dimensions: 2, 2
 	Buildable:
 		BuildPaletteOrder: 40
 		Prerequisites: infantry.china, ~structures.china, ~!commander_tree.fortified_bunker, ~!commander_tree.advanced_infantry_training
@@ -667,7 +661,7 @@ chpropagandatower.pdl:
 		HP: 60000
 
 chinternetcenter:
-	Inherits: ^BuildingChina
+	Inherits: ^BuildingChinaTD
 	Inherits: ^TechLevelBuilding
 	Inherits: ^Transport
 	Inherits: ^DisableOnLowPowerOrForceDisabled
@@ -727,10 +721,10 @@ chinternetcenter:
 		VoiceSet: CHInternetCenterVoice
 
 chsilo:
-	Inherits: ^ScienceBuildingTD
-	Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDownOrForceDisable
-	Inherits@shape: ^3x2Shape
-	Inherits@mines: ^MinefieldUpgrade
+	Inherits: ^ScienceBuilding
+	Inherits: ^DisableOnLowPowerOrPowerDownOrForceDisable
+	Inherits: ^3x2Building
+	Inherits: ^MinefieldUpgrade
 	Valued:
 		Cost: 4000
 	Tooltip:
@@ -809,12 +803,6 @@ chsilo:
 		DirectionArrowAnimation: paradirection
 		SupportPowerPaletteOrder: 40
 		Prerequisites: chsilo
-	WithBuildingBib:
-	WithSupportPowerActivationAnimation:
-		RequiresCondition: !build-incomplete
-	WithSupportPowerActivationOverlay:
-		RequiresCondition: !build-incomplete
-		Sequence: smoke
 	SupportPowerChargeBar:
 	Power:
 		Amount: -200

mods/ca/rules/defaults.yaml

@@ -29,6 +29,12 @@
 	GrantCondition@Model:
 		Condition: tssprite
 
+^RA2Sprite:
+	RenderSprites:
+		PlayerPalette: playerra2
+	GrantCondition@Model:
+		Condition: ra2sprite
+
 ^ScrinSprite:
 	RenderSprites:
 		PlayerPalette: overlayplayerscrin
@@ -79,7 +85,6 @@
 	GrantCondition@Model:
 		Condition: voxel
 
-
 ^InfantryRA2Sprite:
 	RenderSprites:
 		PlayerPalette: playerra2
@@ -206,12 +211,20 @@
 	Selectable:
 		Bounds: 2048, 2048
 
-^2x2Building+Bib:
+^2x2Building:
 	Inherits: ^2x2Shape
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+		LocalCenterOffset: 0,-512,0
+	WithBuildingBib:
+		Sequence: bib3.1
+
+^2x2Building+Bib:
+	Inherits: ^2x2Building
 	Building:
 		Footprint: xx xx ==
 		Dimensions: 2,3
-		LocalCenterOffset: 0,-512,0
 	WithBuildingBib:
 		Sequence: bib3
 

mods/ca/sequences/china.yaml

@@ -26,12 +26,6 @@ chpower:
 		Offset: 0,-10
 	make: chbuildingmake2x2
 		Length: *
-	bib: bib3
-		UseTilesetExtension: true
-		TilesetOverrides:
-			INTERIOR: TEMPERAT
-		Length: *
-		Offset: 0,-14
 	icon: chpowericon
 	iconadv: chadvpowericon
 	idle-anim2: plantsmoke
@@ -94,26 +88,10 @@ chinternetcenter:
 
 chsilo:
 	Inherits: ^StructureOverlays
-	Inherits: ^LowResBuilding
-	Defaults:
-		Offset: 0,-6
-	idle:
-	damaged-idle:
-		Start: 1
-	active: invisibleitem
-	smoke: invisibleitem
-	damaged-active: invisibleitem
-	dead:
+	idle: chinanukesilo
 	make: chbuildingmakebig
 		Length: *
-	bib: bib2
-		UseTilesetExtension: true
-		TilesetOverrides:
-			INTERIOR: TEMPERAT
-		Length: *
-		Offset: 0,0
 	icon: chsiloicon
-		Offset: 0,0
 
 chairport:
 	Inherits: ^StructureOverlays
@@ -142,19 +120,10 @@ chgatling:
 
 chbunker:
 	Inherits: ^StructureOverlays
-	Inherits: ^LowResBuilding
-	Defaults: chbunker
-		Offset: 0,-7
-	idle: chbunker
-	damaged-idle:
-		Start: 1
-	build: chbunker
-	damaged-build: chbunker
+	idle: bunker
 	make: chbuildingmake2x2
 		Length: *
-	dead: chbunker
 	icon: chbunkericon
-		Offset: 0,0
 
 chbunker2:
 	Inherits: chbunker

mods/ca/sequences/defaults.yaml

@@ -1,3 +1,57 @@
+^StructureOverlays:
+	emp-overlay: emp_fx01
+		Length: *
+		BlendMode: Additive
+		Offset: 0, 0
+		UseTilesetCode: false
+		ZOffset: 512
+	chrono-overlay: chronofade
+		Length: *
+		BlendMode: Additive
+		Offset: 0, 0
+		UseTilesetCode: false
+		ZOffset: 512
+	mind-overlay: mindanim
+		Length: *
+		Tick: 200
+		BlendMode: Alpha
+		Offset: 0, 0
+	bib0: mbGAP
+		Offset: 0,0
+		Length: *
+		UseTilesetExtension: true
+		TilesetOverrides:
+			JUNGLE: TEMPERAT
+			BARREN: TEMPERAT
+	bib1: bib1
+		UseTilesetExtension: true
+		Length: *
+		TilesetOverrides:
+			INTERIOR: TEMPERAT
+	bib1.2: bib1
+		UseTilesetExtension: true
+		Length: *
+		TilesetOverrides:
+			INTERIOR: TEMPERAT
+		Offset: 0,-6
+	bib2: bib2
+		UseTilesetExtension: true
+		Length: *
+		TilesetOverrides:
+			INTERIOR: TEMPERAT
+		Offset: 0,6
+	bib3: bib3
+		Length: *
+		UseTilesetExtension: true
+		TilesetOverrides:
+			INTERIOR: TEMPERAT
+	bib3.1: bib3
+		Length: *
+		Offset: 0,-15
+		UseTilesetExtension: true
+		TilesetOverrides:
+			INTERIOR: TEMPERAT
+
 ^VehicleOverlays:
 	emp-overlay: emp_fx01
 		Length: *

mods/ca/sequences/structures.yaml

@@ -1,52 +1,3 @@
-^StructureOverlays:
-	emp-overlay: emp_fx01
-		Length: *
-		BlendMode: Additive
-		Offset: 0, 0
-		UseTilesetCode: false
-		ZOffset: 512
-	chrono-overlay: chronofade
-		Length: *
-		BlendMode: Additive
-		Offset: 0, 0
-		UseTilesetCode: false
-		ZOffset: 512
-	mind-overlay: mindanim
-		Length: *
-		Tick: 200
-		BlendMode: Alpha
-		Offset: 0, 0
-	bib0: mbGAP
-		Offset: 0,0
-		Length: *
-		UseTilesetExtension: true
-		TilesetOverrides:
-			JUNGLE: TEMPERAT
-			BARREN: TEMPERAT
-	bib1: bib1
-		UseTilesetExtension: true
-		Length: *
-		TilesetOverrides:
-			INTERIOR: TEMPERAT
-	bib1.2: bib1
-		UseTilesetExtension: true
-		Length: *
-		TilesetOverrides:
-			INTERIOR: TEMPERAT
-		Offset: 0,-6
-	bib2: bib2
-		UseTilesetExtension: true
-		Length: *
-		TilesetOverrides:
-			INTERIOR: TEMPERAT
-		Offset: 0,6
-	bib3: bib3
-		Length: *
-		UseTilesetExtension: true
-		TilesetOverrides:
-			INTERIOR: TEMPERAT
-
-
 fcom:
 	Inherits: ^StructureOverlays
 	idle: fcom