mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-17 05:56:02 +01:00
Compare commits
2 Commits
54b1280bef
...
20cea95783
| Author | SHA1 | Date | |
|---|---|---|---|
|
20cea95783 | ||
|
|
0dc5a45b5d |
@@ -33,6 +33,7 @@ local bossMenuFunc = {
|
||||
|
||||
{ name = "esx_society",
|
||||
openBossMenu = function(isGang, group)
|
||||
TriggerServerEvent(getScript()..":registerESXSociety", isGang, group)
|
||||
TriggerEvent('esx_society:openBossMenu', group, function() end, { wash = false })
|
||||
end,
|
||||
},
|
||||
@@ -60,6 +61,20 @@ function openBossMenu(isGang, group)
|
||||
end
|
||||
end
|
||||
|
||||
-- Register ESX Society account in the server
|
||||
RegisterNetEvent(getScript()..":registerESXSociety", function(group)
|
||||
local checkExist = exports.esx_society:GetSociety(group)
|
||||
if checkExist == nil then
|
||||
exports.esx_society:registerSociety(
|
||||
group,
|
||||
Gangs[group] and Gangs[group].label or Jobs[group] and Jobs[group].label,
|
||||
group,
|
||||
group,
|
||||
group,
|
||||
{type = "public"}
|
||||
)
|
||||
end
|
||||
end)
|
||||
|
||||
-------------------------------------------------------------
|
||||
-- Global Duty Status
|
||||
|
||||
@@ -71,6 +71,7 @@ function startTempCam(cam, renderTime, loadScene, filter, switchCam)
|
||||
-- if moving from a cached previous cam, or you've sent a camre id for it to switch from, interpolate to it
|
||||
if switchCam or cachePrevCam then
|
||||
SetCamActiveWithInterp(cam, cachePrevCam, renderTime or 1000, 0, 0)
|
||||
SetCamActive(cachePrevCam, false) -- Set previous cam inactive (shouldn't be needed but just in case)
|
||||
else
|
||||
SetCamActive(cam, true)
|
||||
end
|
||||
|
||||
@@ -12,52 +12,6 @@
|
||||
]]
|
||||
|
||||
local societyFunc = {
|
||||
{ bankName = "qb-banking",
|
||||
getAccount =
|
||||
function(society)
|
||||
if not exports["qb-banking"]:GetAccount(society) then
|
||||
if Jobs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateJobAccount(society, 0)
|
||||
Wait(150)
|
||||
elseif Gangs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateGangAccount(society, 0)
|
||||
Wait(150)
|
||||
end
|
||||
end
|
||||
return exports["qb-banking"]:GetAccountBalance(society)
|
||||
end,
|
||||
chargeSociety =
|
||||
function(society, amount)
|
||||
if not exports["qb-banking"]:GetAccount(society) then
|
||||
if Jobs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateJobAccount(society, 0) Wait(150) -- make new account if return "null"
|
||||
elseif Gangs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateGangAccount(society, 0) Wait(150) -- make new account if return "null"
|
||||
end
|
||||
end
|
||||
exports["qb-banking"]:RemoveMoney(society, amount)
|
||||
end,
|
||||
fundSociety =
|
||||
function(society, amount)
|
||||
if not exports["qb-banking"]:GetAccount(society) then
|
||||
if Jobs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateJobAccount(society, 0)
|
||||
Wait(150)
|
||||
elseif Gangs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateGangAccount(society, 0)
|
||||
Wait(150)
|
||||
end
|
||||
end
|
||||
exports["qb-banking"]:AddMoney(society, amount)
|
||||
end,
|
||||
},
|
||||
|
||||
{ bankName = "Renewed-Banking",
|
||||
getAccount =
|
||||
function(society)
|
||||
@@ -129,6 +83,115 @@ local societyFunc = {
|
||||
end
|
||||
end,
|
||||
},
|
||||
|
||||
{ bankName = "qb-banking",
|
||||
getAccount =
|
||||
function(society)
|
||||
if not exports["qb-banking"]:GetAccount(society) then
|
||||
if Jobs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateJobAccount(society, 0)
|
||||
Wait(150)
|
||||
elseif Gangs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateGangAccount(society, 0)
|
||||
Wait(150)
|
||||
end
|
||||
end
|
||||
return exports["qb-banking"]:GetAccountBalance(society)
|
||||
end,
|
||||
chargeSociety =
|
||||
function(society, amount)
|
||||
if not exports["qb-banking"]:GetAccount(society) then
|
||||
if Jobs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateJobAccount(society, 0) Wait(150) -- make new account if return "null"
|
||||
elseif Gangs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateGangAccount(society, 0) Wait(150) -- make new account if return "null"
|
||||
end
|
||||
end
|
||||
exports["qb-banking"]:RemoveMoney(society, amount)
|
||||
end,
|
||||
fundSociety =
|
||||
function(society, amount)
|
||||
if not exports["qb-banking"]:GetAccount(society) then
|
||||
if Jobs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateJobAccount(society, 0)
|
||||
Wait(150)
|
||||
elseif Gangs[society] then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports["qb-banking"]:CreateGangAccount(society, 0)
|
||||
Wait(150)
|
||||
end
|
||||
end
|
||||
exports["qb-banking"]:AddMoney(society, amount)
|
||||
end,
|
||||
},
|
||||
|
||||
{ bankName = "esx_society",
|
||||
getAccount =
|
||||
function(society)
|
||||
local checkExist = exports.esx_society:GetSociety(society)
|
||||
if checkExist == nil then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3esx_society^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports.esx_society:registerSociety(
|
||||
society,
|
||||
Gangs[society] and Gangs[society].label or Jobs[society] and Jobs[society].label,
|
||||
society,
|
||||
society,
|
||||
society,
|
||||
{type = "public"}
|
||||
)
|
||||
end
|
||||
local p = promise.new()
|
||||
TriggerEvent('esx_addonaccount:getSharedAccount', checkExist.account, function(account)
|
||||
p:resolve(account.money)
|
||||
end)
|
||||
local newAmount = Citizen.Await(p)
|
||||
return newAmount
|
||||
end,
|
||||
chargeSociety =
|
||||
function(society, amount)
|
||||
local checkExist = exports.esx_society:GetSociety(society)
|
||||
if checkExist == nil then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3esx_society^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports.esx_society:registerSociety(
|
||||
society,
|
||||
Gangs[society] and Gangs[society].label or Jobs[society] and Jobs[society].label,
|
||||
society,
|
||||
society,
|
||||
society,
|
||||
{type = "public"}
|
||||
)
|
||||
end
|
||||
TriggerEvent('esx_addonaccount:getSharedAccount', checkExist.account, function(account)
|
||||
if amount > 0 and account.money >= amount then
|
||||
account.removeMoney(amount)
|
||||
end
|
||||
end)
|
||||
end,
|
||||
fundSociety =
|
||||
function(society, amount)
|
||||
local checkExist = exports.esx_society:GetSociety(society)
|
||||
if checkExist == nil then
|
||||
print("^6Bridge^7: ^2Making new bank account in ^7'^3esx_society^7' ^2for ^7'^3"..society.."^7'")
|
||||
exports.esx_society:registerSociety(
|
||||
society,
|
||||
Gangs[society] and Gangs[society].label or Jobs[society] and Jobs[society].label,
|
||||
society,
|
||||
society,
|
||||
society,
|
||||
{type = "public"}
|
||||
)
|
||||
end
|
||||
TriggerEvent('esx_addonaccount:getSharedAccount', checkExist.account, function(account)
|
||||
account.addMoney(amount)
|
||||
end)
|
||||
end,
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -200,14 +263,4 @@ function fundSociety(society, amount)
|
||||
end
|
||||
|
||||
print("^1Error^7: ^3FundSociety^7: ^2No supported banking script found")
|
||||
end
|
||||
|
||||
|
||||
-- other
|
||||
if isStarted("esx_society") then
|
||||
createCallback(getScript()..":getESXSocietyAccount", function(source, society)
|
||||
-- Example query – adjust table/field names to match your esx_society implementation.
|
||||
local result = MySQL.scalar.await('SELECT money FROM society_money WHERE society = ?', { society })
|
||||
return result or 0
|
||||
end)
|
||||
end
|
||||
Reference in New Issue
Block a user