mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-18 14:26:03 +01:00
Compare commits
15 Commits
v2.1.08
...
960f73ad6d
| Author | SHA1 | Date | |
|---|---|---|---|
|
960f73ad6d | ||
|
|
18ecc1429e | ||
|
|
a9403e5513 | ||
|
|
9ec7bddfe6 | ||
|
|
d46aa8c2cb | ||
|
|
0793554855 | ||
|
9efc3c94cd | ||
|
9c66499fab | ||
|
|
258a510452 | ||
|
|
2ac3843fb2 | ||
|
696b469309 | ||
|
|
8d48b0d692 | ||
|
|
40ca0eb04d | ||
|
|
f53f29a4b2 | ||
|
|
2cf80881e4 |
@@ -420,7 +420,7 @@ function makeItem(origData)
|
||||
for k, v in pairs(data.craft[data.item]) do
|
||||
if isInventoryOpen() then
|
||||
print("^1Error^7: ^2Inventory is open, you tried to break things")
|
||||
stopCam(0)
|
||||
stopCam(100)
|
||||
ClearPedTasks(Ped)
|
||||
if canReturn then craftingMenu(origData) end
|
||||
CraftLock = false
|
||||
@@ -524,7 +524,7 @@ function makeItem(origData)
|
||||
end
|
||||
|
||||
--Wait(500)
|
||||
stopCam(0)
|
||||
stopCam(100)
|
||||
CraftLock = false
|
||||
if canReturn then craftingMenu(origData) end
|
||||
ClearPedTasks(Ped)
|
||||
|
||||
@@ -64,6 +64,7 @@ function createInput(title, opts)
|
||||
label = (opts[i].label or opts[i].text)..(opts[i].txt and " - "..opts[i].txt or ""),
|
||||
isRequired = opts[i].isRequired,
|
||||
name = opts[i].name,
|
||||
default = opts[i].default,
|
||||
options = opts[i].options,
|
||||
}
|
||||
end
|
||||
|
||||
@@ -171,7 +171,7 @@ function stopTempCam(renderTime)
|
||||
|
||||
clearLoadLocation()
|
||||
|
||||
Wait(renderTime or 0)
|
||||
Wait(renderTime or 500)
|
||||
for i = 1, #camCache do
|
||||
DestroyCam(camCache[i], true)
|
||||
end
|
||||
|
||||
@@ -122,7 +122,7 @@ function GetPlayer(source)
|
||||
return framework.GetPlayer(source)
|
||||
end
|
||||
end
|
||||
return nil
|
||||
return {}
|
||||
end
|
||||
|
||||
-------------------------------------------------------------
|
||||
|
||||
@@ -221,6 +221,10 @@ local billPlayerFunc = {
|
||||
function(data)
|
||||
TriggerEvent("codem-billing:client:OpenMenu")
|
||||
end,
|
||||
tgg =
|
||||
function(data)
|
||||
exports["tgg-billing"]:OpenBillingMenu()
|
||||
end,
|
||||
}
|
||||
|
||||
--- BillPlayer
|
||||
@@ -435,19 +439,26 @@ local hasGroupFunc = {
|
||||
function(group, grade, src)
|
||||
local hasJobFlag, duty = false, true
|
||||
local playerInfo = GetPlayer(src)
|
||||
local jobinfo = playerInfo.job or playerInfo.PlayerData.job
|
||||
if jobinfo and jobinfo.name == group then
|
||||
local jobInfo, gangInfo = nil, nil
|
||||
if next(playerInfo) then
|
||||
jobInfo = playerInfo.job
|
||||
gangInfo = playerInfo.gang
|
||||
if playerInfo.PlayerData then
|
||||
jobInfo = playerInfo.PlayerData.job
|
||||
gangInfo = playerInfo.PlayerData.gang
|
||||
end
|
||||
end
|
||||
if jobInfo and jobInfo.name == group then
|
||||
hasJobFlag = true
|
||||
duty = jobinfo.onduty
|
||||
if grade and not (grade <= jobinfo.grade.level) then
|
||||
duty = jobInfo.onduty
|
||||
if grade and not (grade <= jobInfo.grade.level) then
|
||||
hasJobFlag = false
|
||||
end
|
||||
return hasJobFlag, duty
|
||||
end
|
||||
local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
|
||||
if ganginfo and ganginfo.name == group then
|
||||
if gangInfo and gangInfo.name == group then
|
||||
hasJobFlag = true
|
||||
if grade and not (grade <= ganginfo.grade.level) then
|
||||
if grade and not (grade <= gangInfo.grade.level) then
|
||||
hasJobFlag = false
|
||||
end
|
||||
return hasJobFlag, duty
|
||||
@@ -461,21 +472,29 @@ local hasGroupFunc = {
|
||||
function(group, grade, src)
|
||||
local hasJobFlag, duty = false, true
|
||||
local playerInfo = GetPlayer(src)
|
||||
local jobinfo = playerInfo.job or playerInfo.PlayerData.job
|
||||
if jobinfo and jobinfo.name == group then
|
||||
local jobInfo, gangInfo = nil, nil
|
||||
if next(playerInfo) then
|
||||
jobInfo = playerInfo.job
|
||||
gangInfo = playerInfo.gang
|
||||
if playerInfo.PlayerData then
|
||||
jobInfo = playerInfo.PlayerData.job
|
||||
gangInfo = playerInfo.PlayerData.gang
|
||||
end
|
||||
end
|
||||
if jobInfo and jobInfo.name == group then
|
||||
hasJobFlag = true
|
||||
duty = jobinfo.onduty
|
||||
if grade and not (grade <= jobinfo.grade.level) then
|
||||
duty = jobInfo.onduty
|
||||
if grade and not (grade <= jobInfo.grade.level) then
|
||||
hasJobFlag = false
|
||||
end
|
||||
end
|
||||
local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
|
||||
if ganginfo and ganginfo.name == group then
|
||||
if gangInfo and gangInfo.name == group then
|
||||
hasJobFlag = true
|
||||
if grade and not (grade <= ganginfo.grade.level) then
|
||||
if grade and not (grade <= gangInfo.grade.level) then
|
||||
hasJobFlag = false
|
||||
end
|
||||
end
|
||||
::skip::
|
||||
return hasJobFlag, duty
|
||||
end,
|
||||
},
|
||||
@@ -504,9 +523,8 @@ local hasGroupFunc = {
|
||||
hasGroup =
|
||||
function(group, grade, src)
|
||||
local hasJobFlag, duty = false, true
|
||||
|
||||
local playerInfo = GetPlayer(src)
|
||||
local info = playerInfo.job
|
||||
local info = playerInfo and playerInfo.job
|
||||
while not info do
|
||||
info = GetPlayer(src).job
|
||||
Wait(100)
|
||||
@@ -514,7 +532,6 @@ local hasGroupFunc = {
|
||||
if info.name == group then
|
||||
hasJobFlag = true
|
||||
end
|
||||
|
||||
return hasJobFlag, duty
|
||||
end,
|
||||
},
|
||||
@@ -524,18 +541,25 @@ local hasGroupFunc = {
|
||||
function(group, grade, src)
|
||||
local hasJobFlag, duty = false, true
|
||||
local playerInfo = GetPlayer(src)
|
||||
local jobinfo = playerInfo.job or playerInfo.PlayerData.job
|
||||
if jobinfo and jobinfo.name == group then
|
||||
local jobInfo, gangInfo = nil, nil
|
||||
if next(playerInfo) then
|
||||
jobInfo = playerInfo.job
|
||||
gangInfo = playerInfo.gang
|
||||
if playerInfo.PlayerData then
|
||||
jobInfo = playerInfo.PlayerData.job
|
||||
gangInfo = playerInfo.PlayerData.gang
|
||||
end
|
||||
end
|
||||
if jobInfo and jobInfo.name == group then
|
||||
hasJobFlag = true
|
||||
duty = jobinfo.onduty
|
||||
if grade and not (grade <= jobinfo.grade.level) then
|
||||
duty = jobInfo.onduty
|
||||
if grade and not (grade <= jobInfo.grade.level) then
|
||||
hasJobFlag = false
|
||||
end
|
||||
end
|
||||
local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
|
||||
if ganginfo and ganginfo.name == group then
|
||||
if gangInfo and gangInfo.name == group then
|
||||
hasJobFlag = true
|
||||
if grade and not (grade <= ganginfo.grade.level) then
|
||||
if grade and not (grade <= gangInfo.grade.level) then
|
||||
hasJobFlag = false
|
||||
end
|
||||
end
|
||||
@@ -605,6 +629,8 @@ local getPlayerFunc = {
|
||||
onDuty = info.job.onDuty,
|
||||
--account = info.charinfo.account,
|
||||
citizenId = info.identifier,
|
||||
hunger = info.status.hunger,
|
||||
thirst = info.status.thirst,
|
||||
}
|
||||
return Player
|
||||
end,
|
||||
@@ -635,7 +661,9 @@ local getPlayerFunc = {
|
||||
--account = info.charinfo.account,
|
||||
citizenId = info.identifier,
|
||||
isDead = IsEntityDead(PlayerPedId()),
|
||||
isDown = IsPedDeadOrDying(PlayerPedId(), true)
|
||||
isDown = IsPedDeadOrDying(PlayerPedId(), true),
|
||||
hunger = info.status.hunger,
|
||||
thirst = info.status.thirst,
|
||||
}
|
||||
return Player
|
||||
end,
|
||||
@@ -719,6 +747,8 @@ local getPlayerFunc = {
|
||||
isDead = info.PlayerData.metadata["isdead"],
|
||||
isDown = info.PlayerData.metadata["inlaststand"],
|
||||
charInfo = info.charinfo,
|
||||
hunger = info.PlayerData.metadata["hunger"],
|
||||
thirst = info.PlayerData.metadata["thirst"],
|
||||
}
|
||||
return Player
|
||||
end,
|
||||
@@ -747,6 +777,8 @@ local getPlayerFunc = {
|
||||
isDead = info.metadata["isdead"],
|
||||
isDown = info.metadata["inlaststand"],
|
||||
charInfo = info.charinfo,
|
||||
hunger = info.metadata["hunger"],
|
||||
thirst = info.metadata["thirst"],
|
||||
}
|
||||
return Player
|
||||
end,
|
||||
@@ -778,6 +810,8 @@ local getPlayerFunc = {
|
||||
isDead = info.metadata["isdead"],
|
||||
isDown = info.metadata["inlaststand"],
|
||||
charInfo = info.charinfo,
|
||||
hunger = info.metadata["hunger"],
|
||||
thirst = info.metadata["thirst"],
|
||||
}
|
||||
end
|
||||
return Player
|
||||
@@ -809,6 +843,8 @@ local getPlayerFunc = {
|
||||
isDead = info.metadata["isdead"],
|
||||
isDown = info.metadata["inlaststand"],
|
||||
charInfo = info.charinfo,
|
||||
hunger = info.metadata["hunger"],
|
||||
thirst = info.metadata["thirst"],
|
||||
}
|
||||
return Player
|
||||
end,
|
||||
@@ -840,6 +876,8 @@ local getPlayerFunc = {
|
||||
isDead = info.metadata["isdead"],
|
||||
isDown = info.metadata["inlaststand"],
|
||||
charInfo = info.charinfo,
|
||||
hunger = info.metadata["hunger"],
|
||||
thirst = info.metadata["thirst"],
|
||||
}
|
||||
end
|
||||
return Player
|
||||
@@ -871,6 +909,8 @@ local getPlayerFunc = {
|
||||
isDead = info.metadata["isdead"],
|
||||
isDown = info.metadata["inlaststand"],
|
||||
charInfo = info.charinfo,
|
||||
hunger = info.metadata["hunger"],
|
||||
thirst = info.metadata["thirst"],
|
||||
}
|
||||
return Player
|
||||
end,
|
||||
@@ -972,6 +1012,12 @@ local wardrobeFunc = {
|
||||
TriggerEvent("illenium-appearance:client:openOutfitMenu")
|
||||
end,
|
||||
},
|
||||
{
|
||||
name = "rcore_clothing",
|
||||
openWardrobe = function()
|
||||
TriggerEvent('rcore_clothing:openChangingRoom')
|
||||
end,
|
||||
}
|
||||
}
|
||||
|
||||
--- Opens the clothing customization menu
|
||||
@@ -984,4 +1030,5 @@ function openClothing()
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user