Update functions.ahk

QuickMacro.ahk

@@ -1,7 +1,20 @@
-;
-; Copyright (C) 2017 MacMailler
-; GitHub: https://github.com/MacMailler/QuickMacro
-;
+; RUN AS ADMIN
+Loop, %0%
+  {
+    param := %A_Index%
+    params .= A_Space . param
+  }
+ShellExecute := A_IsUnicode ? "shell32\ShellExecute":"shell32\ShellExecuteA"
+
+IF NOT A_IsAdmin
+{
+    If A_IsCompiled
+       DllCall(ShellExecute, uint, 0, str, "RunAs", str, A_ScriptFullPath, str, params , str, A_WorkingDir, int, 1)
+    Else
+       DllCall(ShellExecute, uint, 0, str, "RunAs", str, A_AhkPath, str, """" . A_ScriptFullPath . """" . A_Space . params, str, A_WorkingDir, int, 1)
+    ExitApp
+}
+; END RUN AS ADMIN
 
 #NoEnv
 #InstallKeybdHook
@@ -11,7 +24,7 @@
 #Include %A_ScriptDir%\includes\keys.ahk
 #Include %A_ScriptDir%\includes\conf.ahk
 #Include %A_ScriptDir%\includes\tray.ahk
-#Include %A_ScriptDir%\includes\crosshair.ahk
+#include %A_ScriptDir%\includes\process_suspend.ahk
 
 loadConf()
 
@@ -20,4 +33,4 @@ End::
 return
 
 #Include %A_ScriptDir%\includes\labels.ahk
-#Include %A_ScriptDir%\includes\functions.ahk
+#Include %A_ScriptDir%\includes\functions.ahk

README.md

@@ -1,28 +1,36 @@
 # QuickMacro
-GTA Online useful macros
+GTA Online useful macros  
+This is a fork from https://github.com/MacMailler/QuickMacro that I reworked to do what I want it to do. Big Thanks to MacMailler for creating QuickMacro. 
+
+Features like sound when enabling QuickMacro/CEO Mode or Empty session are coming from Kezoura (https://github.com/kezoura/GTAO-Macro)
 
 ### Installation and using
-1. [Download](https://github.com/MacMailler/QuickMacro/releases) latest version
-2. Unpack to any place
-3. Run GTA Online
-4. Run QuickMacro.exe (after opening GTAV window)
-5. Press the "End" key
+1. [Download](https://github.com/Liscum/QuickMacro/raw/master/QuickMacro.exe) latest version
+2. Run GTA Online
+3. Run QuickMacro.exe (after opening GTAV window)
+4. Press the "End" key
 
 ### Hotkeys
 + End - Enable/Disable
-+ Num0 + Num1 - Call Pegasus
-+ Num0 + Num2 - Call Mechanic
-+ Num0 + Num3 - Call Lester
-+ Num0 + Num4 - Spawn Buzzard
-+ Num0 + Num5 - Activate ghost team
-+ Num0 + Num6 - Call Mors Mutual Insurance
-+ Num0 + Num7 - Get heavy armor
-+ Num0 + Num8 - Repeat button
-+ Num0 + Num9 - Show/Hide crosshair
-+ NumAdd - Spawn BST(Bull Shark Testosterone)
-+ NumDiv - Toggle CEO Mode
-+ NumSub - Buy ammo
-+ LAlt - Fast heavy weapon reload
-+ NumEnter - Fast EWO
-+ NumDot - Get snack
-+ RCtrl & RShift - Outfit fix
++ NumDot : Snacks
++ NumpadDiv : CEO Mode
++ NumpadMult : Show usage
++ Num0 + Num1 : Call Mechanic
++ Num0 + Num2 : Call Lester
++ Num0 + Num3 : Call MorsMutualAssurance
++ Num0 + Num4 : Call Assistant
++ Num0 + Num5 : Armor
++ Num0 + Num6 : Bribe Authority
++ Num0 + Num7 : Ghost organisation
++ Num0 + Num8 : Personal vehicle
++ Num0 + Num9 : Mk2
++ Num0 + NumAdd : Lower Wanted Level
++	RCtrl + RShift : Empty session
+
+
+While in game, hitting NumpadMult will show the association between keys and actions : 
+
+
+<p align="center">
+  <img src="Usage.png" title="Usage">
+</p>

includes/conf.ahk

@@ -1,67 +1,56 @@
-;
-; Copyright (C) 2017 MacMailler
-; GitHub: https://github.com/MacMailler/QuickMacro
-;
-
 Global SettingsFile := "QuickMacro.ini"
 
 loadConf() {
 	IfExist, %SettingsFile%
 	{
-		IniRead, keyPhoneDalay, %SettingsFile%, Delays, KeyPhoneDalay
+		IniRead, keyPhoneDelay, %SettingsFile%, Delays, KeyPhoneDelay
 		IniRead, keyPhoneDuration, %SettingsFile%, Delays, KeyPhoneDuration
 		IniRead, phoneDelay, %SettingsFile%, Delays, PhoneDelay
 		IniRead, menuDelay, %SettingsFile%, Delays, MenuDelay
 		IniRead, keyMDelay, %SettingsFile%, Delays, KeyMDelay
 		IniRead, keyMDuration, %SettingsFile%, Delays, KeyMDuration
-		IniRead, RepeatButtonDelay, %SettingsFile%, Delays, RepeatButtonDelay
-		IniRead, heavyWeaponKey, %SettingsFile%, Keys, HeavyWeaponKey
-		IniRead, specialWeaponKey, %SettingsFile%, Keys, SpecialWeaponKey
-		IniRead, RepeatButton, %SettingsFile%, Keys, RepeatButton
 
-		IniRead, PegasusKey, %SettingsFile%, Hotkeys, PegasusKey
+
 		IniRead, MechanicKey, %SettingsFile%, Hotkeys, MechanicKey
 		IniRead, LesterKey, %SettingsFile%, Hotkeys, LesterKey
-		IniRead, BuzzardKey, %SettingsFile%, Hotkeys, BuzzardKey
-		IniRead, GhostKey, %SettingsFile%, Hotkeys, GhostKey
+		IniRead, MorsMutualKey, %SettingsFile%, Hotkeys, MorsMutualKey
+		IniRead, AssistantKey, %SettingsFile%, Hotkeys, AssistantKey
 		IniRead, ArmorKey, %SettingsFile%, Hotkeys, ArmorKey
+		IniRead, BribeKey, %SettingsFile%, Hotkeys, BribeKey
+		IniRead, GhostKey, %SettingsFile%, Hotkeys, GhostKey
+		IniRead, VehicleKey, %SettingsFile%, Hotkeys, VehicleKey
+		IniRead, Mk2Key, %SettingsFile%, Hotkeys, Mk2Key
 		IniRead, SnackKey, %SettingsFile%, Hotkeys, SnackKey
-		IniRead, BullsharkKey, %SettingsFile%, Hotkeys, BullsharkKey
-		IniRead, AmmoKey, %SettingsFile%, Hotkeys, AmmoKey
 		IniRead, ToggleCeoKey, %SettingsFile%, Hotkeys, ToggleCeoKey
-		IniRead, MorsMutualKey, %SettingsFile%, Hotkeys, MorsMutualKey
-		IniRead, FastHeavyReloadKey, %SettingsFile%, Hotkeys, FastHeavyReloadKey
-		IniRead, FastEwoKey, %SettingsFile%, Hotkeys, FastEwoKey
-		IniRead, RepeatButtonKey, %SettingsFile%, Hotkeys, RepeatButtonKey
-		IniRead, CrosshairKey, %SettingsFile%, Hotkeys, CrosshairKey
-		IniRead, OutfitFixKey, %SettingsFile%, Hotkeys, OutfitFixKey
+		IniRead, LowerWantedLevelKey, %SettingsFile%, Hotkeys, LowerWantedLevelKey
+		IniRead, EmptySessionKey, %SettingsFile%, Hotkeys, EmptySessionKey
+
+		IniRead, UsageKey, %SettingsFile%, Hotkeys, UsageKey
+
 	} else {
-		IniWrite, %keyPhoneDalay%, %SettingsFile%, Delays, KeyPhoneDalay
+		IniWrite, %keyPhoneDelay%, %SettingsFile%, Delays, KeyPhoneDelay
 		IniWrite, %keyPhoneDuration%, %SettingsFile%, Delays, KeyPhoneDuration
 		IniWrite, %phoneDelay%, %SettingsFile%, Delays, PhoneDelay
 		IniWrite, %menuDelay%, %SettingsFile%, Delays, MenuDelay
 		IniWrite, %keyMDelay%, %SettingsFile%, Delays, KeyMDelay
 		IniWrite, %keyMDuration%, %SettingsFile%, Delays, KeyMDuration
-		IniWrite, %RepeatButtonDelay%, %SettingsFile%, Delays, RepeatButtonDelay
-		IniWrite, %heavyWeaponKey%, %SettingsFile%, Keys, HeavyWeaponKey
-		IniWrite, %specialWeaponKey%, %SettingsFile%, Keys, SpecialWeaponKey
-		IniWrite, %RepeatButton%, %SettingsFile%, Keys, RepeatButton
 
-		IniWrite, %PegasusKey%, %SettingsFile%, Hotkeys, PegasusKey
+
 		IniWrite, %MechanicKey%, %SettingsFile%, Hotkeys, MechanicKey
 		IniWrite, %LesterKey%, %SettingsFile%, Hotkeys, LesterKey
-		IniWrite, %BuzzardKey%, %SettingsFile%, Hotkeys, BuzzardKey
-		IniWrite, %GhostKey%, %SettingsFile%, Hotkeys, GhostKey
+		IniWrite, %MorsMutualKey%, %SettingsFile%, Hotkeys, MorsMutualKey
+		IniWrite, %AssistantKey%, %SettingsFile%, Hotkeys, AssistantKey
 		IniWrite, %ArmorKey%, %SettingsFile%, Hotkeys, ArmorKey
+		IniWrite, %BribeKey%, %SettingsFile%, Hotkeys, BribeKey
+		IniWrite, %GhostKey%, %SettingsFile%, Hotkeys, GhostKey
+		IniWrite, %VehicleKey%, %SettingsFile%, Hotkeys, VehicleKey
+		IniWrite, %Mk2Key%, %SettingsFile%, Hotkeys, Mk2Key
 		IniWrite, %SnackKey%, %SettingsFile%, Hotkeys, SnackKey
-		IniWrite, %BullsharkKey%, %SettingsFile%, Hotkeys, BullsharkKey
-		IniWrite, %AmmoKey%, %SettingsFile%, Hotkeys, AmmoKey
 		IniWrite, %ToggleCeoKey%, %SettingsFile%, Hotkeys, ToggleCeoKey
-		IniWrite, %MorsMutualKey%, %SettingsFile%, Hotkeys, MorsMutualKey
-		IniWrite, %FastHeavyReloadKey%, %SettingsFile%, Hotkeys, FastHeavyReloadKey
-		IniWrite, %FastEwoKey%, %SettingsFile%, Hotkeys, FastEwoKey
-		IniWrite, %RepeatButtonKey%, %SettingsFile%, Hotkeys, RepeatButtonKey
-		IniWrite, %CrosshairKey%, %SettingsFile%, Hotkeys, CrosshairKey
-		IniWrite, %OutfitFixKey%, %SettingsFile%, Hotkeys, OutfitFixKey
+		IniWrite, %LowerWantedLevelKey%, %SettingsFile%, Hotkeys, LowerWantedLevelKey
+		IniWrite, %EmptySessionKey%, %SettingsFile%, Hotkeys, EmptySessionKey
+
+		IniWrite, %UsageKey%, %SettingsFile%, Hotkeys, UsageKey
+
 	}
-}
+}