Update D2k decorations.

mods/d2k/rules/aircraft.yaml

@@ -88,7 +88,6 @@ frigate:
 	-AppearsOnRadar:
 	Cargo:
 		MaxWeight: 20
-		PipCount: 10
 	RejectsOrders:
 
 ornithopter:

mods/d2k/rules/defaults.yaml

@@ -96,30 +96,30 @@
 		Image: rank
 		Sequence: rank-veteran-1
 		Palette: effect
-		ReferencePoint: Bottom, Right
+		Position: BottomRight
+		Margin: 5, 6
 		RequiresCondition: rank-veteran == 1
-		ZOffset: 256
 	WithDecoration@RANK-2:
 		Image: rank
 		Sequence: rank-veteran-2
 		Palette: effect
-		ReferencePoint: Bottom, Right
+		Position: BottomRight
+		Margin: 5, 6
 		RequiresCondition: rank-veteran == 2
-		ZOffset: 256
 	WithDecoration@RANK-3:
 		Image: rank
 		Sequence: rank-veteran-3
 		Palette: effect
-		ReferencePoint: Bottom, Right
+		Position: BottomRight
+		Margin: 5, 6
 		RequiresCondition: rank-veteran == 3
-		ZOffset: 256
 	WithDecoration@RANK-ELITE:
 		Image: rank
 		Sequence: rank-elite
 		Palette: effect
-		ReferencePoint: Bottom, Right
+		Position: BottomRight
+		Margin: 5, 6
 		RequiresCondition: rank-elite
-		ZOffset: 256
 
 ^AutoTargetGround:
 	AutoTarget:
@@ -176,8 +176,6 @@
 		TurnSpeed: 5
 		Locomotor: vehicle
 		PauseOnCondition: notmobile
-	SelectionDecorations:
-	WithSpriteControlGroupDecoration:
 	Selectable:
 		Bounds: 32,32
 	Targetable:
@@ -185,7 +183,6 @@
 	Passenger:
 		CargoType: Vehicle
 	AttackMove:
-	DrawLineToTarget:
 	HiddenUnderFog:
 	ActorLostNotification:
 	Repairable:
@@ -205,9 +202,8 @@
 		LockedCondition: notmobile
 	WithDecoration@CARRYALL:
 		Image: pips
+		Margin: 7, 9
 		Sequence: pickup-indicator
-		ReferencePoint: Top, Left
-		ZOffset: 256
 		RequiresCondition: carryall-reserved
 	RevealOnFire:
 	RevealOnDeath:
@@ -285,8 +281,6 @@
 		Range: 3c768
 	Mobile:
 		Locomotor: foot
-	SelectionDecorations:
-	WithSpriteControlGroupDecoration:
 	Selectable:
 		Bounds: 24,24,0,-4
 		DecorationBounds: 12,20,0,-4
@@ -309,10 +303,8 @@
 			BulletDeath: 4
 		CrushedSequence: die-crushed
 	AttackMove:
-	DrawLineToTarget:
 	Passenger:
 		CargoType: Infantry
-		PipType: Green
 	HiddenUnderFog:
 	ActorLostNotification:
 	Crushable:
@@ -356,7 +348,6 @@
 		AlwaysVisibleStances: None
 	ActorLostNotification:
 	AttackMove:
-	DrawLineToTarget:
 	WithFacingSpriteBody:
 	WithShadow:
 	HitShape:
@@ -372,8 +363,6 @@
 	Huntable:
 	OwnerLostAction:
 		Action: Kill
-	SelectionDecorations:
-	WithSpriteControlGroupDecoration:
 	RevealsShroud:
 	Targetable:
 		TargetTypes: Ground, C4, Structure
@@ -449,7 +438,7 @@
 	WithBuildingRepairDecoration:
 		Image: allyrepair
 		Sequence: repair
-		ReferencePoint: Center
+		Position: Center
 		Palette: player
 		IsPlayerPalette: True
 
@@ -510,7 +499,7 @@
 		Sequence: offline
 		Palette: chrome
 		RequiresCondition: powerdown
-		ReferencePoint: Center
+		Position: Center
 		Offsets:
 			repairing: 10, 0
 	PowerMultiplier@POWERDOWN:
@@ -522,25 +511,60 @@
 		Offsets:
 			powerdown: -10, 0
 
+^Selectable:
+	Selectable:
+	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
+		Margin: -1, -1
+	DrawLineToTarget:
+
 ^SelectableCombatUnit:
+	Inherits@selectiondecorations: ^Selectable
 	Selectable:
 		Priority: 10
 		PriorityModifiers: Ctrl
 
 ^SelectableSupportUnit:
+	Inherits@selectiondecorations: ^Selectable
 	Selectable:
 		Priority: 8
 		PriorityModifiers: Ctrl, Alt
 
 ^SelectableEconomicUnit:
+	Inherits@selectiondecorations: ^Selectable
 	Selectable:
 		Priority: 6
 		PriorityModifiers: Ctrl, Alt
 
 ^SelectableCombatBuilding:
+	Inherits@selectiondecorations: ^Selectable
 	Selectable:
 		Priority: 4
 
 ^SelectableBuilding:
+	Inherits@selectiondecorations: ^Selectable
 	Selectable:
 		Priority: 2
+
+^PrimaryBuilding:
+	PrimaryBuilding:
+		PrimaryCondition: primary
+		ProductionQueues: Building
+		SelectionNotification: PrimaryBuildingSelected
+	WithTextDecoration@primary:
+		RequiresCondition: primary
+		Position: Top
+		Margin: 0, 5
+		RequiresSelection: true
+		Text: PRIMARY
+
+^Upgradeable:
+	GrantConditionOnPrerequisite@UPGRADEABLE:
+		Condition: stardecoration
+	WithDecoration@upgraded:
+		RequiresCondition: stardecoration
+		Position: TopRight
+		Margin: 6, 8
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-upgraded

mods/d2k/rules/structures.yaml

@@ -54,6 +54,8 @@ concreteb:
 
 construction_yard:
 	Inherits: ^Building
+	Inherits@PRIMARY: ^PrimaryBuilding
+	Inherits@UPGRADEABLE: ^Upgradeable
 	Buildable:
 		Description: Produces structures.
 	-DamagedByTerrain:
@@ -103,26 +105,10 @@ construction_yard:
 		RequiresCondition: !build-incomplete
 		Palette: d2k
 	PrimaryBuilding:
-		PrimaryCondition: primary
 		ProductionQueues: Building
-		SelectionNotification: PrimaryBuildingSelected
 	ProvidesPrerequisite@buildingname:
-	GrantConditionOnPrerequisite:
+	GrantConditionOnPrerequisite@UPGRADEABLE:
 		Prerequisites: upgrade.conyard
-		Condition: stardecoration
-	WithDecoration@upgraded:
-		RequiresSelection: true
-		Image: pips
-		Sequence: tag-upgraded
-		ReferencePoint: Top, Right
-		ZOffset: 256
-		RequiresCondition: stardecoration
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		ZOffset: 256
-		RequiresCondition: primary
 	RevealOnDeath:
 		Radius: 5c768
 
@@ -174,6 +160,8 @@ wind_trap:
 
 barracks:
 	Inherits: ^Building
+	Inherits@PRIMARY: ^PrimaryBuilding
+	Inherits@UPGRADEABLE: ^Upgradeable
 	Buildable:
 		Prerequisites: wind_trap
 		Queue: Building
@@ -211,9 +199,7 @@ barracks:
 	Production:
 		Produces: Infantry, Upgrade
 	PrimaryBuilding:
-		PrimaryCondition: primary
 		ProductionQueues: Infantry
-		SelectionNotification: PrimaryBuildingSelected
 	ProductionBar:
 		ProductionType: Infantry
 	ProvidesPrerequisite@atreides:
@@ -236,22 +222,8 @@ barracks:
 			corrino: barracks.harkonnen
 	WithBuildingBib:
 	ProvidesPrerequisite@buildingname:
-	GrantConditionOnPrerequisite:
+	GrantConditionOnPrerequisite@UPGRADEABLE:
 		Prerequisites: upgrade.barracks
-		Condition: stardecoration
-	WithDecoration@upgraded:
-		RequiresSelection: true
-		Image: pips
-		Sequence: tag-upgraded
-		ReferencePoint: Top, Right
-		ZOffset: 256
-		RequiresCondition: stardecoration
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		ZOffset: 256
-		RequiresCondition: primary
 	RevealOnDeath:
 		Radius: 3c768
 
@@ -293,8 +265,6 @@ refinery:
 		DockOffset: 2,1
 		TickRate: 20
 	StoresResources:
-		PipColor: green
-		PipCount: 10
 		Capacity: 2000
 	CustomSellValue:
 		Value: 500
@@ -320,6 +290,11 @@ refinery:
 	Power:
 		Amount: -75
 	ProvidesPrerequisite@buildingname:
+	WithResourceStoragePipsDecoration:
+		Position: BottomLeft
+		Margin: 1, 4
+		RequiresSelection: true
+		PipCount: 10
 
 silo:
 	Inherits: ^Building
@@ -356,8 +331,6 @@ silo:
 	WithResourceLevelSpriteBody:
 		Sequence: stages
 	StoresResources:
-		PipColor: green
-		PipCount: 5
 		Capacity: 2000
 	-SpawnActorsOnSell:
 	Power:
@@ -370,9 +343,16 @@ silo:
 		Range: 2c0, 5c0
 	RevealOnDeath:
 		Radius: 2c768
+	WithResourceStoragePipsDecoration:
+		Position: BottomLeft
+		Margin: 1, 4
+		RequiresSelection: true
+		PipCount: 5
 
 light_factory:
 	Inherits: ^Building
+	Inherits@PRIMARY: ^PrimaryBuilding
+	Inherits@UPGRADEABLE: ^Upgradeable
 	Buildable:
 		Prerequisites: refinery
 		Queue: Building
@@ -423,9 +403,7 @@ light_factory:
 	Production:
 		Produces: Vehicle, Upgrade
 	PrimaryBuilding:
-		PrimaryCondition: primary
 		ProductionQueues: Vehicle
-		SelectionNotification: PrimaryBuildingSelected
 	ProductionBar:
 		ProductionType: Vehicle
 	ProvidesPrerequisite@atreides:
@@ -446,25 +424,13 @@ light_factory:
 	ProvidesPrerequisite@buildingname:
 	Power:
 		Amount: -125
-	GrantConditionOnPrerequisite:
+	GrantConditionOnPrerequisite@UPGRADEABLE:
 		Prerequisites: upgrade.light
-		Condition: stardecoration
-	WithDecoration@upgraded:
-		RequiresSelection: true
-		Image: pips
-		Sequence: tag-upgraded
-		ReferencePoint: Top, Right
-		ZOffset: 256
-		RequiresCondition: stardecoration
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		ZOffset: 256
-		RequiresCondition: primary
 
 heavy_factory:
 	Inherits: ^Building
+	Inherits@PRIMARY: ^PrimaryBuilding
+	Inherits@UPGRADEABLE: ^Upgradeable
 	Buildable:
 		Prerequisites: refinery
 		Queue: Building
@@ -504,9 +470,7 @@ heavy_factory:
 	Production:
 		Produces: Armor, Upgrade
 	PrimaryBuilding:
-		PrimaryCondition: primary
 		ProductionQueues: Armor
-		SelectionNotification: PrimaryBuildingSelected
 	ProductionBar:
 		ProductionType: Armor
 	ProvidesPrerequisite@atreides:
@@ -549,22 +513,8 @@ heavy_factory:
 	Power:
 		Amount: -150
 	ProvidesPrerequisite@buildingname:
-	GrantConditionOnPrerequisite:
+	GrantConditionOnPrerequisite@UPGRADEABLE:
 		Prerequisites: upgrade.heavy
-		Condition: stardecoration
-	WithDecoration@upgraded:
-		RequiresSelection: true
-		Image: pips
-		Sequence: tag-upgraded
-		ReferencePoint: Top, Right
-		ZOffset: 256
-		RequiresCondition: stardecoration
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		ZOffset: 256
-		RequiresCondition: primary
 
 outpost:
 	Inherits: ^Building
@@ -618,6 +568,7 @@ outpost:
 
 starport:
 	Inherits: ^Building
+	Inherits@PRIMARY: ^PrimaryBuilding
 	Tooltip:
 		Name: Starport
 	Buildable:
@@ -672,9 +623,7 @@ starport:
 	ProductionBar:
 		ProductionType: Starport
 	PrimaryBuilding:
-		PrimaryCondition: primary
 		ProductionQueues: Starport
-		SelectionNotification: PrimaryBuildingSelected
 	ProvidesPrerequisite@atreides:
 		Prerequisite: starport.atreides
 		Factions: atreides
@@ -696,12 +645,6 @@ starport:
 	Power:
 		Amount: -150
 	ProvidesPrerequisite@buildingname:
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		ZOffset: 256
-		RequiresCondition: primary
 
 wall:
 	Inherits@1: ^SpriteActor
@@ -919,6 +862,8 @@ repair_pad:
 
 high_tech_factory:
 	Inherits: ^Building
+	Inherits@PRIMARY: ^PrimaryBuilding
+	Inherits@UPGRADEABLE: ^Upgradeable
 	Buildable:
 		Prerequisites: outpost, ~techlevel.medium
 		Queue: Building
@@ -937,9 +882,7 @@ high_tech_factory:
 	ProductionBar:
 		ProductionType: Aircraft
 	PrimaryBuilding:
-		PrimaryCondition: primary
 		ProductionQueues: Aircraft
-		SelectionNotification: PrimaryBuildingSelected
 	Exit:
 		SpawnOffset: 0,0,728
 		ExitCell: 0,0
@@ -995,22 +938,8 @@ high_tech_factory:
 		SupportPowerPaletteOrder: 10
 	Power:
 		Amount: -75
-	GrantConditionOnPrerequisite:
+	GrantConditionOnPrerequisite@UPGRADEABLE:
 		Prerequisites: upgrade.hightech
-		Condition: stardecoration
-	WithDecoration@upgraded:
-		RequiresSelection: true
-		Image: pips
-		Sequence: tag-upgraded
-		ReferencePoint: Top, Right
-		ZOffset: 256
-		RequiresCondition: stardecoration
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		ZOffset: 256
-		RequiresCondition: primary
 
 research_centre:
 	Inherits: ^Building
@@ -1064,6 +993,7 @@ research_centre:
 
 palace:
 	Inherits: ^Building
+	Inherits@PRIMARY: ^PrimaryBuilding
 	Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
 	Buildable:
 		Prerequisites: research_centre, ~techlevel.high
@@ -1127,14 +1057,8 @@ palace:
 		Prerequisite: palace.sardaukar
 		Factions: corrino
 	PrimaryBuilding:
-		PrimaryCondition: primary
 		RequiresCondition: atreides || ordos
-		SelectionNotification: PrimaryBuildingSelected
 	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		ZOffset: 256
 		RequiresCondition: primary && (atreides || ordos)
 	NukePower:
 		Cursor: nuke

mods/d2k/rules/vehicles.yaml

@@ -41,7 +41,6 @@ mcv:
 		EffectiveOwnerFromOwner: true
 	AttractsWorms:
 		Intensity: 700
-	SelectionDecorations:
 	SelfHealing:
 		Step: 50
 		Delay: 3
@@ -66,7 +65,6 @@ harvester:
 		Class: harvester
 		DecorationBounds: 42,42
 	Harvester:
-		PipCount: 7
 		Capacity: 28
 		HarvestFacings: 8
 		Resources: Spice
@@ -94,12 +92,16 @@ harvester:
 	WithDockingAnimation:
 	AttractsWorms:
 		Intensity: 700
-	SelectionDecorations:
 	SelfHealing:
 		Step: 50
 		Delay: 3
 		HealIfBelow: 50
 	-RevealOnFire:
+	WithHarvesterPipsDecoration:
+		Position: BottomLeft
+		Margin: 1, 4
+		RequiresSelection: true
+		PipCount: 7
 
 trike:
 	Inherits: ^Vehicle
@@ -383,7 +385,6 @@ devastator:
 		GrantsCondition: meltdown
 	AttractsWorms:
 		Intensity: 700
-	SelectionDecorations:
 	SelfHealing:
 		Step: 50
 		Delay: 3

mods/d2k/rules/world.yaml

@@ -110,7 +110,6 @@
 	ResourceType@Spice:
 		Type: Spice
 		Name: Spice
-		PipColor: green
 		ResourceType: 1
 		Palette: d2k
 		TerrainType: Spice