From 65917ded8de0e0ae30a40159082a93b7e1b4cc40 Mon Sep 17 00:00:00 2001 From: Popcorn RP - PrinceAlbert <85725579+alberttheprince@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:39:58 -0400 Subject: [PATCH 1/4] Fix: Remove Citizen. to bring format up-to-date Remove unnecessary Citizen. to bring things up to date with current practices in the FiveM community. Replaced: Citizen.CreateThread Citizen. Wait Citizen.Trace --- client.lua | 2 +- dlc_afterhours/nightclubs.lua | 2 +- dlc_bikers/gang.lua | 16 ++++++++-------- dlc_doomsday/facility.lua | 8 ++++---- dlc_finance/office1.lua | 12 ++++++------ dlc_finance/office2.lua | 12 ++++++------ dlc_finance/office3.lua | 12 ++++++------ dlc_finance/office4.lua | 12 ++++++------ dlc_finance/organization.lua | 10 +++++----- dlc_gunrunning/yacht.lua | 2 +- dlc_heists/yacht.lua | 2 +- lib/common.lua | 12 ++++++------ lib/observers/interiorIdObserver.lua | 4 ++-- lib/observers/officeSafeDoorHandler.lua | 4 ++-- 14 files changed, 55 insertions(+), 55 deletions(-) diff --git a/client.lua b/client.lua index 162586f..7478759 100644 --- a/client.lua +++ b/client.lua @@ -1,4 +1,4 @@ -Citizen.CreateThread(function() +CreateThread(function() -- ==================================================================== -- =--------------------- [GTA V: Single player] ---------------------= -- ==================================================================== diff --git a/dlc_afterhours/nightclubs.lua b/dlc_afterhours/nightclubs.lua index 179960a..0b4c9bf 100644 --- a/dlc_afterhours/nightclubs.lua +++ b/dlc_afterhours/nightclubs.lua @@ -287,7 +287,7 @@ AfterHoursNightclubs = { if state then RequestNamedPtfxAsset("scr_ba_club") while not HasNamedPtfxAssetLoaded("scr_ba_club") do - Citizen.Wait(0) + Wait(0) end for key, emitter in pairs(AfterHoursNightclubs.Interior.DryIce.Emitters) do diff --git a/dlc_bikers/gang.lua b/dlc_bikers/gang.lua index edd3638..51e195f 100644 --- a/dlc_bikers/gang.lua +++ b/dlc_bikers/gang.lua @@ -199,10 +199,10 @@ BikerGang = { local IsTextureDictLoaded = LoadStreamedTextureDict(member.textureDict) if not IsTextureDictLoaded then - Citizen.Trace("ERROR: BikerClubhouseDrawMembers - Textures dictionnary \"" .. tostring(member.textureDict) .. "\" cannot be loaded.") + PrintTrace("ERROR: BikerClubhouseDrawMembers - Textures dictionnary \"" .. tostring(member.textureDict) .. "\" cannot be loaded.") end else - Citizen.Trace("ERROR: BikerClubhouseDrawMembers - PedHeadShot not ready.") + PrintTrace("ERROR: BikerClubhouseDrawMembers - PedHeadShot not ready.") end end, Clear = function(member) @@ -347,7 +347,7 @@ BikerGang = { Init = function() if not DrawEmptyRect(BikerGang.Clubhouse.MissionsWall.target, BikerGang.Clubhouse.MissionsWall.prop) then - Citizen.Trace("ERROR: BikerGang.Clubhouse.MissionsWall.Init() - DrawEmptyRect - Timeout") + PrintTrace("ERROR: BikerGang.Clubhouse.MissionsWall.Init() - DrawEmptyRect - Timeout") end end, Enable = function(state) @@ -433,7 +433,7 @@ BikerGang = { } } -Citizen.CreateThread(function() +CreateThread(function() -- Removing the black texture BikerGang.Clubhouse.Members.President.Init() BikerGang.Clubhouse.Members.VicePresident.Init() @@ -492,14 +492,14 @@ Citizen.CreateThread(function() end end - Citizen.Wait(0) -- We need to call all this every frame + Wait(0) -- We need to call all this every frame else -- Not in a clubhouse - Citizen.Wait(1000) + Wait(1000) end else -- No load needed - Citizen.Wait(1000) + Wait(1000) end end end) @@ -549,7 +549,7 @@ function DrawEmblem(texturesDict, rotation) local IsTextureDictLoaded = LoadStreamedTextureDict(texturesDict) if not IsTextureDictLoaded then - Citizen.Trace("ERROR: DrawEmblem - Textures dictionnary cannot be loaded.") + PrintTrace("ERROR: DrawEmblem - Textures dictionnary cannot be loaded.") end BikerGang.Clubhouse.Emblem.stage = 1 diff --git a/dlc_doomsday/facility.lua b/dlc_doomsday/facility.lua index abcf7ff..069c6f8 100644 --- a/dlc_doomsday/facility.lua +++ b/dlc_doomsday/facility.lua @@ -182,7 +182,7 @@ DoomsdayFacility = { RequestModel(model) while not HasModelLoaded(model) do - Citizen.Wait(0) + Wait(0) end local privacyGlass = CreateObject(model, 367.99, 4827.745, -59.0, false, false, false) @@ -211,7 +211,7 @@ DoomsdayFacility = { if handle == 0 then RequestModel(DoomsdayFacility.PrivacyGlass.controlModelHash) while not HasModelLoaded(DoomsdayFacility.PrivacyGlass.controlModelHash) do - Citizen.Wait(0) + Wait(0) end local privacyGlass = CreateObjectNoOffset(DoomsdayFacility.PrivacyGlass.controlModelHash, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.x, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.y, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.z, false, false, false) @@ -269,7 +269,7 @@ DoomsdayFacility = { if entityToAttach ~= 0 then RequestModel(glass.modelHash) while not HasModelLoaded(glass.modelHash) do - Citizen.Wait(0) + Wait(0) end local privacyGlass = CreateObject(glass.modelHash, glass.entityPos.x, glass.entityPos.y, glass.entityPos.z, false, false, false) @@ -301,7 +301,7 @@ DoomsdayFacility = { if handle == 0 then RequestModel(DoomsdayFacility.PrivacyGlass.controlModelHash) while not HasModelLoaded(DoomsdayFacility.PrivacyGlass.controlModelHash) do - Citizen.Wait(0) + Wait(0) end local privacyGlass = CreateObjectNoOffset(DoomsdayFacility.PrivacyGlass.controlModelHash, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.x, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.y, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.z, false, false, false) diff --git a/dlc_finance/office1.lua b/dlc_finance/office1.lua index 131c593..629df5d 100644 --- a/dlc_finance/office1.lua +++ b/dlc_finance/office1.lua @@ -116,8 +116,8 @@ FinanceOffice1 = { elseif doorSide:lower() == "right" then FinanceOffice1.Safe.isRightDoorOpen = true else - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - Citizen.Trace("left right") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + PrintTrace("left right") end end, Close = function(doorSide) @@ -126,8 +126,8 @@ FinanceOffice1 = { elseif doorSide:lower() == "right" then FinanceOffice1.Safe.isRightDoorOpen = false else - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - Citizen.Trace("left right") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + PrintTrace("left right") end end, @@ -152,7 +152,7 @@ FinanceOffice1 = { end if doorHandle == 0 then - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") return end @@ -165,7 +165,7 @@ FinanceOffice1 = { local doorHandle = GetClosestObjectOfType(FinanceOffice1.Safe.Position.x, FinanceOffice1.Safe.Position.y, FinanceOffice1.Safe.Position.z, 5.0, doorHash, false, false, false) while doorHandle == 0 do - Citizen.Wait(25) + Wait(25) doorHandle = GetClosestObjectOfType(FinanceOffice1.Safe.Position.x, FinanceOffice1.Safe.Position.y, FinanceOffice1.Safe.Position.z, 5.0, doorHash, false, false, false) timeout = timeout - 1 diff --git a/dlc_finance/office2.lua b/dlc_finance/office2.lua index 75d2593..c98ddbf 100644 --- a/dlc_finance/office2.lua +++ b/dlc_finance/office2.lua @@ -116,8 +116,8 @@ FinanceOffice2 = { elseif doorSide:lower() == "right" then FinanceOffice2.Safe.isRightDoorOpen = true else - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - Citizen.Trace("left right") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + PrintTrace("left right") end end, Close = function(doorSide) @@ -126,8 +126,8 @@ FinanceOffice2 = { elseif doorSide:lower() == "right" then FinanceOffice2.Safe.isRightDoorOpen = false else - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - Citizen.Trace("left right") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + PrintTrace("left right") end end, @@ -152,7 +152,7 @@ FinanceOffice2 = { end if doorHandle == 0 then - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") return end @@ -165,7 +165,7 @@ FinanceOffice2 = { local doorHandle = GetClosestObjectOfType(FinanceOffice2.Safe.Position.x, FinanceOffice2.Safe.Position.y, FinanceOffice2.Safe.Position.z, 5.0, doorHash, false, false, false) while doorHandle == 0 do - Citizen.Wait(25) + Wait(25) doorHandle = GetClosestObjectOfType(FinanceOffice2.Safe.Position.x, FinanceOffice2.Safe.Position.y, FinanceOffice2.Safe.Position.z, 5.0, doorHash, false, false, false) timeout = timeout - 1 diff --git a/dlc_finance/office3.lua b/dlc_finance/office3.lua index 20a8741..cc090e0 100644 --- a/dlc_finance/office3.lua +++ b/dlc_finance/office3.lua @@ -116,8 +116,8 @@ FinanceOffice3 = { elseif doorSide:lower() == "right" then FinanceOffice3.Safe.isRightDoorOpen = true else - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - Citizen.Trace("left right") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + PrintTrace("left right") end end, Close = function(doorSide) @@ -126,8 +126,8 @@ FinanceOffice3 = { elseif doorSide:lower() == "right" then FinanceOffice3.Safe.isRightDoorOpen = false else - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - Citizen.Trace("left right") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + PrintTrace("left right") end end, @@ -152,7 +152,7 @@ FinanceOffice3 = { end if doorHandle == 0 then - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") return end @@ -165,7 +165,7 @@ FinanceOffice3 = { local doorHandle = GetClosestObjectOfType(FinanceOffice3.Safe.Position.x, FinanceOffice3.Safe.Position.y, FinanceOffice3.Safe.Position.z, 5.0, doorHash, false, false, false) while doorHandle == 0 do - Citizen.Wait(25) + Wait(25) doorHandle = GetClosestObjectOfType(FinanceOffice3.Safe.Position.x, FinanceOffice3.Safe.Position.y, FinanceOffice3.Safe.Position.z, 5.0, doorHash, false, false, false) timeout = timeout - 1 diff --git a/dlc_finance/office4.lua b/dlc_finance/office4.lua index 32e2706..5101488 100644 --- a/dlc_finance/office4.lua +++ b/dlc_finance/office4.lua @@ -116,8 +116,8 @@ FinanceOffice4 = { elseif doorSide:lower() == "right" then FinanceOffice4.Safe.isRightDoorOpen = true else - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - Citizen.Trace("left right") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + PrintTrace("left right") end end, Close = function(doorSide) @@ -126,8 +126,8 @@ FinanceOffice4 = { elseif doorSide:lower() == "right" then FinanceOffice4.Safe.isRightDoorOpen = false else - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - Citizen.Trace("left right") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + PrintTrace("left right") end end, @@ -152,7 +152,7 @@ FinanceOffice4 = { end if doorHandle == 0 then - Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") + PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") return end @@ -165,7 +165,7 @@ FinanceOffice4 = { local doorHandle = GetClosestObjectOfType(FinanceOffice4.Safe.Position.x, FinanceOffice4.Safe.Position.y, FinanceOffice4.Safe.Position.z, 5.0, doorHash, false, false, false) while doorHandle == 0 do - Citizen.Wait(25) + Wait(25) doorHandle = GetClosestObjectOfType(FinanceOffice4.Safe.Position.x, FinanceOffice4.Safe.Position.y, FinanceOffice4.Safe.Position.z, 5.0, doorHash, false, false, false) timeout = timeout - 1 diff --git a/dlc_finance/organization.lua b/dlc_finance/organization.lua index 171801c..d4928d1 100644 --- a/dlc_finance/organization.lua +++ b/dlc_finance/organization.lua @@ -84,7 +84,7 @@ FinanceOrganization = { } } -Citizen.CreateThread(function() +CreateThread(function() FinanceOrganization.Office.Init() while true do @@ -95,19 +95,19 @@ Citizen.CreateThread(function() FinanceOrganization.Office.loaded = true - Citizen.Wait(0) -- We need to call all this every frame + Wait(0) -- We need to call all this every frame else - Citizen.Wait(1000) -- We are not inside an office + Wait(1000) -- We are not inside an office end elseif FinanceOrganization.Office.loaded then -- Loaded and need to unload FinanceOrganization.Office.Clear() FinanceOrganization.Office.loaded = false - Citizen.Wait(1000) -- We can wait longer when we don't need to display text + Wait(1000) -- We can wait longer when we don't need to display text else -- Not needed to load - Citizen.Wait(1000) -- We can wait longer when we don't need to display text + Wait(1000) -- We can wait longer when we don't need to display text end end end) diff --git a/dlc_gunrunning/yacht.lua b/dlc_gunrunning/yacht.lua index c34ce5c..c45a028 100644 --- a/dlc_gunrunning/yacht.lua +++ b/dlc_gunrunning/yacht.lua @@ -34,7 +34,7 @@ GunrunningYacht = { if handle == 0 then RequestModel(GunrunningYacht.Water.modelHash) while not HasModelLoaded(GunrunningYacht.Water.modelHash) do - Citizen.Wait(0) + Wait(0) end local water = CreateObjectNoOffset(GunrunningYacht.Water.modelHash, -1369.0, 6736.0, 5.40, false, false, false) diff --git a/dlc_heists/yacht.lua b/dlc_heists/yacht.lua index 71af6cd..fc7f42c 100644 --- a/dlc_heists/yacht.lua +++ b/dlc_heists/yacht.lua @@ -34,7 +34,7 @@ HeistYacht = { if handle == 0 then RequestModel(HeistYacht.Water.modelHash) while not HasModelLoaded(HeistYacht.Water.modelHash) do - Citizen.Wait(0) + Wait(0) end local water = CreateObjectNoOffset(HeistYacht.Water.modelHash, -2023.773, -1038.0, 5.40, false, false, false) diff --git a/lib/common.lua b/lib/common.lua index f3de00d..b5ce615 100644 --- a/lib/common.lua +++ b/lib/common.lua @@ -144,7 +144,7 @@ function DrawEmptyRect(name, model) local renderId = CreateNamedRenderTargetForModel(name, model) while not IsNamedRendertargetRegistered(name) do - Citizen.Wait(step) + Wait(step) currentTime = currentTime + step @@ -197,7 +197,7 @@ function LoadStreamedTextureDict(texturesDict) RequestStreamedTextureDict(texturesDict, false) while not HasStreamedTextureDictLoaded(texturesDict) do - Citizen.Wait(step) + Wait(step) currentTime = currentTime + step @@ -216,7 +216,7 @@ function LoadScaleform(scaleform) local handle = RequestScaleformMovie(scaleform) while not HasScaleformMovieLoaded(handle) do - Citizen.Wait(step) + Wait(step) currentTime = currentTime + step @@ -235,7 +235,7 @@ function GetPedheadshot(ped) local pedheadshot = RegisterPedheadshot(ped) while not IsPedheadshotReady(pedheadshot) do - Citizen.Wait(step) + Wait(step) currentTime = currentTime + step @@ -257,10 +257,10 @@ function GetPedheadshotTexture(ped) local IsTextureDictLoaded = LoadStreamedTextureDict(textureDict) if not IsTextureDictLoaded then - Citizen.Trace("ERROR: GetPedheadshotTexture - Textures dictionnary \"" .. tostring(textureDict) .. "\" cannot be loaded.") + PrintTrace("ERROR: GetPedheadshotTexture - Textures dictionnary \"" .. tostring(textureDict) .. "\" cannot be loaded.") end else - Citizen.Trace("ERROR: GetPedheadshotTexture - PedHeadShot not ready.") + PrintTrace("ERROR: GetPedheadshotTexture - PedHeadShot not ready.") end return textureDict diff --git a/lib/observers/interiorIdObserver.lua b/lib/observers/interiorIdObserver.lua index 06416b0..1d0335b 100644 --- a/lib/observers/interiorIdObserver.lua +++ b/lib/observers/interiorIdObserver.lua @@ -1,6 +1,6 @@ local _scanDelay = 500 -Citizen.CreateThread(function() +CreateThread(function() while true do Global.currentInteriorId = GetInteriorFromEntity(PlayerPedId()) @@ -48,6 +48,6 @@ Citizen.CreateThread(function() Global.Security.isInsideOffice4 = (Global.currentInteriorId == MpSecurityOffice4.InteriorId) end - Citizen.Wait(_scanDelay) + Wait(_scanDelay) end end) diff --git a/lib/observers/officeSafeDoorHandler.lua b/lib/observers/officeSafeDoorHandler.lua index a044284..64b645c 100644 --- a/lib/observers/officeSafeDoorHandler.lua +++ b/lib/observers/officeSafeDoorHandler.lua @@ -1,7 +1,7 @@ -- Delay between each attempt to open/close the doors corresponding to their state local _scanDelay = 500 -Citizen.CreateThread(function() +CreateThread(function() while true do local office = 0 @@ -42,6 +42,6 @@ Citizen.CreateThread(function() end end - Citizen.Wait(_scanDelay) + Wait(_scanDelay) end end) From 43c76ac5ed887692a58e4c9f50f28583843c866d Mon Sep 17 00:00:00 2001 From: Popcorn RP - PrinceAlbert <85725579+alberttheprince@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:41:32 -0400 Subject: [PATCH 2/4] Fix for PrintTrace --- dlc_bikers/gang.lua | 8 ++++---- dlc_finance/office1.lua | 10 +++++----- dlc_finance/office2.lua | 10 +++++----- dlc_finance/office3.lua | 10 +++++----- dlc_finance/office4.lua | 10 +++++----- lib/common.lua | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlc_bikers/gang.lua b/dlc_bikers/gang.lua index 51e195f..d0e9247 100644 --- a/dlc_bikers/gang.lua +++ b/dlc_bikers/gang.lua @@ -199,10 +199,10 @@ BikerGang = { local IsTextureDictLoaded = LoadStreamedTextureDict(member.textureDict) if not IsTextureDictLoaded then - PrintTrace("ERROR: BikerClubhouseDrawMembers - Textures dictionnary \"" .. tostring(member.textureDict) .. "\" cannot be loaded.") + print("ERROR: BikerClubhouseDrawMembers - Textures dictionnary \"" .. tostring(member.textureDict) .. "\" cannot be loaded.") end else - PrintTrace("ERROR: BikerClubhouseDrawMembers - PedHeadShot not ready.") + print("ERROR: BikerClubhouseDrawMembers - PedHeadShot not ready.") end end, Clear = function(member) @@ -347,7 +347,7 @@ BikerGang = { Init = function() if not DrawEmptyRect(BikerGang.Clubhouse.MissionsWall.target, BikerGang.Clubhouse.MissionsWall.prop) then - PrintTrace("ERROR: BikerGang.Clubhouse.MissionsWall.Init() - DrawEmptyRect - Timeout") + print("ERROR: BikerGang.Clubhouse.MissionsWall.Init() - DrawEmptyRect - Timeout") end end, Enable = function(state) @@ -549,7 +549,7 @@ function DrawEmblem(texturesDict, rotation) local IsTextureDictLoaded = LoadStreamedTextureDict(texturesDict) if not IsTextureDictLoaded then - PrintTrace("ERROR: DrawEmblem - Textures dictionnary cannot be loaded.") + print("ERROR: DrawEmblem - Textures dictionnary cannot be loaded.") end BikerGang.Clubhouse.Emblem.stage = 1 diff --git a/dlc_finance/office1.lua b/dlc_finance/office1.lua index 629df5d..3e3b630 100644 --- a/dlc_finance/office1.lua +++ b/dlc_finance/office1.lua @@ -116,8 +116,8 @@ FinanceOffice1 = { elseif doorSide:lower() == "right" then FinanceOffice1.Safe.isRightDoorOpen = true else - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - PrintTrace("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + print("left right") end end, Close = function(doorSide) @@ -126,8 +126,8 @@ FinanceOffice1 = { elseif doorSide:lower() == "right" then FinanceOffice1.Safe.isRightDoorOpen = false else - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - PrintTrace("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + print("left right") end end, @@ -152,7 +152,7 @@ FinanceOffice1 = { end if doorHandle == 0 then - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") + print("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") return end diff --git a/dlc_finance/office2.lua b/dlc_finance/office2.lua index c98ddbf..c769e58 100644 --- a/dlc_finance/office2.lua +++ b/dlc_finance/office2.lua @@ -116,8 +116,8 @@ FinanceOffice2 = { elseif doorSide:lower() == "right" then FinanceOffice2.Safe.isRightDoorOpen = true else - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - PrintTrace("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + print("left right") end end, Close = function(doorSide) @@ -126,8 +126,8 @@ FinanceOffice2 = { elseif doorSide:lower() == "right" then FinanceOffice2.Safe.isRightDoorOpen = false else - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - PrintTrace("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + print("left right") end end, @@ -152,7 +152,7 @@ FinanceOffice2 = { end if doorHandle == 0 then - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") + print("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") return end diff --git a/dlc_finance/office3.lua b/dlc_finance/office3.lua index cc090e0..55eecc6 100644 --- a/dlc_finance/office3.lua +++ b/dlc_finance/office3.lua @@ -116,8 +116,8 @@ FinanceOffice3 = { elseif doorSide:lower() == "right" then FinanceOffice3.Safe.isRightDoorOpen = true else - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - PrintTrace("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + print("left right") end end, Close = function(doorSide) @@ -126,8 +126,8 @@ FinanceOffice3 = { elseif doorSide:lower() == "right" then FinanceOffice3.Safe.isRightDoorOpen = false else - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - PrintTrace("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + print("left right") end end, @@ -152,7 +152,7 @@ FinanceOffice3 = { end if doorHandle == 0 then - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") + print("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") return end diff --git a/dlc_finance/office4.lua b/dlc_finance/office4.lua index 5101488..788eff6 100644 --- a/dlc_finance/office4.lua +++ b/dlc_finance/office4.lua @@ -116,8 +116,8 @@ FinanceOffice4 = { elseif doorSide:lower() == "right" then FinanceOffice4.Safe.isRightDoorOpen = true else - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - PrintTrace("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + print("left right") end end, Close = function(doorSide) @@ -126,8 +126,8 @@ FinanceOffice4 = { elseif doorSide:lower() == "right" then FinanceOffice4.Safe.isRightDoorOpen = false else - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - PrintTrace("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") + print("left right") end end, @@ -152,7 +152,7 @@ FinanceOffice4 = { end if doorHandle == 0 then - PrintTrace("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") + print("[bob74_ipl] Warning: " .. doorSide .. " safe door handle is 0") return end diff --git a/lib/common.lua b/lib/common.lua index b5ce615..4c57117 100644 --- a/lib/common.lua +++ b/lib/common.lua @@ -257,10 +257,10 @@ function GetPedheadshotTexture(ped) local IsTextureDictLoaded = LoadStreamedTextureDict(textureDict) if not IsTextureDictLoaded then - PrintTrace("ERROR: GetPedheadshotTexture - Textures dictionnary \"" .. tostring(textureDict) .. "\" cannot be loaded.") + print("ERROR: GetPedheadshotTexture - Textures dictionnary \"" .. tostring(textureDict) .. "\" cannot be loaded.") end else - PrintTrace("ERROR: GetPedheadshotTexture - PedHeadShot not ready.") + print("ERROR: GetPedheadshotTexture - PedHeadShot not ready.") end return textureDict From 95f7f97f85580e200a8ffd085908f965d03aee63 Mon Sep 17 00:00:00 2001 From: Popcorn RP - PrinceAlbert <85725579+alberttheprince@users.noreply.github.com> Date: Sat, 10 Aug 2024 20:14:12 -0400 Subject: [PATCH 3/4] Update office1.lua --- dlc_finance/office1.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlc_finance/office1.lua b/dlc_finance/office1.lua index 3e3b630..eab0336 100644 --- a/dlc_finance/office1.lua +++ b/dlc_finance/office1.lua @@ -126,8 +126,7 @@ FinanceOffice1 = { elseif doorSide:lower() == "right" then FinanceOffice1.Safe.isRightDoorOpen = false else - print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - print("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are: left right") end end, From 8b3a77c837859c678bf98edd9c84fc263c53fa2c Mon Sep 17 00:00:00 2001 From: Popcorn RP - PrinceAlbert <85725579+alberttheprince@users.noreply.github.com> Date: Sat, 10 Aug 2024 20:39:06 -0400 Subject: [PATCH 4/4] Fixed remaining prints --- dlc_finance/office1.lua | 3 +-- dlc_finance/office2.lua | 6 ++---- dlc_finance/office3.lua | 6 ++---- dlc_finance/office4.lua | 6 ++---- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlc_finance/office1.lua b/dlc_finance/office1.lua index eab0336..755df0e 100644 --- a/dlc_finance/office1.lua +++ b/dlc_finance/office1.lua @@ -116,8 +116,7 @@ FinanceOffice1 = { elseif doorSide:lower() == "right" then FinanceOffice1.Safe.isRightDoorOpen = true else - print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - print("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are: left right") end end, Close = function(doorSide) diff --git a/dlc_finance/office2.lua b/dlc_finance/office2.lua index c769e58..608a789 100644 --- a/dlc_finance/office2.lua +++ b/dlc_finance/office2.lua @@ -116,8 +116,7 @@ FinanceOffice2 = { elseif doorSide:lower() == "right" then FinanceOffice2.Safe.isRightDoorOpen = true else - print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - print("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are: left right") end end, Close = function(doorSide) @@ -126,8 +125,7 @@ FinanceOffice2 = { elseif doorSide:lower() == "right" then FinanceOffice2.Safe.isRightDoorOpen = false else - print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - print("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are: left right") end end, diff --git a/dlc_finance/office3.lua b/dlc_finance/office3.lua index 55eecc6..e209703 100644 --- a/dlc_finance/office3.lua +++ b/dlc_finance/office3.lua @@ -116,8 +116,7 @@ FinanceOffice3 = { elseif doorSide:lower() == "right" then FinanceOffice3.Safe.isRightDoorOpen = true else - print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - print("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are: left right") end end, Close = function(doorSide) @@ -126,8 +125,7 @@ FinanceOffice3 = { elseif doorSide:lower() == "right" then FinanceOffice3.Safe.isRightDoorOpen = false else - print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - print("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are: left right") end end, diff --git a/dlc_finance/office4.lua b/dlc_finance/office4.lua index 788eff6..1c6fd8a 100644 --- a/dlc_finance/office4.lua +++ b/dlc_finance/office4.lua @@ -116,8 +116,7 @@ FinanceOffice4 = { elseif doorSide:lower() == "right" then FinanceOffice4.Safe.isRightDoorOpen = true else - print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - print("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are: left right") end end, Close = function(doorSide) @@ -126,8 +125,7 @@ FinanceOffice4 = { elseif doorSide:lower() == "right" then FinanceOffice4.Safe.isRightDoorOpen = false else - print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") - print("left right") + print("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are: left right") end end,