Merge branch 'chinabuildings'

mods/ca/rules/allies/infantry.yaml

@@ -163,8 +163,8 @@ Sniper:
 	Inherits: ^Soldier
 	Inherits: ^PrioAntiInfantry
 	Inherits: ^ScoutEquipment
-	Inherits: ^CloakedAttacker
 	Inherits: ^InfantryRA2Sprite
+	Inherits: ^CloakedAttacker
 	Buildable:
 		Queue: Infantry
 		BuildAtProductionType: Soldier
@@ -308,8 +308,8 @@ SpecOps:
 	Inherits: ^Soldier
 	Inherits: ^PrioAntiInfantry
 	Inherits: ^SensorEquipment
-	Inherits: ^CloakedAttacker
 	Inherits: ^InfantryRA2Sprite
+	Inherits: ^CloakedAttacker
 	Buildable:
 		Queue: Infantry
 		BuildAtProductionType: Soldier

mods/ca/rules/china/defaults.yaml

@@ -101,6 +101,13 @@ Player:
 		Modifier: 90
 
 ^BuildingChina:
+	Inherits: ^Building
+	Buildable:
+		IconPalette: chrometd
+	SpawnActorsOnSell:
+		ActorTypes: che1,che1,che1,che1,che1,che1,che1,che1,che1,che1,c1,c1,c1,c1,c7,c7,c7,c7,c10,c10
+
+^BuildingChinaTD:
 	Inherits: ^BuildingTD
 	SpawnActorsOnSell:
 		ActorTypes: che1,che1,che1,che1,che1,che1,che1,che1,che1,che1,c1,c1,c1,c1,c7,c7,c7,c7,c10,c10

mods/ca/rules/china/infantry.yaml

@@ -1,14 +1,10 @@
 CHE1:
 	Inherits: ^Soldier
 	Inherits: ^InfantryRA2Sprite
-	WithShadow:
-		Offset: 43, 128, 0
-		ZOffset: -129
 	Inherits: ^PrioAntiInfantry
 	Inherits: ^ScoutEquipment
 	Inherits: ^BotCaptureHelper
 	Inherits: ^HordeBonus
-	#Inherits@cap: ^BuildingCaptureUpgrade
 	Inherits: ^AnnounceOnBuild
 	Inherits: ^AttackFrontalVoice
 	Buildable:
@@ -44,8 +40,8 @@ CHE1:
 
 minigunner:
 	Inherits: CHE1
-	Inherits: ^InfantryRASprite
 	Inherits: ^PrioAntiLightAA
+	Inherits: ^InfantryRASprite
 	Buildable:
 		BuildPaletteOrder: 20
 		IconPalette: chrometd

mods/ca/rules/china/structures.yaml

@@ -1,6 +1,6 @@
 chcommand:
 	Inherits: ^BuildingChina
-	Inherits: ^3x2Shape
+	Inherits: ^4x3Building+Bib
 	Inherits: ^ConcreteArmor
 	Inherits: ^MinefieldUpgrade
 	Inherits: ^BotFallbackInsurance
@@ -16,9 +16,6 @@ chcommand:
 		Cost: 3000
 	Tooltip:
 		Name: Headquarter (China)
-	Building:
-		Footprint: xxx xxx xxx
-		Dimensions: 3,3
 	Health:
 		HP: 150000
 	BaseProvider:
@@ -31,7 +28,6 @@ chcommand:
 		RevealGeneratedShroud: False
 	RevealsShroud@GAPGEN:
 		Range: 4c0
-	WithBuildingBib:
 	ProvidesRadar:
 		RequiresCondition: !jammed && !disabled && !being-warped && radar
 	Power:
@@ -139,10 +135,10 @@ chcommand.radar:
 		Amount: -30
 
 chpower:
-	Inherits: ^BuildingChina
-	Inherits@shape: ^2x2Shape
-	Inherits@POWER_OUTAGE: ^DisabledByPowerOutage
-	Inherits@mines: ^MinefieldUpgrade
+	Inherits: ^BuildingChinaTD
+	Inherits: ^2x2Building+Bib
+	Inherits: ^DisabledByPowerOutage
+	Inherits: ^MinefieldUpgrade
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 1
@@ -152,16 +148,9 @@ chpower:
 		Cost: 300			#500
 	Tooltip:
 		Name: Nuclear Reactor
-	Building:
-		Footprint: xx xx ==
-		Dimensions: 2,3
-		LocalCenterOffset: 0,-512,0
 	SelectionDecorations:
 	Health:
 		HP: 70000
-	RevealsShroud:
-		Range: 4c0
-	WithBuildingBib:
 	Power:
 		Amount: 100
 	WithDeathAnimation:
@@ -173,6 +162,7 @@ chpower:
 	Voiced:
 		VoiceSet: CHNuclearReactorVoice
 	WithIdleOverlay@SMOKE:
+		Offset: -1700,-310,1550
 		RequiresCondition: !build-incomplete
 		Sequence: idle-anim2
 		Palette: placelinesegment2
@@ -209,15 +199,18 @@ chpower2:
 		Cost: 500			#500
 	Power:
 		Amount: 200
-	RenderSprites:
-		Image: chpower
+	WithIdleOverlay@SMOKE2:
+		Offset: -2200,-750,1600
+		RequiresCondition: !build-incomplete
+		Sequence: idle-anim2
+		Palette: placelinesegment2
 
 chbarracks:
 	Inherits: ^BuildingChina
-	Inherits@shape: ^3x2Shape
-	Inherits@PRIMARY: ^PrimaryBuilding
-	Inherits@InfantryProduction: ^InfantryProduction
-	Inherits@mines: ^MinefieldUpgrade
+	Inherits: ^2x2Building+Bib
+	Inherits: ^PrimaryBuilding
+	Inherits: ^InfantryProduction
+	Inherits: ^MinefieldUpgrade
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -229,19 +222,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:
@@ -282,9 +270,9 @@ chbarracks:
 
 chgatling:
 	Inherits: ^DefenseTD
-	Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
-	Inherits@AUTOTARGET: ^AutoTargetAll
-	Inherits@mines: ^MinefieldUpgrade
+	Inherits: ^DisableOnLowPowerOrPowerDown
+	Inherits: ^AutoTargetAll
+	Inherits: ^MinefieldUpgrade
 	Inherits: ^ChinaGatling
 	Valued:
 		Cost: 800
@@ -435,10 +423,10 @@ chbunker2.advinf:
 
 chsupply:
 	Inherits: ^BuildingChina
-	Inherits@shape: ^3x2Shape
-	Inherits@2: ^BotIncome
-	Inherits@Refinery: ^Refinery
-	Inherits@mines: ^MinefieldUpgrade
+	Inherits: ^3x2Building+Bib
+	Inherits: ^BotIncome
+	Inherits: ^Refinery
+	Inherits: ^MinefieldUpgrade
 	Valued:
 		Cost: 1300
 	Tooltip:
@@ -447,9 +435,6 @@ chsupply:
 		BuildPaletteOrder: 4
 		Prerequisites: anypower, ~structures.china
 		Description: Processes raw Tiberium\ninto useable resources
-	Building:
-		Footprint: xxx ===
-		Dimensions: 3,2
 	Health:
 		HP: 80000
 	RevealsShroud:
@@ -476,10 +461,10 @@ chsupply:
 
 chweap:
 	Inherits: ^BuildingChina
-	Inherits@shape: ^4x3Shape
-	Inherits@PRIMARY: ^PrimaryBuilding
-	Inherits@VehicleProduction: ^VehicleProduction
-	Inherits@mines: ^MinefieldUpgrade
+	Inherits: ^4x3Building+Bib
+	Inherits: ^PrimaryBuilding
+	Inherits: ^VehicleProduction
+	Inherits: ^MinefieldUpgrade
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -490,31 +475,23 @@ chweap:
 		BuildPaletteOrder: 5
 		Prerequisites: chsupply, ~structures.china
 		Description: Produces vehicles
-	Building:
-		Footprint: xxxx xxxx ====
-		Dimensions: 4,3
 	SelectionDecorations:
 	Health:
 		HP: 150000
 	RevealsShroud:
 		Range: 5c0
-	WithBuildingBib:
 	LaysMinefield@minefield:
 		Locations: 0,-1, 1,-1, 2,-1, 3,-1, -1,0, -1,1, 4,0, 4,1, 0,2, 1,2, 2,2, 3,2
 	Exit@1:
-		SpawnOffset: 128,256,0
-		ExitCell: 1,2
+		ExitCell: 4,4
 		ExitDelay: 3
 	Exit@2:
-		ExitCell: 2,2
+		ExitCell: 5,4
 		ExitDelay: 3
 	Power:
 		Amount: -40
 	Voiced:
 		VoiceSet: PRCWarFactoryVoice
-	WithIdleOverlay@BOXES:
-		RequiresCondition: !build-incomplete
-		Sequence: idle-anim1
 	Reservable:
 	RepairsUnits:
 		HpPerStep: 1000
@@ -525,30 +502,27 @@ chweap:
 		Prerequisite: vehicles.china
 
 chpropaganda:
-	Inherits: ^ScienceBuildingTD
+	Inherits: ^ScienceBuilding
 	Inherits: ^TechLevelBuilding
 	Inherits: ^Tier3Tech
-	Inherits@shape: ^4x2Shape
-	Inherits@IDISABLE: ^DisableOnLowPowerOrForceDisabled
-	Inherits@mines: ^MinefieldUpgrade
-	Inherits@speaker: ^PropagandaSpeaker
+	Inherits: ^3x2Building
+	Inherits: ^DisableOnLowPowerOrForceDisabled
+	Inherits: ^MinefieldUpgrade
+	Inherits: ^PropagandaSpeaker
 	Valued:
 		Cost: 2000
 	Tooltip:
 		Name: Propaganda Center
 	Buildable:
+		IconPalette: chrometd
 		BuildPaletteOrder: 8
 		Prerequisites: chweap, radar, ~structures.china, ~!techlevel.medium
 		Description: Provides access to advanced Chinese technologies.
-	Building:
-		Footprint: xxxx xxxx
-		Dimensions: 4,2
 	SelectionDecorations:
 	Health:
 		HP: 110000
 	RevealsShroud:
 		Range: 5c0
-	WithBuildingBib:
 	LaysMinefield@minefield:
 		Locations: 0,-1, 1,-1, 2,-1, 3,-1, -1,0, -1,1, 4,0, 4,1, 0,2, 1,2, 2,2, 3,2
 	ProvidesPrerequisite:
@@ -632,10 +606,15 @@ chpropaganda:
 
 chpropagandatower:
 	Inherits: ^BuildingChina
-	Inherits@speaker: ^PropagandaSpeaker
-	Inherits@IDISABLE: ^DisableOnLowPowerOrForceDisabled
+	Inherits: ^1x1Building
+	Inherits: ^PropagandaSpeaker
+	Inherits: ^DisableOnLowPowerOrForceDisabled
 	RenderSprites:
 		Image: chpropagandatower
+	Building:
+		LocalCenterOffset: 0,0,0
+	Selectable:
+		Bounds: 1024,2600, 0,-900
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -653,8 +632,6 @@ chpropagandatower:
 		Amount: -20
 	MustBeDestroyed:
 		RequiredForShortGame: false
-	WithBuildingBib:
-		HasMinibib: true
 	Voiced:
 		VoiceSet: CHSpeakerTowerVoice
 	AttackOmni:
@@ -675,7 +652,7 @@ chpropagandatower:
 chpropagandatower.pdl:
 	Inherits: chpropagandatower
 	Inherits: ^PointLaserDefenseSystemBig
-	Inherits@AUTOTARGET: ^AutoTargetGround
+	Inherits: ^AutoTargetGround
 	WithProductionIconOverlay@PDL:
 		Types: PDL
 	Valued:
@@ -693,9 +670,9 @@ chinternetcenter:
 	Inherits: ^BuildingChina
 	Inherits: ^TechLevelBuilding
 	Inherits: ^Transport
-	Inherits@IDISABLE: ^DisableOnLowPowerOrForceDisabled
-	Inherits@shape: ^4x3Shape
-	Inherits@mines: ^MinefieldUpgrade
+	Inherits: ^DisableOnLowPowerOrForceDisabled
+	Inherits: ^3x2Building+Bib
+	Inherits: ^MinefieldUpgrade
 	Valued:
 		Cost: 2500
 	Tooltip:
@@ -705,14 +682,8 @@ chinternetcenter:
 		BuildLimit: 1
 		Prerequisites: techcenter, ~structures.china
 		Description: Can shelter Hackers.\nHas surveillance powers.
-	Building:
-		Footprint: ==== xxxx xxxx
-		Dimensions: 4,3
 	Health:
 		HP: 100000
-	RevealsShroud:
-		Range: 6c0
-	WithBuildingBib:
 	LaysMinefield@minefield:
 		Locations: 0,0, 1,0, 2,0, 3,0, -1,1, -1,2, 4,1, 4,2, 0,3, 1,3, 2,3, 3,3
 	ProvidesPrerequisite@buildingname:
@@ -856,11 +827,11 @@ chsilo:
 
 chairport:
 	Inherits: ^BuildingChina
-	Inherits@shape: ^4x3Shape
-	Inherits@PRIMARY: ^PrimaryBuilding
-	Inherits@AIRCRAFTREPAIR: ^RepairsAircraftWithRepairBay
-	Inherits@mines: ^MinefieldUpgrade
-	Inherits@AircraftProduction: ^AircraftProduction
+	Inherits: ^4x2Building+Bib
+	Inherits: ^PrimaryBuilding
+	Inherits: ^RepairsAircraftWithRepairBay
+	Inherits: ^MinefieldUpgrade
+	Inherits: ^AircraftProduction
 	Buildable:
 		BuildPaletteOrder: 7
 		Prerequisites: radar, ~structures.china
@@ -870,8 +841,7 @@ chairport:
 	Tooltip:
 		Name: Airfield
 	Building:
-		Footprint: ____ xxxx xx== xx==
-		Dimensions: 4,4
+		Footprint: x=x= xxx= =x==
 	Health:
 		HP: 150000
 	RevealsShroud: