From 2edc94b69998990cf2a1aae9a05d9067bad1e027 Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Sun, 8 Jun 2025 16:20:16 +0200 Subject: [PATCH] [Garage] --- .../[carscripts]/mh_garage/client/main.lua | 14 ++++--- .../mh_garage/client/retrieve.lua | 3 ++ .../[carscripts]/mh_garage/client/stored.lua | 37 +++++++++++++++++++ .../mh_garage/{ => config}/config.lua | 1 + .../[carscripts]/mh_garage/config/price.lua | 3 ++ .../[carscripts]/mh_garage/fxmanifest.lua | 4 +- 6 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 resources/[carscripts]/mh_garage/client/retrieve.lua create mode 100644 resources/[carscripts]/mh_garage/client/stored.lua rename resources/[carscripts]/mh_garage/{ => config}/config.lua (97%) create mode 100644 resources/[carscripts]/mh_garage/config/price.lua diff --git a/resources/[carscripts]/mh_garage/client/main.lua b/resources/[carscripts]/mh_garage/client/main.lua index 8b79bab03..cd0c864b2 100644 --- a/resources/[carscripts]/mh_garage/client/main.lua +++ b/resources/[carscripts]/mh_garage/client/main.lua @@ -67,7 +67,7 @@ CreateThread(function() if dist < spawnDistance and not isNPCSpawned then SpawnGuardNPC(v.NPC) Wait(300) - AddTargetOptions() + AddTargetOptions(v) elseif dist > spawnDistance and isNPCSpawned then exports['qb-target']:RemoveTargetEntity(npcHandle) RemoveGuardNPC() @@ -78,20 +78,22 @@ CreateThread(function() end end) -function AddTargetOptions() +function AddTargetOptions(zone) exports['qb-target']:AddTargetEntity(npcHandle, { options = { { type = "client", - event = "garage:storeVehicle", + event = "mh_garage:storeVehicle", icon = "fas fa-parking", - label = "Fahrzeug einparken" + label = "Fahrzeug einparken", + item = zone }, { type = "client", - event = "garage:retrieveVehicle", + event = "mh_garage:retrieveVehicle", icon = "fas fa-car", - label = "Fahrzeug ausparken" + label = "Fahrzeug ausparken", + item = zone } }, distance = 2.5 diff --git a/resources/[carscripts]/mh_garage/client/retrieve.lua b/resources/[carscripts]/mh_garage/client/retrieve.lua new file mode 100644 index 000000000..fd8246246 --- /dev/null +++ b/resources/[carscripts]/mh_garage/client/retrieve.lua @@ -0,0 +1,3 @@ +RegisterNetEvent('mh_garage:retrieveVehicle') +AddEventHandler('mh_garage:retrieveVehicle', function() +end) \ No newline at end of file diff --git a/resources/[carscripts]/mh_garage/client/stored.lua b/resources/[carscripts]/mh_garage/client/stored.lua new file mode 100644 index 000000000..0f32b6b4b --- /dev/null +++ b/resources/[carscripts]/mh_garage/client/stored.lua @@ -0,0 +1,37 @@ +RegisterNetEvent('mh_garage:storeVehicle') +AddEventHandler('mh_garage:storeVehicle', function(zone) + local coords = GetEntityCoords(PlayerPedId()) + local vehicles = GetGamePool('CVehicle') + + local opt = {} + + for i = 1, #vehicles, 1 do + local veh_coords = GetEntityCoords(vehicles[1]) + local distance = #(veh_coords - coords) + + if distance < 40.0 then + local mods = QBCore.Functions.GetVehicleProperties(vehicles[i]) + + table.insert(opt, { + title = "Kennzeichen: "..mods.plate, + description = "Soll dieses Fahrzeug eingeparkt werden?", + icon = "car", + onSelect = function() + if zone.price == nil then + + else + local alert = lib.alertDialog({ + header = "Parkplatz kosten", + content = "Parkplatkosten pro Fahrzeug: "..zone.price.."\n\nWillst du das Parkplatz trotzdem Einparken?", + centered = true, + cancel = true + }) + + print(alert) + print(json.encode(alert)) + end + end + }) + end + end +end) \ No newline at end of file diff --git a/resources/[carscripts]/mh_garage/config.lua b/resources/[carscripts]/mh_garage/config/config.lua similarity index 97% rename from resources/[carscripts]/mh_garage/config.lua rename to resources/[carscripts]/mh_garage/config/config.lua index 2df0cdf11..6fb45bf60 100644 --- a/resources/[carscripts]/mh_garage/config.lua +++ b/resources/[carscripts]/mh_garage/config/config.lua @@ -1,6 +1,7 @@ Config = {} Config.Debug = true +Cofig.PriceModel = false Config.Zonen = { { name = "Meetingpoint", diff --git a/resources/[carscripts]/mh_garage/config/price.lua b/resources/[carscripts]/mh_garage/config/price.lua new file mode 100644 index 000000000..1ad11e0dc --- /dev/null +++ b/resources/[carscripts]/mh_garage/config/price.lua @@ -0,0 +1,3 @@ +cprice = { + ["asea"] = 3, +} \ No newline at end of file diff --git a/resources/[carscripts]/mh_garage/fxmanifest.lua b/resources/[carscripts]/mh_garage/fxmanifest.lua index 164de20d8..50a38c489 100644 --- a/resources/[carscripts]/mh_garage/fxmanifest.lua +++ b/resources/[carscripts]/mh_garage/fxmanifest.lua @@ -7,12 +7,12 @@ lua54 'yes' client_scripts { '@NativeUI/NativeUI.lua', '@ox_lib/init.lua', - 'config.lua', + 'config/*.lua', 'client/*.lua' } server_scripts { '@oxmysql/lib/MySQL.lua', - 'config.lua', + 'config/*.lua', 'server/*.lua' } \ No newline at end of file