From 93b72b525b82089ba7f3ceb9d7ef35b8d942c798 Mon Sep 17 00:00:00 2001
From: TheGreenBandit <106003542+TheGreenBandit@users.noreply.github.com>
Date: Mon, 9 Jan 2023 11:40:03 -0500
Subject: [PATCH] Hotkey Additions (#802)

---
 src/core/globals.hpp                   | 15 ++++++++++++++-
 src/services/hotkey/hotkey_service.cpp |  9 +++++++++
 src/views/settings/view_settings.cpp   | 23 ++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/core/globals.hpp b/src/core/globals.hpp
index 0bcecee9..8e226710 100644
--- a/src/core/globals.hpp
+++ b/src/core/globals.hpp
@@ -351,8 +351,21 @@ namespace big
 				int teleport_waypoint = 0;
 				int teleport_objective = 0;
 				int noclip = 0;
+				int bringvehicle = 0;
+				int invis = 0;
+				int heal = 0;
+				int fill_inventory = 0;
+				int skip_cutscene = 0;
+				int freecam = 0;
+				int superrun = 0;
+				int superjump = 0;
+				int beastjump = 0;
+				int invisveh = 0;
+				int localinvisveh = 0;
 
-				NLOHMANN_DEFINE_TYPE_INTRUSIVE(hotkeys, editing_menu_toggle, menu_toggle, teleport_waypoint, teleport_objective, noclip)
+				NLOHMANN_DEFINE_TYPE_INTRUSIVE(hotkeys, editing_menu_toggle, menu_toggle, teleport_waypoint, teleport_objective, 
+					noclip, bringvehicle, invis, heal, fill_inventory, skip_cutscene, freecam, superrun, superjump, beastjump,
+					invisveh, localinvisveh)
 			} hotkeys{};
 
 			bool dev_dlc = false;
diff --git a/src/services/hotkey/hotkey_service.cpp b/src/services/hotkey/hotkey_service.cpp
index eaaaace8..74eab293 100644
--- a/src/services/hotkey/hotkey_service.cpp
+++ b/src/services/hotkey/hotkey_service.cpp
@@ -13,6 +13,15 @@ namespace big
         register_hotkey("waypoint", g.settings.hotkeys.teleport_waypoint, RAGE_JOAAT("waypointtp"));
         register_hotkey("objective", g.settings.hotkeys.teleport_objective, RAGE_JOAAT("objectivetp"));
         register_hotkey("noclip", g.settings.hotkeys.noclip, RAGE_JOAAT("noclip"));
+        register_hotkey("bringpv", g.settings.hotkeys.bringvehicle, RAGE_JOAAT("bringpv"));
+        register_hotkey("invis", g.settings.hotkeys.invis, RAGE_JOAAT("invis"));
+        register_hotkey("heal", g.settings.hotkeys.heal, RAGE_JOAAT("heal"));
+        register_hotkey("fillsnacks", g.settings.hotkeys.fill_inventory, RAGE_JOAAT("fillsnacks"));
+        register_hotkey("skipcutscene", g.settings.hotkeys.skip_cutscene, RAGE_JOAAT("skipcutscene"));
+        register_hotkey("superjump", g.settings.hotkeys.superjump, RAGE_JOAAT("superjump"));
+        register_hotkey("beastjump", g.settings.hotkeys.beastjump, RAGE_JOAAT("beastjump"));
+        register_hotkey("invisveh", g.settings.hotkeys.invisveh, RAGE_JOAAT("invisveh"));
+        register_hotkey("localinvisveh", g.settings.hotkeys.localinvisveh, RAGE_JOAAT("localinvisveh"));
 
         g_renderer->add_wndproc_callback([this](HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
         {
diff --git a/src/views/settings/view_settings.cpp b/src/views/settings/view_settings.cpp
index 1de25b8d..40437995 100644
--- a/src/views/settings/view_settings.cpp
+++ b/src/views/settings/view_settings.cpp
@@ -44,7 +44,28 @@ namespace big
 
 		if (ImGui::Hotkey("Toggle Noclip", &g.settings.hotkeys.noclip))
 			g_hotkey_service->update_hotkey("noclip", g.settings.hotkeys.noclip);
-
+		if (ImGui::Hotkey("Bring PV", &g.settings.hotkeys.bringvehicle))
+			g_hotkey_service->update_hotkey("bringpv", g.settings.hotkeys.bringvehicle);
+		if (ImGui::Hotkey("Toggle invisibility", &g.settings.hotkeys.invis))
+			g_hotkey_service->update_hotkey("invis", g.settings.hotkeys.invis);
+		if (ImGui::Hotkey("Heal", &g.settings.hotkeys.heal))
+			g_hotkey_service->update_hotkey("heal", g.settings.hotkeys.heal);
+		if (ImGui::Hotkey("Fill Snacks", &g.settings.hotkeys.fill_inventory))
+			g_hotkey_service->update_hotkey("fillsnacks", g.settings.hotkeys.fill_inventory);
+		if (ImGui::Hotkey("Skip Cutscene", &g.settings.hotkeys.skip_cutscene))
+			g_hotkey_service->update_hotkey("skipcutscene", g.settings.hotkeys.skip_cutscene);
+		if (ImGui::Hotkey("Toggle Freecam", &g.settings.hotkeys.freecam))
+			g_hotkey_service->update_hotkey("freecam", g.settings.hotkeys.freecam);
+		if (ImGui::Hotkey("Toggle fastrun", &g.settings.hotkeys.superrun))
+			g_hotkey_service->update_hotkey("fastrun", g.settings.hotkeys.superrun);
+		if (ImGui::Hotkey("Toggle superjump", &g.settings.hotkeys.superjump))
+			g_hotkey_service->update_hotkey("superjump", g.settings.hotkeys.superjump);
+		if (ImGui::Hotkey("Toggle beastjump", &g.settings.hotkeys.beastjump))
+			g_hotkey_service->update_hotkey("beastjump", g.settings.hotkeys.beastjump);
+		if (ImGui::Hotkey("Toggle Vehicle Invisibility", &g.settings.hotkeys.invisveh))
+			g_hotkey_service->update_hotkey("invisveh", g.settings.hotkeys.invisveh);
+		if (ImGui::Hotkey("Toggle Local Veh Invisibility", &g.settings.hotkeys.localinvisveh))
+			g_hotkey_service->update_hotkey("localinvisveh", g.settings.hotkeys.localinvisveh);
 
 		ImGui::PopItemWidth();