From 40262e825c31d113fd0c9724e037e7d1246f4491 Mon Sep 17 00:00:00 2001
From: PhatPhuckDave <david.majdandzic@hotmail.com>
Date: Mon, 31 Mar 2025 17:02:08 +0200
Subject: [PATCH] Update

---
 CykaQuick/Lua/Cyka/hotkeyrepair.lua           |  3 +-
 CykaQuick/Lua/Cyka/quickreload_loadmap.lua    | 32 ++++++++++++-------
 .../Data/UI/QuickInteractionsUI.xml           |  2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/CykaQuick/Lua/Cyka/hotkeyrepair.lua b/CykaQuick/Lua/Cyka/hotkeyrepair.lua
index 6cb1185..d4c0b0d 100644
--- a/CykaQuick/Lua/Cyka/hotkeyrepair.lua
+++ b/CykaQuick/Lua/Cyka/hotkeyrepair.lua
@@ -51,7 +51,8 @@ local function clickRepairButton()
 	local button = repairableComponent.RepairButton
 	if button then
 		MyModGlobal.debugPrint("Clicking repair button")
-		button.OnClicked(button, repairableComponent)
+		-- button.OnClicked(button, repairableComponent)
+		button.OnButtonDown()
 	end
 	-- MyModGlobal.debugPrint("StartRepairing result: " .. tostring(result))
 
diff --git a/CykaQuick/Lua/Cyka/quickreload_loadmap.lua b/CykaQuick/Lua/Cyka/quickreload_loadmap.lua
index 8bb1b2a..b4b5083 100644
--- a/CykaQuick/Lua/Cyka/quickreload_loadmap.lua
+++ b/CykaQuick/Lua/Cyka/quickreload_loadmap.lua
@@ -1,20 +1,28 @@
 -- Numbers indicate the maximum number of items that can be loaded
 -- The limit is either the stack size (cramming in as many as fit)
 -- Or this number
+
+local harpoonGun = {
+	spear = 999,
+	batterycell = 1
+}
+local battery = { batterycell = 1 }
+local oxygen = { oxygentank = 1 }
+
 local LOAD_MAP = {
-	plasmacutter = { oxygentank = 1 },
-	weldingtool = { weldingfueltank = 1 },
+	anechoicdivingsuit = oxygen,
+	autocpr = battery,
+	defibrillator = battery,
+	divingmask = oxygen,
+	divingsuit = oxygen,
+	flashlight = battery,
+	handheldsonar = battery,
+	harpooncoilrifle = harpoonGun,
+	harpoongun = harpoonGun,
+	plasmacutter = oxygen,
 	revolver = { revolverround = 999 },
-	harpooncoilrifle = {
-		spear = 999,
-		batterycell = 1
-	},
-	anechoicdivingsuit = { oxygentank = 1, },
-	handheldsonar = { batterycell = 1 },
-	underwaterscooter = { batterycell = 1 },
-	divingsuit = { oxygentank = 1, },
-	flashlight = { batterycell = 1 },
-	divingmask = { oxygentank = 1, },
+	underwaterscooter = battery,
+	weldingtool = { weldingfueltank = 1 },
 }
 
 return LOAD_MAP
diff --git a/Quick Interactions/Data/UI/QuickInteractionsUI.xml b/Quick Interactions/Data/UI/QuickInteractionsUI.xml
index dcb835f..6a6481d 100644
--- a/Quick Interactions/Data/UI/QuickInteractionsUI.xml	
+++ b/Quick Interactions/Data/UI/QuickInteractionsUI.xml	
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<QuickInteractionsUI Absolute="[-12,-399,,]" Anchor="[0,1]" BackgroundColor="255,255,255,255" BackgroundSprite="{ Path: CUI.png, SourceRect: [128,32,32,32] }" FitContent="[True,True]" IgnoreEvents="true" OutlineColor="0,0,0,0" Relative="[-0.5,0,,]" ResizibleLeft="false" ResizibleRight="false" Visible="false">
+<QuickInteractionsUI Absolute="[2,-457,,]" Anchor="[0,1]" BackgroundColor="255,255,255,255" BackgroundSprite="{ Path: CUI.png, SourceRect: [128,32,32,32] }" FitContent="[True,True]" IgnoreEvents="true" OutlineColor="0,0,0,0" Relative="[-0.5,0,,]" ResizibleLeft="false" ResizibleRight="false" Visible="false">
   <CUIVerticalList AKA="layout" BottomGap="0" BreakSerialization="true" FitContent="[True,True]" IgnoreEvents="true" Relative="[0,0,1,1]" Scrollable="true" Visible="false" />
 </QuickInteractionsUI>
\ No newline at end of file