From 9d2cec6982559f0d1ba4d88c0686fba0bf3da57d Mon Sep 17 00:00:00 2001 From: DeityLink Date: Tue, 22 Jun 2021 00:23:50 +0200 Subject: [PATCH] Fixes Numpad numbers no longer working (#29841) --- interface/interface.dm | 18 +++++----- interface/skin.dmf | 72 +++++++++++++++++++-------------------- interface/skin_azerty.dmf | 72 +++++++++++++++++++-------------------- 3 files changed, 81 insertions(+), 81 deletions(-) diff --git a/interface/interface.dm b/interface/interface.dm index 0c618d29ff4..04c00edced6 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -106,15 +106,15 @@ Any-Mode: (hotkey doesn't need to be on) \tPGDN = activate held object \tEND = throw \tSHIFT+MMB = point-at -\tNUMPAD8 = target head -\tNUMPAD7 = target mouth -\tNUMPAD9 = target eyes -\tNUMPAD5 = target chest -\tNUMPAD2 = target groin -\tNUMPAD4 = target left arm -\tNUMPAD6 = target right arm -\tNUMPAD1 = target left leg -\tNUMPAD3 = target right leg +\tAlt+NUMPAD8 = target head +\tAlt+NUMPAD7 = target mouth +\tAlt+NUMPAD9 = target eyes +\tAlt+NUMPAD5 = target chest +\tAlt+NUMPAD2 = target groin +\tAlt+NUMPAD4 = target left arm +\tAlt+NUMPAD6 = target right arm +\tAlt+NUMPAD1 = target left leg +\tAlt+NUMPAD3 = target right leg \tCtrl+NUMPAD4 = target left hand \tCtrl+NUMPAD6 = target right hand \tCtrl+NUMPAD1 = target left foot diff --git a/interface/skin.dmf b/interface/skin.dmf index 55f076aa23d..10d727dfbcd 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -59,32 +59,32 @@ macro "macro" elem "DELETE" name = "Delete" command = "delete-key-pressed" - elem "NUMPAD8" - name = "Numpad8" + elem "ALT+NUMPAD8" + name = "ALT+NUMPAD8" command = "a-zone head" - elem "NUMPAD5" - name = "Numpad5" + elem "ALT+NUMPAD5" + name = "ALT+NUMPAD5" command = "a-zone chest" - elem "NUMPAD2" - name = "Numpad2" + elem "ALT+NUMPAD2" + name = "ALT+NUMPAD2" command = "a-zone groin" - elem "NUMPAD7" - name = "Numpad7" + elem "ALT+NUMPAD7" + name = "ALT+NUMPAD7" command = "a-zone eyes" - elem "NUMPAD9" - name = "Numpad9" + elem "ALT+NUMPAD9" + name = "ALT+NUMPAD9" command = "a-zone mouth" - elem "NUMPAD4" - name = "Numpad4" + elem "ALT+NUMPAD4" + name = "ALT+NUMPAD4" command = "a-zone l_arm" - elem "NUMPAD1" - name = "Numpad1" + elem "ALT+NUMPAD1" + name = "ALT+NUMPAD1" command = "a-zone l_leg" - elem "NUMPAD6" - name = "Numpad6" + elem "ALT+NUMPAD6" + name = "ALT+NUMPAD6" command = "a-zone r_arm" - elem "NUMPAD3" - name = "Numpad3" + elem "ALT+NUMPAD3" + name = "ALT+NUMPAD3" command = "a-zone r_leg" elem "CTRL+NUMPAD4" name = "CTRL+Numpad4" @@ -295,32 +295,32 @@ macro "hotkeymode" elem "6" name = "6" command = "a-bite" - elem "NUMPAD8" - name = "Numpad8" + elem "ALT+NUMPAD8" + name = "ALT+NUMPAD8" command = "a-zone head" - elem "NUMPAD5" - name = "Numpad5" + elem "ALT+NUMPAD5" + name = "ALT+NUMPAD5" command = "a-zone chest" - elem "NUMPAD2" - name = "Numpad2" + elem "ALT+NUMPAD2" + name = "ALT+NUMPAD2" command = "a-zone groin" - elem "NUMPAD7" - name = "Numpad7" + elem "ALT+NUMPAD7" + name = "ALT+NUMPAD7" command = "a-zone eyes" - elem "NUMPAD9" - name = "Numpad9" + elem "ALT+NUMPAD9" + name = "ALT+NUMPAD9" command = "a-zone mouth" - elem "NUMPAD4" - name = "Numpad4" + elem "ALT+NUMPAD4" + name = "ALT+NUMPAD4" command = "a-zone l_arm" - elem "NUMPAD1" - name = "Numpad1" + elem "ALT+NUMPAD1" + name = "ALT+NUMPAD1" command = "a-zone l_leg" - elem "NUMPAD6" - name = "Numpad6" + elem "ALT+NUMPAD6" + name = "ALT+NUMPAD6" command = "a-zone r_arm" - elem "NUMPAD3" - name = "Numpad3" + elem "ALT+NUMPAD3" + name = "ALT+NUMPAD3" command = "a-zone r_leg" elem "CTRL+NUMPAD4" name = "CTRL+Numpad4" diff --git a/interface/skin_azerty.dmf b/interface/skin_azerty.dmf index 96150b03618..72d4bdaa717 100644 --- a/interface/skin_azerty.dmf +++ b/interface/skin_azerty.dmf @@ -59,32 +59,32 @@ macro "macro" elem "DELETE" name = "Delete" command = "delete-key-pressed" - elem "NUMPAD8" - name = "Numpad8" + elem "ALT+NUMPAD8" + name = "ALT+NUMPAD8" command = "a-zone head" - elem "NUMPAD5" - name = "Numpad5" + elem "ALT+NUMPAD5" + name = "ALT+NUMPAD5" command = "a-zone chest" - elem "NUMPAD2" - name = "Numpad2" + elem "ALT+NUMPAD2" + name = "ALT+NUMPAD2" command = "a-zone groin" - elem "NUMPAD7" - name = "Numpad7" + elem "ALT+NUMPAD7" + name = "ALT+NUMPAD7" command = "a-zone eyes" - elem "NUMPAD9" - name = "Numpad9" + elem "ALT+NUMPAD9" + name = "ALT+NUMPAD9" command = "a-zone mouth" - elem "NUMPAD4" - name = "Numpad4" + elem "ALT+NUMPAD4" + name = "ALT+NUMPAD4" command = "a-zone l_arm" - elem "NUMPAD1" - name = "Numpad1" + elem "ALT+NUMPAD1" + name = "ALT+NUMPAD1" command = "a-zone l_leg" - elem "NUMPAD6" - name = "Numpad6" + elem "ALT+NUMPAD6" + name = "ALT+NUMPAD6" command = "a-zone r_arm" - elem "NUMPAD3" - name = "Numpad3" + elem "ALT+NUMPAD3" + name = "ALT+NUMPAD3" command = "a-zone r_leg" elem "CTRL+NUMPAD4" name = "CTRL+Numpad4" @@ -295,32 +295,32 @@ macro "hotkeymode" elem "6" name = "6" command = "a-bite" - elem "NUMPAD8" - name = "Numpad8" + elem "ALT+NUMPAD8" + name = "ALT+NUMPAD8" command = "a-zone head" - elem "NUMPAD5" - name = "Numpad5" + elem "ALT+NUMPAD5" + name = "ALT+NUMPAD5" command = "a-zone chest" - elem "NUMPAD2" - name = "Numpad2" + elem "ALT+NUMPAD2" + name = "ALT+NUMPAD2" command = "a-zone groin" - elem "NUMPAD7" - name = "Numpad7" + elem "ALT+NUMPAD7" + name = "ALT+NUMPAD7" command = "a-zone eyes" - elem "NUMPAD9" - name = "Numpad9" + elem "ALT+NUMPAD9" + name = "ALT+NUMPAD9" command = "a-zone mouth" - elem "NUMPAD4" - name = "Numpad4" + elem "ALT+NUMPAD4" + name = "ALT+NUMPAD4" command = "a-zone l_arm" - elem "NUMPAD1" - name = "Numpad1" + elem "ALT+NUMPAD1" + name = "ALT+NUMPAD1" command = "a-zone l_leg" - elem "NUMPAD6" - name = "Numpad6" + elem "ALT+NUMPAD6" + name = "ALT+NUMPAD6" command = "a-zone r_arm" - elem "NUMPAD3" - name = "Numpad3" + elem "ALT+NUMPAD3" + name = "ALT+NUMPAD3" command = "a-zone r_leg" elem "CTRL+NUMPAD4" name = "CTRL+Numpad4"