From 4f18c5777fa4fad7db8c09c409abaa2ea72064f5 Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Tue, 10 Jun 2025 11:38:32 +0200 Subject: [PATCH 1/6] a --- .../[carscripts]/mh_garage/config/config.lua | 2 +- .../_modules/banking/example/sh_banking.lua | 9 ++++++--- resources/[tools]/RxBilling/config.lua | 18 +++++++++--------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/resources/[carscripts]/mh_garage/config/config.lua b/resources/[carscripts]/mh_garage/config/config.lua index 5de9b1270..da8c4b9c6 100644 --- a/resources/[carscripts]/mh_garage/config/config.lua +++ b/resources/[carscripts]/mh_garage/config/config.lua @@ -7,7 +7,7 @@ Config.PriceModel = false Config.CallKeyVehicles = true Config.Verwaltung = { - garage = true, + garage = false, garage_change = 1000, -- Kosten um das Fahrzeug in einer anderen Garage zu versetzen. garage_time = 10, -- Zeit in Minuten bis das Fahrzeug in der neuen Garage ist! diff --git a/resources/[creator]/jobs_creator/_modules/banking/example/sh_banking.lua b/resources/[creator]/jobs_creator/_modules/banking/example/sh_banking.lua index 12c1ae9bc..be2ca7ced 100644 --- a/resources/[creator]/jobs_creator/_modules/banking/example/sh_banking.lua +++ b/resources/[creator]/jobs_creator/_modules/banking/example/sh_banking.lua @@ -10,18 +10,21 @@ table.insert(Integrations.modules[moduleType], moduleName) -- This is just an EXAMPLE, so you have to edit it to make it work Integrations[moduleType][moduleName].getSocietyMoney = function(societyName) - local money = exports['example-banking']:getMoney(societyName) + --local money = exports['example-banking']:getMoney(societyName) + local money = exports['okokBanking']:GetAccount(society) return money end -- This is just an EXAMPLE, so you have to edit it to make it work Integrations[moduleType][moduleName].giveMoneyToSociety = function(societyName, amount) - local success = exports['example-banking']:giveMoney(societyName, amount) + --local success = exports['example-banking']:giveMoney(societyName, amount) + local success = exports['okokBanking']:AddMoney(society, value) return success -- Return true if success, false if not end -- This is just an EXAMPLE, so you have to edit it to make it work Integrations[moduleType][moduleName].removeMoneyFromSociety = function(societyName, amount) - local success = exports['example-banking']:removeMoney(societyName, amount) + --local success = exports['example-banking']:removeMoney(societyName, amount) + local success = exports['okokBanking']:RemoveMoney(society, value) return success -- Return true if success, false if not end diff --git a/resources/[tools]/RxBilling/config.lua b/resources/[tools]/RxBilling/config.lua index 5c775b61a..f8a842f84 100644 --- a/resources/[tools]/RxBilling/config.lua +++ b/resources/[tools]/RxBilling/config.lua @@ -1,5 +1,5 @@ --[[ -BY RX Scripts © rxscripts.xyz +BY RX Scripts � rxscripts.xyz --]] Config = {} @@ -12,7 +12,7 @@ Config.ReceiveMoney = { } Config.PlayerInvoices = { - enabled = true, -- Spieler können anderen Spielern Rechnungen senden + enabled = true, -- Spieler k�nnen anderen Spielern Rechnungen senden maxInvoices = 5, -- Maximal ausstehende Rechnungen pro Spieler } @@ -21,11 +21,11 @@ Config.JobInvoices = { label = 'Polizei', requiredGrade = 2, presetInvoices = { - { name = 'Rotes Licht überfahren', amount = 250, reason = 'Rotes Licht überfahren' }, + { name = 'Rotes Licht �berfahren', amount = 250, reason = 'Rotes Licht �berfahren' }, { name = 'Falsches Parken', amount = 150, reason = 'Falsches Parken' }, { name = 'Zu schnelles Fahren', amount = 300, reason = 'Zu schnelles Fahren' }, - { name = 'Gefährliches Fahren', amount = 500, reason = 'Gefährliches Fahren' }, - { name = 'Körperverletzung', amount = 1000, reason = 'Körperverletzung' }, + { name = 'Gef�hrliches Fahren', amount = 500, reason = 'Gef�hrliches Fahren' }, + { name = 'K�rperverletzung', amount = 1000, reason = 'K�rperverletzung' }, } }, ['ambulance'] = { @@ -47,17 +47,17 @@ Config.JobInvoices = { } Config.AutoPay = { - enabled = true, -- Automatisches Bezahlen nach bestimmter Zeit + enabled = false, -- Automatisches Bezahlen nach bestimmter Zeit hours = 24, -- Nach wie vielen Stunden eine Rechnung automatisch bezahlt wird feePercentagePerHour = 0.05 -- Aufschlag pro Stunde (0.05 = 5 %) } Config.Commands = { - openBilling = 'billing', -- /billing öffnet das Rechnungsmenü + openBilling = 'billing', -- /billing �ffnet das Rechnungsmen� } Config.Keybinds = { - openBilling = 'F7', -- Taste zum Öffnen des Rechnungsmenüs (false = deaktivieren) + openBilling = 'F7', -- Taste zum �ffnen des Rechnungsmen�s (false = deaktivieren) } Config.UI = { @@ -79,7 +79,7 @@ Config.UI = { } --[[ - Passe diesen Teil nur an, wenn du die Namen der Ressourcen geändert hast + Passe diesen Teil nur an, wenn du die Namen der Ressourcen ge�ndert hast --]] Resources = { FM = { name = 'fmLib', export = 'new' }, From 7ea7f77c38c2d1b1057c64fcc5f0952e195efdef Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Tue, 10 Jun 2025 11:54:11 +0200 Subject: [PATCH 2/6] Update sh_banking.lua --- .../jobs_creator/_modules/banking/example/sh_banking.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/[creator]/jobs_creator/_modules/banking/example/sh_banking.lua b/resources/[creator]/jobs_creator/_modules/banking/example/sh_banking.lua index be2ca7ced..2e3934d18 100644 --- a/resources/[creator]/jobs_creator/_modules/banking/example/sh_banking.lua +++ b/resources/[creator]/jobs_creator/_modules/banking/example/sh_banking.lua @@ -11,20 +11,20 @@ table.insert(Integrations.modules[moduleType], moduleName) -- This is just an EXAMPLE, so you have to edit it to make it work Integrations[moduleType][moduleName].getSocietyMoney = function(societyName) --local money = exports['example-banking']:getMoney(societyName) - local money = exports['okokBanking']:GetAccount(society) + local money = exports['okokBanking']:GetAccount(societyName) return money end -- This is just an EXAMPLE, so you have to edit it to make it work Integrations[moduleType][moduleName].giveMoneyToSociety = function(societyName, amount) --local success = exports['example-banking']:giveMoney(societyName, amount) - local success = exports['okokBanking']:AddMoney(society, value) + local success = exports['okokBanking']:AddMoney(societyName, amount) return success -- Return true if success, false if not end -- This is just an EXAMPLE, so you have to edit it to make it work Integrations[moduleType][moduleName].removeMoneyFromSociety = function(societyName, amount) --local success = exports['example-banking']:removeMoney(societyName, amount) - local success = exports['okokBanking']:RemoveMoney(society, value) + local success = exports['okokBanking']:RemoveMoney(societyName, amount) return success -- Return true if success, false if not end From f87ff974af0456b4d35b275d447b2d503d5ffdfe Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Tue, 10 Jun 2025 12:18:28 +0200 Subject: [PATCH 3/6] Update config.lua --- resources/[tools]/RxBilling/config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/[tools]/RxBilling/config.lua b/resources/[tools]/RxBilling/config.lua index f8a842f84..4d06f0a8b 100644 --- a/resources/[tools]/RxBilling/config.lua +++ b/resources/[tools]/RxBilling/config.lua @@ -13,7 +13,7 @@ Config.ReceiveMoney = { Config.PlayerInvoices = { enabled = true, -- Spieler k�nnen anderen Spielern Rechnungen senden - maxInvoices = 5, -- Maximal ausstehende Rechnungen pro Spieler + maxInvoices = 5000, -- Maximal ausstehende Rechnungen pro Spieler } Config.JobInvoices = { From 01c47d8275d9d650dad32bd99c9f466027120989 Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Tue, 10 Jun 2025 12:20:32 +0200 Subject: [PATCH 4/6] Update config.lua --- resources/[carscripts]/mh_garage/config/config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/[carscripts]/mh_garage/config/config.lua b/resources/[carscripts]/mh_garage/config/config.lua index da8c4b9c6..3da443262 100644 --- a/resources/[carscripts]/mh_garage/config/config.lua +++ b/resources/[carscripts]/mh_garage/config/config.lua @@ -23,7 +23,7 @@ Config.Verwaltung = { Config.Zonen = { { name = "Meetingpoint", - price = 10, --pro FZ + price = nil, --pro FZ NPC = { spawn = vector4(236.1599, -798.8522, 29.3653, 181.7547), model = "s_m_m_security_01", From 2a1c160f5184675cac7cc86ab3d9822677e9c4b7 Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Tue, 10 Jun 2025 12:24:19 +0200 Subject: [PATCH 5/6] Update stored.lua --- resources/[carscripts]/mh_garage/client/stored.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/[carscripts]/mh_garage/client/stored.lua b/resources/[carscripts]/mh_garage/client/stored.lua index 1df228b7a..1e860ee4b 100644 --- a/resources/[carscripts]/mh_garage/client/stored.lua +++ b/resources/[carscripts]/mh_garage/client/stored.lua @@ -20,7 +20,7 @@ AddEventHandler('mh_garage:storeVehicle', function() icon = "car", onSelect = function() print(CurrentZone.price) - if CurrentZone.price ~= false then + if CurrentZone.price ~= nil then lib.hideContext("StoredVehicles") lib.registerContext({ From 1ad0701e3a2ca22d5474c97353bfe29b834d828a Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Tue, 10 Jun 2025 12:26:33 +0200 Subject: [PATCH 6/6] Update stored.lua --- resources/[carscripts]/mh_garage/client/stored.lua | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/resources/[carscripts]/mh_garage/client/stored.lua b/resources/[carscripts]/mh_garage/client/stored.lua index 1e860ee4b..db7e0c7a8 100644 --- a/resources/[carscripts]/mh_garage/client/stored.lua +++ b/resources/[carscripts]/mh_garage/client/stored.lua @@ -62,7 +62,18 @@ AddEventHandler('mh_garage:storeVehicle', function() lib.showContext("thisVehicle") else - StoredVehicle(vehicles[i], CurrentZone) + QBCore.Functions.TriggerCallback('mh_garage:storedVehicle', function(cb) + if cb.status then + TriggerServerEvent('mh_Parking:deleteVehicle', mods.plate, NetworkGetNetworkIdFromEntity(vehicles[i])) + --DeleteVehicle(vehicles[i]) + Notification(cb.text, cb.type, CurrentZone.name) + else + if cb.police and Config.EnabledPolice then + exports["roadphone"]:sendDispatch("Hier hat grade jemand versucht, ein Fahrzeug einzuparken.\nDas Zündschloss sah Beschädigt aus.\nKennzeichen: "..veh.plate, 'police', nil) + end + Notification(cb.text, cb.type) + end + end, mods, CurrentZone) end end })