Ticket #3962: forcedelete_v3.patch

config/default.cfg

@@ -284 +284 @@
 batchtrain = Shift           ; Modifier to train units in batches
 massbarter = Shift           ; Modifier to barter bunch of resources
 masstribute = Shift          ; Modifier to tribute bunch of resources
+noconfirmation = Shift       ; Do not ask confirmation when deleting a building/unit
 fulltradeswap = Shift        ; Modifier to put the desired trade resource to 100%
 unloadtype = Shift           ; Modifier to unload all units of type
 deselectgroup = Ctrl         ; Modifier to deselect units when clicking group icon, instead of selecting
@@ -292 +293 @@
 
 [hotkey.session.savedgames]
 delete = Delete               ; Delete the selected saved game asking confirmation
-noConfirmation = Shift        ; Do not ask confirmation when deleting a game
+noconfirmation = Shift        ; Do not ask confirmation when deleting a game
 
 [hotkey.session.queueunit]   ; > UNIT TRAINING
 1 = "Z"            ; add first unit type to queue

mods/public/gui/credits/texts/programming.json

@@ -161 +161 @@
             {"name": "Rolf Sievers"},
             {"nick": "s0600204", "name": "Matthew Norwood"},
             {"nick": "SafaAlfulaij"},
+            {"nick": "Sandarac"},
             {"nick": "sanderd17", "name": "Sander Deryckere"},
             {"nick": "sathyam", "name": "Sathyam Vellal"},
             {"nick": "sbte", "name": "Sven Baars"},

mods/public/gui/replaymenu/replay_actions.js

@@ -133 +133 @@
     if (!Engine.GetGUIObjectByName("deleteReplayButton").enabled)
         return;
 
-    if (Engine.HotkeyIsPressed("session.savedgames.noConfirmation"))
+    if (Engine.HotkeyIsPressed("session.savedgames.noconfirmation"))
         deleteReplayWithoutConfirmation();
     else
         deleteReplay();

mods/public/gui/savedgames/load.xml

@@ -31 +31 @@
             <action on="Press">
                 if (!this.enabled)
                     return;
-                if (Engine.HotkeyIsPressed("session.savedgames.noConfirmation"))
+                if (Engine.HotkeyIsPressed("session.savedgames.noconfirmation"))
                     deleteGameWithoutConfirmation();
                 else
                     deleteGame();

mods/public/gui/session/unit_actions.js

@@ -1022 +1022 @@
             let selection = g_Selection.toList();
             if (!selection.length)
                 return;
-
-            openDeleteDialog(selection);
+            if (Engine.HotkeyIsPressed("session.noconfirmation"))
+                Engine.PostNetworkCommand({
+                    "type": "delete-entities",
+                    "entities": selection
+                });
+            else
+                openDeleteDialog(selection);
         },
     },
     "stop": {