Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: accessing undefined variable + replace _U with TranslateCap #693

Merged
merged 6 commits into from
Apr 10, 2024
Merged

fix: accessing undefined variable + replace _U with TranslateCap #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01c383a
fix: (esx_policejob) accessing undefined variable
bitpredator Apr 7, 2024
fe78778
fix: (esx_policejob) accessing undefined variable
bitpredator Apr 7, 2024
bd5535f
fix: (esx_boat) undefined variable
bitpredator Apr 8, 2024
b98de72
fix: (es_extended\client\main.lua) remove white line
bitpredator Apr 9, 2024
fc51eeb
chore: (esx_ambulancejob) replace _U with TranslateCap + fix accessin…
bitpredator Apr 9, 2024
320df5d
fix: (esx-radio) accessing undefined variable radioProp
bitpredator Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server-data/resources/[esx]/es_extended/client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function ESX.SpawnPlayer(skin, coords, cb)
p:resolve()
end)
Citizen.Await(p)

local playerPed = PlayerPedId()
FreezeEntityPosition(playerPed, true)
SetEntityCoordsNoOffset(playerPed, coords.x, coords.y, coords.z, false, false, false, true)
Expand Down Expand Up @@ -54,7 +54,7 @@ AddEventHandler("esx:playerLoaded", function(xPlayer, _, skin)
while not DoesEntityExist(ESX.PlayerData.ped) do
Wait(20)
end

ESX.PlayerLoaded = true

local metadata = ESX.PlayerData.metadata
Expand Down
70 changes: 35 additions & 35 deletions server-data/resources/[esx_addons]/esx_ambulancejob/client/job.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
local CurrentAction, CurrentActionMsg, CurrentActionData = nil, "", {}
local HasAlreadyEnteredMarker, LastHospital, LastPart, LastPartNum
local isBusy, deadPlayers, deadPlayerBlips, isOnDuty = false, {}, {}, false
local isBusy, deadPlayers, deadPlayerBlips, isOnDuty, vehicle = false, {}, {}, false, {}
isInShopMenu = false

function OpenAmbulanceActionsMenu()
local elements = {
{ unselectable = true, icon = "fas fa-shirt", title = "Ambulance Actions" },
{ icon = "fas fa-shirt", title = _U("cloakroom"), value = "cloakroom" },
{ icon = "fas fa-shirt", title = TranslateCap("cloakroom"), value = "cloakroom" },
}

if Config.EnablePlayerManagement and ESX.PlayerData.job.grade_name == "boss" then
elements[#elements + 1] = {
icon = "fas fa-ambulance",
title = _U("boss_actions"),
title = TranslateCap("boss_actions"),
value = "boss_actions",
}
end
Expand All @@ -30,20 +30,20 @@ end

function OpenMobileAmbulanceActionsMenu()
local elements = {
{ unselectable = true, icon = "fas fa-ambulance", title = _U("ambulance") },
{ icon = "fas fa-ambulance", title = _U("ems_menu"), value = "citizen_interaction" },
{ unselectable = true, icon = "fas fa-ambulance", title = TranslateCap("ambulance") },
{ icon = "fas fa-ambulance", title = TranslateCap("ems_menu"), value = "citizen_interaction" },
}

ESX.OpenContext("right", elements, function(_, element)
if element.value == "citizen_interaction" then
local elements2 = {
{ unselectable = true, icon = "fas fa-ambulance", title = element.title },
{ icon = "fas fa-syringe", title = _U("ems_menu_revive"), value = "revive" },
{ icon = "fas fa-bandage", title = _U("ems_menu_small"), value = "small" },
{ icon = "fas fa-bandage", title = _U("ems_menu_big"), value = "big" },
{ icon = "fas fa-car", title = _U("ems_menu_putincar"), value = "put_in_vehicle" },
{ icon = "fas fa-syringe", title = _U("ems_menu_search"), value = "search" },
{ icon = "fas fa-syringe", title = _U("billing"), value = "billing" },
{ icon = "fas fa-syringe", title = TranslateCap("ems_menu_revive"), value = "revive" },
{ icon = "fas fa-bandage", title = TranslateCap("ems_menu_small"), value = "small" },
{ icon = "fas fa-bandage", title = TranslateCap("ems_menu_big"), value = "big" },
{ icon = "fas fa-car", title = TranslateCap("ems_menu_putincar"), value = "put_in_vehicle" },
{ icon = "fas fa-syringe", title = TranslateCap("ems_menu_search"), value = "search" },
{ icon = "fas fa-syringe", title = TranslateCap("billing"), value = "billing" },
}

ESX.OpenContext("right", elements2, function(_, element2)
Expand All @@ -56,7 +56,7 @@ function OpenMobileAmbulanceActionsMenu()
if element2.value == "search" then
TriggerServerEvent("esx_ambulancejob:svsearch")
elseif closestPlayer == -1 or closestDistance > 1.0 then
ESX.ShowNotification(_U("no_players"))
ESX.ShowNotification(TranslateCap("no_players"))
else
if element2.value == "revive" then
revivePlayer(closestPlayer)
Expand All @@ -70,7 +70,7 @@ function OpenMobileAmbulanceActionsMenu()
local playerPed = PlayerPedId()

isBusy = true
ESX.ShowNotification(_U("heal_inprogress"))
ESX.ShowNotification(TranslateCap("heal_inprogress"))
TaskStartScenarioInPlace(playerPed, "CODE_HUMAN_MEDIC_TEND_TO_DEAD", 0, true)
Wait(10000)
ClearPedTasks(playerPed)
Expand All @@ -81,13 +81,13 @@ function OpenMobileAmbulanceActionsMenu()
GetPlayerServerId(closestPlayer),
"small"
)
ESX.ShowNotification(_U("heal_complete", GetPlayerName(closestPlayer)))
ESX.ShowNotification(TranslateCap("heal_complete", GetPlayerName(closestPlayer)))
isBusy = false
else
ESX.ShowNotification(_U("player_not_conscious"))
ESX.ShowNotification(TranslateCap("player_not_conscious"))
end
else
ESX.ShowNotification(_U("not_enough_bandage"))
ESX.ShowNotification(TranslateCap("not_enough_bandage"))
end
end, "bandage")
elseif element2.value == "big" then
Expand All @@ -100,20 +100,20 @@ function OpenMobileAmbulanceActionsMenu()
local playerPed = PlayerPedId()

isBusy = true
ESX.ShowNotification(_U("heal_inprogress"))
ESX.ShowNotification(TranslateCap("heal_inprogress"))
TaskStartScenarioInPlace(playerPed, "CODE_HUMAN_MEDIC_TEND_TO_DEAD", 0, true)
Wait(10000)
ClearPedTasks(playerPed)

TriggerServerEvent("esx_ambulancejob:removeItem", "medikit")
TriggerServerEvent("esx_ambulancejob:heal", GetPlayerServerId(closestPlayer), "big")
ESX.ShowNotification(_U("heal_complete", GetPlayerName(closestPlayer)))
ESX.ShowNotification(TranslateCap("heal_complete", GetPlayerName(closestPlayer)))
isBusy = false
else
ESX.ShowNotification(_U("player_not_conscious"))
ESX.ShowNotification(TranslateCap("player_not_conscious"))
end
else
ESX.ShowNotification(_U("not_enough_medikit"))
ESX.ShowNotification(TranslateCap("not_enough_medikit"))
end
end, "medikit")
elseif element2.value == "put_in_vehicle" then
Expand All @@ -130,16 +130,16 @@ local billing

if billing == "billing" then
ESX.UI.Menu.Open("dialog", GetCurrentResourceName(), "billing", {
title = _U("invoice_amount"),
title = TranslateCap("invoice_amount"),
}, function(data, menu)
local amount = tonumber(data.value)
if amount == nil then
ESX.ShowNotification(_U("amount_invalid"))
ESX.ShowNotification(TranslateCap("amount_invalid"))
else
menu.close()
local closestPlayer, closestDistance = ESX.Game.GetClosestPlayer()
if closestPlayer == -1 or closestDistance > 3.0 then
ESX.ShowNotification(_U("no_players_near"))
ESX.ShowNotification(TranslateCap("no_players_near"))
else
TriggerServerEvent(
"esx_billing:sendBill",
Expand All @@ -148,7 +148,7 @@ if billing == "billing" then
"Ambulance",
amount
)
ESX.ShowNotification(_U("billing_sent"))
ESX.ShowNotification(TranslateCap("billing_sent"))
end
end
end, function(_, menu)
Expand All @@ -167,7 +167,7 @@ function revivePlayer(closestPlayer)
if IsPedDeadOrDying(closestPlayerPed, 1) then
local playerPed = PlayerPedId()
local lib, anim = "mini@cpr@char_a@cpr_str", "cpr_pumpchest"
ESX.ShowNotification(_U("revive_inprogress"))
ESX.ShowNotification(TranslateCap("revive_inprogress"))

for _ = 1, 15 do
Wait(900)
Expand All @@ -180,10 +180,10 @@ function revivePlayer(closestPlayer)
TriggerServerEvent("esx_ambulancejob:removeItem", "medikit")
TriggerServerEvent("esx_ambulancejob:revive", GetPlayerServerId(closestPlayer))
else
ESX.ShowNotification(_U("player_not_unconscious"))
ESX.ShowNotification(TranslateCap("player_notTranslateCapnconscious"))
end
else
ESX.ShowNotification(_U("not_enough_medikit"))
ESX.ShowNotification(TranslateCap("not_enough_medikit"))
end
isBusy = false
end, "medikit")
Expand Down Expand Up @@ -422,15 +422,15 @@ end)
AddEventHandler("esx_ambulancejob:hasEnteredMarker", function(hospital, part, partNum)
if part == "AmbulanceActions" then
CurrentAction = part
CurrentActionMsg = _U("actions_prompt")
CurrentActionMsg = TranslateCap("actions_prompt")
CurrentActionData = {}
elseif part == "Vehicles" then
CurrentAction = part
CurrentActionMsg = _U("garage_prompt")
CurrentActionMsg = TranslateCap("garage_prompt")
CurrentActionData = { hospital = hospital, partNum = partNum }
elseif part == "Helicopters" then
CurrentAction = part
CurrentActionMsg = _U("helicopter_prompt")
CurrentActionMsg = TranslateCap("helicopter_prompt")
CurrentActionData = { hospital = hospital, partNum = partNum }
end
end)
Expand Down Expand Up @@ -504,9 +504,9 @@ end)

function OpenCloakroomMenu()
local elements = {
{ unselectable = true, icon = "fas fa-shirt", title = _U("cloakroom") },
{ icon = "fas fa-shirt", title = _U("ems_clothes_civil"), value = "citizen_wear" },
{ icon = "fas fa-shirt", title = _U("ems_clothes_ems"), value = "ambulance_wear" },
{ unselectable = true, icon = "fas fa-shirt", title = TranslateCap("cloakroom") },
{ icon = "fas fa-shirt", title = TranslateCap("ems_clothes_civil"), value = "citizen_wear" },
{ icon = "fas fa-shirt", title = TranslateCap("ems_clothes_ems"), value = "ambulance_wear" },
}

ESX.OpenContext("right", elements, function(_, element)
Expand Down Expand Up @@ -549,7 +549,7 @@ AddEventHandler("esx_ambulancejob:heal", function(healType, quiet)
end

if not quiet then
ESX.ShowNotification(_U("healed"))
ESX.ShowNotification(TranslateCap("healed"))
end
end)

Expand Down Expand Up @@ -587,7 +587,7 @@ AddEventHandler("esx_ambulancejob:setDeadPlayers", function(_deadPlayers)
SetBlipCategory(blip, 7)

BeginTextCommandSetBlipName("STRING")
AddTextComponentSubstringPlayerName(_U("blip_dead"))
AddTextComponentSubstringPlayerName(TranslateCap("blip_dead"))
EndTextCommandSetBlipName(blip)

deadPlayerBlips[playerId] = blip
Expand Down
18 changes: 9 additions & 9 deletions server-data/resources/[esx_addons]/esx_ambulancejob/client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ CreateThread(function()
SetBlipAsShortRange(blip, true)

BeginTextCommandSetBlipName("STRING")
AddTextComponentSubstringPlayerName(_U("blip_hospital"))
AddTextComponentSubstringPlayerName(TranslateCap("blip_hospital"))
EndTextCommandSetBlipName(blip)
end
end)
Expand Down Expand Up @@ -161,7 +161,7 @@ AddEventHandler("esx_ambulancejob:useItem", function(itemName)
end

TriggerEvent("esx_ambulancejob:heal", "big", true)
ESX.ShowNotification(_U("used_medikit"))
ESX.ShowNotification(TranslateCap("used_medikit"))
end)
elseif itemName == "bandage" then
local lib, anim = "anim@heists@narcotics@funding@gang_idle", "gang_chatting_idle01" -- TODO better animations
Expand All @@ -177,7 +177,7 @@ AddEventHandler("esx_ambulancejob:useItem", function(itemName)
end

TriggerEvent("esx_ambulancejob:heal", "small", true)
ESX.ShowNotification(_U("used_bandage"))
ESX.ShowNotification(TranslateCap("used_bandage"))
end)
end
end)
Expand All @@ -197,7 +197,7 @@ function StartDistressSignal()
SetTextDropShadow()
SetTextOutline()
BeginTextCommandDisplayText("STRING")
AddTextComponentSubstringPlayerName(_U("distress_send"))
AddTextComponentSubstringPlayerName(TranslateCap("distress_send"))
EndTextCommandDisplayText(0.175, 0.805)

if IsControlJustReleased(0, 47) then
Expand All @@ -212,7 +212,7 @@ function SendDistressSignal()
local playerPed = PlayerPedId()
local coords = GetEntityCoords(playerPed)

ESX.ShowNotification(_U("distress_sent"))
ESX.ShowNotification(TranslateCap("distress_sent"))
TriggerServerEvent("esx_ambulancejob:onPlayerDistress")
end

Expand Down Expand Up @@ -278,7 +278,7 @@ function StartDeathTimer()
-- early respawn timer
while earlySpawnTimer > 0 and isDead do
Wait(0)
text = _U("respawn_available_in", secondsToClock(earlySpawnTimer))
text = TranslateCap("respawn_available_in", secondsToClock(earlySpawnTimer))

DrawGenericTextThisFrame()

Expand All @@ -290,17 +290,17 @@ function StartDeathTimer()
-- bleedout timer
while bleedoutTimer > 0 and isDead do
Wait(0)
text = _U("respawn_bleedout_in", secondsToClock(bleedoutTimer))
text = TranslateCap("respawn_bleedout_in", secondsToClock(bleedoutTimer))

if not Config.EarlyRespawnFine then
text = text .. _U("respawn_bleedout_prompt")
text = text .. TranslateCap("respawn_bleedout_prompt")

if IsControlPressed(0, 38) and timeHeld > 60 then
RemoveItemsAfterRPDeath()
break
end
elseif Config.EarlyRespawnFine and canPayFine then
text = text .. _U("respawn_bleedout_fine", ESX.Math.GroupDigits(Config.EarlyRespawnFineAmount))
text = text .. TranslateCap("respawn_bleedout_fine", ESX.Math.GroupDigits(Config.EarlyRespawnFineAmount))

if IsControlPressed(0, 38) and timeHeld > 60 then
TriggerServerEvent("esx_ambulancejob:payFine")
Expand Down
Loading
Loading