FumeNodes/ND_Core
1
0
Fork 0
mirror of https://github.com/ND-Framework/ND_Core.git synced 2026-08-17 05:56:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update main.lua

Browse Source 
* Removed shot spotter (it will be made a separate resource)
* Fixed some security variabilities (modders being able to drop players)
* Other small changes

Planned:
* Moving most money related stuff the server.
This commit is contained in:
Andyyy7666
2021-12-24 23:27:09 +01:00
committed by GitHub
parent 761dac7d20
commit e49cf38f92
1 changed files with 53 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
ND_Core/source/client/main.lua
View File

@@ -6,13 +6,14 @@
------------------------------------------------------------------------ ------------------------------------------------------------------------
------------------------------------------------------------------------ ------------------------------------------------------------------------
started = true local started = true
registered = false registered = false
admin = false admin = false
-- This is used to add department drop down on the ui.
RegisterNetEvent("permsChecked") RegisterNetEvent("permsChecked")
AddEventHandler("permsChecked", function(role, rolePermission) AddEventHandler("permsChecked", function(role, rolePermission)
if rolePermission == true then if rolePermission then
if role == "ADMIN" then if role == "ADMIN" then
admin = true admin = true
else else
@@ -31,15 +32,12 @@ Citizen.CreateThread(function()
if IsPedOnFoot(ped) or IsPedInVehicle(ped, GetVehiclePedIsIn(ped, false), false) then if IsPedOnFoot(ped) or IsPedInVehicle(ped, GetVehiclePedIsIn(ped, false), false) then
print("^0This framework is created by ^5Andyyy#7666 ^0for support you can join the ^5discord: ^0https://discord.gg/Z9Mxu72zZ6") print("^0This framework is created by ^5Andyyy#7666 ^0for support you can join the ^5discord: ^0https://discord.gg/Z9Mxu72zZ6")
for i = 1, #config.departments do -- if you have an error that says attempt to index a nil value (global 'config') it's beacuse you have edited the config wrong. for i = 1, #config.departments do -- if you have an error that says attempt to index a nil value (global 'config') it's beacuse you have edited the config wrong.
TriggerServerEvent("checkPerms", config.departments[i]) TriggerServerEvent("checkPerms", config.departments[i]) -- check permissions for each department with the department names.
end end
Citizen.Wait(10) TriggerServerEvent("checkPerms", "ADMIN") -- check if the player has the admin role.
TriggerServerEvent("checkPerms", "ADMIN")
Citizen.Wait(10)
TriggerServerEvent("getCharacters") TriggerServerEvent("getCharacters")
Citizen.Wait(100) Citizen.Wait(100)
TriggerServerEvent("getAop") TriggerServerEvent("getAop")
Citizen.Wait(10)
SwitchOutPlayer(ped, 0, 1) SwitchOutPlayer(ped, 0, 1)
FreezeEntityPosition(ped, true) FreezeEntityPosition(ped, true)
SetEntityVisible(ped, false, 0) SetEntityVisible(ped, false, 0)
@@ -49,16 +47,13 @@ Citizen.CreateThread(function()
end) end)
RegisterNUICallback("exitGame", function(data) RegisterNUICallback("exitGame", function(data)
TriggerServerEvent("exitGame", GetPlayerServerId(PlayerId())) TriggerServerEvent("exitGame")
end) end)
RegisterNetEvent("returnCharacters") RegisterNetEvent("returnCharacters")
AddEventHandler("returnCharacters", function(characters) AddEventHandler("returnCharacters", function(characters)
for i = 1, #characters do for i = 1, #characters do
index = characters[i] index = characters[i]
if config.debugMode then
print(index.id .. " " .. index.firstName .. " " .. index.lastName .. " " .. index.dob .. " " .. index.gender .. index.twt .. " " .. index.department .. " " .. index.cash .. " " .. index.bank)
end
SendNUIMessage({ SendNUIMessage({
type = "character", type = "character",
id = index.id, id = index.id,
@@ -73,12 +68,10 @@ AddEventHandler("returnCharacters", function(characters)
}) })
end end
characterAmount = #characters characterAmount = #characters
if config.debugMode then
print("Characters: " .. characterAmount .. "/" .. config.characterLimit)
end
SetDisplay(true, "ui") SetDisplay(true, "ui")
end) end)
-- Creating a character
RegisterNUICallback("newCharacter", function(data) RegisterNUICallback("newCharacter", function(data)
if characterAmount < config.characterLimit then if characterAmount < config.characterLimit then
newCharacter = { newCharacter = {
@@ -113,6 +106,7 @@ AddEventHandler("returnNewCharacter", function(id, character)
}) })
end) end)
-- editing a character
RegisterNUICallback("editCharacter", function(data) RegisterNUICallback("editCharacter", function(data)
newCharacter = { newCharacter = {
firstName = data.firstName, firstName = data.firstName,
@@ -121,13 +115,12 @@ RegisterNUICallback("editCharacter", function(data)
gender = data.gender, gender = data.gender,
twtName = data.twtName, twtName = data.twtName,
department = data.department, department = data.department,
--startingCash = data.startingCash,
--startingBank = data.startingBank,
id = data.id id = data.id
} }
TriggerServerEvent("editCharacter", newCharacter) TriggerServerEvent("editCharacter", newCharacter)
end) end)
-- deleting a character
RegisterNUICallback("delCharacter", function(data) RegisterNUICallback("delCharacter", function(data)
TriggerServerEvent("delCharacter", data.character) TriggerServerEvent("delCharacter", data.character)
characterAmount = characterAmount -1 characterAmount = characterAmount -1
@@ -136,6 +129,7 @@ RegisterNUICallback("delCharacter", function(data)
}) })
end) end)
-- Once the player clicks on the character in the ui, it will be set as the main character or the current character. This info can be used later in exports or elsewhere in this resource.
RegisterNUICallback("setMainCharacter", function(data) RegisterNUICallback("setMainCharacter", function(data)
mainFirstName = data.firstName mainFirstName = data.firstName
mainLastName = data.lastName mainLastName = data.lastName
@@ -147,12 +141,6 @@ RegisterNUICallback("setMainCharacter", function(data)
mainStartingBank = data.startingBank mainStartingBank = data.startingBank
mainCharaterId = data.character mainCharaterId = data.character
if config.debugMode then
for k, v in pairs(data) do
print(v)
end
end
for i = 1, #config.departments do for i = 1, #config.departments do
validDept = config.departments[i] validDept = config.departments[i]
if mainDepartment == validDept then if mainDepartment == validDept then
@@ -171,13 +159,12 @@ RegisterNUICallback("setMainCharacter", function(data)
registered = true registered = true
end) end)
-- This will display the money that the player has.
RegisterNetEvent("returnMoney") RegisterNetEvent("returnMoney")
AddEventHandler("returnMoney", function(cash, bank) AddEventHandler("returnMoney", function(cash, bank)
while not registered do while not registered do
Citizen.Wait(100) Citizen.Wait(10)
end end
cash = cash
bank = bank
SendNUIMessage({ SendNUIMessage({
type = "Money", type = "Money",
cash = "Cash: $" .. cash, cash = "Cash: $" .. cash,
@@ -185,6 +172,7 @@ AddEventHandler("returnMoney", function(cash, bank)
}) })
end) end)
-- Teleporting
RegisterNUICallback("tpToLocation", function(data) RegisterNUICallback("tpToLocation", function(data)
local ped = PlayerPedId() local ped = PlayerPedId()
FreezeEntityPosition(ped, false) FreezeEntityPosition(ped, false)
@@ -199,6 +187,7 @@ RegisterNUICallback("tpToLocation", function(data)
TriggerServerEvent("getMoney", mainCharaterId) TriggerServerEvent("getMoney", mainCharaterId)
end) end)
-- Choosing the do not tp button.
RegisterNUICallback("tpDoNot", function(data) RegisterNUICallback("tpDoNot", function(data)
local ped = PlayerPedId() local ped = PlayerPedId()
SwitchInPlayer(ped) SwitchInPlayer(ped)
@@ -221,12 +210,12 @@ function SetDisplay(bool, typeName)
}) })
end end
if config.enableRichPrecence == true then if config.enableRichPrecence then
Citizen.CreateThread(function() Citizen.CreateThread(function()
while true do while true do
Citizen.Wait(config.updateIntervall * 1000) Citizen.Wait(config.updateIntervall * 1000)
SetDiscordAppId(config.appId) SetDiscordAppId(config.appId)
if registered == true then if registered then
SetRichPresence(" Playing : " .. config.serverName .. " as " .. mainFirstName .. " " .. mainLastName) SetRichPresence(" Playing : " .. config.serverName .. " as " .. mainFirstName .. " " .. mainLastName)
SetDiscordRichPresenceAsset(config.largeLogo) SetDiscordRichPresenceAsset(config.largeLogo)
SetDiscordRichPresenceAssetText("Playing: " .. config.serverName) SetDiscordRichPresenceAssetText("Playing: " .. config.serverName)
@@ -239,117 +228,46 @@ if config.enableRichPrecence == true then
end) end)
end end
-- Shot spotter
if config.shotSpotterEnabled then
local activateShotSpotter = false
local alreadyShot = false
RegisterNetEvent("shotSpotterReport")
AddEventHandler("shotSpotterReport", function(x, y, z, postal)
if registered then
if mainDepartment == "SAHP" or mainDepartment == "LSPD" or mainDepartment == "BCSO" then
activateShotSpotter = true
while activateShotSpotter do
Citizen.Wait(0)
blip = AddBlipForCoord(x, y, z)
SetBlipSprite(blip, 161)
SetBlipAsShortRange(blip, true)
BeginTextCommandSetBlipName("STRING")
AddTextComponentString("Shot Spotter")
EndTextCommandSetBlipName(blip)
if not postal then
msg = "~r~Dispatch: ~w~Shotspotter detected in " .. GetStreetNameFromHashKey(GetStreetNameAtCoord(x, y, z)) .. "."
else
msg = "~r~Dispatch: ~w~Shotspotter detected in " .. GetStreetNameFromHashKey(GetStreetNameAtCoord(x, y, z)) .. ", postal: " .. postal .. "."
end
TriggerEvent('chat:addMessage', {
args = {msg}
})
Citizen.Wait(config.shotSpotterTimer * 1000)
activateShotSpotter = false
break
end
RemoveBlip(blip)
end
end
end)
Citizen.CreateThread(function()
while true do
Citizen.Wait(0)
local ped = PlayerPedId()
if registered then
if mainDepartment == "CIV" then
if IsPedShooting(ped) then
if not alreadyShot then
Citizen.Wait(config.shotSpotterDelay * 1000)
pedCoords = GetEntityCoords(ped)
if config.shotSpotterUsePostal then
postal = exports["nearest_postal123"]:getPostal()
else
postal = false
end
TriggerServerEvent("shotSpotterActive", pedCoords.x, pedCoords.y, pedCoords.z, postal)
if config.debugMode then
print(pedCoords.x, pedCoords.y, pedCoords.z)
end
end
alreadyShot = true
Citizen.Wait(config.shotSpotterCooldown * 1000)
alreadyShot = false
end
end
end
end
end)
end
-- hide gta default cash, ammo and reticle hud. -- hide gta default cash, ammo and reticle hud.
if config.hideAmmoAndMoney == true or config.hideReticle == true then if config.hideAmmoAndMoney or config.hideReticle then
Citizen.CreateThread(function() Citizen.CreateThread(function()
while true do while true do
Citizen.Wait(0) Citizen.Wait(0)
if config.hideAmmoAndMoney == true then if config.hideAmmoAndMoney then
HideHudComponentThisFrame(3) -- CASH HideHudComponentThisFrame(3) -- CASH
HideHudComponentThisFrame(4) -- MP_CASH HideHudComponentThisFrame(4) -- MP_CASH
HideHudComponentThisFrame(13) -- CASH_CHANGE HideHudComponentThisFrame(13) -- CASH_CHANGE
HideHudComponentThisFrame(2) -- WEAPON_ICON HideHudComponentThisFrame(2) -- WEAPON_ICON
end end
if config.hideReticle == true then if config.hideReticle then
--if IsPlayerFreeAiming(PlayerPedId()) then HideHudComponentThisFrame(14) -- RETICLE
HideHudComponentThisFrame(14) -- RETICLE
--end
end end
if config.customPauseMenu then if config.customPauseMenu and registered then
if registered then if IsPauseMenuActive() then
if IsPauseMenuActive() then BeginScaleformMovieMethodOnFrontendHeader("SET_HEADING_DETAILS")
BeginScaleformMovieMethodOnFrontendHeader("SET_HEADING_DETAILS") AddTextEntry("FE_THDR_GTAO", config.serverName)
AddTextEntry("FE_THDR_GTAO", config.serverName) ScaleformMovieMethodAddParamPlayerNameString(mainFirstName .. " " .. mainLastName)
ScaleformMovieMethodAddParamPlayerNameString(mainFirstName .. " " .. mainLastName) --PushScaleformMovieFunctionParameterString("Cash: $" .. cash)
--PushScaleformMovieFunctionParameterString("Cash: $" .. cash) --PushScaleformMovieFunctionParameterString("Bank: $" .. bank)
--PushScaleformMovieFunctionParameterString("Bank: $" .. bank) EndScaleformMovieMethod()
EndScaleformMovieMethod()
end
end end
end end
end end
end) end)
end end
-- Planning on moving everything money related to server side.
RegisterNetEvent("receiveBank") RegisterNetEvent("receiveBank")
AddEventHandler("receiveBank", function(amount, playerSending, name) AddEventHandler("receiveBank", function(amount, playerSending, name)
if config.debugMode then
print("Recived $" .. amount .. " from " .. name .. " [".. playerSending .."]")
end
SetNotificationTextEntry("STRING") SetNotificationTextEntry("STRING")
AddTextComponentString("Recived $" .. amount .. " from " .. name .. " [".. playerSending .."]") AddTextComponentString("Recived $" .. amount .. " from " .. name .. " [".. playerSending .."]")
SetNotificationMessage("CHAR_BANK_FLEECA", "CHAR_BANK_FLEECA", true, 9,"FleecaBank", "") SetNotificationMessage("CHAR_BANK_FLEECA", "CHAR_BANK_FLEECA", true, 9,"FleecaBank", "")
TriggerServerEvent("addBank", amount, mainCharaterId) TriggerServerEvent("addBank", amount, mainCharaterId)
end) end)
-- Planning on moving everything money related to server side.
RegisterNetEvent("receiveCash") RegisterNetEvent("receiveCash")
AddEventHandler("receiveCash", function(amount, playerSending, name) AddEventHandler("receiveCash", function(amount, playerSending, name)
if config.debugMode then
print("Recived $" .. amount .. " from " .. name .. " [".. playerSending .."]")
end
SetNotificationTextEntry("STRING") SetNotificationTextEntry("STRING")
AddTextComponentString(name .. " gave you $" .. amount .. ".") AddTextComponentString(name .. " gave you $" .. amount .. ".")
SetNotificationMessage("CHAR_DEFAULT", "CHAR_DEFAULT", true, 9, name .. " [".. playerSending .."]", "") SetNotificationMessage("CHAR_DEFAULT", "CHAR_DEFAULT", true, 9, name .. " [".. playerSending .."]", "")
@@ -361,6 +279,7 @@ AddEventHandler("updateMoney", function()
TriggerServerEvent("getMoney", mainCharaterId) TriggerServerEvent("getMoney", mainCharaterId)
end) end)
-- Salary | Planning on moving everything money related to server side.
Citizen.CreateThread(function() Citizen.CreateThread(function()
while true do while true do
Citizen.Wait(config.salaryInterval * 60000) Citizen.Wait(config.salaryInterval * 60000)
@@ -373,12 +292,14 @@ Citizen.CreateThread(function()
end end
end) end)
-- Planning on moving everything money related to server side.
function sendBank(sendingCharacterId, receiveingPlayerId, amount, sendingPlayerId) function sendBank(sendingCharacterId, receiveingPlayerId, amount, sendingPlayerId)
if registered then if registered then
TriggerServerEvent("bankPay", sendingCharacterId, receiveingPlayerId, amount, sendingPlayerId, mainFirstName .. " " .. mainLastName) TriggerServerEvent("bankPay", sendingCharacterId, receiveingPlayerId, amount, sendingPlayerId, mainFirstName .. " " .. mainLastName)
end end
end end
-- Planning on moving everything money related to server side.
function sendCash(sendingCharacterId, amount, sendingPlayerId) function sendCash(sendingCharacterId, amount, sendingPlayerId)
if registered then if registered then
target, distance = GetClosestPlayer() target, distance = GetClosestPlayer()
@@ -390,6 +311,7 @@ function sendCash(sendingCharacterId, amount, sendingPlayerId)
end end
end end
-- Notification above the map.
function notify(message) function notify(message)
SetNotificationTextEntry("STRING") SetNotificationTextEntry("STRING")
AddTextComponentString(message) AddTextComponentString(message)
@@ -429,26 +351,25 @@ function GetPlayers()
return players return players
end end
function getCharacterInfo(int) function getCharacterInfo(infoType)
if registered then if registered then
if int == 1 then mainCharacter = {
return mainFirstName [1] = mainFirstName,
elseif int == 2 then [2] = mainLastName,
return mainLastName [3] = mainDateOfBirth,
elseif int == 3 then [4] = mainGender,
return mainDateOfBirth [5] = mainTwtName,
elseif int == 4 then [6] = mainDepartment,
return mainGender [7] = mainStartingCash,
elseif int == 5 then [8] = mainStartingBank,
return mainTwtName [9] = mainCharaterId
elseif int == 6 then }
return mainDepartment for k, v in pairs(mainCharacter) do
elseif int == 7 then if k == infoType then
return mainStartingCash return v
elseif int == 8 then end
return mainStartingBank
elseif int == 9 then
return mainCharaterId
end end
else
return "Error: Player not registered"
end end
end end