diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 465b27ca0b..1f2aba0be0 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -242,9 +242,18 @@ 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 Huntable: OwnerLostAction: Action: Kill @@ -294,6 +303,7 @@ ^Helicopter: Inherits@1: ^ExistsInWorld Inherits@3: ^SpriteActor + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: OwnerLostAction: Action: Kill @@ -351,6 +361,7 @@ ^Infantry: Inherits@1: ^ExistsInWorld Inherits@3: ^SpriteActor + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: OwnerLostAction: Action: Kill @@ -517,6 +528,7 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: OwnerLostAction: Action: Kill @@ -573,6 +585,7 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: Health: HP: 30000 @@ -629,6 +642,7 @@ ^Plane: Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: OwnerLostAction: Action: Kill @@ -653,6 +667,7 @@ ^Ship: Inherits@1: ^ExistsInWorld Inherits@3: ^SpriteActor + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: OwnerLostAction: Action: Kill diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index 039c63e0f2..769648dc84 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -162,6 +162,7 @@ E5: E6: Inherits: ^Soldier + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Valued: Cost: 500 Tooltip: diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 41b31b3b79..718d379478 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -1,5 +1,6 @@ MCV: Inherits: ^Vehicle + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Valued: Cost: 3500 Tooltip: @@ -43,6 +44,7 @@ MCV: HARV: Inherits: ^Tank Inherits@CLOAK: ^AcceptsCloakCrate + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Valued: Cost: 1000 Tooltip: @@ -681,6 +683,7 @@ MHQ: TRUCK: Inherits: ^Vehicle + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Buildable: Queue: Vehicle.GDI, Vehicle.Nod BuildPaletteOrder: 35 diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 160ece3fe8..0da0c5fcbc 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -163,9 +163,18 @@ AttackMove: AssaultMoveCondition: assault-move +^FlatSelectionMode: + Selectable: + PriorityModifiers: Ctrl + +^LowPrioritySelectionMode: + Selectable: + PriorityModifiers: Ctrl, Alt + ^Vehicle: Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor + Inherits@SELECTION_MODE: ^FlatSelectionMode Tooltip: GenericName: Unit Huntable: @@ -269,6 +278,7 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience Inherits@3: ^SpriteActor + Inherits@SELECTION_MODE: ^FlatSelectionMode Tooltip: GenericName: Unit Huntable: diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 2cfb7dcd50..81d5d6f3d6 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -1,5 +1,6 @@ mcv: Inherits: ^Tank + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Buildable: Prerequisites: repair_pad, upgrade.heavy, ~techlevel.medium Queue: Armor @@ -50,6 +51,7 @@ mcv: harvester: Inherits: ^Tank + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Buildable: Queue: Armor Prerequisites: refinery diff --git a/mods/ra/maps/fort-lonestar/rules.yaml b/mods/ra/maps/fort-lonestar/rules.yaml index eb09d2e187..74c123a9d1 100644 --- a/mods/ra/maps/fort-lonestar/rules.yaml +++ b/mods/ra/maps/fort-lonestar/rules.yaml @@ -138,6 +138,7 @@ OILB: MOBILETENT: Inherits: ^Vehicle + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Valued: Cost: 2000 Tooltip: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 50bf81e680..e26ed424fa 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -231,11 +231,20 @@ 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 Huntable: OwnerLostAction: Action: Kill @@ -319,6 +328,7 @@ Inherits@3: ^InfantryExperienceHospitalOverrides Inherits@4: ^SpriteActor Inherits@bounty: ^GlobalBounty + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: OwnerLostAction: Action: Kill @@ -488,6 +498,7 @@ Inherits@3: ^IronCurtainable Inherits@4: ^SpriteActor Inherits@bounty: ^GlobalBounty + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: OwnerLostAction: Action: Kill @@ -540,6 +551,7 @@ Inherits@3: ^IronCurtainable Inherits@4: ^SpriteActor Inherits@bounty: ^GlobalBounty + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: OwnerLostAction: Action: Kill diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 3fea4e2ebb..7251191248 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -244,6 +244,7 @@ E4: E6: Inherits: ^Soldier + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Buildable: Queue: Infantry BuildAtProductionType: Soldier diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index a0cf0e9e8c..8bd614e385 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -289,6 +289,7 @@ ARTY: HARV: Inherits: ^Vehicle + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Buildable: Queue: Vehicle BuildPaletteOrder: 10 @@ -342,6 +343,7 @@ HARV: MCV: Inherits: ^Vehicle + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Buildable: Queue: Vehicle BuildPaletteOrder: 90 @@ -468,6 +470,7 @@ APC: MNLY: Inherits: ^TrackedVehicle + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Buildable: Queue: Vehicle BuildPaletteOrder: 100 @@ -511,6 +514,7 @@ MNLY: TRUK: Inherits: ^Vehicle + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Buildable: Queue: Vehicle BuildPaletteOrder: 20 diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 2d7a3314ac..bf9830c542 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -179,6 +179,14 @@ AttackMove: AssaultMoveCondition: assault-move +^FlatSelectionMode: + Selectable: + PriorityModifiers: Ctrl + +^LowPrioritySelectionMode: + Selectable: + PriorityModifiers: Ctrl, Alt + ^2x1Shape: HitShape: Type: Rectangle @@ -536,6 +544,7 @@ Inherits@3: ^SpriteActor Inherits@4: ^Cloakable Inherits@CRATESTATS: ^CrateStatModifiers + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: OwnerLostAction: Action: Kill @@ -738,6 +747,7 @@ Inherits@4: ^Cloakable Inherits@5: ^DamagedByVeins Inherits@CRATESTATS: ^CrateStatModifiers + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: OwnerLostAction: Action: Kill @@ -839,6 +849,7 @@ ^Aircraft: Inherits@2: ^ExistsInWorld Inherits@3: ^Cloakable + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: OwnerLostAction: Action: Kill @@ -931,6 +942,7 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor Inherits@3: ^HealsOnTiberium + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: DrawLineToTarget: Health: @@ -1082,6 +1094,7 @@ Inherits@1: ^EmpDisable Inherits@2: ^ExistsInWorld Inherits@3: ^Cloakable + Inherits@SELECTION_MODE: ^FlatSelectionMode Huntable: RenderVoxels: RenderSprites: diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index 1fbb0de6f1..ece7b5181c 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -40,6 +40,7 @@ E1: ENGINEER: Inherits: ^Soldier + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Valued: Cost: 500 Tooltip: diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index a848fe497e..8b8fea057c 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -1,6 +1,7 @@ MCV: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Buildable: Queue: Vehicle BuildPaletteOrder: 160 @@ -45,6 +46,7 @@ MCV: HARV: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor + Inherits@SELECTION_MODE: ^LowPrioritySelectionMode Valued: Cost: 1400 Tooltip: