From c39103e8969181400dd976278e765e9c41ad53fc Mon Sep 17 00:00:00 2001 From: Jacob <42719082+ThatGuyJacobee@users.noreply.github.com> Date: Sun, 16 Jan 2022 16:06:50 +0000 Subject: [PATCH] Safe Zone air vehicles whitelist, updated holograms and scripts. + Updated Safe-Zones to whitelist air vehicles from being stopped. + Latest version of wl_wars2x police radar. + Updated weapon restrictions. + Fire-Scripts updated to latest version. --- resources/Fire-Script/client/dispatch.lua | 7 + resources/Fire-Script/client/fire.lua | 36 ++- resources/Fire-Script/client/main.lua | 42 ++- resources/Fire-Script/client/utils.lua | 6 +- resources/Fire-Script/config.lua | 4 +- resources/Fire-Script/fires.json | 2 +- resources/Fire-Script/fxmanifest.lua | 2 +- resources/Fire-Script/server/dispatch.lua | 2 +- resources/Fire-Script/server/fire.lua | 47 ++- resources/Fire-Script/server/main.lua | 52 +++- resources/Fire-Script/whitelist.json | 2 +- resources/Holograms/holograms.lua | 13 +- resources/Safe-Zones/README.md | 7 +- resources/Safe-Zones/client/client.lua | 49 ++- resources/Safe-Zones/config.lua | 39 ++- resources/Safe-Zones/fxmanifest.lua | 8 +- resources/Safe-Zones/version.json | 6 +- .../Discord-WepRestriction/client.lua | 10 +- resources/[EGRP-Phone]/npwd/sv_npwd.log | 294 ++++++++++++++++++ resources/wk_wars2x/cl_radar.lua | 55 ++-- resources/wk_wars2x/config.lua | 4 + resources/wk_wars2x/fxmanifest.lua | 2 +- 22 files changed, 548 insertions(+), 141 deletions(-) diff --git a/resources/Fire-Script/client/dispatch.lua b/resources/Fire-Script/client/dispatch.lua index d6106cfc2..6cdf2656d 100644 --- a/resources/Fire-Script/client/dispatch.lua +++ b/resources/Fire-Script/client/dispatch.lua @@ -94,6 +94,13 @@ function Dispatch:clear(dispatchNumber) if dispatchNumber and self.blips[dispatchNumber] and self.blips[dispatchNumber].blip then RemoveBlip(self.blips[dispatchNumber].blip) self.blips[dispatchNumber].blip = false + elseif dispatchNumber == 0 then + for k, v in pairs(self.blips) do + if self.blips[k].blip then + RemoveBlip(self.blips[k].blip) + self.blips[k].blip = false + end + end end end diff --git a/resources/Fire-Script/client/fire.lua b/resources/Fire-Script/client/fire.lua index b2456ac1c..57d4d253c 100644 --- a/resources/Fire-Script/client/fire.lua +++ b/resources/Fire-Script/client/fire.lua @@ -1,5 +1,5 @@ --================================-- --- FIRE SCRIPT v1.6.9 -- +-- FIRE SCRIPT v1.7.6 -- -- by GIMI (+ foregz, Albo1125) -- -- License: GNU GPL 3.0 -- --================================-- @@ -34,10 +34,12 @@ function Fire:removeFlame(fireIndex, flameIndex) if not (fireIndex and flameIndex and self.active[fireIndex]) then return end + if self.active[fireIndex].flames[flameIndex] and self.active[fireIndex].flames[flameIndex] > -1 then RemoveScriptFire(self.active[fireIndex].flames[flameIndex]) self.active[fireIndex].flames[flameIndex] = nil end + if self.active[fireIndex].particles[flameIndex] and self.active[fireIndex].particles[flameIndex] ~= 0 then local particles = self.active[fireIndex].particles[flameIndex] Citizen.SetTimeout( @@ -49,6 +51,7 @@ function Fire:removeFlame(fireIndex, flameIndex) ) self.active[fireIndex].particles[flameIndex] = nil end + if self.active[fireIndex].flameParticles[flameIndex] and self.active[fireIndex].flameParticles[flameIndex] ~= 0 then local flameParticles = self.active[fireIndex].flameParticles[flameIndex] Citizen.SetTimeout( @@ -60,6 +63,7 @@ function Fire:removeFlame(fireIndex, flameIndex) ) self.active[fireIndex].flameParticles[flameIndex] = nil end + self.active[fireIndex].flameCoords[flameIndex] = nil if self.active[fireIndex] ~= nil and countElements(self.active[fireIndex].flames) < 1 then @@ -73,7 +77,7 @@ function Fire:remove(fireIndex, callback) return end - for k, v in pairs(self.active[fireIndex].flames) do + for k, v in pairs(self.active[fireIndex].flameCoords) do self:removeFlame(fireIndex, k) Citizen.Wait(20) end @@ -130,14 +134,16 @@ Citizen.CreateThread( for fireIndex, v in pairs(Fire.active) do if countElements(v.particles) ~= 0 then for flameIndex, _v in pairs(v.particles) do - local isFirePresent = GetNumberOfFiresInRange( - v.flameCoords[flameIndex].x, - v.flameCoords[flameIndex].y, - v.flameCoords[flameIndex].z, - 0.05 - ) - if isFirePresent == 0 then - TriggerServerEvent('fireManager:removeFlame', fireIndex, flameIndex) + if v.flameCoords[flameIndex] ~= nil then + local isFirePresent = GetNumberOfFiresInRange( + v.flameCoords[flameIndex].x, + v.flameCoords[flameIndex].y, + v.flameCoords[flameIndex].z, + 0.05 + ) + if isFirePresent == 0 then + TriggerServerEvent('fireManager:removeFlame', fireIndex, flameIndex) + end end end end @@ -150,13 +156,14 @@ Citizen.CreateThread( function() while true do local pedCoords = GetEntityCoords(GetPlayerPed(-1)) - while syncInProgress do - Citizen.Wait(10) - end for fireIndex, v in pairs(Fire.active) do for flameIndex, coords in pairs(Fire.active[fireIndex].flameCoords) do Citizen.Wait(10) - if not syncInProgress and Fire.active[fireIndex] and Fire.active[fireIndex].flameCoords[flameIndex] and not Fire.active[fireIndex].particles[flameIndex] and #(coords - pedCoords) < 300.0 then + while syncInProgress do + Citizen.Wait(10) + end + syncInProgress = true + if Fire.active[fireIndex] and Fire.active[fireIndex].flameCoords[flameIndex] and not Fire.active[fireIndex].particles[flameIndex] and #(coords - pedCoords) < 300.0 then local z = coords.z repeat @@ -211,6 +218,7 @@ Citizen.CreateThread( Fire.active[fireIndex].flames[flameIndex] = nil end end + syncInProgress = false end end Citizen.Wait(1500) diff --git a/resources/Fire-Script/client/main.lua b/resources/Fire-Script/client/main.lua index d4cfac1a5..06003de45 100644 --- a/resources/Fire-Script/client/main.lua +++ b/resources/Fire-Script/client/main.lua @@ -1,11 +1,9 @@ --================================-- --- FIRE SCRIPT v1.7.4 -- +-- FIRE SCRIPT v1.7.6 -- -- by GIMI (+ foregz, Albo1125) -- -- License: GNU GPL 3.0 -- --================================-- -local syncInProgress = false - --================================-- -- CHAT -- --================================-- @@ -24,6 +22,10 @@ TriggerEvent('chat:addSuggestion', '/startfire', 'Creates a fire', { { name = "dispatch", help = "true or false (default false)" + }, + { + name = "dispatchMessage", + help = "Sets a custom dispatch message (leave empty to generate automatically)" } }) @@ -105,11 +107,15 @@ TriggerEvent('chat:addSuggestion', '/firewlreload', 'Reloads the whitelist from TriggerEvent('chat:addSuggestion', '/firedispatch', 'Manages the fire script dispatch subscribers', { { name = "action", - help = "add / remove" + help = "add / remove / scenario (scenario = sets the scenario's dispatch message)" }, { - name = "playerID", - help = "The player's server ID" + name = "playerID / scenarioID", + help = "The player's server ID / the scenario's ID" + }, + { + name = "dispatchMessage", + help = "(optional) Sets a custom dispatch message for the scenario (use only with par. #1 scenario; leave empty to remove previous custom message)" } }) @@ -123,7 +129,7 @@ TriggerEvent('chat:addSuggestion', '/remindme', 'Sets the GPS waypoint to the sp TriggerEvent('chat:addSuggestion', '/cleardispatch', 'Clears navigation to the last dispatch call.', { { name = "dispatchID", - help = "(optional) The dispatch identifier, if filled in, the call's blip will be removed." + help = "(optional) The dispatch identifier, if filled in, the call's blip will be removed. Set to 0 to remove all dispatch blips." } }) @@ -200,7 +206,13 @@ RegisterCommand( local probability = tonumber(args[2]) local triggerDispatch = args[3] == "true" - TriggerServerEvent('fireManager:command:startfire', GetEntityCoords(GetPlayerPed(-1)), maxSpread, probability, triggerDispatch) + table.remove(args, 1) + table.remove(args, 1) + table.remove(args, 1) + + local dispatchMessage = next(args) and table.concat(args, " ") or nil + + TriggerServerEvent('fireManager:command:startfire', GetEntityCoords(GetPlayerPed(-1)), maxSpread, probability, triggerDispatch, dispatchMessage) end, false ) @@ -310,7 +322,9 @@ AddEventHandler( while syncInProgress do Citizen.Wait(10) end + syncInProgress = true Fire:remove(fireIndex) + syncInProgress = false end ) @@ -321,7 +335,12 @@ AddEventHandler( while syncInProgress do Citizen.Wait(10) end - Fire:removeAll() + syncInProgress = true + Fire:removeAll( + function() + syncInProgress = false + end + ) end ) @@ -332,7 +351,9 @@ AddEventHandler( while syncInProgress do Citizen.Wait(10) end + syncInProgress = true Fire:removeFlame(fireIndex, flameIndex) + syncInProgress = false end ) @@ -340,6 +361,9 @@ RegisterNetEvent("fireClient:createFlame") AddEventHandler( "fireClient:createFlame", function(fireIndex, flameIndex, coords) + while syncInProgress do + Citizen.Wait(10) + end syncInProgress = true Fire:createFlame(fireIndex, flameIndex, coords) syncInProgress = false diff --git a/resources/Fire-Script/client/utils.lua b/resources/Fire-Script/client/utils.lua index 05b44da9e..de4e371ba 100644 --- a/resources/Fire-Script/client/utils.lua +++ b/resources/Fire-Script/client/utils.lua @@ -1,5 +1,5 @@ --================================-- --- FIRE SCRIPT v1.6.3 -- +-- FIRE SCRIPT v1.7.6 -- -- by GIMI (+ foregz, Albo1125) -- -- License: GNU GPL 3.0 -- --================================-- @@ -29,4 +29,6 @@ function countElements(table) end end return count -end \ No newline at end of file +end + +syncInProgress = false \ No newline at end of file diff --git a/resources/Fire-Script/config.lua b/resources/Fire-Script/config.lua index f71325b8b..21100974a 100644 --- a/resources/Fire-Script/config.lua +++ b/resources/Fire-Script/config.lua @@ -1,5 +1,5 @@ --================================-- --- FIRE SCRIPT v1.7.4 -- +-- FIRE SCRIPT v1.7.6 -- -- by GIMI (+ foregz, Albo1125) -- -- License: GNU GPL 3.0 -- --================================-- @@ -15,7 +15,7 @@ Config.Fire = { chance = 50, -- Fire spawn chance (out of 100 chances, how many lead to spawning a fire?); Set to values between 1-100 players = 3, -- Sets the minimum number of players subscribed to dispatch for the spawner to spawn fires. firefighterJobs = { -- If using ESX (Config.Dispatch.enableESX), you can specify which players will count as firefighters in Config.Fire.spawner.players above; If not using ESX you can set this to nil - ["fd"] = nil -- Always set the job name in the key, value has to be true + ["fd"] = false -- Always set the job name in the key, value has to be true } } } diff --git a/resources/Fire-Script/fires.json b/resources/Fire-Script/fires.json index 267d07dbd..0637a088a 100644 --- a/resources/Fire-Script/fires.json +++ b/resources/Fire-Script/fires.json @@ -1 +1 @@ -[{"dispatchCoords":{"x":-858.9586181640625,"y":-418.1961669921875,"z":336.3800048828125},"flames":[]},{"dispatchCoords":{"x":-1172.3480224609376,"y":-882.9169921875,"z":14.03715419769287},"flames":[]}] \ No newline at end of file +[] \ No newline at end of file diff --git a/resources/Fire-Script/fxmanifest.lua b/resources/Fire-Script/fxmanifest.lua index 29a126550..82a5b9fcf 100644 --- a/resources/Fire-Script/fxmanifest.lua +++ b/resources/Fire-Script/fxmanifest.lua @@ -5,7 +5,7 @@ games { } author 'GIMI, foregz, Albo1125' -version '1.7.3' +version '1.7.6' description 'Fire Script' client_scripts { diff --git a/resources/Fire-Script/server/dispatch.lua b/resources/Fire-Script/server/dispatch.lua index 37a24d56a..61a6194ab 100644 --- a/resources/Fire-Script/server/dispatch.lua +++ b/resources/Fire-Script/server/dispatch.lua @@ -66,7 +66,7 @@ end function Dispatch:getRandomPlayer() if not next(self._players) then - return false + return next(GetPlayers()) or false end return table.random(self._players) end \ No newline at end of file diff --git a/resources/Fire-Script/server/fire.lua b/resources/Fire-Script/server/fire.lua index fd65f54a3..c3e74af68 100644 --- a/resources/Fire-Script/server/fire.lua +++ b/resources/Fire-Script/server/fire.lua @@ -1,5 +1,5 @@ --================================-- --- FIRE SCRIPT v1.7.3 -- +-- FIRE SCRIPT v1.7.6 -- -- by GIMI (+ foregz, Albo1125) -- -- License: GNU GPL 3.0 -- --================================-- @@ -41,11 +41,11 @@ function Fire:create(coords, maximumSpread, spreadChance) while spread do Citizen.Wait(2000) local index, flames = highestIndex(self.active, fireIndex) - if flames ~= 0 and flames <= maximumSpread then + if flames ~= 0 and flames <= maximumSpread and self.active[fireIndex] ~= nil then for k, v in ipairs(self.active[fireIndex]) do index, flames = highestIndex(self.active, fireIndex) local rndSpread = math.random(100) - if count ~= 0 and flames <= maximumSpread and rndSpread <= spreadChance then + if flames <= maximumSpread and rndSpread <= spreadChance then local x = self.active[fireIndex][k].x local y = self.active[fireIndex][k].y local z = self.active[fireIndex][k].z @@ -56,9 +56,12 @@ function Fire:create(coords, maximumSpread, spreadChance) coords = vector3(x + xSpread, y + ySpread, z) self:createFlame(fireIndex, coords) + elseif flames > maximumSpread then + spread = false + break end end - elseif flames == 0 then + elseif flames == 0 or self.active[fireIndex] == nil then break end end @@ -101,14 +104,8 @@ end function Fire:removeFlame(fireIndex, flameIndex) if self.active[fireIndex] and self.active[fireIndex][flameIndex] then self.active[fireIndex][flameIndex] = nil - if type(next(self.active[fireIndex])) == "string" and self.activeBinds[fireIndex] then - self.binds[self.activeBinds[fireIndex]][fireIndex] = nil - - if self.activeBinds[fireIndex] == self.currentRandom and next(self.binds[self.activeBinds[fireIndex]]) == nil then - self.currentRandom = nil - end - - self.activeBinds[fireIndex] = nil + if type(next(self.active[fireIndex])) == "string" then + self:remove(fireIndex) end end TriggerClientEvent('fireClient:removeFlame', -1, fireIndex, flameIndex) @@ -122,6 +119,7 @@ function Fire:removeAll() end end self.active = {} + self.activeBinds = {} self.binds = {} self.currentRandom = nil end @@ -164,9 +162,13 @@ function Fire:startRegistered(registeredFireID, triggerDispatch, dispatchPlayer) Config.Dispatch.timeout, function() if Config.Dispatch.enabled then - Dispatch.expectingInfo[dispatchPlayer] = true + if self.registered[registeredFireID].message ~= nil then + Dispatch:create(self.registered[registeredFireID].message, dispatchCoords) + else + Dispatch.expectingInfo[dispatchPlayer] = true + TriggerClientEvent('fd:dispatch', dispatchPlayer, dispatchCoords) + end end - TriggerClientEvent('fd:dispatch', dispatchPlayer, dispatchCoords) end ) end @@ -308,6 +310,7 @@ end function Fire:loadRegistered() local firesFile = loadData("fires") + self.random = {} if firesFile ~= nil then for index, fire in pairs(firesFile) do for _, flame in pairs(fire.flames) do @@ -316,22 +319,12 @@ function Fire:loadRegistered() if fire.dispatchCoords then fire.dispatchCoords = vector3(fire.dispatchCoords.x, fire.dispatchCoords.y, fire.dispatchCoords.z) end + if fire.random == true then + self.random[index] = true + end end self.registered = firesFile - self:updateRandom() else saveData({}, "fires") end -end - -function Fire:updateRandom() -- Creates a table containing all fires with random flag enabled - self.random = {} - if not (self.registered and next(self.registered) ~= nil) then - return - end - for k, v in pairs(self.registered) do - if v.random == true then - self.random[k] = true - end - end end \ No newline at end of file diff --git a/resources/Fire-Script/server/main.lua b/resources/Fire-Script/server/main.lua index ff80efbf6..99443b881 100644 --- a/resources/Fire-Script/server/main.lua +++ b/resources/Fire-Script/server/main.lua @@ -1,5 +1,5 @@ --================================-- --- FIRE SCRIPT v1.7.4 -- +-- FIRE SCRIPT v1.7.6 -- -- by GIMI (+ foregz, Albo1125) -- -- License: GNU GPL 3.0 -- --================================-- @@ -8,7 +8,7 @@ -- VERSION CHECK -- --================================-- -Version = "1.7.4" +Version = "1.7.6" LatestVersionFeed = "https://api.github.com/repos/gimicze/firescript/releases/latest" Citizen.CreateThread( @@ -59,7 +59,7 @@ AddEventHandler( RegisterNetEvent('fireManager:command:startfire') AddEventHandler( 'fireManager:command:startfire', - function(coords, maxSpread, chance, triggerDispatch) + function(coords, maxSpread, chance, triggerDispatch, dispatchMessage) if not Whitelist:isWhitelisted(source, "firescript.start") then sendMessage(source, "Insufficient permissions.") return @@ -79,9 +79,13 @@ AddEventHandler( Config.Dispatch.timeout, function() if Config.Dispatch.enabled and not Config.Dispatch.disableCalls then - Dispatch.expectingInfo[_source] = true + if dispatchMessage then + Dispatch:create(dispatchMessage, coords) + else + Dispatch.expectingInfo[_source] = true + TriggerClientEvent('fd:dispatch', _source, coords) + end end - TriggerClientEvent('fd:dispatch', _source, coords) end ) end @@ -353,21 +357,35 @@ RegisterCommand( return end - local identifier = GetPlayerIdentifier(serverId, 0) + if action == "scenario" then + if not Fire.registered[serverId] then + sendMessage(source, "The specified scenario hasn't been found.") + return + end - if not identifier then - sendMessage(source, "Player not online.") - return - end + table.remove(args, 1) + table.remove(args, 1) - if action == "add" then - Dispatch:subscribe(serverId, (not args[3] or args[3] ~= "false")) - sendMessage(source, ("Subscribed %s to dispatch."):format(GetPlayerName(serverId))) - elseif action == "remove" then - Dispatch:unsubscribe(serverId, identifier) - sendMessage(source, ("Unsubscribed %s from the dispatch."):format(GetPlayerName(serverId))) + Fire.registered[serverId].message = next(args) and table.concat(args, " ") or nil + Fire:saveRegistered() + sendMessage(source, ("Changed scenario's (#%s) dispatch message."):format(serverId)) else - sendMessage(source, "Invalid action.") + local identifier = GetPlayerIdentifier(serverId, 0) + + if not identifier then + sendMessage(source, "Player not online.") + return + end + + if action == "add" then + Dispatch:subscribe(serverId, (not args[3] or args[3] ~= "false")) + sendMessage(source, ("Subscribed %s to dispatch."):format(GetPlayerName(serverId))) + elseif action == "remove" then + Dispatch:unsubscribe(serverId, identifier) + sendMessage(source, ("Unsubscribed %s from the dispatch."):format(GetPlayerName(serverId))) + else + sendMessage(source, "Invalid action.") + end end end, true diff --git a/resources/Fire-Script/whitelist.json b/resources/Fire-Script/whitelist.json index 27d06e239..0637a088a 100644 --- a/resources/Fire-Script/whitelist.json +++ b/resources/Fire-Script/whitelist.json @@ -1 +1 @@ -{"steam:11000010b8e82ca":true,"steam:110000103f289e1":true,"steam:11000014381fcb9":true,"steam:11000011b34e457":true,"steam:1100001034e3e9d":true,"steam:11000010e6980a7":true,"steam:110000136d3d578":true,"steam:11000013dc26ecb":true,"steam:11000011a5bc26d":true,"steam:1100001425c916f":true,"steam:110000131ff8eae":true,"steam:11000014843b806":true} \ No newline at end of file +[] \ No newline at end of file diff --git a/resources/Holograms/holograms.lua b/resources/Holograms/holograms.lua index 15e8b19a1..dfbc8da34 100644 --- a/resources/Holograms/holograms.lua +++ b/resources/Holograms/holograms.lua @@ -46,10 +46,15 @@ function Holograms() Draw3DText( -857.60, -411.40, 37.64 -3.250, "Instagram: @EliteGaming_UK", 4, 0.15, 0.15) end -- Spawn - Extra Info - if GetDistanceBetweenCoords( -849.87, -431.62, 37.14, GetEntityCoords(GetPlayerPed(-1))) < 32.5 then - Draw3DText( -849.87, -431.62, 37.14 -1.400, "Community Status Board:", 4, 0.2, 0.2) - --Draw3DText( -849.87, -431.62, 37.14 -1.800, "Find The Text Event > Starting @2PM GMT - 17/02/21", 4, 0.15, 0.15) - Draw3DText( -849.87, -431.62, 37.14 -2.100, "Next Event Announced Soon! Check back on discord!", 4, 0.15, 0.15) + if GetDistanceBetweenCoords( -849.87, -431.62, 38.14, GetEntityCoords(GetPlayerPed(-1))) < 32.5 then + Draw3DText( -849.87, -431.62, 38.14 -1.400, "Community Status Board:", 4, 0.2, 0.2) + Draw3DText( -849.87, -431.62, 38.14 -1.800, "---", 4, 0.15, 0.15) + --Draw3DText( -849.87, -431.62, 38.14 -1.800, "Find The Text Event > Starting @2PM GMT - 17/02/21", 4, 0.15, 0.15) + Draw3DText( -849.87, -431.62, 38.14 -2.100, "Brand new phone in-game now!!", 4, 0.15, 0.15) + Draw3DText( -849.87, -431.62, 38.14 -2.400, "Access the phone using /phone or F1!", 4, 0.15, 0.15) + Draw3DText( -849.87, -431.62, 38.14 -2.800, "---", 4, 0.15, 0.15) + Draw3DText( -849.87, -431.62, 38.14 -3.100, "New voice chat & radio system!", 4, 0.15, 0.15) + Draw3DText( -849.87, -431.62, 38.14 -3.400, "Alter VC range via F11, and access radio via /radio", 4, 0.15, 0.15) end -- Event Text - Submarine --if GetDistanceBetweenCoords( 525.49, -3240.52, 11.88, GetEntityCoords(GetPlayerPed(-1))) < 3.5 then diff --git a/resources/Safe-Zones/README.md b/resources/Safe-Zones/README.md index eb7f0941c..7856af8bf 100644 --- a/resources/Safe-Zones/README.md +++ b/resources/Safe-Zones/README.md @@ -7,8 +7,11 @@

Release Licence - Discord Status + Discord Status

+ +https://discord.gg/prefech +

Safezone for FiveM (A place where you can't kill anyone and can't be killed)

@@ -27,7 +30,7 @@ ensure JD_SafeZone ``` 4. configure the Config.lua to add more zones -### My Discord: https://discord.gg/m4BvmkG +### My Discord: https://discord.gg/prefech ### Images ![Image](https://i.gyazo.com/fefe100e0d859b6160fb1d05ee707d22.jpg) diff --git a/resources/Safe-Zones/client/client.lua b/resources/Safe-Zones/client/client.lua index 225f43ec2..af7d2ab5c 100644 --- a/resources/Safe-Zones/client/client.lua +++ b/resources/Safe-Zones/client/client.lua @@ -1,5 +1,6 @@ local notify = false local hasRun = false +local notify = true local function insidePolygon( point) local oddNodes = false @@ -18,6 +19,15 @@ local function insidePolygon( point) return oddNodes end +local function has_value (tab, val) + for index, value in ipairs(tab) do + if value == val then + return true + end + end + return false +end + Citizen.CreateThread(function() while true do local iPed = GetPlayerPed(-1) @@ -28,17 +38,28 @@ Citizen.CreateThread(function() drawPoly(inZone) end if inZone then - if Config.TopLeftInfoBox then + if Config.TopLeftInfoBox and not Config.pNotify then DisplayHelpText("~BLIP_INFO_ICON~ You are in a ~g~SafeZone") end - NetworkSetFriendlyFireOption(false) - DisablePlayerFiring(iPed, true) - SetCurrentPedWeapon(_source,GetHashKey("WEAPON_UNARMED"),true) + if Config.pNotify then + if notify then + notify = false + exports.pNotify:SendNotification({text = Config.pNotifyEnterMessage, type = Config.pNotifyEnterType, timeout = math.random(1000, 10000)}) + end + end + if not has_value(Config.WeaponBypass, GetSelectedPedWeapon(iPed)) then + SetCurrentPedWeapon(iPed, GetHashKey("WEAPON_UNARMED"), true) + DisablePlayerFiring(iPed, true) + SetWeaponDamageModifierThisFrame(GetSelectedPedWeapon(iPed), -1000) + end + if IsPedInAnyVehicle(iPed, false) then veh = GetVehiclePedIsUsing(iPed) SetEntityCanBeDamaged(veh, false) if Config.MaxVehicleSpeed then - SetVehicleMaxSpeed(veh, Config.MaxVehicleSpeed) + if not has_value(Config.MaxSpeedBypass, GetVehicleClass(veh)) then + SetVehicleMaxSpeed(veh, Config.MaxVehicleSpeed) + end end end SetEntityInvincible(iPed, true) @@ -54,6 +75,12 @@ Citizen.CreateThread(function() end hasRun = false else + if Config.pNotify then + if not notify then + notify = true + exports.pNotify:SendNotification({text = Config.pNotifyExitMessage, type = Config.pNotifyExitType, timeout = math.random(1000, 10000)}) + end + end if not hasRun then hasRun = true SetEntityInvincible(iPed, false) @@ -105,14 +132,14 @@ function drawPoly(isEntityZone) end - function _drawWall(p1, p2) +function _drawWall(p1, p2) local bottomLeft = vector3(p1[1], p1[2], p1[3] - 1.5) local topLeft = vector3(p1[1], p1[2], p1[3] + Config.BorderHight) local bottomRight = vector3(p2[1], p2[2], p2[3] - 1.5) local topRight = vector3(p2[1], p2[2], p2[3] + Config.BorderHight) - DrawPoly(bottomLeft,topLeft,bottomRight,0,255,0,48) - DrawPoly(topLeft,topRight,bottomRight,0,255,0,48) - DrawPoly(bottomRight,topRight,topLeft,0,255,0,48) - DrawPoly(bottomRight,topLeft,bottomLeft,0,255,0,48) - end \ No newline at end of file + DrawPoly(bottomLeft,topLeft,bottomRight,0,255,0,10) + DrawPoly(topLeft,topRight,bottomRight,0,255,0,10) + DrawPoly(bottomRight,topRight,topLeft,0,255,0,10) + DrawPoly(bottomRight,topLeft,bottomLeft,0,255,0,10) +end \ No newline at end of file diff --git a/resources/Safe-Zones/config.lua b/resources/Safe-Zones/config.lua index 502146d1d..d12e1e43e 100644 --- a/resources/Safe-Zones/config.lua +++ b/resources/Safe-Zones/config.lua @@ -3,7 +3,44 @@ Config = {} Config.TopLeftInfoBox = true Config.ShowBorder = false Config.BorderHight = 5 + Config.MaxVehicleSpeed = 20.00 -- set to false to disable. +Config.MaxSpeedBypass = { -- Vehicles classes added in this bypass will still be able to go faster than the max speed set above. + --0, -- Compacts + --1, -- Sedans + --2, -- SUVs + --3, -- Coupes + --4, -- Muscle + --5, -- Sports Classics + --6, -- Sports + --7, -- Super + --8, -- Motorcycles + --9, -- Off-road + --10, -- Industrial + --11, -- Utility + --12, -- Vans + --13, -- Cycles + --14, -- Boats + 15, -- Helicopters + 16, -- Planes + --17, -- Service + --18, -- Emergency + --19, -- Military + --20, -- Commercial + --21, -- Trains +} + +Config.WeaponBypass = { + --GetHashKey("WEAPON_PISTOL"), + GetHashKey("WEAPON_PISTOL"), +} + + +Config.pNotify = false +Config.pNotifyEnterMessage = "You have entered a safezone" +Config.pNotifyEnterType = "info" +Config.pNotifyExitMessage = "You have left a safezone" +Config.pNotifyExitType = "info" Config.Zones = { { @@ -226,4 +263,4 @@ Config.Zones = { -- Version checker for when i update :) -Config.versionCheck = "1.0.4" +Config.versionCheck = "1.0.8" diff --git a/resources/Safe-Zones/fxmanifest.lua b/resources/Safe-Zones/fxmanifest.lua index 91b2646d2..d228dfa79 100644 --- a/resources/Safe-Zones/fxmanifest.lua +++ b/resources/Safe-Zones/fxmanifest.lua @@ -1,7 +1,7 @@ -author 'JokeDevil' -description 'JD SafeZone (https://www.jokedevil.com)' -version '1.0.5' -url 'https://jokedevil.com' +author 'Prefech' +description 'JD SafeZone (https://www.prefech.com)' +version '1.0.8' +url 'https://prefech.com' -- Server Scripts diff --git a/resources/Safe-Zones/version.json b/resources/Safe-Zones/version.json index 7a8ca5923..d6dd86e46 100644 --- a/resources/Safe-Zones/version.json +++ b/resources/Safe-Zones/version.json @@ -1,5 +1,5 @@ { - "date": "Mar 11, 2021", - "version": "1.0.6", - "changelog": "Added option to limit vehicle speed inside a safezone." + "date": "Oct 7, 2021", + "version": "1.0.8", + "changelog": "Added:\n•Speed limit bypass option for vehicles classes." } diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/client.lua b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/client.lua index 2a10fec21..1b950a729 100644 --- a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/client.lua +++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/client.lua @@ -11,11 +11,11 @@ restrictedWeapons = { {"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 8 {"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 9 {"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 10 -{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 11 -{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 12 -{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 13 -{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 14 -{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 15 +{}, -- 11 +{}, -- 12 +{}, -- 13 +{}, -- 14 +{}, -- 15 } --[[ Weapon components list: https://wiki.rage.mp/index.php?title=Weapons_Components diff --git a/resources/[EGRP-Phone]/npwd/sv_npwd.log b/resources/[EGRP-Phone]/npwd/sv_npwd.log index e3b31be4f..6f12c4fc1 100644 --- a/resources/[EGRP-Phone]/npwd/sv_npwd.log +++ b/resources/[EGRP-Phone]/npwd/sv_npwd.log @@ -489,3 +489,297 @@ {"module":"twitter","message":"Twitter service started","level":"debug","timestamp":"2022-01-15T03:33:58.719Z"} {"module":"match","message":"Match service started","level":"debug","timestamp":"2022-01-15T03:33:58.720Z"} {"message":"Sucessfully started","level":"info","timestamp":"2022-01-15T03:34:36.751Z"} +{"module":"marketplace","message":"Marketplace service started","level":"debug","timestamp":"2022-01-15T06:00:04.095Z"} +{"module":"player","message":"Player Service started","level":"debug","timestamp":"2022-01-15T06:00:04.096Z"} +{"module":"calls","message":"Call service started","level":"debug","timestamp":"2022-01-15T06:00:04.097Z"} +{"module":"notes","message":"Notes service started","level":"debug","timestamp":"2022-01-15T06:00:04.098Z"} +{"module":"contact","message":"Contacts service started","level":"debug","timestamp":"2022-01-15T06:00:04.098Z"} +{"module":"photo","message":"Photo service started","level":"debug","timestamp":"2022-01-15T06:00:04.099Z"} +{"module":"messages","message":"Messages service started","level":"debug","timestamp":"2022-01-15T06:00:04.099Z"} +{"module":"twitter","message":"Twitter service started","level":"debug","timestamp":"2022-01-15T06:00:04.100Z"} +{"module":"match","message":"Match service started","level":"debug","timestamp":"2022-01-15T06:00:04.101Z"} +{"message":"Sucessfully started","level":"info","timestamp":"2022-01-15T06:00:10.386Z"} +{"module":"bridge","message":"[generatePhoneNumber] 286-796-4915","level":"debug","timestamp":"2022-01-15T09:11:37.533Z"} +{"module":"player","message":"New NPWD Player added through event (1) (steam:110000109c4740c)","level":"info","timestamp":"2022-01-15T09:11:37.536Z"} +{"module":"player","message":{"source":1,"_identifier":"steam:110000109c4740c","_phoneNumber":"286-796-4915","username":"vJack"},"level":"debug","timestamp":"2022-01-15T09:11:37.537Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-15T09:11:37.710Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T09:11:37.710Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-15T09:11:37.711Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T09:11:37.711Z"} +{"module":"twitter","message":"Creating default Twitter profile 2867964915 for steam:110000109c4740c","level":"info","timestamp":"2022-01-15T09:11:37.716Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:3f08ed87-b36f-4371-817c-9c8b72c70b0f (7.818ms), Data >>","level":"silly","timestamp":"2022-01-15T09:11:37.719Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-15T09:11:37.719Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:f5ec869b-f904-45ad-a516-c22507d347a5 (11.9935ms), Data >>","level":"silly","timestamp":"2022-01-15T09:11:37.722Z"} +{"module":"events","message":{"status":"ok","data":{"id":4,"profile_name":"2867964915","identifier":"steam:110000109c4740c","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-15T09:11:37.000Z","updatedAt":"2022-01-15T09:11:37.000Z"}},"level":"silly","timestamp":"2022-01-15T09:11:37.722Z"} +{"module":"events","message":"netPromise > npwd:fetchCalls > RequestObj","level":"silly","timestamp":"2022-01-15T09:25:59.071Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T09:25:59.071Z"} +{"module":"events","message":"Response Promise Event npwd:fetchCalls:77caf9ea-864a-4d38-9550-21207c59192a (3.5911ms), Data >>","level":"silly","timestamp":"2022-01-15T09:25:59.075Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-15T09:25:59.075Z"} +{"module":"events","message":"netPromise > npwd:getContacts > RequestObj","level":"silly","timestamp":"2022-01-15T09:25:59.226Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T09:25:59.226Z"} +{"module":"events","message":"Response Promise Event npwd:getContacts:525e5cac-1ff6-4200-a20a-ca9a50ca0f5d (3.7686ms), Data >>","level":"silly","timestamp":"2022-01-15T09:25:59.229Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-15T09:25:59.230Z"} +{"module":"events","message":"netPromise > phone:getMyProfile > RequestObj","level":"silly","timestamp":"2022-01-15T09:27:43.230Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T09:27:43.231Z"} +{"module":"match","message":"Creating default match profile 2867964915 for steam:110000109c4740c","level":"info","timestamp":"2022-01-15T09:27:43.235Z"} +{"module":"events","message":"Response Promise Event phone:getMyProfile:0f3e3916-31bb-4c1c-8648-94cf66cac5ae (7.2078ms), Data >>","level":"silly","timestamp":"2022-01-15T09:27:43.238Z"} +{"module":"events","message":{"status":"ok","data":{"id":2,"identifier":"steam:110000109c4740c","name":"2867964915","image":"https://upload.wikimedia.org/wikipedia/commons/a/ac/No_image_available.svg","bio":"","location":"","job":"","tags":"","createdAt":"2022-01-15T09:27:43.000Z","updatedAt":"2022-01-15T09:27:43.000Z","lastActive":1642238863,"tagList":[],"lastActiveFormatted":"Sat, 15 Jan 2022 09:27:43 GMT","viewed":false}},"level":"silly","timestamp":"2022-01-15T09:27:43.238Z"} +{"module":"events","message":"netPromise > phone:getMatchProfiles > RequestObj","level":"silly","timestamp":"2022-01-15T09:27:43.385Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T09:27:43.385Z"} +{"module":"events","message":"Response Promise Event phone:getMatchProfiles:ece196c4-7635-4305-a964-cb6258c7b75b (3.7037ms), Data >>","level":"silly","timestamp":"2022-01-15T09:27:43.389Z"} +{"module":"events","message":{"status":"ok","data":[{"id":1,"identifier":"steam:110000131ff8eae","name":"karen911","image":"","bio":"","location":"","job":"","tags":"","createdAt":"2022-01-14T23:48:11.000Z","updatedAt":"2022-01-14T23:48:40.000Z","lastActive":1642204120,"lastSeen":null,"tagList":[],"lastActiveFormatted":"Fri, 14 Jan 2022 23:48:40 GMT","viewed":false}]},"level":"silly","timestamp":"2022-01-15T09:27:43.389Z"} +{"module":"events","message":"netPromise > phone:saveLikes > RequestObj","level":"silly","timestamp":"2022-01-15T09:27:50.520Z"} +{"module":"events","message":{"source":1,"data":[{"id":1,"liked":false}]},"level":"silly","timestamp":"2022-01-15T09:27:50.520Z"} +{"module":"match","message":"Saving likes for identifier steam:110000109c4740c","level":"debug","timestamp":"2022-01-15T09:27:50.521Z"} +{"module":"events","message":"Response Promise Event phone:saveLikes:75859a0d-9bd7-47cd-97e9-ce83c17deb4d (3.6874ms), Data >>","level":"silly","timestamp":"2022-01-15T09:27:50.524Z"} +{"module":"events","message":{"status":"ok","data":false},"level":"silly","timestamp":"2022-01-15T09:27:50.524Z"} +{"module":"events","message":"netPromise > npwd:fetchTweets > RequestObj","level":"silly","timestamp":"2022-01-15T09:27:53.465Z"} +{"module":"events","message":{"source":1,"data":{"pageId":0}},"level":"silly","timestamp":"2022-01-15T09:27:53.465Z"} +{"module":"events","message":"Response Promise Event npwd:fetchTweets:eab69585-73f0-4ca6-ad50-25f2f855d850 (10.0718ms), Data >>","level":"silly","timestamp":"2022-01-15T09:27:53.475Z"} +{"module":"events","message":{"data":[{"id":5,"identifier":"steam:110000131ff8eae","profile_id":3,"profile_name":"1318129927","avatar_url":"https://i.file.glass/QrEvq.png","likes":0,"visible":1,"message":"fatbitch","images":"","isRetweet":false,"retweetId":null,"retweetProfileName":null,"retweetAvatarUrl":null,"isLiked":0,"isReported":0,"createdAt":"2022-01-14T23:50:16.000Z","updatedAt":"2022-01-14T23:50:16.000Z","seconds_since_tweet":34657,"isMine":false},{"id":4,"identifier":"steam:11000010e6980a7","profile_id":1,"profile_name":"Jacobee","avatar_url":"https://i.file.glass/QrEvq.png","likes":0,"visible":1,"message":"Nonce","images":"","isRetweet":false,"retweetId":null,"retweetProfileName":null,"retweetAvatarUrl":null,"isLiked":0,"isReported":0,"createdAt":"2022-01-14T23:46:42.000Z","updatedAt":"2022-01-14T23:46:42.000Z","seconds_since_tweet":34871,"isMine":false},{"id":3,"identifier":"steam:110000136d3d578","profile_id":2,"profile_name":"Choxie","avatar_url":"https://i.file.glass/QrEvq.png","likes":0,"visible":1,"message":"wdffadsfasd","images":"","isRetweet":false,"retweetId":null,"retweetProfileName":null,"retweetAvatarUrl":null,"isLiked":0,"isReported":0,"createdAt":"2022-01-14T23:46:22.000Z","updatedAt":"2022-01-14T23:46:22.000Z","seconds_since_tweet":34891,"isMine":false},{"id":2,"identifier":"steam:11000010e6980a7","profile_id":1,"profile_name":"Jacobee","avatar_url":"https://i.file.glass/QrEvq.png","likes":0,"visible":1,"message":"@0175399259 d","images":"","isRetweet":false,"retweetId":null,"retweetProfileName":null,"retweetAvatarUrl":null,"isLiked":0,"isReported":0,"createdAt":"2022-01-14T23:45:46.000Z","updatedAt":"2022-01-14T23:45:46.000Z","seconds_since_tweet":34927,"isMine":false},{"id":1,"identifier":"steam:11000010e6980a7","profile_id":1,"profile_name":"Jacobee","avatar_url":"https://i.file.glass/QrEvq.png","likes":0,"visible":1,"message":"Cum ??","images":"","isRetweet":false,"retweetId":null,"retweetProfileName":null,"retweetAvatarUrl":null,"isLiked":0,"isReported":0,"createdAt":"2022-01-14T23:45:29.000Z","updatedAt":"2022-01-14T23:45:29.000Z","seconds_since_tweet":34944,"isMine":false}],"status":"ok"},"level":"silly","timestamp":"2022-01-15T09:27:53.476Z"} +{"module":"events","message":"netPromise > npwd:FetchPhotos > RequestObj","level":"silly","timestamp":"2022-01-15T09:28:04.626Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T09:28:04.626Z"} +{"module":"events","message":"Response Promise Event npwd:FetchPhotos:35fa6b1c-8345-4bfb-9302-9d495a384a55 (3.4418ms), Data >>","level":"silly","timestamp":"2022-01-15T09:28:04.630Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-15T09:28:04.630Z"} +{"module":"events","message":"netPromise > npwd:UploadPhoto > RequestObj","level":"silly","timestamp":"2022-01-15T09:30:53.483Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T09:30:53.483Z"} +{"module":"events","message":"Response Promise Event npwd:UploadPhoto:cb3e9a10-49c3-420b-97b2-4c556e497b6c (0.4903ms), Data >>","level":"silly","timestamp":"2022-01-15T09:30:53.483Z"} +{"module":"events","message":{"status":"error","errorMsg":"DB_ERROR"},"level":"silly","timestamp":"2022-01-15T09:30:53.483Z"} +{"module":"photo","source":1,"level":"error","message":"Failed to upload photo, Column 'image' cannot be null","timestamp":"2022-01-15T09:30:53.486Z"} +{"module":"events","message":"Response Promise Event npwd:UploadPhoto:cb3e9a10-49c3-420b-97b2-4c556e497b6c (3.8475ms), Data >>","level":"silly","timestamp":"2022-01-15T09:30:53.487Z"} +{"module":"events","message":{"status":"error","errorMsg":"DB_ERROR"},"level":"silly","timestamp":"2022-01-15T09:30:53.487Z"} +{"module":"events","message":"netPromise > npwd:fetchAllListings > RequestObj","level":"silly","timestamp":"2022-01-15T09:31:15.139Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T09:31:15.139Z"} +{"module":"events","message":"Response Promise Event npwd:fetchAllListings:4693011d-f09c-438c-9a7b-098ffe3e5980 (3.5163ms), Data >>","level":"silly","timestamp":"2022-01-15T09:31:15.142Z"} +{"module":"events","message":{"data":[],"status":"ok"},"level":"silly","timestamp":"2022-01-15T09:31:15.143Z"} +{"module":"events","message":"netPromise > npwd:UploadPhoto > RequestObj","level":"silly","timestamp":"2022-01-15T09:34:04.412Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T09:34:04.412Z"} +{"module":"events","message":"Response Promise Event npwd:UploadPhoto:07042c75-7e09-4d0b-848a-6801f2c63364 (0.5319ms), Data >>","level":"silly","timestamp":"2022-01-15T09:34:04.413Z"} +{"module":"events","message":{"status":"error","errorMsg":"DB_ERROR"},"level":"silly","timestamp":"2022-01-15T09:34:04.413Z"} +{"module":"photo","source":1,"level":"error","message":"Failed to upload photo, Column 'image' cannot be null","timestamp":"2022-01-15T09:34:04.416Z"} +{"module":"events","message":"Response Promise Event npwd:UploadPhoto:07042c75-7e09-4d0b-848a-6801f2c63364 (3.8771ms), Data >>","level":"silly","timestamp":"2022-01-15T09:34:04.416Z"} +{"module":"events","message":{"status":"error","errorMsg":"DB_ERROR"},"level":"silly","timestamp":"2022-01-15T09:34:04.416Z"} +{"module":"player","message":"Unloaded NPWD Player, source: (1)","level":"info","timestamp":"2022-01-15T10:16:42.926Z"} +{"module":"player","message":"New NPWD Player added through event (2) (steam:110000109c4740c)","level":"info","timestamp":"2022-01-15T12:24:00.603Z"} +{"module":"player","message":{"source":2,"_identifier":"steam:110000109c4740c","_phoneNumber":"286-796-4915","username":"vJack"},"level":"debug","timestamp":"2022-01-15T12:24:00.603Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-15T12:24:00.805Z"} +{"module":"events","message":{"source":2,"data":null},"level":"silly","timestamp":"2022-01-15T12:24:00.805Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-15T12:24:00.806Z"} +{"module":"events","message":{"source":2,"data":null},"level":"silly","timestamp":"2022-01-15T12:24:00.806Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:54d84378-bdc0-40da-b9ab-e70b1b3a4444 (3.8049ms), Data >>","level":"silly","timestamp":"2022-01-15T12:24:00.809Z"} +{"module":"events","message":{"status":"ok","data":{"id":4,"profile_name":"2867964915","identifier":"steam:110000109c4740c","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-15T09:11:37.000Z","updatedAt":"2022-01-15T09:11:37.000Z"}},"level":"silly","timestamp":"2022-01-15T12:24:00.809Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:f74d49cd-b218-49b5-b7e0-4787579c2446 (3.8911ms), Data >>","level":"silly","timestamp":"2022-01-15T12:24:00.810Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-15T12:24:00.810Z"} +{"module":"player","message":"Unloaded NPWD Player, source: (2)","level":"info","timestamp":"2022-01-15T14:00:47.627Z"} +{"module":"marketplace","message":"Marketplace service started","level":"debug","timestamp":"2022-01-15T15:06:57.155Z"} +{"module":"player","message":"Player Service started","level":"debug","timestamp":"2022-01-15T15:06:57.156Z"} +{"module":"calls","message":"Call service started","level":"debug","timestamp":"2022-01-15T15:06:57.157Z"} +{"module":"notes","message":"Notes service started","level":"debug","timestamp":"2022-01-15T15:06:57.158Z"} +{"module":"contact","message":"Contacts service started","level":"debug","timestamp":"2022-01-15T15:06:57.158Z"} +{"module":"photo","message":"Photo service started","level":"debug","timestamp":"2022-01-15T15:06:57.159Z"} +{"module":"messages","message":"Messages service started","level":"debug","timestamp":"2022-01-15T15:06:57.159Z"} +{"module":"twitter","message":"Twitter service started","level":"debug","timestamp":"2022-01-15T15:06:57.160Z"} +{"module":"match","message":"Match service started","level":"debug","timestamp":"2022-01-15T15:06:57.161Z"} +{"message":"Sucessfully started","level":"info","timestamp":"2022-01-15T15:08:08.672Z"} +{"module":"bridge","message":"[generatePhoneNumber] 361-565-1287","level":"debug","timestamp":"2022-01-15T19:39:00.298Z"} +{"module":"player","message":"New NPWD Player added through event (1) (steam:11000013b8280e6)","level":"info","timestamp":"2022-01-15T19:39:00.304Z"} +{"module":"player","message":{"source":1,"_identifier":"steam:11000013b8280e6","_phoneNumber":"361-565-1287","username":"Dali"},"level":"debug","timestamp":"2022-01-15T19:39:00.305Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-15T19:39:00.625Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T19:39:00.626Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-15T19:39:00.627Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-15T19:39:00.627Z"} +{"module":"twitter","message":"Creating default Twitter profile 3615651287 for steam:11000013b8280e6","level":"info","timestamp":"2022-01-15T19:39:00.638Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:d25d3c76-2d23-412b-8872-bb0f7d9faa13 (14.532ms), Data >>","level":"silly","timestamp":"2022-01-15T19:39:00.642Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-15T19:39:00.642Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:aa560536-d052-45fe-a1fa-a0e4ccffdbcc (19.3179ms), Data >>","level":"silly","timestamp":"2022-01-15T19:39:00.645Z"} +{"module":"events","message":{"status":"ok","data":{"id":5,"profile_name":"3615651287","identifier":"steam:11000013b8280e6","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-15T19:39:00.000Z","updatedAt":"2022-01-15T19:39:00.000Z"}},"level":"silly","timestamp":"2022-01-15T19:39:00.645Z"} +{"module":"bridge","message":"[generatePhoneNumber] 942-547-7775","level":"debug","timestamp":"2022-01-15T19:39:15.873Z"} +{"module":"player","message":"New NPWD Player added through event (2) (steam:1100001433a3fc2)","level":"info","timestamp":"2022-01-15T19:39:15.876Z"} +{"module":"player","message":{"source":2,"_identifier":"steam:1100001433a3fc2","_phoneNumber":"942-547-7775","username":"DurakiiPR"},"level":"debug","timestamp":"2022-01-15T19:39:15.876Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-15T19:39:16.172Z"} +{"module":"events","message":{"source":2,"data":null},"level":"silly","timestamp":"2022-01-15T19:39:16.172Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-15T19:39:16.173Z"} +{"module":"events","message":{"source":2,"data":null},"level":"silly","timestamp":"2022-01-15T19:39:16.173Z"} +{"module":"twitter","message":"Creating default Twitter profile 9425477775 for steam:1100001433a3fc2","level":"info","timestamp":"2022-01-15T19:39:16.178Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:9b648be5-c908-49dd-9c40-680a99c5f5ca (6.0375ms), Data >>","level":"silly","timestamp":"2022-01-15T19:39:16.179Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-15T19:39:16.179Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:b60f30aa-9e13-4feb-b687-65ccc829f8f4 (13.1788ms), Data >>","level":"silly","timestamp":"2022-01-15T19:39:16.185Z"} +{"module":"events","message":{"status":"ok","data":{"id":6,"profile_name":"9425477775","identifier":"steam:1100001433a3fc2","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-15T19:39:16.000Z","updatedAt":"2022-01-15T19:39:16.000Z"}},"level":"silly","timestamp":"2022-01-15T19:39:16.185Z"} +{"module":"player","message":"Unloaded NPWD Player, source: (1)","level":"info","timestamp":"2022-01-15T19:42:44.613Z"} +{"module":"events","message":"netPromise > npwd:fetchAllListings > RequestObj","level":"silly","timestamp":"2022-01-15T19:42:45.016Z"} +{"module":"events","message":{"source":2,"data":null},"level":"silly","timestamp":"2022-01-15T19:42:45.016Z"} +{"module":"events","message":"Response Promise Event npwd:fetchAllListings:9142264a-8f7b-4145-aec6-1c02271b76e6 (4.7445ms), Data >>","level":"silly","timestamp":"2022-01-15T19:42:45.021Z"} +{"module":"events","message":{"data":[],"status":"ok"},"level":"silly","timestamp":"2022-01-15T19:42:45.021Z"} +{"module":"player","message":"New NPWD Player added through event (3) (steam:11000013b8280e6)","level":"info","timestamp":"2022-01-15T19:44:52.637Z"} +{"module":"player","message":{"source":3,"_identifier":"steam:11000013b8280e6","_phoneNumber":"361-565-1287","username":"Dali"},"level":"debug","timestamp":"2022-01-15T19:44:52.637Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-15T19:44:52.936Z"} +{"module":"events","message":{"source":3,"data":null},"level":"silly","timestamp":"2022-01-15T19:44:52.936Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-15T19:44:52.937Z"} +{"module":"events","message":{"source":3,"data":null},"level":"silly","timestamp":"2022-01-15T19:44:52.937Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:2e4b6166-9585-4d9c-8e16-a14f27887240 (6.3547ms), Data >>","level":"silly","timestamp":"2022-01-15T19:44:52.942Z"} +{"module":"events","message":{"status":"ok","data":{"id":5,"profile_name":"3615651287","identifier":"steam:11000013b8280e6","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-15T19:39:00.000Z","updatedAt":"2022-01-15T19:39:00.000Z"}},"level":"silly","timestamp":"2022-01-15T19:44:52.943Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:0b08d39a-bc55-49b9-aeec-f780e3679921 (6.5036ms), Data >>","level":"silly","timestamp":"2022-01-15T19:44:52.943Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-15T19:44:52.944Z"} +{"module":"player","message":"Unloaded NPWD Player, source: (2)","level":"info","timestamp":"2022-01-15T20:28:06.479Z"} +{"module":"events","message":"netPromise > npwd:fetchAllListings > RequestObj","level":"silly","timestamp":"2022-01-15T20:28:06.758Z"} +{"module":"events","message":{"source":3,"data":null},"level":"silly","timestamp":"2022-01-15T20:28:06.758Z"} +{"module":"events","message":"Response Promise Event npwd:fetchAllListings:e340676f-e79b-4242-95ed-8580de8e6459 (3.2397ms), Data >>","level":"silly","timestamp":"2022-01-15T20:28:06.761Z"} +{"module":"events","message":{"data":[],"status":"ok"},"level":"silly","timestamp":"2022-01-15T20:28:06.761Z"} +{"module":"player","message":"New NPWD Player added through event (4) (steam:1100001433a3fc2)","level":"info","timestamp":"2022-01-15T20:29:33.282Z"} +{"module":"player","message":{"source":4,"_identifier":"steam:1100001433a3fc2","_phoneNumber":"942-547-7775","username":"DurakiiPR"},"level":"debug","timestamp":"2022-01-15T20:29:33.283Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-15T20:29:33.586Z"} +{"module":"events","message":{"source":4,"data":null},"level":"silly","timestamp":"2022-01-15T20:29:33.586Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-15T20:29:33.587Z"} +{"module":"events","message":{"source":4,"data":null},"level":"silly","timestamp":"2022-01-15T20:29:33.587Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:baae6154-027e-47e4-953e-1583843399ae (3.8948ms), Data >>","level":"silly","timestamp":"2022-01-15T20:29:33.590Z"} +{"module":"events","message":{"status":"ok","data":{"id":6,"profile_name":"9425477775","identifier":"steam:1100001433a3fc2","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-15T19:39:16.000Z","updatedAt":"2022-01-15T19:39:16.000Z"}},"level":"silly","timestamp":"2022-01-15T20:29:33.590Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:fc3ed622-a468-4134-bc04-5f11cb241ad3 (4.0718ms), Data >>","level":"silly","timestamp":"2022-01-15T20:29:33.591Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-15T20:29:33.591Z"} +{"module":"player","message":"Unloaded NPWD Player, source: (4)","level":"info","timestamp":"2022-01-15T20:36:33.268Z"} +{"module":"player","message":"Unloaded NPWD Player, source: (3)","level":"info","timestamp":"2022-01-15T20:36:40.165Z"} +{"module":"player","message":"New NPWD Player added through event (5) (steam:1100001433a3fc2)","level":"info","timestamp":"2022-01-15T22:10:10.779Z"} +{"module":"player","message":{"source":5,"_identifier":"steam:1100001433a3fc2","_phoneNumber":"942-547-7775","username":"DurakiiPR"},"level":"debug","timestamp":"2022-01-15T22:10:10.779Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-15T22:10:11.251Z"} +{"module":"events","message":{"source":5,"data":null},"level":"silly","timestamp":"2022-01-15T22:10:11.251Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-15T22:10:11.252Z"} +{"module":"events","message":{"source":5,"data":null},"level":"silly","timestamp":"2022-01-15T22:10:11.252Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:d0fa56d6-385f-47b9-8294-fb2ef8b7952b (5.3665ms), Data >>","level":"silly","timestamp":"2022-01-15T22:10:11.256Z"} +{"module":"events","message":{"status":"ok","data":{"id":6,"profile_name":"9425477775","identifier":"steam:1100001433a3fc2","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-15T19:39:16.000Z","updatedAt":"2022-01-15T19:39:16.000Z"}},"level":"silly","timestamp":"2022-01-15T22:10:11.256Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:3fdcf9f9-7737-467b-b6c8-6ccc189ff4d8 (4.6151ms), Data >>","level":"silly","timestamp":"2022-01-15T22:10:11.257Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-15T22:10:11.257Z"} +{"module":"player","message":"Unloaded NPWD Player, source: (5)","level":"info","timestamp":"2022-01-15T22:51:39.185Z"} +{"module":"player","message":"New NPWD Player added through event (6) (steam:110000131ff8eae)","level":"info","timestamp":"2022-01-15T23:53:27.355Z"} +{"module":"player","message":{"source":6,"_identifier":"steam:110000131ff8eae","_phoneNumber":"131-812-9927","username":"Max Rodriguez"},"level":"debug","timestamp":"2022-01-15T23:53:27.356Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-15T23:53:27.657Z"} +{"module":"events","message":{"source":6,"data":null},"level":"silly","timestamp":"2022-01-15T23:53:27.658Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-15T23:53:27.658Z"} +{"module":"events","message":{"source":6,"data":null},"level":"silly","timestamp":"2022-01-15T23:53:27.659Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:7b8a63d3-4d2f-476a-860f-0de6fdde1a04 (5.2101ms), Data >>","level":"silly","timestamp":"2022-01-15T23:53:27.663Z"} +{"module":"events","message":{"status":"ok","data":{"id":3,"profile_name":"1318129927","identifier":"steam:110000131ff8eae","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-14T23:43:06.000Z","updatedAt":"2022-01-14T23:43:06.000Z"}},"level":"silly","timestamp":"2022-01-15T23:53:27.663Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:cce5569e-100a-4bbc-b856-0f6080e685dc (4.8192ms), Data >>","level":"silly","timestamp":"2022-01-15T23:53:27.663Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-15T23:53:27.663Z"} +{"module":"player","message":"Unloaded NPWD Player, source: (6)","level":"info","timestamp":"2022-01-16T00:37:21.982Z"} +{"module":"player","message":"New NPWD Player added through event (7) (steam:1100001433a3fc2)","level":"info","timestamp":"2022-01-16T01:58:03.762Z"} +{"module":"player","message":{"source":7,"_identifier":"steam:1100001433a3fc2","_phoneNumber":"942-547-7775","username":"DurakiiPR"},"level":"debug","timestamp":"2022-01-16T01:58:03.762Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-16T01:58:04.067Z"} +{"module":"events","message":{"source":7,"data":null},"level":"silly","timestamp":"2022-01-16T01:58:04.068Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-16T01:58:04.068Z"} +{"module":"events","message":{"source":7,"data":null},"level":"silly","timestamp":"2022-01-16T01:58:04.068Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:2b871a32-fb00-4712-8578-d1965bc07cd5 (4.1093ms), Data >>","level":"silly","timestamp":"2022-01-16T01:58:04.071Z"} +{"module":"events","message":{"status":"ok","data":{"id":6,"profile_name":"9425477775","identifier":"steam:1100001433a3fc2","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-15T19:39:16.000Z","updatedAt":"2022-01-15T19:39:16.000Z"}},"level":"silly","timestamp":"2022-01-16T01:58:04.072Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:0874a2e0-3f47-48c9-bda8-e48317f158a8 (4.1554ms), Data >>","level":"silly","timestamp":"2022-01-16T01:58:04.072Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-16T01:58:04.072Z"} +{"module":"player","message":"New NPWD Player added through event (8) (steam:11000013b8280e6)","level":"info","timestamp":"2022-01-16T02:01:38.131Z"} +{"module":"player","message":{"source":8,"_identifier":"steam:11000013b8280e6","_phoneNumber":"361-565-1287","username":"Dali"},"level":"debug","timestamp":"2022-01-16T02:01:38.131Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-16T02:01:38.383Z"} +{"module":"events","message":{"source":8,"data":null},"level":"silly","timestamp":"2022-01-16T02:01:38.383Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-16T02:01:38.384Z"} +{"module":"events","message":{"source":8,"data":null},"level":"silly","timestamp":"2022-01-16T02:01:38.384Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:8e5213cc-e601-4cd7-bab4-0bdbc99bfaf6 (4.7884ms), Data >>","level":"silly","timestamp":"2022-01-16T02:01:38.387Z"} +{"module":"events","message":{"status":"ok","data":{"id":5,"profile_name":"3615651287","identifier":"steam:11000013b8280e6","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-15T19:39:00.000Z","updatedAt":"2022-01-15T19:39:00.000Z"}},"level":"silly","timestamp":"2022-01-16T02:01:38.388Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:a5e9c364-0791-4980-9499-cd40c078af7b (4.4912ms), Data >>","level":"silly","timestamp":"2022-01-16T02:01:38.388Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-16T02:01:38.388Z"} +{"module":"player","message":"Unloaded NPWD Player, source: (8)","level":"info","timestamp":"2022-01-16T03:40:44.088Z"} +{"module":"player","message":"Unloaded NPWD Player, source: (7)","level":"info","timestamp":"2022-01-16T03:40:48.962Z"} +{"module":"marketplace","message":"Marketplace service started","level":"debug","timestamp":"2022-01-16T06:00:27.623Z"} +{"module":"player","message":"Player Service started","level":"debug","timestamp":"2022-01-16T06:00:27.624Z"} +{"module":"calls","message":"Call service started","level":"debug","timestamp":"2022-01-16T06:00:27.625Z"} +{"module":"notes","message":"Notes service started","level":"debug","timestamp":"2022-01-16T06:00:27.625Z"} +{"module":"contact","message":"Contacts service started","level":"debug","timestamp":"2022-01-16T06:00:27.626Z"} +{"module":"photo","message":"Photo service started","level":"debug","timestamp":"2022-01-16T06:00:27.626Z"} +{"module":"messages","message":"Messages service started","level":"debug","timestamp":"2022-01-16T06:00:27.627Z"} +{"module":"twitter","message":"Twitter service started","level":"debug","timestamp":"2022-01-16T06:00:27.628Z"} +{"module":"match","message":"Match service started","level":"debug","timestamp":"2022-01-16T06:00:27.628Z"} +{"message":"Sucessfully started","level":"info","timestamp":"2022-01-16T06:01:32.450Z"} +{"module":"marketplace","message":"Marketplace service started","level":"debug","timestamp":"2022-01-16T15:40:42.462Z"} +{"module":"player","message":"Player Service started","level":"debug","timestamp":"2022-01-16T15:40:42.463Z"} +{"module":"calls","message":"Call service started","level":"debug","timestamp":"2022-01-16T15:40:42.464Z"} +{"module":"notes","message":"Notes service started","level":"debug","timestamp":"2022-01-16T15:40:42.464Z"} +{"module":"contact","message":"Contacts service started","level":"debug","timestamp":"2022-01-16T15:40:42.465Z"} +{"module":"photo","message":"Photo service started","level":"debug","timestamp":"2022-01-16T15:40:42.465Z"} +{"module":"messages","message":"Messages service started","level":"debug","timestamp":"2022-01-16T15:40:42.466Z"} +{"module":"twitter","message":"Twitter service started","level":"debug","timestamp":"2022-01-16T15:40:42.467Z"} +{"module":"match","message":"Match service started","level":"debug","timestamp":"2022-01-16T15:40:42.467Z"} +{"message":"Sucessfully started","level":"info","timestamp":"2022-01-16T15:41:19.065Z"} +{"module":"player","message":"New NPWD Player added through event (1) (steam:11000010e6980a7)","level":"info","timestamp":"2022-01-16T15:43:11.760Z"} +{"module":"player","message":{"source":1,"_identifier":"steam:11000010e6980a7","_phoneNumber":"017-539-9259","username":"ThatGuyJacobee"},"level":"debug","timestamp":"2022-01-16T15:43:11.760Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-16T15:43:11.902Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-16T15:43:11.902Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-16T15:43:11.908Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-16T15:43:11.908Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:4ba8fd4d-e49c-415e-9a83-9c4ea5970364 (21.9033ms), Data >>","level":"silly","timestamp":"2022-01-16T15:43:11.924Z"} +{"module":"events","message":{"status":"ok","data":{"id":1,"profile_name":"Jacobee","identifier":"steam:11000010e6980a7","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-14T23:38:13.000Z","updatedAt":"2022-01-14T23:46:34.000Z"}},"level":"silly","timestamp":"2022-01-16T15:43:11.924Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:44428090-bf84-430f-a3c4-1f85285bced0 (17.4045ms), Data >>","level":"silly","timestamp":"2022-01-16T15:43:11.925Z"} +{"module":"events","message":{"status":"ok","data":[{"unread":null,"phoneNumber":"148-688-9109","conversation_id":"017-539-9259+148-688-9109","user_identifier":"017-539-9259"}]},"level":"silly","timestamp":"2022-01-16T15:43:11.926Z"} +{"module":"events","message":"netPromise > npwd:fetchCalls > RequestObj","level":"silly","timestamp":"2022-01-16T15:43:36.859Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-16T15:43:36.860Z"} +{"module":"events","message":"Response Promise Event npwd:fetchCalls:55dc7478-6b03-48a3-b2e2-2892479cfa25 (8.7133ms), Data >>","level":"silly","timestamp":"2022-01-16T15:43:36.868Z"} +{"module":"events","message":{"status":"ok","data":[{"id":4,"identifier":"9a1014b2-a1a2-4052-800d-b25dc5a12776","transmitter":"131-812-9927","receiver":"017-539-9259","is_accepted":1,"start":"1642204274","end":"1642205365"},{"id":3,"identifier":"e07d0551-ce32-4e8d-a372-5311fdc0e062","transmitter":"131-812-9927","receiver":"017-539-9259","is_accepted":1,"start":"1642204045","end":"1642204080"},{"id":2,"identifier":"1255d851-ae15-4e56-b3aa-de99b1cfe86f","transmitter":"017-539-9259","receiver":"148-688-9109","is_accepted":1,"start":"1642203739","end":"1642203757"},{"id":1,"identifier":"05c8bc84-c362-4673-9a2f-9cd911c566ad","transmitter":"148-688-9109","receiver":"017-539-9259","is_accepted":1,"start":"1642203654","end":"1642203681"}]},"level":"silly","timestamp":"2022-01-16T15:43:36.869Z"} +{"module":"events","message":"netPromise > npwd:getContacts > RequestObj","level":"silly","timestamp":"2022-01-16T15:43:36.961Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-16T15:43:36.961Z"} +{"module":"events","message":"Response Promise Event npwd:getContacts:cd5ba2cd-e4e3-45df-b68f-daef6596e9a5 (8.0037ms), Data >>","level":"silly","timestamp":"2022-01-16T15:43:36.969Z"} +{"module":"events","message":{"status":"ok","data":[{"id":1,"identifier":"steam:11000010e6980a7","avatar":"","number":"148-688-9109","display":"Choxie"}]},"level":"silly","timestamp":"2022-01-16T15:43:36.969Z"} +{"module":"events","message":"netPromise > npwd:beginCall > RequestObj","level":"silly","timestamp":"2022-01-16T15:43:45.917Z"} +{"module":"events","message":{"source":1,"data":{"receiverNumber":"131-812-9927"}},"level":"silly","timestamp":"2022-01-16T15:43:45.918Z"} +{"module":"events","message":"Response Promise Event npwd:beginCall:86061dec-ceb4-4f77-93f1-2536032b4896 (5.0516ms), Data >>","level":"silly","timestamp":"2022-01-16T15:43:45.922Z"} +{"module":"events","message":{"status":"ok","data":{"is_accepted":false,"transmitter":"017-539-9259","isTransmitter":true,"receiver":"131-812-9927","isUnavailable":true}},"level":"silly","timestamp":"2022-01-16T15:43:45.923Z"} +{"module":"events","message":"netPromise > npwd:endCall > RequestObj","level":"silly","timestamp":"2022-01-16T15:43:50.453Z"} +{"module":"events","message":{"source":1,"data":{"isTransmitter":true,"transmitterNumber":"017-539-9259"}},"level":"silly","timestamp":"2022-01-16T15:43:50.453Z"} +{"module":"calls","message":"Call with transmitter number 017-539-9259 does not exist in current calls map!","level":"error","timestamp":"2022-01-16T15:43:50.454Z"} +{"module":"events","message":"Response Promise Event npwd:endCall:34dabcc9-a2cb-49b6-8c35-53da8448444a (0.9987ms), Data >>","level":"silly","timestamp":"2022-01-16T15:43:50.454Z"} +{"module":"events","message":{"status":"error","errorMsg":"DOES_NOT_EXIST"},"level":"silly","timestamp":"2022-01-16T15:43:50.454Z"} +{"module":"events","message":"netPromise > npwd:fetchAllNotes > RequestObj","level":"silly","timestamp":"2022-01-16T15:43:54.826Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-16T15:43:54.827Z"} +{"module":"events","message":"Response Promise Event npwd:fetchAllNotes:34faa11c-ad03-4ea9-85a2-e45e1a36b00e (7.7909ms), Data >>","level":"silly","timestamp":"2022-01-16T15:43:54.834Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-16T15:43:54.834Z"} +{"module":"events","message":"netPromise > npwd:fetchTweets > RequestObj","level":"silly","timestamp":"2022-01-16T15:44:00.124Z"} +{"module":"events","message":{"source":1,"data":{"pageId":0}},"level":"silly","timestamp":"2022-01-16T15:44:00.124Z"} +{"module":"events","message":"Response Promise Event npwd:fetchTweets:f4e5b3f6-38b4-4d87-8b83-83e7bb499160 (22.8926ms), Data >>","level":"silly","timestamp":"2022-01-16T15:44:00.147Z"} +{"module":"events","message":{"data":[{"id":5,"identifier":"steam:110000131ff8eae","profile_id":3,"profile_name":"1318129927","avatar_url":"https://i.file.glass/QrEvq.png","likes":0,"visible":1,"message":"fatbitch","images":"","isRetweet":false,"retweetId":null,"retweetProfileName":null,"retweetAvatarUrl":null,"isLiked":0,"isReported":0,"createdAt":"2022-01-14T23:50:16.000Z","updatedAt":"2022-01-14T23:50:16.000Z","seconds_since_tweet":143624,"isMine":false},{"id":4,"identifier":"steam:11000010e6980a7","profile_id":1,"profile_name":"Jacobee","avatar_url":"https://i.file.glass/QrEvq.png","likes":0,"visible":1,"message":"Nonce","images":"","isRetweet":false,"retweetId":null,"retweetProfileName":null,"retweetAvatarUrl":null,"isLiked":0,"isReported":0,"createdAt":"2022-01-14T23:46:42.000Z","updatedAt":"2022-01-14T23:46:42.000Z","seconds_since_tweet":143838,"isMine":true},{"id":3,"identifier":"steam:110000136d3d578","profile_id":2,"profile_name":"Choxie","avatar_url":"https://i.file.glass/QrEvq.png","likes":0,"visible":1,"message":"wdffadsfasd","images":"","isRetweet":false,"retweetId":null,"retweetProfileName":null,"retweetAvatarUrl":null,"isLiked":0,"isReported":0,"createdAt":"2022-01-14T23:46:22.000Z","updatedAt":"2022-01-14T23:46:22.000Z","seconds_since_tweet":143858,"isMine":false},{"id":2,"identifier":"steam:11000010e6980a7","profile_id":1,"profile_name":"Jacobee","avatar_url":"https://i.file.glass/QrEvq.png","likes":0,"visible":1,"message":"@0175399259 d","images":"","isRetweet":false,"retweetId":null,"retweetProfileName":null,"retweetAvatarUrl":null,"isLiked":0,"isReported":0,"createdAt":"2022-01-14T23:45:46.000Z","updatedAt":"2022-01-14T23:45:46.000Z","seconds_since_tweet":143894,"isMine":true},{"id":1,"identifier":"steam:11000010e6980a7","profile_id":1,"profile_name":"Jacobee","avatar_url":"https://i.file.glass/QrEvq.png","likes":0,"visible":1,"message":"Cum ??","images":"","isRetweet":false,"retweetId":null,"retweetProfileName":null,"retweetAvatarUrl":null,"isLiked":1,"isReported":0,"createdAt":"2022-01-14T23:45:29.000Z","updatedAt":"2022-01-14T23:45:29.000Z","seconds_since_tweet":143911,"isMine":true}],"status":"ok"},"level":"silly","timestamp":"2022-01-16T15:44:00.147Z"} +{"module":"events","message":"netPromise > npwd:toggleLike > RequestObj","level":"silly","timestamp":"2022-01-16T15:44:02.946Z"} +{"module":"events","message":{"source":1,"data":{"tweetId":5}},"level":"silly","timestamp":"2022-01-16T15:44:02.946Z"} +{"module":"events","message":"Response Promise Event npwd:toggleLike:7e6a692b-c896-459f-af20-a99b02680d1c (8.0314ms), Data >>","level":"silly","timestamp":"2022-01-16T15:44:02.954Z"} +{"module":"events","message":{"status":"ok"},"level":"silly","timestamp":"2022-01-16T15:44:02.954Z"} +{"module":"player","message":"Unloaded NPWD Player, source: (1)","level":"info","timestamp":"2022-01-16T15:45:04.696Z"} +{"module":"marketplace","message":"Marketplace service started","level":"debug","timestamp":"2022-01-16T15:45:48.844Z"} +{"module":"player","message":"Player Service started","level":"debug","timestamp":"2022-01-16T15:45:48.845Z"} +{"module":"calls","message":"Call service started","level":"debug","timestamp":"2022-01-16T15:45:48.846Z"} +{"module":"notes","message":"Notes service started","level":"debug","timestamp":"2022-01-16T15:45:48.846Z"} +{"module":"contact","message":"Contacts service started","level":"debug","timestamp":"2022-01-16T15:45:48.847Z"} +{"module":"photo","message":"Photo service started","level":"debug","timestamp":"2022-01-16T15:45:48.847Z"} +{"module":"messages","message":"Messages service started","level":"debug","timestamp":"2022-01-16T15:45:48.848Z"} +{"module":"twitter","message":"Twitter service started","level":"debug","timestamp":"2022-01-16T15:45:48.849Z"} +{"module":"match","message":"Match service started","level":"debug","timestamp":"2022-01-16T15:45:48.849Z"} +{"message":"Sucessfully started","level":"info","timestamp":"2022-01-16T15:47:07.039Z"} +{"module":"marketplace","message":"Marketplace service started","level":"debug","timestamp":"2022-01-16T15:47:22.177Z"} +{"module":"player","message":"Player Service started","level":"debug","timestamp":"2022-01-16T15:47:22.178Z"} +{"module":"calls","message":"Call service started","level":"debug","timestamp":"2022-01-16T15:47:22.179Z"} +{"module":"notes","message":"Notes service started","level":"debug","timestamp":"2022-01-16T15:47:22.179Z"} +{"module":"contact","message":"Contacts service started","level":"debug","timestamp":"2022-01-16T15:47:22.180Z"} +{"module":"photo","message":"Photo service started","level":"debug","timestamp":"2022-01-16T15:47:22.180Z"} +{"module":"messages","message":"Messages service started","level":"debug","timestamp":"2022-01-16T15:47:22.181Z"} +{"module":"twitter","message":"Twitter service started","level":"debug","timestamp":"2022-01-16T15:47:22.182Z"} +{"module":"match","message":"Match service started","level":"debug","timestamp":"2022-01-16T15:47:22.182Z"} +{"message":"Sucessfully started","level":"info","timestamp":"2022-01-16T15:47:30.718Z"} +{"module":"player","message":"New NPWD Player added through event (1) (steam:11000010e6980a7)","level":"info","timestamp":"2022-01-16T15:48:33.637Z"} +{"module":"player","message":{"source":1,"_identifier":"steam:11000010e6980a7","_phoneNumber":"017-539-9259","username":"ThatGuyJacobee"},"level":"debug","timestamp":"2022-01-16T15:48:33.638Z"} +{"module":"events","message":"netPromise > npwd:getOrCreateTwitterProfile > RequestObj","level":"silly","timestamp":"2022-01-16T15:48:33.760Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-16T15:48:33.760Z"} +{"module":"events","message":"netPromise > npwd:fetchMessageGroups > RequestObj","level":"silly","timestamp":"2022-01-16T15:48:33.766Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-16T15:48:33.766Z"} +{"module":"events","message":"Response Promise Event npwd:getOrCreateTwitterProfile:891224c9-db5a-4fd3-8d4b-6b7ce5f9e5bb (30.2919ms), Data >>","level":"silly","timestamp":"2022-01-16T15:48:33.790Z"} +{"module":"events","message":{"status":"ok","data":{"id":1,"profile_name":"Jacobee","identifier":"steam:11000010e6980a7","avatar_url":"https://i.file.glass/QrEvq.png","createdAt":"2022-01-14T23:38:13.000Z","updatedAt":"2022-01-14T23:46:34.000Z"}},"level":"silly","timestamp":"2022-01-16T15:48:33.791Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessageGroups:055ed153-01dd-4f70-8350-429dac946bbd (26.5974ms), Data >>","level":"silly","timestamp":"2022-01-16T15:48:33.793Z"} +{"module":"events","message":{"status":"ok","data":[{"unread":null,"phoneNumber":"148-688-9109","conversation_id":"017-539-9259+148-688-9109","user_identifier":"017-539-9259"}]},"level":"silly","timestamp":"2022-01-16T15:48:33.793Z"} +{"module":"events","message":"netPromise > npwd:FetchPhotos > RequestObj","level":"silly","timestamp":"2022-01-16T16:03:49.601Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-16T16:03:49.602Z"} +{"module":"events","message":"Response Promise Event npwd:FetchPhotos:8c3d4469-278b-4955-95e4-18ec77c7d1d9 (8.3168ms), Data >>","level":"silly","timestamp":"2022-01-16T16:03:49.610Z"} +{"module":"events","message":{"status":"ok","data":[]},"level":"silly","timestamp":"2022-01-16T16:03:49.610Z"} +{"module":"events","message":"netPromise > npwd:getContacts > RequestObj","level":"silly","timestamp":"2022-01-16T16:03:53.487Z"} +{"module":"events","message":{"source":1,"data":null},"level":"silly","timestamp":"2022-01-16T16:03:53.488Z"} +{"module":"events","message":"Response Promise Event npwd:getContacts:86b173df-bade-4d65-b82a-666a02b5eb60 (4.0723ms), Data >>","level":"silly","timestamp":"2022-01-16T16:03:53.491Z"} +{"module":"events","message":{"status":"ok","data":[{"id":1,"identifier":"steam:11000010e6980a7","avatar":"","number":"148-688-9109","display":"Choxie"}]},"level":"silly","timestamp":"2022-01-16T16:03:53.492Z"} +{"module":"events","message":"netPromise > npwd:fetchMessages > RequestObj","level":"silly","timestamp":"2022-01-16T16:03:54.323Z"} +{"module":"events","message":{"source":1,"data":{"conversationId":"017-539-9259+148-688-9109","page":0}},"level":"silly","timestamp":"2022-01-16T16:03:54.324Z"} +{"module":"events","message":"Response Promise Event npwd:fetchMessages:dbde146b-55e7-4749-8431-77fb46e1d8bc (7.8049ms), Data >>","level":"silly","timestamp":"2022-01-16T16:03:54.331Z"} +{"module":"events","message":{"status":"ok","data":[{"id":1,"conversation_id":"017-539-9259+148-688-9109","message":"U a bitch sir","author":"017-539-9259"}]},"level":"silly","timestamp":"2022-01-16T16:03:54.331Z"} diff --git a/resources/wk_wars2x/cl_radar.lua b/resources/wk_wars2x/cl_radar.lua index 1c51439ee..43c37fa85 100644 --- a/resources/wk_wars2x/cl_radar.lua +++ b/resources/wk_wars2x/cl_radar.lua @@ -41,7 +41,7 @@ local pairs = pairs --[[---------------------------------------------------------------------------------- - Key bind registering + UI loading and key binds registering ----------------------------------------------------------------------------------]]-- local function RegisterKeyBinds() if ( UTIL:IsResourceNameValid() ) then @@ -115,12 +115,6 @@ local function RegisterKeyBinds() end end - ---[[---------------------------------------------------------------------------------- - UI loading and key binds trigger -----------------------------------------------------------------------------------]]-- -local spawned = false - local function LoadUISettings() UTIL:Log( "Attempting to load saved UI settings data." ) @@ -140,32 +134,6 @@ local function LoadUISettings() end end --- Runs every time the player spawns, but the additional check means it only runs the first time --- the player spawns -AddEventHandler( "playerSpawned", function() - if ( not spawned ) then - RegisterKeyBinds() - LoadUISettings() - - spawned = true - end -end ) - --- Loads the UI settings when the resource gets restarted, this way active users don't have the --- default settings applied -AddEventHandler( "onResourceStart", function( resourceName ) - if ( GetCurrentResourceName() == resourceName ) then - Citizen.CreateThread( function() - Citizen.Wait( 1000 ) - - RegisterKeyBinds() - LoadUISettings() - - DecorSetBool( PlayerPedId(), "wk_wars2x_sync_remoteOpen", false ) - end ) - end -end ) - --[[---------------------------------------------------------------------------------- Radar variables @@ -511,8 +479,13 @@ if ( RADAR:IsFastLimitAllowed() ) then end -- Add the fast options to the main menu options table - table.insert( self.vars.menuOptions, fastOptions[1] ) - table.insert( self.vars.menuOptions, fastOptions[2] ) + if ( CONFIG.fast_limit_first_in_menu ) then + table.insert( self.vars.menuOptions, 1, fastOptions[2] ) --FasSpd + table.insert( self.vars.menuOptions, 2, fastOptions[1] ) --FasLoc + else + table.insert( self.vars.menuOptions, fastOptions[1] ) --FasLoc + table.insert( self.vars.menuOptions, fastOptions[2] ) --FasSpd + end end -- Returns the numerical fast limit @@ -1814,6 +1787,18 @@ Citizen.CreateThread( function() RADAR:CreateFastLimitConfig() end + -- Register the key binds + RegisterKeyBinds() + + -- Wait a short period of time + Citizen.Wait( 1000 ) + + -- Load the saved UI settings (if available) + LoadUISettings() + + -- Set the player's remoteOpen decorator to false + DecorSetBool( PlayerPedId(), "wk_wars2x_sync_remoteOpen", false ) + -- Update the operator menu positions RADAR:UpdateOptionIndexes( true ) diff --git a/resources/wk_wars2x/config.lua b/resources/wk_wars2x/config.lua index be4a6349a..6844120b2 100644 --- a/resources/wk_wars2x/config.lua +++ b/resources/wk_wars2x/config.lua @@ -38,6 +38,10 @@ CONFIG = {} -- exceeds the fast limit, it will be locked into the fast box. Default setting is disabled to maintain realism CONFIG.allow_fast_limit = true +-- Radar fast limit menu order +-- When enabled, the fast limit options menu will be displayed first followed by fast lock toggle, then all default menu options. +CONFIG.fast_limit_first_in_menu = false + -- Radar only lock players with auto fast locking -- When enabled, the radar will only automatically lock a speed if the caught vehicle has a real player in it. CONFIG.only_lock_players = false diff --git a/resources/wk_wars2x/fxmanifest.lua b/resources/wk_wars2x/fxmanifest.lua index 6ede8a1c2..b34da14fa 100644 --- a/resources/wk_wars2x/fxmanifest.lua +++ b/resources/wk_wars2x/fxmanifest.lua @@ -38,7 +38,7 @@ game "gta5" name "Wraith ARS 2X" description "Police radar and plate reader system for FiveM" author "WolfKnight" -version "1.3.0" +version "1.3.1" -- Include the files files {