From b1a354842fc9b5f60fb64d2ff5c4a601c0e0f595 Mon Sep 17 00:00:00 2001
From: mar <mar@mar.alemor.org>
Date: Sat, 24 Dec 2022 11:32:38 -0600
Subject: [PATCH] bugfix

---
 lib/HoldRepeat.ahk         |  2 +-
 src/Deep Rock Galactic.ahk | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/HoldRepeat.ahk b/lib/HoldRepeat.ahk
index 2f19589..4eebd9a 100644
--- a/lib/HoldRepeat.ahk
+++ b/lib/HoldRepeat.ahk
@@ -21,7 +21,7 @@ HoldLoop(Primary, Secondary, Tertiary) {
             return
         }
     }
-    keyHeld:=0
+    keyHeld:=!Tertiary.Length
     for index,key in Tertiary {
         if GetKeyState(key,"P") {
             keyHeld:=1
diff --git a/src/Deep Rock Galactic.ahk b/src/Deep Rock Galactic.ahk
index b7f1cab..89b3ab8 100644
--- a/src/Deep Rock Galactic.ahk	
+++ b/src/Deep Rock Galactic.ahk	
@@ -12,14 +12,18 @@ WrapperWindow:="Deep Rock Galactic  "
 #Include "../lib/Wrapper.ahk"
 
 ; Initialize variables
-FullAutoEnabled := [0,0,0,0]
+FullAutoEnabled := [0,0,0,0,1]
 EquipState := 1
 
 ToggleFullAuto(Index) {
     global FullAutoEnabled
     FullAutoEnabled[Index] := !FullAutoEnabled[Index]
     EnabledDisabled := (FullAutoEnabled[Index] ? "enabled" : "disabled")
-    ToolTip "Full Auto " EnabledDisabled " for " Index, A_ScreenWidth // 2, A_ScreenHeight // 2
+    if   (Index < 5) {
+        ToolTip "Full Auto " EnabledDisabled " for " Index, A_ScreenWidth // 2, A_ScreenHeight // 2
+    } else {
+        ToolTip "Extra macros " EnabledDisabled, A_ScreenWidth // 2, A_ScreenHeight // 2
+    }
     SetTimer RemoveTooltip, -1000
 }
 
@@ -46,22 +50,23 @@ RemoveTooltip() {
 *F2::ToggleFullAuto(2)
 *F3::ToggleFullAuto(3)
 *F4::ToggleFullAuto(4)
+*F5::ToggleFullAuto(5)
 
 ; Do full auto when caps lock is on for enabled weapons
 #HotIf (GetKeyState("CapsLock","T") and FullAutoEnabled[EquipState])
 *LButton::Turbo("LButton")
-#HotIf
 
 ;
 ; Other
 ;
+#HotIf FullAutoEnabled[5]
 
 ; Alt + E holds E
-*!e UP::Hold("e",["w","a","s","d","Space","LButton","RButton"])
+*!e UP::Hold("e",["w","a","s","d"])
 
 ; Press shift to sprint, only toggles on
 *LShift::{
-    Send "{Blind}{LShift down}"
+    Send "{Blind}{LShift up}{LShift down}"
     if (KeyWait("LShift", "T0.1") and KeyWait("LShift", "D T0.1")) {
         Send "{LShift}{LShift}"
     }