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

feat: money change description

Browse Source
This commit is contained in:
Andyyy7666
2022-12-09 03:02:46 +01:00
parent ab877749a8
commit 3b393af7ef
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/commands.lua
View File

@@ -12,13 +12,13 @@ NDCore.Functions.AddCommand("setmoney", "Admin command, manage player money.", f
if action == "remove" then if action == "remove" then
if not amount or amount < 1 then return end if not amount or amount < 1 then return end
NDCore.Functions.DeductMoney(amount, target, moneyType) NDCore.Functions.DeductMoney(amount, target, moneyType, "Server staff action.")
elseif action == "add" then elseif action == "add" then
if not amount or amount < 1 then return end if not amount or amount < 1 then return end
NDCore.Functions.AddMoney(amount, target, moneyType) NDCore.Functions.AddMoney(amount, target, moneyType, "Server staff action.")
elseif action == "set" then elseif action == "set" then
local character = NDCore.Functions.GetPlayer(target) local character = NDCore.Functions.GetPlayer(target)
NDCore.Functions.SetPlayerData(character.id, moneyType, amount) NDCore.Functions.SetPlayerData(character.id, moneyType, amount, "Server staff action.")
end end
end, true, { end, true, {
{ name="player", help="Player server id" }, { name="player", help="Player server id" },

26
server/functions.lua
View File

@@ -137,7 +137,7 @@ function NDCore.Functions.TransferBank(amount, player, target)
else else
MySQL.query.await("UPDATE characters SET bank = bank - ? WHERE character_id = ?", {amount, NDCore.Players[player].id}) MySQL.query.await("UPDATE characters SET bank = bank - ? WHERE character_id = ?", {amount, NDCore.Players[player].id})
NDCore.Functions.UpdateMoney(player) NDCore.Functions.UpdateMoney(player)
TriggerEvent("ND:moneyChange", player, "bank", amount, "remove") TriggerEvent("ND:moneyChange", player, "bank", amount, "remove", "Transfer")
TriggerClientEvent("chat:addMessage", player, { TriggerClientEvent("chat:addMessage", player, {
color = {0, 255, 0}, color = {0, 255, 0},
args = {"Success", "You paid " .. NDCore.Players[target].firstName .. " " .. NDCore.Players[target].lastName .. " $" .. amount .. "."} args = {"Success", "You paid " .. NDCore.Players[target].firstName .. " " .. NDCore.Players[target].lastName .. " $" .. amount .. "."}
@@ -145,7 +145,7 @@ function NDCore.Functions.TransferBank(amount, player, target)
MySQL.query.await("UPDATE characters SET bank = bank + ? WHERE character_id = ?", {amount, NDCore.Players[target].id}) MySQL.query.await("UPDATE characters SET bank = bank + ? WHERE character_id = ?", {amount, NDCore.Players[target].id})
NDCore.Functions.UpdateMoney(target) NDCore.Functions.UpdateMoney(target)
TriggerEvent("ND:moneyChange", target, "bank", amount, "add") TriggerEvent("ND:moneyChange", target, "bank", amount, "add", "Transfer")
TriggerClientEvent("chat:addMessage", target, { TriggerClientEvent("chat:addMessage", target, {
color = {0, 255, 0}, color = {0, 255, 0},
args = {"Success", NDCore.Players[player].firstName .. " " .. NDCore.Players[player].lastName .. " sent you $" .. amount .. "."} args = {"Success", NDCore.Players[player].firstName .. " " .. NDCore.Players[player].lastName .. " sent you $" .. amount .. "."}
@@ -226,8 +226,8 @@ function NDCore.Functions.WithdrawMoney(amount, player)
MySQL.query.await("UPDATE characters SET bank = bank - ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id}) MySQL.query.await("UPDATE characters SET bank = bank - ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id})
MySQL.query.await("UPDATE characters SET cash = cash + ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id}) MySQL.query.await("UPDATE characters SET cash = cash + ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id})
NDCore.Functions.UpdateMoney(player) NDCore.Functions.UpdateMoney(player)
TriggerEvent("ND:moneyChange", player, "bank", amount, "remove") TriggerEvent("ND:moneyChange", player, "bank", amount, "remove", "Withdraw")
TriggerEvent("ND:moneyChange", player, "cash", amount, "add") TriggerEvent("ND:moneyChange", player, "cash", amount, "add", "Withdraw")
return true return true
end end
@@ -240,13 +240,13 @@ function NDCore.Functions.DepositMoney(amount, player)
MySQL.query.await("UPDATE characters SET cash = cash - ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id}) MySQL.query.await("UPDATE characters SET cash = cash - ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id})
MySQL.query.await("UPDATE characters SET bank = bank + ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id}) MySQL.query.await("UPDATE characters SET bank = bank + ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id})
NDCore.Functions.UpdateMoney(player) NDCore.Functions.UpdateMoney(player)
TriggerEvent("ND:moneyChange", player, "cash", amount, "remove") TriggerEvent("ND:moneyChange", player, "cash", amount, "remove", "Deposit")
TriggerEvent("ND:moneyChange", player, "bank", amount, "add") TriggerEvent("ND:moneyChange", player, "bank", amount, "add", "Deposit")
return true return true
end end
-- Deducts money from the player, "bank" or "cash" needs to be specified. -- Deducts money from the player, "bank" or "cash" needs to be specified.
function NDCore.Functions.DeductMoney(amount, player, from) function NDCore.Functions.DeductMoney(amount, player, from, description)
local amount = tonumber(amount) local amount = tonumber(amount)
local player = tonumber(player) local player = tonumber(player)
if from == "bank" then if from == "bank" then
@@ -255,11 +255,11 @@ function NDCore.Functions.DeductMoney(amount, player, from)
MySQL.query.await("UPDATE characters SET cash = cash - ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id}) MySQL.query.await("UPDATE characters SET cash = cash - ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id})
end end
NDCore.Functions.UpdateMoney(player) NDCore.Functions.UpdateMoney(player)
TriggerEvent("ND:moneyChange", player, from, amount, "remove") TriggerEvent("ND:moneyChange", player, from, amount, "remove", description)
end end
-- Adds money from the player, "bank" or "cash" needs to be specified. -- Adds money from the player, "bank" or "cash" needs to be specified.
function NDCore.Functions.AddMoney(amount, player, to) function NDCore.Functions.AddMoney(amount, player, to, description)
local amount = tonumber(amount) local amount = tonumber(amount)
local player = tonumber(player) local player = tonumber(player)
if to == "bank" then if to == "bank" then
@@ -268,7 +268,7 @@ function NDCore.Functions.AddMoney(amount, player, to)
MySQL.query.await("UPDATE characters SET cash = cash + ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id}) MySQL.query.await("UPDATE characters SET cash = cash + ? WHERE character_id = ? LIMIT 1", {amount, NDCore.Players[player].id})
end end
NDCore.Functions.UpdateMoney(player) NDCore.Functions.UpdateMoney(player)
TriggerEvent("ND:moneyChange", player, to, amount, "add") TriggerEvent("ND:moneyChange", player, to, amount, "add", description)
end end
-- Adds the players character to the NDCore.Players table, this table consists of every players selected character. -- Adds the players character to the NDCore.Players table, this table consists of every players selected character.
@@ -355,7 +355,7 @@ function NDCore.Functions.DeleteCharacter(characterId)
end end
-- Updates the player's data -- Updates the player's data
function NDCore.Functions.SetPlayerData(characterId, key, value) function NDCore.Functions.SetPlayerData(characterId, key, value, description)
if not key then return end if not key then return end
local player = nil local player = nil
@@ -369,13 +369,13 @@ function NDCore.Functions.SetPlayerData(characterId, key, value)
if key == "cash" then if key == "cash" then
if player then if player then
NDCore.Players[player][key] = value NDCore.Players[player][key] = value
TriggerEvent("ND:moneyChange", player, "cash", tonumber(value), "set") TriggerEvent("ND:moneyChange", player, "cash", tonumber(value), "set", description)
end end
MySQL.query("UPDATE characters SET cash = ? WHERE character_id = ?", {tonumber(value), characterId}) MySQL.query("UPDATE characters SET cash = ? WHERE character_id = ?", {tonumber(value), characterId})
elseif key == "bank" then elseif key == "bank" then
if player then if player then
NDCore.Players[player][key] = value NDCore.Players[player][key] = value
TriggerEvent("ND:moneyChange", player, "bank", tonumber(value), "set") TriggerEvent("ND:moneyChange", player, "bank", tonumber(value), "set", description)
end end
MySQL.query("UPDATE characters SET bank = ? WHERE character_id = ?", {tonumber(value), characterId}) MySQL.query("UPDATE characters SET bank = ? WHERE character_id = ?", {tonumber(value), characterId})
elseif key == "job" then elseif key == "job" then