From aa78a2febb1fda1d5f94e3f40b57475802198032 Mon Sep 17 00:00:00 2001 From: Nordi98 Date: Mon, 11 Aug 2025 23:31:05 +0200 Subject: [PATCH] ed --- .../[jobs]/[medic]/mh_Teddy/client/client.lua | 6 ++--- resources/[jobs]/[medic]/mh_Teddy/config.lua | 2 +- .../ps-multijob/client/cl_main.lua | 23 +++++++------------ resources/[standalone]/ps-multijob/config.lua | 7 +++++- .../ps-multijob/server/sv_main.lua | 4 ++-- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/resources/[jobs]/[medic]/mh_Teddy/client/client.lua b/resources/[jobs]/[medic]/mh_Teddy/client/client.lua index 3cb075874..30cfd2188 100644 --- a/resources/[jobs]/[medic]/mh_Teddy/client/client.lua +++ b/resources/[jobs]/[medic]/mh_Teddy/client/client.lua @@ -123,8 +123,8 @@ function CheckPlayerArrivalAt(targetPos) local dist = #(GetEntityCoords(player) - vector3(targetPos.x, targetPos.y, targetPos.z)) if dist < 2.0 then DisableAllControlActions(0) - SetEntityCoords(player, 1121.6, -1553.79, 36.09, false, false, false, true) - SetEntityHeading(player, 178.72) + SetEntityCoords(player, -1878.6747, -322.2974, 50.1690, false, false, false, true) + SetEntityHeading(player, 47.9116) StartTreatmentSequence(player) break end @@ -152,7 +152,7 @@ function StartTreatmentSequence(playerPed) -- Spieler an Koordinate setzen SetEntityCoords(playerPed, 1121.6, -1553.79, 36.09) - SetEntityHeading(playerPed, 178.72) + SetEntityHeading(playerPed, 175.78) EnableAllControlActions(0) DoScreenFadeIn(1000) diff --git a/resources/[jobs]/[medic]/mh_Teddy/config.lua b/resources/[jobs]/[medic]/mh_Teddy/config.lua index 978387fbd..afe7f4c4b 100644 --- a/resources/[jobs]/[medic]/mh_Teddy/config.lua +++ b/resources/[jobs]/[medic]/mh_Teddy/config.lua @@ -5,7 +5,7 @@ Config.DoctorModel = "s_m_m_doctor_01" Config.StretcherProp = "v_med_bed2" -- Behandlungskosten -Config.TreatmentPrice = 5000 +Config.TreatmentPrice = 200 -- Cooldown Config.TreatmentCooldown = 30 diff --git a/resources/[standalone]/ps-multijob/client/cl_main.lua b/resources/[standalone]/ps-multijob/client/cl_main.lua index 28c86f79e..15efc8ae7 100644 --- a/resources/[standalone]/ps-multijob/client/cl_main.lua +++ b/resources/[standalone]/ps-multijob/client/cl_main.lua @@ -1,4 +1,5 @@ local QBCore = exports['qb-core']:GetCoreObject() +local isJobMenuOpen = false local function GetJobs() local p = promise.new() @@ -10,7 +11,8 @@ end local function OpenUI() local job = QBCore.Functions.GetPlayerData().job - SetNuiFocus(true,true) + SetNuiFocus(true, true) + isJobMenuOpen = true SendNUIMessage({ action = 'sendjobs', activeJob = job["name"], @@ -29,7 +31,8 @@ end) RegisterNUICallback('closemenu', function(data, cb) cb({}) - SetNuiFocus(false,false) + SetNuiFocus(false, false) + isJobMenuOpen = false end) RegisterNUICallback('removejob', function(data, cb) @@ -73,18 +76,8 @@ RegisterKeyMapping('jobmenu', "Show Job Management", "keyboard", "J") TriggerEvent('chat:removeSuggestion', '/jobmenu') - --- Add this to cl_main.lua RegisterNetEvent('ps-multijob:refreshJobs', function() - if not IsPauseMenuActive() then -- Only refresh if menu is open - local isMenuOpen = false - -- Check if the NUI is focused (menu is open) - if IsPauseMenuActive() and IsPauseMenuRestarting() then - isMenuOpen = true - end - - if isMenuOpen then - OpenUI() -- Refresh the UI with updated job data - end + if isJobMenuOpen then + OpenUI() -- Refresh the UI with updated job data end -end) \ No newline at end of file +end) diff --git a/resources/[standalone]/ps-multijob/config.lua b/resources/[standalone]/ps-multijob/config.lua index 72685cb48..d464ddf4c 100644 --- a/resources/[standalone]/ps-multijob/config.lua +++ b/resources/[standalone]/ps-multijob/config.lua @@ -18,7 +18,12 @@ Config.WhitelistJobs = { ["ambulance"] = true, ["mechanic"] = true, ["judge"] = true, - ["lawyer"] = true, + ["doj"] = true, + ["admin"] = true, + ["marshal"] = true, + ["admin"] = true, + ["taxi"] = true, + ["news"] = true, } Config.Descriptions = { diff --git a/resources/[standalone]/ps-multijob/server/sv_main.lua b/resources/[standalone]/ps-multijob/server/sv_main.lua index a08c23b20..a35e76c7b 100644 --- a/resources/[standalone]/ps-multijob/server/sv_main.lua +++ b/resources/[standalone]/ps-multijob/server/sv_main.lua @@ -297,13 +297,13 @@ RegisterNetEvent("jobs_creator:injectJobs", function(jobs) -- This will run when jobs are injected by jobs_creator print("ps-multijob: Jobs have been updated by jobs_creator") - -- Optional: You could notify online players that jobs have been updated - -- This would allow them to refresh their job menu to see any new jobs + -- Notify online players that jobs have been updated local Players = QBCore.Functions.GetPlayers() for i = 1, #Players do local Player = QBCore.Functions.GetPlayer(Players[i]) if Player then TriggerClientEvent('QBCore:Notify', Players[i], "Job system has been updated", "success") + TriggerClientEvent('ps-multijob:refreshJobs', Players[i]) -- Trigger refresh event end end end)