diff --git a/resources/[standalone]/[rcore_tv]/rcore_television/config.lua b/resources/[standalone]/[rcore_tv]/rcore_television/config.lua index 2188013d5..d1e98608c 100644 --- a/resources/[standalone]/[rcore_tv]/rcore_television/config.lua +++ b/resources/[standalone]/[rcore_tv]/rcore_television/config.lua @@ -265,92 +265,7 @@ function PlayWearAnimation() TaskPlayAnim(ped, dict, anim, 8.0, 1.0, -1, 48, 0.0, false, false, false) end --- this will create television at defined coords with default URL. -Config.PlayingTelevisionOnLocation = { - --["random_uniqid"] = { - -- ModelHash = GetHashKey("prop_tv_flat_michael"), - -- Position = vector3(0, 0, 0), - -- Heading = 180.0, - -- - -- URL = "https://www.youtube.com/watch?v=oqwKTKbsINY", -- will ignore the whitelist / blacklist since only a dev can add this. - -- - -- -- There is variable "time" which getting called in NUI / complet redirect, so should it count? - -- -- true = wont - -- -- false = will count - -- DisableCountTime = false, - -- DisableInteraction = true, - --}, - ["some_tv_uniq_id"] = { - ModelHash = GetHashKey("prop_tv_flat_michael"), - Position = vector3(459.02, -983.5, 31.2), - Heading = 180.0, - - -- will add behind the url ?identifier=some_tv_uniq_id - AddIdentifierToURL = true, - URL = "nui://rcore_television/html/custom/menu/index.html", -- will ignore the whitelist / blacklist since only a dev can add this. - - Job = { - ["police"] = { "*" }, - ["ambulance"] = { "grade1", "grade2", "grade3" } - }, - - -- this table will get send to the DUI message, which mean you can build your custom html menu or whatever you would love to. - Items = { - [0] = { - Label = "Wear bulletproof vest", - CallBack = function() - SetPedArmour(PlayerPedId(), 100) - TriggerEvent('skinchanger:getSkin', function(skin) - skin.bproof_1 = 20 - TriggerEvent('skinchanger:loadSkin', skin) - end) - - PlayWearAnimation() - end, - - CloseAfterUse = true, - }, - [1] = { - Label = "Take it off", - CallBack = function() - SetPedArmour(PlayerPedId(), 0) - TriggerEvent('skinchanger:getSkin', function(skin) - skin.bproof_1 = -1 - TriggerEvent('skinchanger:loadSkin', skin) - end) - - PlayWearAnimation() - end, - - CloseAfterUse = true, - }, - }, - - -- There is variable "time" which getting called in NUI / complet redirect, so should it count? - -- true = wont - -- false = will count - DisableCountTime = true, - }, -} - -Config.ReplaceObjects = { - { - pos = vector3(-54.47, -1087.27, 27.27), - radius = 2.0, - originalModelHash = 1036195894, - newModelHash = GetHashKey("prop_tv_flat_01"), - } -} - --- this will create television on coords that can be used by other folks -Config.CreateTelevisionModelOnCoords = { - { - ModelHash = GetHashKey("prop_tv_flat_01"), - Position = vector3(-921.48, -1181.22, -0.38), - Heading = 300.00, - }, -} -- if this is set to true it will preload one scaleform of television if some users experiencing bad loading Config.UsePreloaded = true diff --git a/resources/[standalone]/sh-elevator/client/client.lua b/resources/[standalone]/sh-elevator/client/client.lua index b3b74424f..6ee2929ba 100644 --- a/resources/[standalone]/sh-elevator/client/client.lua +++ b/resources/[standalone]/sh-elevator/client/client.lua @@ -34,7 +34,7 @@ local function Teleport(pos) local sceneLoadTimer = GetGameTimer() while not IsNewLoadSceneLoaded() do - if GetGameTimer() - sceneLoadTimer > 1000 then break end + if GetGameTimer() - sceneLoadTimer > 500 then break end Wait(0) end @@ -42,7 +42,7 @@ local function Teleport(pos) sceneLoadTimer = GetGameTimer() while not HasCollisionLoadedAroundEntity(cache.ped) do - if GetGameTimer() - sceneLoadTimer > 1000 then break end + if GetGameTimer() - sceneLoadTimer > 500 then break end Wait(0) end