diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 05dba22aca..29d12e583c 100644 --- 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 @@ -363,7 +355,7 @@ ^Infantry: Inherits@1: ^ExistsInWorld Inherits@3: ^SpriteActor - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: Action: Kill @@ -530,7 +522,7 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: Action: Kill @@ -587,7 +579,7 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: Health: HP: 30000 @@ -668,7 +660,7 @@ ^Ship: Inherits@1: ^ExistsInWorld Inherits@3: ^SpriteActor - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: Action: Kill @@ -699,13 +691,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: @@ -1150,6 +1141,7 @@ ^Defense: Inherits: ^BaseBuilding + Inherits@selection: ^SelectableCombatBuilding RenderRangeCircle: RenderDetectionCircle: -GivesBuildableArea: @@ -1169,3 +1161,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 index 769648dc84..704cbfc2c9 100644 --- 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 index cfad0b0c2a..09ce3870df 100644 --- a/mods/cnc/rules/tech.yaml +++ b/mods/cnc/rules/tech.yaml @@ -39,7 +39,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 index 938bcdb8ea..e922dc7269 100644 --- 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: ^SelectableSupportUnit 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 index 23d33970a2..e6dc218625 100644 --- 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: @@ -279,7 +271,7 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience Inherits@3: ^SpriteActor - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Tooltip: GenericName: Unit Huntable: @@ -374,6 +366,7 @@ ^Building: Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor + Inherits@selection: ^SelectableBuilding Tooltip: GenericName: Structure Huntable: @@ -381,8 +374,6 @@ Action: Kill SelectionDecorations: WithSpriteControlGroupDecoration: - Selectable: - Priority: 2 RevealsShroud: Targetable: TargetTypes: Ground, C4, Structure @@ -464,6 +455,7 @@ ^Defense: Inherits: ^Building + Inherits@selection: ^SelectableCombatBuilding WithSpriteTurret: AttackTurreted: RenderRangeCircle: @@ -529,3 +521,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 index 1f2f0fd8ac..fa43b34f6b 100644 --- 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 index e99cd1fed7..8303bc6f54 100644 --- 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 index 4a12f6d536..b14db6da95 100644 --- 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 index 74c123a9d1..2b4c35b343 100644 --- 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: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 290cac41c0..89496e1e55 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -224,20 +224,12 @@ GivesBounty: RequiresCondition: global-bounty -^FlatSelectionMode: - Selectable: - PriorityModifiers: Ctrl - -^LowPrioritySelectionMode: - Selectable: - PriorityModifiers: Ctrl, Alt - ^Vehicle: Inherits@1: ^ExistsInWorld Inherits@2: ^IronCurtainable Inherits@3: ^SpriteActor Inherits@bounty: ^GlobalBounty - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: Action: Kill @@ -321,7 +313,7 @@ Inherits@3: ^InfantryExperienceHospitalOverrides Inherits@4: ^SpriteActor Inherits@bounty: ^GlobalBounty - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: Action: Kill @@ -492,7 +484,7 @@ Inherits@3: ^IronCurtainable Inherits@4: ^SpriteActor Inherits@bounty: ^GlobalBounty - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: Action: Kill @@ -544,7 +536,7 @@ Inherits@1: ^ExistsInWorld Inherits@4: ^SpriteActor Inherits@bounty: ^GlobalBounty - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: Action: Kill @@ -641,10 +633,9 @@ Inherits@3: ^SpriteActor Inherits@shape: ^1x1Shape Inherits@bounty: ^GlobalBounty + Inherits@selection: ^SelectableBuilding SelectionDecorations: WithSpriteControlGroupDecoration: - Selectable: - Priority: 3 Targetable: TargetTypes: Ground, C4, DetonateAttack, Structure Building: @@ -729,6 +720,7 @@ ^Defense: Inherits: ^Building + Inherits@selection: ^SelectableCombatBuilding Selectable: Bounds: 24,24 Targetable: @@ -1242,3 +1234,26 @@ Types: SpyInfiltrate Power: RequiresCondition: !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/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 5157442e87..77a59eaacd 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -242,7 +242,7 @@ E4: E6: Inherits: ^Soldier - Inherits@SELECTION_MODE: ^LowPrioritySelectionMode + Inherits@selection: ^SelectableSupportUnit Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -283,8 +283,6 @@ E6: EnterBlockedCursor: move-blocked Voiced: VoiceSet: EngineerVoice - Selectable: - Priority: 5 -AttackFrontal: SPY: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 64ca613e5d..fc9fdb56e8 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -286,7 +286,7 @@ ARTY: HARV: Inherits: ^Vehicle - Inherits@SELECTION_MODE: ^LowPrioritySelectionMode + Inherits@selection: ^SelectableEconomicUnit Buildable: Queue: Vehicle BuildPaletteOrder: 110 @@ -298,7 +298,6 @@ HARV: Name: Ore Truck GenericName: Harvester Selectable: - Priority: 7 DecorationBounds: 42,42 SelectionDecorations: Harvester: @@ -340,7 +339,7 @@ HARV: MCV: Inherits: ^Vehicle - Inherits@SELECTION_MODE: ^LowPrioritySelectionMode + Inherits@selection: ^SelectableSupportUnit Buildable: Queue: Vehicle BuildPaletteOrder: 210 @@ -352,7 +351,6 @@ MCV: Tooltip: Name: Mobile Construction Vehicle Selectable: - Priority: 4 DecorationBounds: 42,42 SelectionDecorations: Health: @@ -467,7 +465,7 @@ APC: MNLY: Inherits: ^TrackedVehicle - Inherits@SELECTION_MODE: ^LowPrioritySelectionMode + Inherits@selection: ^SelectableSupportUnit Buildable: Queue: Vehicle BuildPaletteOrder: 310 @@ -479,8 +477,6 @@ MNLY: Name: Minelayer UpdatesPlayerStatistics: AddToArmyValue: true - Selectable: - Priority: 5 Health: HP: 30000 Armor: @@ -511,7 +507,7 @@ MNLY: TRUK: Inherits: ^Vehicle - Inherits@SELECTION_MODE: ^LowPrioritySelectionMode + Inherits@selection: ^SelectableSupportUnit Buildable: Queue: Vehicle BuildPaletteOrder: 410 @@ -521,8 +517,6 @@ TRUK: Cost: 500 Tooltip: Name: Supply Truck - Selectable: - Priority: 6 Health: HP: 11000 Armor: diff --git a/mods/ts/rules/civilian-vehicles.yaml b/mods/ts/rules/civilian-vehicles.yaml index af5ef9f257..b9d6a29d49 100644 --- a/mods/ts/rules/civilian-vehicles.yaml +++ b/mods/ts/rules/civilian-vehicles.yaml @@ -42,6 +42,7 @@ ^TRUCK: Inherits: ^CivilianVoxelVehicle + Inherits@selection: ^SelectableSupportUnit Valued: Cost: 500 Tooltip: @@ -65,6 +66,7 @@ TRUCKB: ICBM: Inherits: ^CivilianVoxelCrusher + Inherits@selection: ^SelectableSupportUnit Valued: Cost: 1400 Tooltip: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index ed816c29a0..2c6906c07d 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -179,14 +179,6 @@ AttackMove: AssaultMoveCondition: assault-move -^FlatSelectionMode: - Selectable: - PriorityModifiers: Ctrl - -^LowPrioritySelectionMode: - Selectable: - PriorityModifiers: Ctrl, Alt - ^2x1Shape: HitShape: Type: Rectangle @@ -305,12 +297,11 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor Inherits@3: ^Cloakable + Inherits@selection: ^SelectableBuilding Huntable: WithTextControlGroupDecoration: SelectionDecorations: Palette: pips - Selectable: - Priority: 3 Targetable: TargetTypes: Ground, Building, C4 HitShape: @@ -546,7 +537,7 @@ Inherits@3: ^SpriteActor Inherits@4: ^Cloakable Inherits@CRATESTATS: ^CrateStatModifiers - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: Action: Kill @@ -751,7 +742,7 @@ Inherits@4: ^Cloakable Inherits@5: ^DamagedByVeins Inherits@CRATESTATS: ^CrateStatModifiers - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: Action: Kill @@ -856,7 +847,7 @@ ^Aircraft: Inherits@2: ^ExistsInWorld Inherits@3: ^Cloakable - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: Action: Kill @@ -950,7 +941,7 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor Inherits@3: ^HealsOnTiberium - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: DrawLineToTarget: QueuedLineWidth: 2 @@ -1085,6 +1076,7 @@ ^Defense: Inherits: ^Building + Inherits@selection: ^SelectableCombatBuilding -GivesBuildableArea: RenderRangeCircle: RenderDetectionCircle: @@ -1104,7 +1096,7 @@ Inherits@1: ^EmpDisable Inherits@2: ^ExistsInWorld Inherits@3: ^Cloakable - Inherits@SELECTION_MODE: ^FlatSelectionMode + Inherits@selection: ^SelectableCombatUnit Huntable: RenderVoxels: RenderSprites: @@ -1330,3 +1322,26 @@ GrantCondition@IDISABLE: RequiresCondition: lowpower || powerdown Condition: 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/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 7e3f159d46..fd68d2d56c 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -343,6 +343,7 @@ REPAIR: WEED: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor + Inherits@selection: ^SelectableEconomicUnit Valued: Cost: 1400 Tooltip: diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index ece7b5181c..024461d7ff 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -40,7 +40,7 @@ E1: ENGINEER: Inherits: ^Soldier - Inherits@SELECTION_MODE: ^LowPrioritySelectionMode + Inherits@selection: ^SelectableSupportUnit Valued: Cost: 500 Tooltip: @@ -72,8 +72,6 @@ ENGINEER: FactionImages: gdi: engineer.gdi nod: engineer.nod - Selectable: - Priority: 5 FLAMEGUY: Inherits@1: ^ExistsInWorld diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index a23a975d5b..c1a094bb58 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -1,7 +1,7 @@ MCV: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor - Inherits@SELECTION_MODE: ^LowPrioritySelectionMode + Inherits@selection: ^SelectableSupportUnit Buildable: Queue: Vehicle BuildPaletteOrder: 160 @@ -12,7 +12,6 @@ MCV: Tooltip: Name: Mobile Construction Vehicle Selectable: - Priority: 3 DecorationBounds: 42,42 Health: HP: 100000 @@ -45,7 +44,7 @@ MCV: HARV: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor - Inherits@SELECTION_MODE: ^LowPrioritySelectionMode + Inherits@selection: ^SelectableEconomicUnit Valued: Cost: 1400 Tooltip: @@ -56,7 +55,6 @@ HARV: Prerequisites: ~factory, proc, ~techlevel.low Description: Collects Tiberium for processing.\n Unarmed Selectable: - Priority: 7 Bounds: 36,36 DecorationBounds: 36,36 Harvester: @@ -106,6 +104,7 @@ HARV: LPST: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor + Inherits@selection: ^SelectableSupportUnit -AppearsOnRadar: Buildable: Queue: Vehicle