Add selection tiers as inheritable templates

OpenRA · Jul 8, 2019 · 111cb7d · 111cb7d
1 parent 1c03fb9
commit 111cb7d
Show file tree

Hide file tree

Showing 16 changed files with 135 additions and 96 deletions.
diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
@@ -242,18 +242,10 @@
 		Condition: cloak-force-disabled
 		ValidDamageStates: Critical
 
-^FlatSelectionMode:
-	Selectable:
-		PriorityModifiers: Ctrl
-
-^LowPrioritySelectionMode:
-	Selectable:
-		PriorityModifiers: Ctrl, Alt
-
 ^Vehicle:
 	Inherits@1: ^ExistsInWorld
 	Inherits@3: ^SpriteActor
-	Inherits@SELECTION_MODE: ^FlatSelectionMode
+	Inherits@selection: ^SelectableCombatUnit
 	Huntable:
 	OwnerLostAction:
 		Action: Kill
@@ -303,7 +295,7 @@
 ^Helicopter:
 	Inherits@1: ^ExistsInWorld
 	Inherits@3: ^SpriteActor
-	Inherits@SELECTION_MODE: ^FlatSelectionMode
+	Inherits@selection: ^SelectableCombatUnit
 	Huntable:
 	OwnerLostAction:
 		Action: Kill
@@ -361,7 +353,7 @@
 ^Infantry:
 	Inherits@1: ^ExistsInWorld
 	Inherits@3: ^SpriteActor
-	Inherits@SELECTION_MODE: ^FlatSelectionMode
+	Inherits@selection: ^SelectableCombatUnit
 	Huntable:
 	OwnerLostAction:
 		Action: Kill
@@ -528,7 +520,7 @@
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^SpriteActor
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
-	Inherits@SELECTION_MODE: ^FlatSelectionMode
+	Inherits@selection: ^SelectableCombatUnit
 	Huntable:
 	OwnerLostAction:
 		Action: Kill
@@ -585,7 +577,7 @@
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^SpriteActor
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
-	Inherits@SELECTION_MODE: ^FlatSelectionMode
+	Inherits@selection: ^SelectableCombatUnit
 	Huntable:
 	Health:
 		HP: 30000
@@ -666,7 +658,7 @@
 ^Ship:
 	Inherits@1: ^ExistsInWorld
 	Inherits@3: ^SpriteActor
-	Inherits@SELECTION_MODE: ^FlatSelectionMode
+	Inherits@selection: ^SelectableCombatUnit
 	Huntable:
 	OwnerLostAction:
 		Action: Kill
@@ -697,13 +689,12 @@
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^SpriteActor
 	Inherits@shape: ^1x1Shape
+	Inherits@selection: ^SelectableBuilding
 	Huntable:
 	OwnerLostAction:
 		Action: Kill
 	SelectionDecorations:
 	WithSpriteControlGroupDecoration:
-	Selectable:
-		Priority: 3
 	Targetable:
 		TargetTypes: Ground, C4, Structure
 	Armor:
@@ -1143,6 +1134,7 @@
 
 ^Defense:
 	Inherits: ^BaseBuilding
+	Inherits@selection: ^SelectableCombatBuilding
 	RenderRangeCircle:
 	RenderDetectionCircle:
 	-GivesBuildableArea:
@@ -1162,3 +1154,26 @@
 	WithColoredOverlay@IDISABLE:
 		RequiresCondition: lowpower
 		Palette: disabled
+
+^SelectableCombatUnit:
+	Selectable:
+		Priority: 10
+		PriorityModifiers: Ctrl
+
+^SelectableSupportUnit:
+	Selectable:
+		Priority: 8
+		PriorityModifiers: Ctrl, Alt
+
+^SelectableEconomicUnit:
+	Selectable:
+		Priority: 6
+		PriorityModifiers: Ctrl, Alt
+
+^SelectableCombatBuilding:
+	Selectable:
+		Priority: 4
+
+^SelectableBuilding:
+	Selectable:
+		Priority: 2
diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml
@@ -162,7 +162,7 @@ E5:
 
 E6:
 	Inherits: ^Soldier
-	Inherits@SELECTION_MODE: ^LowPrioritySelectionMode
+	Inherits@selection: ^SelectableSupportUnit
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -190,8 +190,6 @@ E6:
 	Captures@CAPTURES:
 		CaptureTypes: building, husk
 		PlayerExperience: 50
-	Selectable:
-		Priority: 5
 	-AttackFrontal:
 
 RMBO:

diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml
@@ -38,7 +38,6 @@ HOSP:
 	Inherits@shape: ^2x2Shape
 	Selectable:
 		Bounds: 48,48
-		Priority: 0
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2

diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml
@@ -1,6 +1,6 @@
 MCV:
 	Inherits: ^Vehicle
-	Inherits@SELECTION_MODE: ^LowPrioritySelectionMode
+	Inherits@selection: ^SelectableSupportUnit
 	Valued:
 		Cost: 3500
 	Tooltip:
@@ -13,7 +13,6 @@ MCV:
 		BuildDurationModifier: 40
 		Description: Deploys into another Construction Yard.\n  Unarmed
 	Selectable:
-		Priority: 4
 		DecorationBounds: 36,36
 	Mobile:
 		Speed: 71
@@ -44,7 +43,7 @@ MCV:
 HARV:
 	Inherits: ^Tank
 	Inherits@CLOAK: ^AcceptsCloakCrate
-	Inherits@SELECTION_MODE: ^LowPrioritySelectionMode
+	Inherits@selection: ^SelectableEconomicUnit
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -58,7 +57,6 @@ HARV:
 		BuildDurationModifier: 40
 		Description: Collects Tiberium for processing.\n  Unarmed
 	Selectable:
-		Priority: 7
 		DecorationBounds: 36,36
 	Harvester:
 		Resources: Tiberium, BlueTiberium
@@ -683,7 +681,7 @@ MHQ:
 
 TRUCK:
 	Inherits: ^Vehicle
-	Inherits@SELECTION_MODE: ^LowPrioritySelectionMode
+	Inherits@selection: ^SelectableEconomicUnit
 	Buildable:
 		Queue: Vehicle.GDI, Vehicle.Nod
 		BuildPaletteOrder: 35
@@ -693,8 +691,6 @@ TRUCK:
 		Cost: 500
 	Tooltip:
 		Name: Supply Truck
-	Selectable:
-		Priority: 6
 	Health:
 		HP: 11000
 	Armor:

diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
@@ -163,18 +163,10 @@
 	AttackMove:
 		AssaultMoveCondition: assault-move
 
-^FlatSelectionMode:
-	Selectable:
-		PriorityModifiers: Ctrl
-
-^LowPrioritySelectionMode:
-	Selectable:
-		PriorityModifiers: Ctrl, Alt
-
 ^Vehicle:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^SpriteActor
-	Inherits@SELECTION_MODE: ^FlatSelectionMode
+	Inherits@selection: ^SelectableCombatUnit
 	Tooltip:
 		GenericName: Unit
 	Huntable:
@@ -278,7 +270,7 @@
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^GainsExperience
 	Inherits@3: ^SpriteActor
-	Inherits@SELECTION_MODE: ^FlatSelectionMode
+	Inherits@selection: ^SelectableCombatUnit
 	Tooltip:
 		GenericName: Unit
 	Huntable:
@@ -373,15 +365,14 @@
 ^Building:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^SpriteActor
+	Inherits@selection: ^SelectableBuilding
 	Tooltip:
 		GenericName: Structure
 	Huntable:
 	OwnerLostAction:
 		Action: Kill
 	SelectionDecorations:
 	WithSpriteControlGroupDecoration:
-	Selectable:
-		Priority: 2
 	RevealsShroud:
 	Targetable:
 		TargetTypes: Ground, C4, Structure
@@ -463,6 +454,7 @@
 
 ^Defense:
 	Inherits: ^Building
+	Inherits@selection: ^SelectableCombatBuilding
 	WithSpriteTurret:
 	AttackTurreted:
 	RenderRangeCircle:
@@ -528,3 +520,26 @@
 	WithBuildingRepairDecoration:
 		Offsets:
 			powerdown: -10, 0
+
+^SelectableCombatUnit:
+	Selectable:
+		Priority: 10
+		PriorityModifiers: Ctrl
+
+^SelectableSupportUnit:
+	Selectable:
+		Priority: 8
+		PriorityModifiers: Ctrl, Alt
+
+^SelectableEconomicUnit:
+	Selectable:
+		Priority: 6
+		PriorityModifiers: Ctrl, Alt
+
+^SelectableCombatBuilding:
+	Selectable:
+		Priority: 4
+
+^SelectableBuilding:
+	Selectable:
+		Priority: 2
diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml
@@ -24,6 +24,7 @@ light_inf:
 
 engineer:
 	Inherits: ^Infantry
+	Inherits@selection: ^SelectableSupportUnit
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 30

diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
@@ -799,7 +799,6 @@ medium_gun_turret:
 	Selectable:
 		Bounds: 32,32
 		DecorationBounds: 32,40,0,-8
-		Priority: 3
 	Health:
 		HP: 27000
 	Armor:
@@ -847,7 +846,6 @@ large_gun_turret:
 	Selectable:
 		Bounds: 32,32
 		DecorationBounds: 32,40,0,-8
-		Priority: 3
 	Health:
 		HP: 30000
 	Armor:

diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml
@@ -1,6 +1,6 @@
 mcv:
 	Inherits: ^Tank
-	Inherits@SELECTION_MODE: ^LowPrioritySelectionMode
+	Inherits@selection: ^SelectableSupportUnit
 	Buildable:
 		Prerequisites: repair_pad, upgrade.heavy, ~techlevel.medium
 		Queue: Armor
@@ -14,7 +14,6 @@ mcv:
 		Name: Mobile Construction Vehicle
 	Selectable:
 		Class: mcv
-		Priority: 3
 		DecorationBounds: 42,42
 	Health:
 		HP: 45000
@@ -51,7 +50,7 @@ mcv:
 
 harvester:
 	Inherits: ^Tank
-	Inherits@SELECTION_MODE: ^LowPrioritySelectionMode
+	Inherits@selection: ^SelectableEconomicUnit
 	Buildable:
 		Queue: Armor
 		Prerequisites: refinery
@@ -65,7 +64,6 @@ harvester:
 		Name: Spice Harvester
 	Selectable:
 		Class: harvester
-		Priority: 7
 		DecorationBounds: 42,42
 	Harvester:
 		PipCount: 7

diff --git a/mods/ra/maps/fort-lonestar/rules.yaml b/mods/ra/maps/fort-lonestar/rules.yaml
@@ -138,13 +138,12 @@ OILB:
 
 MOBILETENT:
 	Inherits: ^Vehicle
-	Inherits@SELECTION_MODE: ^LowPrioritySelectionMode
+	Inherits@selection: ^SelectableSupportUnit
 	Valued:
 		Cost: 2000
 	Tooltip:
 		Name: Mobile Tent
 	Selectable:
-		Priority: 4
 		DecorationBounds: 21,21
 	SelectionDecorations:
 	Health: