Adjust 'BOMB' category usage and add torpedo/normal bomber selection …

…hotkeys (#6009)
FAForever · Mar 23, 2024 · d16448b · d16448b
1 parent 15648e6
commit d16448b
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 2 deletions.
diff --git a/changelog/3804.md b/changelog/3804.md
@@ -20,6 +20,13 @@ Via this feature one could assign attack orders to (mobile) units that you lack
 
 ## Features
 
+- (#6009) Add separate hotkeys to select all normal bombers and all torpedo bombers
+
+  They can be found in the Selection category of the hotkeys as "Select all Bombers (Normal)" and "Select all Bombers (Torpedo)".
+  Selecting normal bombers excludes the Mercy, as it is a kamikaze missile.
+
+- (#6015) Extend the context-based templates feature
+- 
 - (#6010) Add a hotkey label for the Attack Move button
 
 - (#6015, #6016) Extend the context-based templates feature
@@ -56,6 +63,10 @@ In this scenario you can easily create mass extractors, hydrocarbons and/or wall
 
 - (#6008) Remove unecessary category from the Brick
 
+- (#6009) Add Mercy to the `BOMB` category alongside Fire Beetle. Remove Loyalist from the category as its Charge ability was removed.
+
+  This allows category filtering to filter for Mercies.
+
 ## Contributors
 
 With thanks to the following people who contributed through coding:

diff --git a/engine/Core/Categories.lua b/engine/Core/Categories.lua
@@ -31,6 +31,7 @@ categories = {
     ASF = categoryValue,
     BATTLESHIP = categoryValue,
     BENIGN = categoryValue,
+    --- Used for units that die when attacking
     BOMB = categoryValue,
     BOMBER = categoryValue,
     BOT = categoryValue,

diff --git a/loc/US/strings_db.lua b/loc/US/strings_db.lua
@@ -4458,6 +4458,9 @@ key_desc_0403="build static artilleries + mobile artilleries"
 key_desc_0404="build TML & SML + mobile missile launchers + nuke subs / battleship & missile ship & sera / uef cruisers"
 key_desc_0405="Dock"
 
+key_desc_0407="Select all Bombers (Normal)"
+key_desc_0408="Select all Bombers (Torpedo)"
+
 keymap_category_0000="UI"
 keymap_category_0004="Selection"
 keymap_category_0025="Camera"

diff --git a/lua/keymap/keyactions.lua b/lua/keymap/keyactions.lua
@@ -365,6 +365,14 @@ local keyActionsSelectionQuickSelect = {
         action = 'UI_SelectByCategory AIR BOMBER',
         category = 'selection',
     },
+    ['select_surface_bombers'] = {
+        action = 'UI_Lua import("/lua/keymap/smartselection.lua").smartSelect("AIR BOMBER -ANTINAVY -BOMB")',
+        category = 'selection',
+    },
+    ['select_torpedo_bombers'] = {
+        action = 'UI_SelectByCategory AIR BOMBER ANTINAVY',
+        category = 'selection',
+    },
     ['select_anti_air_fighters'] = {
         action = 'UI_Lua import("/lua/keymap/smartselection.lua").smartSelect("AIR HIGHALTAIR ANTIAIR -BOMBER -EXPERIMENTAL")',
         category = 'selection',

diff --git a/lua/keymap/keydescriptions.lua b/lua/keymap/keydescriptions.lua
@@ -557,4 +557,7 @@ keyDescriptions = {
     ['shift_load_transports_clear'] = '<LOC key_desc_shift_load_transports_clear>Load into transports. Applies immediately',
     ['copy_orders'] = '<LOC key_desc_copy_orders>Copy orders of the unit the mouse is on top of',
     ['shift_copy_orders'] = '<LOC key_desc_shift_copy_orders>Copy orders of the unit the mouse is on top of',
+
+    ['select_surface_bombers'] = '<LOC key_desc_0407>Select all Bombers (Normal)',
+    ['select_torpedo_bombers'] = '<LOC key_desc_0408>Select all Bombers (Torpedo)',
 }
diff --git a/units/DAA0206/DAA0206_unit.bp b/units/DAA0206/DAA0206_unit.bp
@@ -36,6 +36,7 @@ UnitBlueprint{
     Categories = {
         "AEON",
         "AIR",
+        "BOMB",
         "BOMBER",
         "CANNOTUSEAIRSTAGING",
         "MOBILE",

diff --git a/units/URL0303/URL0303_unit.bp b/units/URL0303/URL0303_unit.bp
@@ -10,7 +10,6 @@ UnitBlueprint {
     BuildIconSortPriority = 20,
     Categories = {
         "ANTIMISSILE",
-        "BOMB",
         "BOT",
         "BUILTBYTIER3FACTORY",
         "CYBRAN",
@@ -43,7 +42,6 @@ UnitBlueprint {
     },
     Display = {
         Abilities = {
-            "<LOC ability_suicideweapon>Suicide Weapon",
             "<LOC ability_stun>EMP Weapon",
             "<LOC ability_tacticalmissledeflect>Tactical Missile Deflection",
             "<LOC ability_deathaoe>Volatile",