barracks

mods/ca/rules/china/structures.yaml

@@ -214,10 +214,12 @@ chpower2:
 
 chbarracks:
 	Inherits: ^BuildingChina
-	Inherits@shape: ^3x2Shape
-	Inherits@PRIMARY: ^PrimaryBuilding
-	Inherits@InfantryProduction: ^InfantryProduction
-	Inherits@mines: ^MinefieldUpgrade
+	Inherits: ^2x2Building+Bib
+	Inherits: ^PrimaryBuilding
+	Inherits: ^InfantryProduction
+	Inherits: ^MinefieldUpgrade
+	RenderSprites:
+		PlayerPalette: overlayplayer
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -229,19 +231,14 @@ chbarracks:
 		Prerequisites: anypower, ~structures.china
 		Queue: Building
 		Description: Trains infantry.
-	Building:
-		Footprint: xxx xxx ===
-		Dimensions: 3,3
-		LocalCenterOffset: 0,-512,0
 	Health:
 		HP: 60000
 	RevealsShroud:
 		MinRange: 4c0
 		Range: 5c0
-		RevealGeneratedShroud: False
+		RevealGeneratedShrou: False
 	RevealsShroud@GAPGEN:
 		Range: 4c0
-	WithBuildingBib:
 	LaysMinefield@minefield:
 		Locations: 0,-1, 1,-1, 2,-1, -1,0, -1,1, 3,0, 3,1, 0,2, 1,2, 2,2
 	Exit@1:

mods/ca/rules/defaults.yaml

@@ -188,6 +188,14 @@
 	Selectable:
 		Bounds: 2048, 2048
 
+^2x2Building+Bib:
+	Inherits: ^2x2Shape
+	Building:
+		Footprint: xx xx ==
+		Dimensions: 2,3
+		LocalCenterOffset: 0,-512,0
+	WithBuildingBib:
+
 ^3x2Shape:
 	HitShape:
 		UseTargetableCellsOffsets: true

mods/ca/sequences/china.yaml

@@ -65,18 +65,14 @@ chpower:
 
 chbarracks:
 	Inherits: ^StructureOverlays
-	Inherits: ^LowResBuilding
-	idle:
-	damaged-idle:
-		Start: 1
-	dead:
+	idle: chinabarracks
 	make: chbuildingmakebig
 		Length: *
-	bib: bib2
+	bib: bib3
+		Length: *
 		UseTilesetExtension: true
 		TilesetOverrides:
 			INTERIOR: TEMPERAT
-		Length: *
 	icon: chbarracksicon
 
 chsupply: