diff --git a/config.lua b/config.lua index be3e5171..a6f10be3 100644 --- a/config.lua +++ b/config.lua @@ -7,6 +7,8 @@ Config.Accounts = { money = _U('account_money') } +Config.StartingAccountMoney = {bank = 50000} + Config.EnableSocietyPayouts = false -- pay from the society account that the player is employed at? Requirement: esx_society Config.DisableWantedLevel = true Config.EnableHud = true -- enable the default hud? Display current job and accounts (black, bank & cash) diff --git a/server/classes/player.lua b/server/classes/player.lua index 042100fd..86c2583b 100644 --- a/server/classes/player.lua +++ b/server/classes/player.lua @@ -164,7 +164,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, end if not found then - table.insert(missingAccounts, account) + missingAccounts[account] = Config.StartingAccountMoney[account] or 0 end end @@ -172,10 +172,11 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, end self.createMissingAccounts = function(missingAccounts, cb) - for k,v in ipairs(missingAccounts) do - MySQL.Async.execute('INSERT INTO user_accounts (identifier, name) VALUES (@identifier, @name)', { + for name,money in pairs(missingAccounts) do + MySQL.Async.execute('INSERT INTO user_accounts (identifier, name, money) VALUES (@identifier, @name, @money)', { ['@identifier'] = self.identifier, - ['@name'] = v + ['@name'] = name, + ['@money'] = money }, function(rowsChanged) if cb then cb() diff --git a/server/main.lua b/server/main.lua index b52782d0..68cc5852 100644 --- a/server/main.lua +++ b/server/main.lua @@ -169,12 +169,12 @@ function loadESXPlayer(identifier, playerId) local xPlayer = CreateExtendedPlayer(playerId, identifier, userData.group, userData.accounts, userData.inventory, userData.job, userData.loadout, userData.playerName, userData.coords) xPlayer.getMissingAccounts(function(missingAccounts) - if #missingAccounts > 0 then - for k,v in ipairs(missingAccounts) do + if ESX.Table.SizeOf(missingAccounts) > 0 then + for name,money in pairs(missingAccounts) do table.insert(xPlayer.accounts, { - name = v, - money = 0, - label = Config.Accounts[v] + name = name, + money = money, + label = Config.Accounts[name] }) end @@ -192,7 +192,6 @@ function loadESXPlayer(identifier, playerId) inventory = xPlayer.getInventory(), job = xPlayer.getJob(), loadout = xPlayer.getLoadout(), - money = xPlayer.getMoney(), maxWeight = xPlayer.maxWeight })