From 62d7bcef2aed691c70506dd74a9ad0590e3ee75a Mon Sep 17 00:00:00 2001 From: Thekuca <63980591+Thekuca@users.noreply.github.com> Date: Sun, 7 May 2023 21:43:00 +0200 Subject: [PATCH] refactor(overrides/oxinventory): format code --- .../server/classes/overrides/oxinventory.lua | 356 +++++++++--------- 1 file changed, 178 insertions(+), 178 deletions(-) diff --git a/[core]/es_extended/server/classes/overrides/oxinventory.lua b/[core]/es_extended/server/classes/overrides/oxinventory.lua index 2a43144c..0bc5fe67 100644 --- a/[core]/es_extended/server/classes/overrides/oxinventory.lua +++ b/[core]/es_extended/server/classes/overrides/oxinventory.lua @@ -1,223 +1,223 @@ local Inventory if Config.OxInventory then - AddEventHandler('ox_inventory:loadInventory', function(module) - Inventory = module - end) + AddEventHandler('ox_inventory:loadInventory', function(module) + Inventory = module + end) end Core.PlayerFunctionOverrides.OxInventory = { - getInventory = function(self) - return function(minimal) - if minimal then - local minimalInventory = {} + getInventory = function(self) + return function(minimal) + if minimal then + local minimalInventory = {} - for k, v in pairs(self.inventory) do - if v.count and v.count > 0 then - local metadata = v.metadata + for k, v in pairs(self.inventory) do + if v.count and v.count > 0 then + local metadata = v.metadata - if v.metadata and next(v.metadata) == nil then - metadata = nil - end + if v.metadata and next(v.metadata) == nil then + metadata = nil + end - minimalInventory[#minimalInventory+1] = { - name = v.name, - count = v.count, - slot = k, - metadata = metadata - } - end - end + minimalInventory[#minimalInventory+1] = { + name = v.name, + count = v.count, + slot = k, + metadata = metadata + } + end + end - return minimalInventory - end + return minimalInventory + end - return self.inventory - end - end, + return self.inventory + end + end, - getLoadout = function(self) - return function() - return {} - end - end, + getLoadout = function(self) + return function() + return {} + end + end, - setAccountMoney = function(self) - return function(accountName,money, reason) - reason = reason or 'unknown' - if money >= 0 then - local account = self.getAccount(accountName) + setAccountMoney = function(self) + return function(accountName,money, reason) + reason = reason or 'unknown' + if money >= 0 then + local account = self.getAccount(accountName) - if account then - money = account.round and ESX.Math.Round(money) or money - self.accounts[account.index].money = money + if account then + money = account.round and ESX.Math.Round(money) or money + self.accounts[account.index].money = money - self.triggerEvent('esx:setAccountMoney', account) - TriggerEvent('esx:setAccountMoney', self.source, accountName, money, reason) - if Inventory.accounts[accountName] then - Inventory.SetItem(self.source, accountName, money) - end - end - end - end - end, + self.triggerEvent('esx:setAccountMoney', account) + TriggerEvent('esx:setAccountMoney', self.source, accountName, money, reason) + if Inventory.accounts[accountName] then + Inventory.SetItem(self.source, accountName, money) + end + end + end + end + end, - addAccountMoney = function(self) - return function(accountName,money, reason) - reason = reason or 'unknown' - if money > 0 then - local account = self.getAccount(accountName) + addAccountMoney = function(self) + return function(accountName,money, reason) + reason = reason or 'unknown' + if money > 0 then + local account = self.getAccount(accountName) - if account then + if account then money = account.round and ESX.Math.Round(money) or money self.accounts[account.index].money = self.accounts[account.index].money + money - self.triggerEvent('esx:setAccountMoney', account) - TriggerEvent('esx:addAccountMoney', self.source, accountName, money, reason) - if Inventory.accounts[accountName] then - Inventory.AddItem(self.source, accountName, money) - end - end - end - end - end, + self.triggerEvent('esx:setAccountMoney', account) + TriggerEvent('esx:addAccountMoney', self.source, accountName, money, reason) + if Inventory.accounts[accountName] then + Inventory.AddItem(self.source, accountName, money) + end + end + end + end + end, - removeAccountMoney = function(self) - return function(accountName,money, reason) - reason = reason or 'unknown' - if money > 0 then - local account = self.getAccount(accountName) + removeAccountMoney = function(self) + return function(accountName,money, reason) + reason = reason or 'unknown' + if money > 0 then + local account = self.getAccount(accountName) - if account then - money = account.round and ESX.Math.Round(money) or money - self.accounts[account.index].money = self.accounts[account.index].mone - money - self.triggerEvent('esx:setAccountMoney', account) - TriggerEvent('esx:removeAccountMoney', self.source, accountName, money, reason) - if Inventory.accounts[accountName] then - Inventory.RemoveItem(self.source, accountName, money) - end - end - end - end - end, + if account then + money = account.round and ESX.Math.Round(money) or money + self.accounts[account.index].money = self.accounts[account.index].mone - money + self.triggerEvent('esx:setAccountMoney', account) + TriggerEvent('esx:removeAccountMoney', self.source, accountName, money, reason) + if Inventory.accounts[accountName] then + Inventory.RemoveItem(self.source, accountName, money) + end + end + end + end + end, - getInventoryItem = function(self) - return function(name,metadata) - return Inventory.GetItem(self.source, name, metadata) - end - end, + getInventoryItem = function(self) + return function(name,metadata) + return Inventory.GetItem(self.source, name, metadata) + end + end, - addInventoryItem = function(self) - return function(name,count,metadata,slot) - return Inventory.AddItem(self.source, name, count or 1, metadata, slot) - end - end, + addInventoryItem = function(self) + return function(name,count,metadata,slot) + return Inventory.AddItem(self.source, name, count or 1, metadata, slot) + end + end, - removeInventoryItem = function(self) - return function(name,count,metadata,slot) - return Inventory.RemoveItem(self.source, name, count or 1, metadata, slot) - end - end, + removeInventoryItem = function(self) + return function(name,count,metadata,slot) + return Inventory.RemoveItem(self.source, name, count or 1, metadata, slot) + end + end, - setInventoryItem = function(self) - return function(name,count,metadata) - return Inventory.SetItem(self.source, name, count, metadata) - end - end, + setInventoryItem = function(self) + return function(name,count,metadata) + return Inventory.SetItem(self.source, name, count, metadata) + end + end, - canCarryItem = function(self) - return function(name,count,metadata) - return Inventory.CanCarryItem(self.source, name, count, metadata) - end - end, + canCarryItem = function(self) + return function(name,count,metadata) + return Inventory.CanCarryItem(self.source, name, count, metadata) + end + end, - canSwapItem = function(self) - return function(firstItem, firstItemCount, testItem, testItemCount) - return Inventory.CanSwapItem(self.source, firstItem, firstItemCount, testItem, testItemCount) - end - end, + canSwapItem = function(self) + return function(firstItem, firstItemCount, testItem, testItemCount) + return Inventory.CanSwapItem(self.source, firstItem, firstItemCount, testItem, testItemCount) + end + end, - setMaxWeight = function(self) - return function(newWeight) - self.maxWeight = newWeight - self.triggerEvent('esx:setMaxWeight', self.maxWeight) - return Inventory.Set(self.source, 'maxWeight', newWeight) - end - end, + setMaxWeight = function(self) + return function(newWeight) + self.maxWeight = newWeight + self.triggerEvent('esx:setMaxWeight', self.maxWeight) + return Inventory.Set(self.source, 'maxWeight', newWeight) + end + end, - addWeapon = function(self) - return function() end - end, + addWeapon = function(self) + return function() end + end, - addWeaponComponent = function(self) - return function() end - end, + addWeaponComponent = function(self) + return function() end + end, - addWeaponAmmo = function(self) - return function() end - end, + addWeaponAmmo = function(self) + return function() end + end, - updateWeaponAmmo = function(self) - return function() end - end, + updateWeaponAmmo = function(self) + return function() end + end, - setWeaponTint = function(self) - return function() end - end, + setWeaponTint = function(self) + return function() end + end, - getWeaponTint = function(self) - return function() end - end, + getWeaponTint = function(self) + return function() end + end, - removeWeapon = function(self) - return function() end - end, + removeWeapon = function(self) + return function() end + end, - removeWeaponComponent = function(self) - return function() end - end, + removeWeaponComponent = function(self) + return function() end + end, - removeWeaponAmmo = function(self) - return function() end - end, + removeWeaponAmmo = function(self) + return function() end + end, - hasWeaponComponent = function(self) - return function() - return false - end - end, + hasWeaponComponent = function(self) + return function() + return false + end + end, - hasWeapon = function(self) - return function() - return false - end - end, + hasWeapon = function(self) + return function() + return false + end + end, - hasItem = function(self) - return function(name,metadata) - return Inventory.GetItem(self.source, name, metadata) - end - end, + hasItem = function(self) + return function(name,metadata) + return Inventory.GetItem(self.source, name, metadata) + end + end, - getWeapon = function(self) - return function() end - end, + getWeapon = function(self) + return function() end + end, - syncInventory = function(self) - return function(weight, maxWeight, items, money) - self.weight, self.maxWeight = weight, maxWeight - self.inventory = items + syncInventory = function(self) + return function(weight, maxWeight, items, money) + self.weight, self.maxWeight = weight, maxWeight + self.inventory = items - if money then - for accountName, amount in pairs(money) do - local account = self.getAccount(accountName) + if money then + for accountName, amount in pairs(money) do + local account = self.getAccount(accountName) - if account and ESX.Math.Round(account.money) ~= amount then - account.money = amount - self.triggerEvent('esx:setAccountMoney', account) - TriggerEvent('esx:setAccountMoney', self.source, accountName, amount, 'Sync account with item') - end - end - end - end - end + if account and ESX.Math.Round(account.money) ~= amount then + account.money = amount + self.triggerEvent('esx:setAccountMoney', account) + TriggerEvent('esx:setAccountMoney', self.source, accountName, amount, 'Sync account with item') + end + end + end + end + end }