Update TS decorations.

mods/ts/rules/aircraft.yaml

@@ -1,6 +1,7 @@
 DPOD:
 	Inherits: ^Aircraft
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 10
 	Tooltip:
@@ -17,7 +18,6 @@ DPOD:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 1
-		PipCount: 1
 		UnloadVoice: Move
 		EjectOnDeath: true
 	Armament:
@@ -26,13 +26,18 @@ DPOD:
 		Voice: Attack
 	AmmoPool:
 		Ammo: 5
-		PipCount: 5
-		PipType: Ammo
-		PipTypeEmpty: AmmoEmpty
 	-SpawnActorOnDeath:
+	WithAmmoPipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Margin: 4, 5
+		FullSequence: pip-ammo
+		EmptySequence: pip-ammoempty
+		Palette: pips
 
 DSHP:
 	Inherits: ^Aircraft
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -60,7 +65,6 @@ DSHP:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 5
-		PipCount: 5
 		UnloadVoice: Move
 		EjectOnDeath: true
 	SpawnActorOnDeath:
@@ -109,9 +113,6 @@ ORCA:
 		AttackType: Hover
 	AmmoPool:
 		Ammo: 5
-		PipCount: 5
-		PipType: Ammo
-		PipTypeEmpty: AmmoEmpty
 		AmmoCondition: ammo
 	RenderSprites:
 	SpawnActorOnDeath:
@@ -122,6 +123,13 @@ ORCA:
 		RequiresCondition: empdisable
 	Rearmable:
 		RearmActors: gahpad, nahpad
+	WithAmmoPipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Margin: 4, 5
+		FullSequence: pip-ammo
+		EmptySequence: pip-ammoempty
+		Palette: pips
 
 ORCAB:
 	Inherits: ^EMPableAircraft
@@ -166,11 +174,8 @@ ORCAB:
 		PauseOnCondition: empdisable
 	AmmoPool:
 		Ammo: 10
-		PipCount: 2
 		ReloadCount: 5
 		ReloadDelay: 200
-		PipType: Ammo
-		PipTypeEmpty: AmmoEmpty
 		AmmoCondition: ammo
 	RenderSprites:
 	Hovers@CRUISING:
@@ -183,9 +188,18 @@ ORCAB:
 		RequiresCondition: empdisable
 	Rearmable:
 		RearmActors: gahpad, nahpad
+	WithAmmoPipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Margin: 4, 5
+		PipCount: 2
+		FullSequence: pip-ammo
+		EmptySequence: pip-ammoempty
+		Palette: pips
 
 ORCATRAN:
 	Inherits: ^EMPableAircraft
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 1200
 	Tooltip:
@@ -216,7 +230,6 @@ ORCATRAN:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 5
-		PipCount: 5
 		UnloadVoice: Move
 		EjectOnDeath: true
 		AfterUnloadDelay: 40
@@ -312,10 +325,7 @@ SCRIN:
 		PauseOnCondition: empdisable
 	AmmoPool:
 		Ammo: 15
-		PipCount: 3
 		ReloadCount: 5
-		PipType: Ammo
-		PipTypeEmpty: AmmoEmpty
 		AmmoCondition: ammo
 	RenderSprites:
 	DeathSounds:
@@ -327,6 +337,14 @@ SCRIN:
 		RequiresCondition: empdisable
 	Rearmable:
 		RearmActors: gahpad, nahpad
+	WithAmmoPipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Margin: 4, 5
+		PipCount: 3
+		FullSequence: pip-ammo
+		EmptySequence: pip-ammoempty
+		Palette: pips
 
 APACHE:
 	Inherits: ^EMPableAircraft
@@ -368,9 +386,6 @@ APACHE:
 		AttackType: Hover
 	AmmoPool:
 		Ammo: 12
-		PipCount: 4
-		PipType: Ammo
-		PipTypeEmpty: AmmoEmpty
 		AmmoCondition: ammo
 	WithIdleOverlay@ROTORAIR:
 		Offset: 85,0,598
@@ -389,6 +404,14 @@ APACHE:
 		RequiresCondition: empdisable
 	Rearmable:
 		RearmActors: gahpad, nahpad
+	WithAmmoPipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Margin: 4, 5
+		PipCount: 4
+		FullSequence: pip-ammo
+		EmptySequence: pip-ammoempty
+		Palette: pips
 
 HUNTER:
 	Inherits@2: ^ExistsInWorld
@@ -427,12 +450,9 @@ HUNTER:
 	Hovers@CRUISING:
 		RequiresCondition: cruising
 	QuantizeFacingsFromSequence:
-	DrawLineToTarget:
 	AppearsOnRadar:
 		UseLocation: true
 	Interactable:
-	SelectionDecorations:
-		Palette: pips
 	HitShape:
 	MapEditorData:
 		Categories: System

mods/ts/rules/bridges.yaml

@@ -11,7 +11,8 @@ CABHUT:
 		Palette: player
 	Targetable:
 		TargetTypes: C4
-	-SelectionDecorations:
+	-Selectable:
+	Interactable:
 	-Demolishable:
 	-Explodes:
 	-FrozenUnderFog:

mods/ts/rules/civilian-infantry.yaml

@@ -71,12 +71,12 @@ CHAMSPY:
 	Disguise:
 		DisguisedCondition: disguise
 	WithDecoration@disguise:
+		RequiresCondition: disguise
+		Position: TopRight
+		Margin: 6, 10
 		Image: pips
 		Sequence: pip-disguise
 		Palette: pips
-		ReferencePoint: Top, Right
-		ZOffset: 256
-		RequiresCondition: disguise
 	Infiltrates:
 		Types: SpyInfiltrate
 		Notification: BuildingInfiltrated

mods/ts/rules/civilian-structures.yaml

@@ -1385,7 +1385,6 @@ GASPOT:
 		MaxHeightDelta: 3
 	WithIdleOverlay@LIGHTS:
 		Sequence: idle-lights
-	SelectionDecorations:
 	MapEditorData:
 		Categories: Civilian building
 
@@ -1417,7 +1416,6 @@ GALITE:
 	Selectable:
 		Bounds: 24, 24, 0, -4
 		DecorationBounds: 25, 35, 0, -12
-	SelectionDecorations:
 	-Cloak@EXTERNALCLOAK:
 	-ExternalCondition@CLOAKGENERATOR:
 	-ExternalCondition@CRATE-CLOAK:
@@ -1515,7 +1513,6 @@ UFO:
 		Type: Heavy
 	MapEditorData:
 		RequireTilesets: TEMPERATE
-	SelectionDecorations:
 	ThrowsShrapnel@SMALL:
 		Pieces: 9, 12
 	ThrowsShrapnel@LARGE:

mods/ts/rules/civilian-vehicles.yaml

@@ -92,6 +92,7 @@ ICBM:
 
 BUS:
 	Inherits: ^CivilianVoxelCrusher
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -111,13 +112,13 @@ BUS:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 20
-		PipCount: 5
 		UnloadVoice: Unload
 		LoadingCondition: loading
 		EjectOnDeath: true
 
 PICK:
 	Inherits: ^CivilianVoxelVehicle
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -137,13 +138,13 @@ PICK:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 2
-		PipCount: 5
 		UnloadVoice: Unload
 		LoadingCondition: loading
 		EjectOnDeath: true
 
 CAR:
 	Inherits: ^CivilianVoxelVehicle
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -163,13 +164,13 @@ CAR:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 4
-		PipCount: 5
 		UnloadVoice: Unload
 		LoadingCondition: loading
 		EjectOnDeath: true
 
 WINI:
 	Inherits: ^CivilianVoxelVehicle
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -189,40 +190,39 @@ WINI:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 5
-		PipCount: 5
 		UnloadVoice: Unload
 		LoadingCondition: loading
 		EjectOnDeath: true
 
 LOCOMOTIVE:
 	Inherits: ^Train
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 800
 	Tooltip:
 		Name: Train Locomotive
 	Cargo:
 		MaxWeight: 2
-		PipCount: 2
 		EjectOnDeath: true
 
 TRAINCAR:
 	Inherits: ^Train
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 800
 	Tooltip:
 		Name: Passenger Car
 	Cargo:
 		MaxWeight: 10
-		PipCount: 5
 		EjectOnDeath: true
 
 CARGOCAR:
 	Inherits: ^Train
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 800
 	Tooltip:
 		Name: Cargo Car
 	Cargo:
 		MaxWeight: 10
-		PipCount: 5
 		EjectOnDeath: true

mods/ts/rules/defaults.yaml

@@ -59,19 +59,19 @@
 		DamageCooldown: 125
 		RequiresCondition: rank-elite
 	WithDecoration@VETERAN:
+		RequiresCondition: rank-veteran
+		Position: BottomRight
+		Margin: 3, 4
 		Image: rank
 		Sequence: veteran
 		Palette: ra
-		ReferencePoint: Bottom, Right
-		RequiresCondition: rank-veteran
-		ZOffset: 256
 	WithDecoration@ELITE:
+		RequiresCondition: rank-elite
+		Position: BottomRight
+		Margin: 3, 4
 		Image: rank
 		Sequence: elite
 		Palette: ra
-		ReferencePoint: Bottom, Right
-		RequiresCondition: rank-elite
-		ZOffset: 256
 
 ^InfantryExperienceHospitalOverrides:
 	WithDecoration@VETERAN:
@@ -304,9 +304,6 @@
 	Inherits@3: ^Cloakable
 	Inherits@selection: ^SelectableBuilding
 	Huntable:
-	WithTextControlGroupDecoration:
-	SelectionDecorations:
-		Palette: pips
 	Targetable:
 		TargetTypes: Ground, Building, C4
 	HitShape:
@@ -397,7 +394,7 @@
 	WithBuildingRepairDecoration:
 		Image: allyrepair
 		Sequence: repair
-		ReferencePoint: Center
+		Position: Center
 		Palette: mouse
 
 ^CivBuilding:
@@ -547,9 +544,6 @@
 	OwnerLostAction:
 		Action: Kill
 		DeathTypes: BulletDeath
-	DrawLineToTarget:
-		QueuedLineWidth: 2
-		QueuedMarkerWidth: 3
 	Health:
 		HP: 5000
 	Armor:
@@ -564,9 +558,6 @@
 		Voice: Move
 		Speed: 71
 		Locomotor: foot
-	WithTextControlGroupDecoration:
-	SelectionDecorations:
-		Palette: pips
 	Selectable:
 		DecorationBounds: 15,23,0,-9
 		Bounds: 24,24,0,-9
@@ -616,11 +607,12 @@
 		RequiresCondition: hospital && damaged
 		Condition: hospitalheal
 	WithDecoration@REDCROSS:
+		RequiresCondition: hospitalheal
+		Position: BottomRight
+		Margin: 3, 4
 		Image: pips
 		Sequence: medic
 		Palette: pips
-		ReferencePoint: Bottom, Right
-		RequiresCondition: hospitalheal
 		BlinkInterval: 32
 		BlinkPattern: Off, On
 	RevealOnFire:
@@ -758,9 +750,6 @@
 	Huntable:
 	OwnerLostAction:
 		Action: Kill
-	DrawLineToTarget:
-		QueuedLineWidth: 2
-		QueuedMarkerWidth: 3
 	Mobile:
 		PauseOnCondition: empdisable || being-captured || carried
 		Locomotor: wheeled
@@ -768,9 +757,6 @@
 		Voice: Move
 	Selectable:
 		Bounds: 40,24
-	WithTextControlGroupDecoration:
-	SelectionDecorations:
-		Palette: pips
 	Voiced:
 		VoiceSet: Vehicle
 	Targetable:
@@ -863,9 +849,6 @@
 	Huntable:
 	OwnerLostAction:
 		Action: Kill
-	DrawLineToTarget:
-		QueuedLineWidth: 2
-		QueuedMarkerWidth: 3
 	AppearsOnRadar:
 		UseLocation: true
 	Targetable@GROUND:
@@ -874,10 +857,6 @@
 	Targetable@AIRBORNE:
 		TargetTypes: Air
 		RequiresCondition: airborne
-	Selectable:
-	WithTextControlGroupDecoration:
-	SelectionDecorations:
-		Palette: pips
 	Repairable:
 		RepairActors: gadept
 		Voice: Move
@@ -963,9 +942,6 @@
 	Inherits@3: ^HealsOnTiberium
 	Inherits@selection: ^SelectableCombatUnit
 	Huntable:
-	DrawLineToTarget:
-		QueuedLineWidth: 2
-		QueuedMarkerWidth: 3
 	Health:
 	Armor:
 		Type: Light
@@ -973,9 +949,6 @@
 		Speed: 113
 		TurnSpeed: 16
 		Locomotor: visceroid
-	WithTextControlGroupDecoration:
-	SelectionDecorations:
-		Palette: pips
 	Selectable:
 		Bounds: 26,26,0,-3
 	Targetable:
@@ -1121,9 +1094,6 @@
 	RenderVoxels:
 	RenderSprites:
 	WithVoxelBody:
-	DrawLineToTarget:
-		QueuedLineWidth: 2
-		QueuedMarkerWidth: 3
 	Mobile:
 		TurnSpeed: 5
 		Voice: Move
@@ -1143,9 +1113,6 @@
 		RequiresCondition: !inside-tunnel
 	Selectable:
 		Bounds: 40,24
-	WithTextControlGroupDecoration:
-	SelectionDecorations:
-		Palette: pips
 	Voiced:
 		VoiceSet: Vehicle
 	Targetable:
@@ -1324,7 +1291,7 @@
 		Sequence: offline
 		Palette: mouse
 		RequiresCondition: powerdown
-		ReferencePoint: Center
+		Position: Center
 		Offsets:
 			repairing: 12, 0
 	PowerMultiplier@POWERDOWN:
@@ -1343,25 +1310,62 @@
 		RequiresCondition: lowpower || powerdown
 		Condition: disabled
 
+^Selectable:
+	Selectable:
+	SelectionDecorations:
+	WithTextControlGroupDecoration:
+		Margin: 2, 0
+	DrawLineToTarget:
+		QueuedLineWidth: 2
+		QueuedMarkerWidth: 3
+
 ^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
 
+^CargoPips:
+	WithCargoPipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Palette: pips
+		Margin: 5, 2
+		CustomPipSequences:
+			red: pip-red
+			green: pip-green
+			yellow: pip-yellow
+
 ^SelectableCombatBuilding:
+	Inherits@selectiondecorations: ^Selectable
 	Selectable:
 		Priority: 4
 
 ^SelectableBuilding:
+	Inherits@selectiondecorations: ^Selectable
 	Selectable:
 		Priority: 2
+
+^PrimaryBuilding:
+	PrimaryBuilding:
+		PrimaryCondition: primary
+		SelectionNotification: PrimaryBuildingSelected
+	WithTextDecoration@primary:
+		RequiresCondition: primary
+		Position: Top
+		RequiresSelection: true
+		Margin: 0, 5
+		Text: PRIMARY
+		Color: E0D048

mods/ts/rules/gdi-infantry.yaml

@@ -74,7 +74,7 @@ MEDIC:
 		Step: 500
 		Delay: 60
 	Passenger:
-		PipType: Red
+		CustomPipType: red
 
 JUMPJET:
 	Inherits: ^Soldier
@@ -102,7 +102,7 @@ JUMPJET:
 	Armor:
 		Type: Light
 	Passenger:
-		PipType: Green
+		CustomPipType: green
 	RevealsShroud:
 		Range: 6c0
 	Armament:

mods/ts/rules/gdi-structures.yaml

@@ -66,11 +66,11 @@ GAPOWR:
 		RequiresCondition: !empdisable && powrup.b
 		Amount: 50
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
 
 GAPILE:
 	Inherits: ^Building
 	Inherits@SHAPE: ^2x2Shape
+	Inherits@PRIMARY: ^PrimaryBuilding
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 30
@@ -141,9 +141,6 @@ GAPILE:
 	Production:
 		Produces: Infantry
 		PauseOnCondition: empdisable
-	PrimaryBuilding:
-		PrimaryCondition: primary
-		SelectionNotification: PrimaryBuildingSelected
 	ProductionBar:
 		ProductionType: Infantry
 	WithIdleOverlay@LIGHTS:
@@ -158,18 +155,11 @@ GAPILE:
 	Power:
 		Amount: -20
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		Color: E0D048
-		ZOffset: 256
-		RequiresCondition: primary
 
 GAWEAP:
 	Inherits: ^Building
 	Inherits@SHAPE: ^4x3FactoryWithBibShape
+	Inherits@PRIMARY: ^PrimaryBuilding
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -206,9 +196,6 @@ GAWEAP:
 	Production:
 		Produces: Vehicle
 		PauseOnCondition: empdisable
-	PrimaryBuilding:
-		PrimaryCondition: primary
-		SelectionNotification: PrimaryBuildingSelected
 	ProductionBar:
 		ProductionType: Vehicle
 	WithIdleOverlay@ROOF:
@@ -231,18 +218,11 @@ GAWEAP:
 	Power:
 		Amount: -30
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		Color: E0D048
-		ZOffset: 256
-		RequiresCondition: primary
 
 GAHPAD:
 	Inherits: ^Building
 	Inherits@SHAPE: ^2x2Shape
+	Inherits@PRIMARY: ^PrimaryBuilding
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -270,9 +250,6 @@ GAHPAD:
 	Production:
 		Produces: Air
 		PauseOnCondition: empdisable
-	PrimaryBuilding:
-		PrimaryCondition: primary
-		SelectionNotification: PrimaryBuildingSelected
 	Reservable:
 	RepairsUnits:
 		HpPerStep: 1000
@@ -296,14 +273,6 @@ GAHPAD:
 		Bounds: 88, 66, 0, -5
 		DecorationBounds: 88, 66, 0, -5
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		Color: E0D048
-		ZOffset: 256
-		RequiresCondition: primary
 
 GADEPT:
 	Inherits: ^Building
@@ -362,7 +331,6 @@ GADEPT:
 	Power:
 		Amount: -30
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
 	RenderSprites:
 		Image: gadept.gdi
 		FactionImages:
@@ -412,7 +380,6 @@ GARADR:
 	Power:
 		Amount: -50
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
 
 GATECH:
 	Inherits: ^Building
@@ -448,7 +415,6 @@ GATECH:
 	Power:
 		Amount: -150
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
 
 GAPLUG:
 	Inherits: ^Building
@@ -558,4 +524,3 @@ GAPLUG:
 		PauseOnCondition: disabled
 		Sequence: idle-hunterseekerb
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:

mods/ts/rules/gdi-support.yaml

@@ -137,7 +137,6 @@ GACTWR:
 			tower.rocket: !build-incomplete && !tower.rocket && !tower.vulcan && !tower.sam
 			tower.sam: !build-incomplete && !tower.vulcan && !tower.rocket && !tower.sam
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
 	Replacement:
 		ReplaceableTypes: GDITower
 

mods/ts/rules/gdi-vehicles.yaml

@@ -1,6 +1,7 @@
 APC:
 	Inherits: ^Tank
 	Inherits@VOXELS: ^VoxelActor
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -28,7 +29,6 @@ APC:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 5
-		PipCount: 5
 		UnloadVoice: Unload
 		LoadingCondition: loading
 		EjectOnDeath: true
@@ -409,6 +409,5 @@ JUGG:
 	WithMuzzleOverlay:
 	RevealOnFire:
 		ArmamentNames: deployed
-	SelectionDecorations:
 	Selectable:
 		DecorationBounds: 48,40,0,-8

mods/ts/rules/nod-infantry.yaml

@@ -68,7 +68,6 @@ CYBORG:
 		Weapon: Vulcan3
 	AttackFrontal:
 		Voice: Attack
-	SelectionDecorations:
 	ProducibleWithLevel:
 		Prerequisites: barracks.upgraded
 
@@ -108,7 +107,6 @@ CYC2:
 		LocalOffset: 240,120,966
 	AttackFrontal:
 		Voice: Attack
-	SelectionDecorations:
 	ProducibleWithLevel:
 		Prerequisites: barracks.upgraded
 

mods/ts/rules/nod-structures.yaml

@@ -35,7 +35,6 @@ NAPOWR:
 		TargetTypes: Ground, Building, C4, SpyInfiltrate
 	ScalePowerWithHealth:
 	PowerTooltip:
-	SelectionDecorations:
 
 NAAPWR:
 	Inherits: ^Building
@@ -74,12 +73,12 @@ NAAPWR:
 		TargetTypes: Ground, Building, C4, SpyInfiltrate
 	ScalePowerWithHealth:
 	PowerTooltip:
-	SelectionDecorations:
 	ProvidesPrerequisite@buildingname:
 
 NAHAND:
 	Inherits: ^Building
 	Inherits@SHAPE: ^3x2Shape
+	Inherits@PRIMARY: ^PrimaryBuilding
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 40
@@ -156,9 +155,6 @@ NAHAND:
 	Production:
 		Produces: Infantry
 		PauseOnCondition: empdisable
-	PrimaryBuilding:
-		PrimaryCondition: primary
-		SelectionNotification: PrimaryBuildingSelected
 	ProductionBar:
 		ProductionType: Infantry
 	WithIdleOverlay@LIGHTS:
@@ -170,18 +166,11 @@ NAHAND:
 	Power:
 		Amount: -20
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		Color: E0D048
-		ZOffset: 256
-		RequiresCondition: primary
 
 NAWEAP:
 	Inherits: ^Building
 	Inherits@SHAPE: ^4x3FactoryWithBibShape
+	Inherits@PRIMARY: ^PrimaryBuilding
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -218,9 +207,6 @@ NAWEAP:
 	Production:
 		Produces: Vehicle
 		PauseOnCondition: empdisable
-	PrimaryBuilding:
-		PrimaryCondition: primary
-		SelectionNotification: PrimaryBuildingSelected
 	ProductionBar:
 		ProductionType: Vehicle
 	WithIdleOverlay@ROOF:
@@ -237,18 +223,11 @@ NAWEAP:
 	Power:
 		Amount: -30
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		Color: E0D048
-		ZOffset: 256
-		RequiresCondition: primary
 
 NAHPAD:
 	Inherits: ^Building
 	Inherits@SHAPE: ^2x2Shape
+	Inherits@PRIMARY: ^PrimaryBuilding
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -276,9 +255,6 @@ NAHPAD:
 	Production:
 		Produces: Air
 		PauseOnCondition: empdisable
-	PrimaryBuilding:
-		PrimaryCondition: primary
-		SelectionNotification: PrimaryBuildingSelected
 	Reservable:
 	RepairsUnits:
 		HpPerStep: 1000
@@ -302,14 +278,6 @@ NAHPAD:
 		Bounds: 78, 48, 0, -6
 		DecorationBounds: 78, 54, 0, -8
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-	WithTextDecoration@primary:
-		RequiresSelection: true
-		Text: PRIMARY
-		ReferencePoint: Top
-		Color: E0D048
-		ZOffset: 256
-		RequiresCondition: primary
 
 NARADR:
 	Inherits: ^Building
@@ -354,7 +322,6 @@ NARADR:
 	Power:
 		Amount: -40
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
 
 NATECH:
 	Inherits: ^Building
@@ -390,7 +357,6 @@ NATECH:
 	Power:
 		Amount: -150
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
 
 NATMPL:
 	Inherits: ^Building

mods/ts/rules/nod-support.yaml

@@ -182,7 +182,6 @@ NALASR:
 		RequiresCondition: !build-incomplete
 	Power:
 		Amount: -40
-	SelectionDecorations:
 	BodyOrientation:
 		QuantizedFacings: 0
 
@@ -233,7 +232,6 @@ NAOBEL:
 		Sequence: idle-lights
 	Power:
 		Amount: -150
-	SelectionDecorations:
 
 NASAM:
 	Inherits: ^Defense
@@ -273,7 +271,6 @@ NASAM:
 		LocalOffset: 543,0,815
 	Power:
 		Amount: -30
-	SelectionDecorations:
 
 NASTLH:
 	Inherits: ^Building
@@ -318,7 +315,6 @@ NASTLH:
 	Selectable:
 		Bounds: 106, 48, 8, -6
 		DecorationBounds: 106, 60, 8, -15
-	SelectionDecorations:
 
 NAMISL:
 	Inherits: ^Building
@@ -381,7 +377,6 @@ NAMISL:
 		TrailInterval: 0
 		TrailSequences: idle
 	WithNukeLaunchOverlay:
-	SelectionDecorations:
 
 NAWAST:
 	Inherits: ^Building
@@ -414,8 +409,6 @@ NAWAST:
 		DockAngle: 160
 		DockOffset: 2,1
 	StoresResources:
-		PipColor: Red
-		PipCount: 15
 		Capacity: 56
 	Power:
 		Amount: -40
@@ -433,4 +426,10 @@ NAWAST:
 		RequiresCondition: !build-incomplete
 		Sequence: bib
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
+	WithResourceStoragePipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Margin: 5, 2
+		PipCount: 15
+		FullSequence: pip-red
+		Palette: pips

mods/ts/rules/nod-vehicles.yaml

@@ -383,10 +383,18 @@ WEED:
 	WithVoxelUnloadBody:
 	-DamagedByTerrain@VEINS:
 	-LeavesTrails@VEINS:
+	WithHarvesterPipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Margin: 5, 2
+		FullSequence: pip-red
+		Palette: pips
+		PipCount: 7
 
 SAPC:
 	Inherits: ^Tank
 	Inherits@VOXELS: ^VoxelActor
+	Inherits@CARGOPIPS: ^CargoPips
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -414,7 +422,6 @@ SAPC:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 5
-		PipCount: 5
 		UnloadVoice: Unload
 		LoadingCondition: loading
 		EjectOnDeath: true

mods/ts/rules/shared-infantry.yaml

@@ -59,7 +59,7 @@ ENGINEER:
 	Health:
 		HP: 10000
 	Passenger:
-		PipType: Yellow
+		CustomPipType: yellow
 	EngineerRepair:
 	RepairsBridges:
 		RepairNotification: BridgeRepaired

mods/ts/rules/shared-structures.yaml

@@ -84,7 +84,6 @@ GACNST:
 	ProvidesPrerequisite@nod:
 		Factions: nod
 		Prerequisite: structures.nod
-	SelectionDecorations:
 
 PROC:
 	Inherits: ^Building
@@ -114,8 +113,6 @@ PROC:
 		DockOffset: 2,1
 		DiscardExcessResources: true
 	StoresResources:
-		PipColor: Green
-		PipCount: 10
 		Capacity: 2000
 	CustomSellValue:
 		Value: 600
@@ -138,7 +135,6 @@ PROC:
 	Power:
 		Amount: -30
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
 	RenderSprites:
 		Image: proc.gdi
 		FactionImages:
@@ -149,6 +145,12 @@ PROC:
 	Explodes:
 		RequiresCondition: contains-tiberium
 		Weapon: TiberiumExplosion
+	WithResourceStoragePipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Margin: 5, 2
+		PipCount: 10
+		Palette: pips
 
 GASILO:
 	Inherits: ^Building
@@ -190,17 +192,20 @@ GASILO:
 		RequiresCondition: !build-incomplete
 		Sequence: idle-lights
 	StoresResources:
-		PipColor: Green
-		PipCount: 5
 		Capacity: 1500
 	Power:
 		Amount: -10
-	SelectionDecorations:
 	GrantConditionOnPlayerResources:
 		Condition: contains-tiberium
 	Explodes:
 		RequiresCondition: contains-tiberium
 		Weapon: TiberiumExplosion
+	WithResourceStoragePipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Margin: 5, 2
+		PipCount: 5
+		Palette: pips
 
 ANYPOWER:
 	AlwaysVisible:

mods/ts/rules/shared-support.yaml

@@ -37,7 +37,6 @@ NAPULS:
 		Sequence: turret
 	Power:
 		Amount: -150
-	SelectionDecorations:
 	RenderSprites:
 		Image: napuls.gdi
 		FactionImages:

mods/ts/rules/shared-vehicles.yaml

@@ -34,7 +34,6 @@ MCV:
 		TransformSounds: place2.aud
 		NoTransformSounds:
 		Voice: Move
-	SelectionDecorations:
 	RenderSprites:
 		Image: mcv.gdi
 		FactionImages:
@@ -92,7 +91,6 @@ HARV:
 	WithHarvestOverlay:
 		LocalOffset: 543,0,0
 		Palette: effect
-	SelectionDecorations:
 	RenderSprites:
 		Image: harv.gdi
 		FactionImages:
@@ -100,6 +98,15 @@ HARV:
 			nod: harv.nod
 	-DamagedByTerrain@VEINS:
 	-LeavesTrails@VEINS:
+	WithHarvesterPipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Margin: 5, 2
+		PipCount: 7
+		Palette: pips
+		ResourceSequences:
+			Tiberium: pip-green
+			BlueTiberium: pip-blue
 
 LPST:
 	Inherits: ^Tank

mods/ts/rules/world.yaml

@@ -200,7 +200,6 @@
 	ResourceType@Tiberium:
 		Type: Tiberium
 		Name: Tiberium
-		PipColor: Green
 		ResourceType: 1
 		Palette: greentiberium
 		Sequences: tib01, tib02, tib03, tib04, tib05, tib06, tib07, tib08, tib09, tib10, tib11, tib12
@@ -212,7 +211,6 @@
 	ResourceType@BlueTiberium:
 		Type: BlueTiberium
 		Name: Tiberium
-		PipColor: Blue
 		ResourceType: 2
 		Palette: bluetiberium
 		Sequences: tib01, tib02, tib03, tib04, tib05, tib06, tib07, tib08, tib09, tib10, tib11, tib12
@@ -224,7 +222,6 @@
 	ResourceType@Veins:
 		Type: Veins
 		Name: Veins
-		PipColor: Red
 		ResourceType: 3
 		Palette: player
 		Sequences: veins