Merge pull request #11621 from Mailaender/text-controlgroup

Added With*ControlGroup

mods/cnc/rules/defaults.yaml

@@ -69,6 +69,7 @@
 			Beach: 50
 		TurnSpeed: 5
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Bounds: 24,24
 	Targetable:
@@ -133,6 +134,7 @@
 		UpgradeTypes: airborne
 		UpgradeMinEnabledLevel: 1
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Bounds: 24,24
 	Aircraft:
@@ -191,6 +193,8 @@
 				PathingCost: 300
 			Beach: 80
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
+		ReferencePoint: Top
 	Selectable:
 		Bounds: 12,17,0,-6
 	Targetable:
@@ -351,6 +355,7 @@
 			Beach: 80
 		Voice: Move
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Bounds: 24,24
 	Targetable:
@@ -398,6 +403,7 @@
 			BlueTiberium: 100
 			Beach: 60
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Bounds: 24,24
 	Targetable:
@@ -463,6 +469,7 @@
 		TerrainSpeeds:
 			Water: 100
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 	Targetable:
 		TargetTypes: Ground, Water
@@ -486,6 +493,7 @@
 	Inherits@2: ^SpriteActor
 	Huntable:
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Priority: 3
 	Targetable:

mods/d2k/rules/defaults.yaml

@@ -74,6 +74,7 @@
 			Dune: 50
 		TurnSpeed: 5
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Bounds: 32,32
 	Targetable:
@@ -183,6 +184,7 @@
 			Dune: 80
 			Rough: 80
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Bounds: 12,20,0,-4
 	Targetable:
@@ -245,6 +247,7 @@
 	Inherits@2: ^SpriteActor
 	Huntable:
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Priority: 2
 	RevealsShroud:

mods/ra/rules/defaults.yaml

@@ -82,6 +82,7 @@
 			Beach: 40
 		TurnSpeed: 5
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Bounds: 24, 24
 	Targetable:
@@ -189,6 +190,8 @@
 			Gems: 80
 			Beach: 80
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
+		ReferencePoint: Top
 	Selectable:
 		Bounds: 12,18,0,-8
 	Targetable:
@@ -316,6 +319,7 @@
 		TerrainSpeeds:
 			Water: 100
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Bounds: 24,24
 	Targetable:
@@ -357,6 +361,7 @@
 	AppearsOnRadar:
 		UseLocation: true
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Bounds: 24,24
 	Aircraft:
@@ -420,6 +425,7 @@
 	Inherits@2: ^IronCurtainable
 	Inherits@3: ^SpriteActor
 	SelectionDecorations:
+	WithSpriteControlGroupDecoration:
 	Selectable:
 		Priority: 3
 	Targetable:

mods/ts/rules/defaults.yaml

@@ -93,6 +93,7 @@
 	Inherits@2: ^SpriteActor
 	Inherits@3: ^Cloakable
 	Huntable:
+	WithTextControlGroupDecoration:
 	SelectionDecorations:
 		Palette: pips
 	Selectable:
@@ -268,6 +269,7 @@
 			BlueTiberium: 90
 				PathingCost: 90
 			Veins: 50
+	WithTextControlGroupDecoration:
 	SelectionDecorations:
 		Palette: pips
 	Selectable:
@@ -439,6 +441,7 @@
 		Voice: Move
 	Selectable:
 		Bounds: 40,24
+	WithTextControlGroupDecoration:
 	SelectionDecorations:
 		Palette: pips
 	Voiced:
@@ -540,6 +543,7 @@
 		UpgradeTypes: airborne
 		UpgradeMinEnabledLevel: 1
 	Selectable:
+	WithTextControlGroupDecoration:
 	SelectionDecorations:
 		Palette: pips
 	Aircraft:
@@ -633,6 +637,7 @@
 			Tiberium: 100
 			BlueTiberium: 100
 			Veins: 100
+	WithTextControlGroupDecoration:
 	SelectionDecorations:
 		Palette: pips
 	Selectable:
@@ -747,6 +752,7 @@
 		TerrainTypes: Clear, Road, DirtRoad, Rough
 	WithSpriteBody:
 	WithMakeAnimation:
+	WithTextControlGroupDecoration:
 	SelectionDecorations:
 		Palette: pips
 	Selectable:
@@ -784,6 +790,7 @@
 		Range: 5c0
 	Selectable:
 		Bounds: 40,24
+	WithTextControlGroupDecoration:
 	SelectionDecorations:
 		Palette: pips
 	Voiced:

mods/ts/sequences/misc.yaml

@@ -87,9 +87,6 @@ darken:
 pips:
 	medic:
 		Start: 6
-	groups: pipsra #TODO: backfall to RA asset
-		Start: 8
-		Length: 10
 	pip-empty: pips2
 	pip-green: pips2
 		Start: 1