diff --git a/init.lua b/init.lua index bfd4c31..f4b020b 100644 --- a/init.lua +++ b/init.lua @@ -90,6 +90,7 @@ end) -- ▄█▀ █▄▄ █▀▄ ▀▄▀ █▄▄ █▀▄ if not IsDuplicityVersion() then goto client end Bridge.RegisterModule('Version', Version) +Bridge.RegisterModule('Banking', Banking) -- ▄▀▀ █ █ ██▀ █▄ █ ▀█▀ -- ▀▄▄ █▄▄ █ █▄▄ █ ▀█ █ diff --git a/lib/entities/client/client_entity.lua b/lib/entities/client/client_entity.lua index 55de714..1b7e706 100644 --- a/lib/entities/client/client_entity.lua +++ b/lib/entities/client/client_entity.lua @@ -12,7 +12,7 @@ local function SpawnEntity(entityData) -- for k, v in pairs(entityData.args) do -- print(string.format("SpawnEntity %s: %s", k, v)) -- end - local loaded, model = Utility.GetModel(entityData.model) + local loaded, model = Utility.LoadModel(entityData.model) if not loaded then print(string.format("[ClientEntity] Failed to load model %s for entity %s", entityData.model, entityData.id)) return diff --git a/modules/managment/_default/server.lua b/modules/banking/_default/server.lua similarity index 76% rename from modules/managment/_default/server.lua rename to modules/banking/_default/server.lua index 5ad2fd8..4f17414 100644 --- a/modules/managment/_default/server.lua +++ b/modules/banking/_default/server.lua @@ -1,16 +1,16 @@ ---@diagnostic disable: duplicate-set-field -Managment = Managment or {} +Banking = Banking or {} ---This will get the name of the Managment system being being used. ---@return string -Managment.GetManagmentName = function() +Banking.GetManagmentName = function() return 'default' end ---This will return a number ---@param account string ---@return number -Managment.GetAccountMoney = function(account) +Banking.GetAccountMoney = function(account) return 0, print("The resource you are using does not support this function.") end @@ -19,7 +19,7 @@ end ---@param amount number ---@param reason string ---@return boolean -Managment.AddAccountMoney = function(account, amount, reason) +Banking.AddAccountMoney = function(account, amount, reason) return false, print("The resource you are using does not support this function.") end @@ -28,8 +28,8 @@ end ---@param amount number ---@param reason string ---@return boolean -Managment.RemoveAccountMoney = function(account, amount, reason) +Banking.RemoveAccountMoney = function(account, amount, reason) return false, print("The resource you are using does not support this function.") end -return Managment \ No newline at end of file +return Banking \ No newline at end of file diff --git a/modules/managment/fd_banking/server.lua b/modules/banking/fd_banking/server.lua similarity index 76% rename from modules/managment/fd_banking/server.lua rename to modules/banking/fd_banking/server.lua index be4ccc5..ad74b7b 100644 --- a/modules/managment/fd_banking/server.lua +++ b/modules/banking/fd_banking/server.lua @@ -1,19 +1,19 @@ ---@diagnostic disable: duplicate-set-field if GetResourceState('fd_banking') == 'missing' then return end -Managment = Managment or {} +Banking = Banking or {} local fd_banking = exports['fd_banking'] ---This will get the name of the Managment system being being used. ---@return string -Managment.GetManagmentName = function() +Banking.GetManagmentName = function() return 'fd_banking' end ---This will return a number ---@param account string ---@return number -Managment.GetAccountMoney = function(account) +Banking.GetAccountMoney = function(account) return fd_banking:GetAccount(account) end @@ -22,7 +22,7 @@ end ---@param amount number ---@param reason string ---@return boolean -Managment.AddAccountMoney = function(account, amount, reason) +Banking.AddAccountMoney = function(account, amount, reason) return fd_banking:AddMoney(account, amount, reason) end @@ -31,8 +31,8 @@ end ---@param amount number ---@param reason string ---@return boolean -Managment.RemoveAccountMoney = function(account, amount, reason) +Banking.RemoveAccountMoney = function(account, amount, reason) return fd_banking:RemoveMoney(account, amount, reason) end -return Managment \ No newline at end of file +return Banking \ No newline at end of file diff --git a/modules/managment/kartik-banking/server.lua b/modules/banking/kartik-banking/server.lua similarity index 77% rename from modules/managment/kartik-banking/server.lua rename to modules/banking/kartik-banking/server.lua index 5d7f53a..078f7d1 100644 --- a/modules/managment/kartik-banking/server.lua +++ b/modules/banking/kartik-banking/server.lua @@ -1,19 +1,19 @@ ---@diagnostic disable: duplicate-set-field if GetResourceState('kartik-banking') == 'missing' then return end -Managment = Managment or {} +Banking = Banking or {} local kartik = exports['kartik-banking'] ---This will get the name of the Managment system being being used. ---@return string -Managment.GetManagmentName = function() +Banking.GetManagmentName = function() return 'kartik-banking' end ---This will return a number ---@param account string ---@return number -Managment.GetAccountMoney = function(account) +Banking.GetAccountMoney = function(account) local balance = kartik:GetAccountMoney(account) return balance or 0 end @@ -23,7 +23,7 @@ end ---@param amount number ---@param reason string ---@return boolean -Managment.AddAccountMoney = function(account, amount, reason) +Banking.AddAccountMoney = function(account, amount, reason) return kartik:AddAccountMoney(account, amount, reason) end @@ -32,8 +32,8 @@ end ---@param amount number ---@param reason string ---@return boolean -Managment.RemoveAccountMoney = function(account, amount, reason) +Banking.RemoveAccountMoney = function(account, amount, reason) return kartik:RemoveAccountMoney(account, amount, reason) end -return Managment +return Banking diff --git a/modules/managment/okokBanking/server.lua b/modules/banking/okokBanking/server.lua similarity index 76% rename from modules/managment/okokBanking/server.lua rename to modules/banking/okokBanking/server.lua index 7870503..33bf69d 100644 --- a/modules/managment/okokBanking/server.lua +++ b/modules/banking/okokBanking/server.lua @@ -1,19 +1,19 @@ ---@diagnostic disable: duplicate-set-field if GetResourceState('okokBanking') == 'missing' then return end -Managment = Managment or {} +Banking = Banking or {} local okokBanking = exports['okokBanking'] ---This will get the name of the Managment system being being used. ---@return string -Managment.GetManagmentName = function() +Banking.GetManagmentName = function() return 'okokBanking' end ---This will return a number ---@param account string ---@return number -Managment.GetAccountMoney = function(account) +Banking.GetAccountMoney = function(account) return okokBanking:GetAccount(account) end @@ -22,7 +22,7 @@ end ---@param amount number ---@param _ string ---@return boolean -Managment.AddAccountMoney = function(account, amount, _) +Banking.AddAccountMoney = function(account, amount, _) return okokBanking:AddMoney(account, amount) end @@ -31,8 +31,8 @@ end ---@param amount number ---@param _ string ---@return boolean -Managment.RemoveAccountMoney = function(account, amount, _) +Banking.RemoveAccountMoney = function(account, amount, _) return okokBanking:RemoveMoney(account, amount) end -return Managment \ No newline at end of file +return Banking \ No newline at end of file diff --git a/modules/managment/qb-banking/server.lua b/modules/banking/qb-banking/server.lua similarity index 76% rename from modules/managment/qb-banking/server.lua rename to modules/banking/qb-banking/server.lua index cc7530e..e275daa 100644 --- a/modules/managment/qb-banking/server.lua +++ b/modules/banking/qb-banking/server.lua @@ -1,19 +1,19 @@ ---@diagnostic disable: duplicate-set-field if GetResourceState('qb-banking') == 'missing' then return end -Managment = Managment or {} +Banking = Banking or {} local qbBanking = exports['qb-banking'] ---This will get the name of the Managment system being being used. ---@return string -Managment.GetManagmentName = function() +Banking.GetManagmentName = function() return 'qb-banking' end ---This will return a number ---@param account string ---@return number -Managment.GetAccountMoney = function(account) +Banking.GetAccountMoney = function(account) return qbBanking:GetAccountBalance(account) end @@ -22,7 +22,7 @@ end ---@param amount number ---@param reason string ---@return boolean -Managment.AddAccountMoney = function(account, amount, reason) +Banking.AddAccountMoney = function(account, amount, reason) return qbBanking:AddMoney(account, amount, reason) end @@ -31,8 +31,8 @@ end ---@param amount number ---@param reason string ---@return boolean -Managment.RemoveAccountMoney = function(account, amount, reason) +Banking.RemoveAccountMoney = function(account, amount, reason) return qbBanking:RemoveMoney(account, amount, reason) end -return Managment \ No newline at end of file +return Banking \ No newline at end of file diff --git a/modules/managment/renewed-banking/server.lua b/modules/banking/renewed-banking/server.lua similarity index 77% rename from modules/managment/renewed-banking/server.lua rename to modules/banking/renewed-banking/server.lua index 677eee0..4ae9c21 100644 --- a/modules/managment/renewed-banking/server.lua +++ b/modules/banking/renewed-banking/server.lua @@ -1,19 +1,19 @@ ---@diagnostic disable: duplicate-set-field if GetResourceState('Renewed-Banking') == 'missing' then return end -Managment = Managment or {} +Banking = Banking or {} local renewed = exports['Renewed-Banking'] ---This will get the name of the Managment system being being used. ---@return string -Managment.GetManagmentName = function() +Banking.GetManagmentName = function() return 'Renewed-Banking' end ---This will return a number ---@param account string ---@return number -Managment.GetAccountMoney = function(account) +Banking.GetAccountMoney = function(account) return renewed:getAccountMoney(account) end @@ -22,7 +22,7 @@ end ---@param amount number ---@param _ string ---@return boolean -Managment.AddAccountMoney = function(account, amount, _) +Banking.AddAccountMoney = function(account, amount, _) return renewed:addAccountMoney(account, amount) end @@ -31,8 +31,8 @@ end ---@param amount number ---@param _ string ---@return boolean -Managment.RemoveAccountMoney = function(account, amount, _) +Banking.RemoveAccountMoney = function(account, amount, _) return renewed:removeAccountMoney(account, amount) end -return Managment \ No newline at end of file +return Banking \ No newline at end of file diff --git a/modules/managment/tgg-banking/server.lua b/modules/banking/tgg-banking/server.lua similarity index 76% rename from modules/managment/tgg-banking/server.lua rename to modules/banking/tgg-banking/server.lua index 30a137c..fc276e7 100644 --- a/modules/managment/tgg-banking/server.lua +++ b/modules/banking/tgg-banking/server.lua @@ -1,19 +1,19 @@ ---@diagnostic disable: duplicate-set-field if GetResourceState('tgg-banking') == 'missing' then return end -Managment = Managment or {} +Banking = Banking or {} local tgg = exports['tgg-banking'] ---This will get the name of the Managment system being being used. ---@return string -Managment.GetManagmentName = function() +Banking.GetManagmentName = function() return 'tgg-banking' end ---This will return a number ---@param account string ---@return number -Managment.GetAccountMoney = function(account) +Banking.GetAccountMoney = function(account) return tgg:GetSocietyAccountMoney(account) or 0 end @@ -22,7 +22,7 @@ end ---@param amount number ---@param _ string ---@return boolean -Managment.AddAccountMoney = function(account, amount, _) +Banking.AddAccountMoney = function(account, amount, _) return tgg:AddSocietyMoney(account, amount) end @@ -31,8 +31,8 @@ end ---@param amount number ---@param _ string ---@return boolean -Managment.RemoveAccountMoney = function(account, amount, _) +Banking.RemoveAccountMoney = function(account, amount, _) return tgg:RemoveSocietyMoney(account, amount) end -return Managment \ No newline at end of file +return Banking \ No newline at end of file diff --git a/modules/managment/tgiann-bank/server.lua b/modules/banking/tgiann-bank/server.lua similarity index 76% rename from modules/managment/tgiann-bank/server.lua rename to modules/banking/tgiann-bank/server.lua index 55f1b10..082ee73 100644 --- a/modules/managment/tgiann-bank/server.lua +++ b/modules/banking/tgiann-bank/server.lua @@ -1,19 +1,19 @@ ---@diagnostic disable: duplicate-set-field if GetResourceState('tgiann-bank') == 'missing' then return end -Managment = Managment or {} +Banking = Banking or {} local tgiann = exports["tgiann-bank"] ---This will get the name of the Managment system being being used. ---@return string -Managment.GetManagmentName = function() +Banking.GetManagmentName = function() return 'tgiann-bank' end ---This will return a number ---@param account string ---@return number -Managment.GetAccountMoney = function(account) +Banking.GetAccountMoney = function(account) return tgiann:GetJobAccountBalance(account) end @@ -22,7 +22,7 @@ end ---@param amount number ---@param _ string ---@return boolean -Managment.AddAccountMoney = function(account, amount, _) +Banking.AddAccountMoney = function(account, amount, _) return tgiann:AddJobMoney(account, amount) end @@ -31,8 +31,8 @@ end ---@param amount number ---@param _ string ---@return boolean -Managment.RemoveAccountMoney = function(account, amount, _) +Banking.RemoveAccountMoney = function(account, amount, _) return tgiann:RemoveJobMoney(account, amount) end -return Managment \ No newline at end of file +return Banking \ No newline at end of file diff --git a/modules/managment/wasabi_banking/server.lua b/modules/banking/wasabi_banking/server.lua similarity index 78% rename from modules/managment/wasabi_banking/server.lua rename to modules/banking/wasabi_banking/server.lua index 0a755b6..5d6cea6 100644 --- a/modules/managment/wasabi_banking/server.lua +++ b/modules/banking/wasabi_banking/server.lua @@ -1,19 +1,19 @@ ---@diagnostic disable: duplicate-set-field if GetResourceState('wasabi_banking') == 'missing' then return end -Managment = Managment or {} +Banking = Banking or {} local wasabi_banking = exports['wasabi_banking'] ---This will get the name of the Managment system being being used. ---@return string -Managment.GetManagmentName = function() +Banking.GetManagmentName = function() return 'wasabi_banking' end ---This will return a number ---@param account string ---@return number -Managment.GetAccountMoney = function(account) +Banking.GetAccountMoney = function(account) local balance = wasabi_banking:GetAccountBalance(account, 'society') return balance or 0 end @@ -23,7 +23,7 @@ end ---@param amount number ---@param reason string ---@return boolean -Managment.AddAccountMoney = function(account, amount, reason) +Banking.AddAccountMoney = function(account, amount, reason) return wasabi_banking:AddMoney('society', account, amount) end @@ -32,8 +32,8 @@ end ---@param amount number ---@param reason string ---@return boolean -Managment.RemoveAccountMoney = function(account, amount, reason) +Banking.RemoveAccountMoney = function(account, amount, reason) return wasabi_banking:RemoveMoney('society', account, amount) end -return Managment \ No newline at end of file +return Banking \ No newline at end of file diff --git a/modules/dialogue/_default/client/client.lua b/modules/dialogue/_default/client/client.lua index 4792b0e..4768371 100644 --- a/modules/dialogue/_default/client/client.lua +++ b/modules/dialogue/_default/client/client.lua @@ -66,7 +66,6 @@ function Dialogue.Open( name, dialogue, characterOptions, dialogueOptions, onSel SetCamCoord(cam, endLocation.x, endLocation.y, endLocation.z) RenderScriptCams(true, true, 1000, true, false) SetCamActive(cam, true) - end SendNUIMessage({ type = "open",