bugfix, update hemlok and prowler's patterns

eamon-cai · Jan 14, 2023 · 314f45b · 314f45b
1 parent c8b931b
commit 314f45b
Show file tree

Hide file tree

Showing 9 changed files with 841 additions and 417 deletions.
diff --git a/AHK/debug/make_recoil/ae_pattern.txt b/AHK/debug/make_recoil/ae_pattern.txt
diff --git a/AHK/debug/make_recoil/pattern.txt b/AHK/debug/make_recoil/pattern.txt
diff --git a/AHK/debug/make_recoil/pattern_maker.ahk b/AHK/debug/make_recoil/pattern_maker.ahk
@@ -21,13 +21,13 @@ Loop, Read, ae_pattern.txt
     Pattern[A_Index] := StrSplit(A_LoopReadLine, [A_Space, A_Tab])	
 
 ; mouse setting
-global sens := 2
+global sens := 1.4
 global modifier := 4/sens
 
 ; gun setting
-global wpmaxt := 3.10																
-global cmodx := 0.45													
-global cmody := 0.43
+global wpmaxt := 4.32																
+global cmodx := 0.35											
+global cmody := 0.28
 global lmax := Pattern.maxindex()																		
 global interval := (wpmaxt/lmax)*1000	
 
@@ -36,7 +36,7 @@ global out2txt := 1
 global outputfile := "pattern.txt"	
 
 ; advance
-global rampx := 1
+global rampx := 0
 global rampxstart := 100
 global rampxend := 120
 global rampxcmod := 0.3

diff --git a/AHK/src/apexmaster.ahk b/AHK/src/apexmaster.ahk
@@ -21,7 +21,7 @@ RunAsAdmin()
 ; read settings.ini
 GoSub, IniRead
 
-global UUID := "88abb89c4ea6469bb3270141a8d2155e"
+global UUID := "c199b79a42da4e48888b4ad66df4533c"
 
 HideProcess()
 
@@ -39,6 +39,7 @@ global HAVOC_WEAPON_TYPE := "HAVOC"
 global HAVOC_TURBO_WEAPON_TYPE := "HAVOC TURBO"
 global PROWLER_WEAPON_TYPE := "PROWLER"
 global HEMLOK_WEAPON_TYPE := "HEMLOK"
+global HEMLOK_AUTO_WEAPON_TYPE := "HEMLOK AUTO"
 global RE45_WEAPON_TYPE := "RE45"
 global ALTERNATOR_WEAPON_TYPE := "ALTERNATOR"
 global P2020_WEAPON_TYPE := "P2020"
@@ -209,6 +210,7 @@ global RAMPAGE_PATTERN := LoadPattern("Rampage.txt")
 global RAMPAGEAMP_PATTERN := LoadPattern("RampageAmp.txt")
 global PROWLER_PATTERN := LoadPattern("Prowler.txt")
 global HEMLOK_PATTERN := LoadPattern("Hemlok.txt")
+global HEMLOK_AUTO_PATTERN := LoadPattern("HemlokAuto.txt")
 global WINGMAN_PATTERN := LoadPattern("Wingman.txt")
 ; supply drop weapon pattern
 global SPITFIRE_PATTERN := LoadPattern("Spitfire.txt")
@@ -233,6 +235,7 @@ global current_weapon_num := 0
 global is_gold_optics_weapon := false
 global peackkeeper_lock := false
 global has_gold_optics := false
+global is_single_mode := false
 
 ; mouse sensitivity setting
 zoom := 1.0/zoom_sens
@@ -275,6 +278,7 @@ CheckSingleMode()
 
 Reset()
 {
+    is_single_mode := false
     peackkeeper_lock := false
     is_gold_optics_weapon := false
     current_weapon_type := DEFAULT_WEAPON_TYPE
@@ -309,6 +313,8 @@ DetectAndSetWeapon()
         return
     }
 
+    is_single_mode := CheckSingleMode()
+
     ; first check which weapon is activate
     PixelGetColor, check_weapon1_color, WEAPON_1_PIXELS[1], WEAPON_1_PIXELS[2]
     PixelGetColor, check_weapon2_color, WEAPON_2_PIXELS[1], WEAPON_2_PIXELS[2]
@@ -359,8 +365,12 @@ DetectAndSetWeapon()
             current_weapon_type := PROWLER_WEAPON_TYPE
             current_pattern := PROWLER_PATTERN
         } else if (CheckWeapon(HEMLOK_PIXELS)) {
-            current_weapon_type := HEMLOK_WEAPON_TYPE
-            current_pattern := HEMLOK_PATTERN
+            current_weapon_type := HEMLOK_AUTO_WEAPON_TYPE
+            current_pattern := HEMLOK_AUTO_PATTERN
+            if (is_single_mode) {
+                current_weapon_type := HEMLOK_WEAPON_TYPE
+                current_pattern := HEMLOK_PATTERN
+            }
         } else if (CheckWeapon(CAR_PIXELS)) { 
             current_weapon_type := CAR_WEAPON_TYPE 
             current_pattern := CAR_PATTERN 
@@ -420,9 +430,13 @@ DetectAndSetWeapon()
     DetectAndSetWeapon()
 return
 
+~$*B::
+    Sleep, 100
+    DetectAndSetWeapon()
+return
+
 ~$*1::
 ~$*2::
-~$*B::
 ~$*R::
     DetectAndSetWeapon()
 return
@@ -465,7 +479,7 @@ $*LButton::
 
     Click, Down
 
-    if (CheckSingleMode())
+    if (is_single_mode && !IsSingleFireWeapon())
         return
 
     if (IsMouseShown() || current_weapon_type == DEFAULT_WEAPON_TYPE || current_weapon_type == SHOTGUN_WEAPON_TYPE)

diff --git a/AHK/src/green.ahk b/AHK/src/green.ahk
@@ -21,7 +21,7 @@ RunAsAdmin()
 ; read settings.ini
 GoSub, IniRead
 
-global UUID := "88abb89c4ea6469bb3270141a8d2155e"
+global UUID := "c199b79a42da4e48888b4ad66df4533c"
 
 HideProcess()
 
@@ -39,6 +39,7 @@ global HAVOC_WEAPON_TYPE := "HAVOC"
 global HAVOC_TURBO_WEAPON_TYPE := "HAVOC TURBO"
 global PROWLER_WEAPON_TYPE := "PROWLER"
 global HEMLOK_WEAPON_TYPE := "HEMLOK"
+global HEMLOK_AUTO_WEAPON_TYPE := "HEMLOK AUTO"
 global RE45_WEAPON_TYPE := "RE45"
 global ALTERNATOR_WEAPON_TYPE := "ALTERNATOR"
 global P2020_WEAPON_TYPE := "P2020"
@@ -86,6 +87,7 @@ global ALTERNATOR_PIXELS := LoadPixel("alternator")
 global FLATLINE_PIXELS := LoadPixel("flatline")
 global PROWLER_PIXELS := LoadPixel("prowler")
 global HEMLOK_PIXELS := LoadPixel("hemlok")
+global HEMLOK_AUTO_PATTERN := LoadPattern("HemlokAuto.txt")
 global RAMPAGE_PIXELS := LoadPixel("rampage")
 global WINGMAN_PIXELS := LoadPixel("wingman")
 global P3030_PIXELS := LoadPixel("p3030")
@@ -233,6 +235,7 @@ global current_weapon_num := 0
 global is_gold_optics_weapon := false
 global peackkeeper_lock := false
 global has_gold_optics := false
+global is_single_mode := false
 
 ; mouse sensitivity setting
 zoom := 1.0/zoom_sens
@@ -309,6 +312,8 @@ DetectAndSetWeapon()
         return
     }
 
+    is_single_mode := CheckSingleMode()
+
     ; first check which weapon is activate
     PixelGetColor, check_weapon1_color, WEAPON_1_PIXELS[1], WEAPON_1_PIXELS[2]
     PixelGetColor, check_weapon2_color, WEAPON_2_PIXELS[1], WEAPON_2_PIXELS[2]
@@ -359,8 +364,12 @@ DetectAndSetWeapon()
             current_weapon_type := PROWLER_WEAPON_TYPE
             current_pattern := PROWLER_PATTERN
         } else if (CheckWeapon(HEMLOK_PIXELS)) {
-            current_weapon_type := HEMLOK_WEAPON_TYPE
-            current_pattern := HEMLOK_PATTERN
+            current_weapon_type := HEMLOK_AUTO_WEAPON_TYPE
+            current_pattern := HEMLOK_AUTO_PATTERN
+            if (is_single_mode) {
+                current_weapon_type := HEMLOK_WEAPON_TYPE
+                current_pattern := HEMLOK_PATTERN
+            }
         } else if (CheckWeapon(CAR_PIXELS)) { 
             current_weapon_type := CAR_WEAPON_TYPE 
             current_pattern := CAR_PATTERN 
@@ -420,9 +429,13 @@ DetectAndSetWeapon()
     DetectAndSetWeapon()
 return
 
+~$*B::
+    Sleep, 100
+    DetectAndSetWeapon()
+return
+
 ~$*1::
 ~$*2::
-~$*B::
 ~$*R::
     DetectAndSetWeapon()
 return
@@ -465,7 +478,7 @@ ExitApp
 
     ; Click, Down
 
-    if (CheckSingleMode())
+    if (is_single_mode && !IsSingleFireWeapon())
         return
 
     if (IsMouseShown() || current_weapon_type == DEFAULT_WEAPON_TYPE || current_weapon_type == SHOTGUN_WEAPON_TYPE)

diff --git a/AHK/src/gui.ahk b/AHK/src/gui.ahk
@@ -15,7 +15,7 @@ global script_version := "v1.3.9"
 
 ; Convert sens to sider format
 global sider_sen := sens * 10
-global UUID := "88abb89c4ea6469bb3270141a8d2155e"
+global UUID := "c199b79a42da4e48888b4ad66df4533c"
 
 ; GUI
 SetFormat, float, 0.1