mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-19 06:46:04 +01:00
Compare commits
4 Commits
v2.1.06
...
b282d3393f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b282d3393f | ||
|
|
180cc7b2a2 | ||
|
|
beb67b79a5 | ||
|
|
c359bc4342 |
@@ -957,3 +957,17 @@ function GetEntityForwardVector(entity)
|
|||||||
local heading = math.rad(GetEntityHeading(entity) + 90)
|
local heading = math.rad(GetEntityHeading(entity) + 90)
|
||||||
return vec3(math.cos(heading), math.sin(heading), 0.0)
|
return vec3(math.cos(heading), math.sin(heading), 0.0)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function adjustMinMaxZ(coord, table)
|
||||||
|
local table = table
|
||||||
|
local adMinZ, adMaxZ = false, false
|
||||||
|
if table.minZ > (coord.z + 0.1) then
|
||||||
|
adMinZ = true
|
||||||
|
table.minZ = (coord.z - 1.05)
|
||||||
|
end
|
||||||
|
if table.maxZ < (coord.z - 0.1) then
|
||||||
|
adMinZ = true
|
||||||
|
table.maxZ = (coord.z + 0.80)
|
||||||
|
end
|
||||||
|
return table.minZ, table.maxZ, adMinZ, adMaxZ
|
||||||
|
end
|
||||||
@@ -2785,11 +2785,12 @@ function openShop(data)
|
|||||||
if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
|
if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
|
||||||
|
|
||||||
-- If shop has registered coords, limit players from being too far away from it when opening
|
-- If shop has registered coords, limit players from being too far away from it when opening
|
||||||
local exploitCheck = triggerCallback(getScript()..":getRegisteredShopLocation", data.shop)
|
local exploitCheck = triggerCallback(getScript()..":getRegisteredShopLocation", data.originShop or data.shop)
|
||||||
if not exploitCheck then
|
if not exploitCheck then
|
||||||
print("^3Warning^7: ^2This isn't a registered store^1, refusing call^7")
|
print("^3Warning^7: ^2This isn't a registered store^1, refusing call^7")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if not distExploitCheck(exploitCheck) then
|
if not distExploitCheck(exploitCheck) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@@ -2799,6 +2800,29 @@ function openShop(data)
|
|||||||
lookEnt(data.coords)
|
lookEnt(data.coords)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
if not data.items.items[1] then
|
||||||
|
local shopMenu = {}
|
||||||
|
--jsonPrint(data.items)
|
||||||
|
for k, v in pairs(data.items.items) do
|
||||||
|
print(v.header)
|
||||||
|
local clonedTable = cloneTable(data)
|
||||||
|
local itemsTable = v.items or v.Items
|
||||||
|
shopMenu[#shopMenu+1] = {
|
||||||
|
header = v.header or k,
|
||||||
|
txt = countTable(itemsTable).." Products",
|
||||||
|
onSelect = function()
|
||||||
|
clonedTable.originShop = data.shop
|
||||||
|
clonedTable.shop = data.shop.."_"..k
|
||||||
|
clonedTable.label = data.items.label.." - "..(v.header or k)
|
||||||
|
clonedTable.slots = #itemsTable
|
||||||
|
clonedTable.items.items = itemsTable
|
||||||
|
openShop(clonedTable)
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
end
|
||||||
|
return openMenu(shopMenu, { header = data.items.label, canClose = true, })
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
for i = 1, #InvFunc do
|
for i = 1, #InvFunc do
|
||||||
local inv = InvFunc[i]
|
local inv = InvFunc[i]
|
||||||
@@ -2865,8 +2889,15 @@ function registerShop(name, label, items, society, coords)
|
|||||||
for i = 1, #InvFunc do
|
for i = 1, #InvFunc do
|
||||||
local inv = InvFunc[i]
|
local inv = InvFunc[i]
|
||||||
if isStarted(inv.invName) then
|
if isStarted(inv.invName) then
|
||||||
inv.registerShop(name, label, items, society)
|
if not items[1] then
|
||||||
debugPrint("^6Bridge^7: ^2Registering ^5"..inv.invName.." ^3Store^7:", name, "^4Label^7: "..label, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
|
for k, v in pairs(items) do
|
||||||
|
inv.registerShop(name.."_"..k, label.." - "..(v.header or k), v.items, society)
|
||||||
|
debugPrint("^6Bridge^7: ^2Registering ^5"..inv.invName.." ^3Store^7:", name.."_"..k, "^4Label^7: "..label.." - "..(v.header or k), coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
|
||||||
|
end
|
||||||
|
else
|
||||||
|
inv.registerShop(name, label, items, society)
|
||||||
|
debugPrint("^6Bridge^7: ^2Registering ^5"..inv.invName.." ^3Store^7:", name, "^4Label^7: "..label, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
|
||||||
|
end
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -252,7 +252,7 @@ function createEntityTarget(entity, opts, dist)
|
|||||||
-- Store the target entity for later cleanup.
|
-- Store the target entity for later cleanup.
|
||||||
targetEntities[#targetEntities + 1] = entity
|
targetEntities[#targetEntities + 1] = entity
|
||||||
|
|
||||||
-- if force target off, use jim_bridge buiilt in target functions
|
-- if force target off, use jim_bridge built in target functions
|
||||||
if Config.System.DontUseTarget then
|
if Config.System.DontUseTarget then
|
||||||
exports.jim_bridge:createEntityTarget(entity, opts, dist)
|
exports.jim_bridge:createEntityTarget(entity, opts, dist)
|
||||||
debugPrint("^6Bridge^7: ^2Creating new ^3Entity ^2target with ^6jim_bridge ^2for entity ^7"..entity)
|
debugPrint("^6Bridge^7: ^2Creating new ^3Entity ^2target with ^6jim_bridge ^2for entity ^7"..entity)
|
||||||
@@ -324,8 +324,7 @@ end
|
|||||||
---}, 2.0)
|
---}, 2.0)
|
||||||
---```
|
---```
|
||||||
function createBoxTarget(data, opts, dist)
|
function createBoxTarget(data, opts, dist)
|
||||||
|
-- if force target off, use jim_bridge built in target functions
|
||||||
-- if force target off, use jim_bridge buiilt in target functions
|
|
||||||
if Config.System.DontUseTarget then
|
if Config.System.DontUseTarget then
|
||||||
debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6jim_bridge ^7"..data[1])
|
debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6jim_bridge ^7"..data[1])
|
||||||
return exports.jim_bridge:createZoneTarget(data, opts, dist)
|
return exports.jim_bridge:createZoneTarget(data, opts, dist)
|
||||||
@@ -336,6 +335,13 @@ function createBoxTarget(data, opts, dist)
|
|||||||
local script = targetFunc[i]
|
local script = targetFunc[i]
|
||||||
if isStarted(script.targetName) then
|
if isStarted(script.targetName) then
|
||||||
debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6"..script.targetName.." ^7"..data[1])
|
debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6"..script.targetName.." ^7"..data[1])
|
||||||
|
if data[5].minZ or data[5].maxZ then
|
||||||
|
local adMinZ, adMaxZ
|
||||||
|
data[5].minZ, data[5].maxZ, adMinZ, adMaxZ = adjustMinMaxZ(data[2], { minZ = data[5].minZ, maxZ = data[5].maxZ })
|
||||||
|
if adMinZ or adMaxZ then
|
||||||
|
print("^5Debug^7: ^2Auto adjusted ^7'^4"..data[1].."^7' ^2minZ and maxZ because ^1they weren't set correctly ^2remove or fix them for this target")
|
||||||
|
end
|
||||||
|
end
|
||||||
local target = script.boxTarget(data, opts, dist)
|
local target = script.boxTarget(data, opts, dist)
|
||||||
boxTargets[#boxTargets + 1] = target
|
boxTargets[#boxTargets + 1] = target
|
||||||
return target
|
return target
|
||||||
@@ -344,6 +350,45 @@ function createBoxTarget(data, opts, dist)
|
|||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
function createPropTarget(data, opts, dist)
|
||||||
|
-- Audo create a location based on a coord and a prop models dimensions
|
||||||
|
local width, depth, _ = GetPropDimensions(data[3])
|
||||||
|
local min, max = GetModelDimensions(data[3])
|
||||||
|
local coordAdjustment = data[2] - vec4(0, 0, 1.03, 0)
|
||||||
|
local newData = {
|
||||||
|
[1] = data[1],
|
||||||
|
[2] = coordAdjustment.xyz,
|
||||||
|
[3] = width + 0.1,
|
||||||
|
[4] = depth + 0.1,
|
||||||
|
[5] = {
|
||||||
|
name = data[1],
|
||||||
|
heading = coordAdjustment.w - 90.0,
|
||||||
|
debugPoly = debugMode,
|
||||||
|
minZ = coordAdjustment.z + (min.z) - 0.1,
|
||||||
|
maxZ = coordAdjustment.z + (max.z) + 0.1,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-- if force target off, use jim_bridge built in target functions
|
||||||
|
if Config.System.DontUseTarget then
|
||||||
|
debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6jim_bridge ^7"..data[1])
|
||||||
|
return exports.jim_bridge:createZoneTarget(newData, opts, dist)
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Check for target script and use that
|
||||||
|
for i = 1, #targetFunc do
|
||||||
|
local script = targetFunc[i]
|
||||||
|
if isStarted(script.targetName) then
|
||||||
|
debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6"..script.targetName.." ^7"..data[1])
|
||||||
|
local target = script.boxTarget(newData, opts, dist)
|
||||||
|
boxTargets[#boxTargets + 1] = target
|
||||||
|
return target
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
-------------------------------------------------------------
|
-------------------------------------------------------------
|
||||||
-- Circle Zone Target Creation
|
-- Circle Zone Target Creation
|
||||||
-------------------------------------------------------------
|
-------------------------------------------------------------
|
||||||
@@ -382,7 +427,7 @@ end
|
|||||||
--- ```
|
--- ```
|
||||||
function createCircleTarget(data, opts, dist)
|
function createCircleTarget(data, opts, dist)
|
||||||
|
|
||||||
-- if force target off, use jim_bridge buiilt in target functions
|
-- if force target off, use jim_bridge built in target functions
|
||||||
if Config.System.DontUseTarget then
|
if Config.System.DontUseTarget then
|
||||||
debugPrint("^6Bridge^7: ^2Creating new ^3Sphere ^2target with ^6jim_bridge ^7"..data[1])
|
debugPrint("^6Bridge^7: ^2Creating new ^3Sphere ^2target with ^6jim_bridge ^7"..data[1])
|
||||||
return exports.jim_bridge:createZoneTarget(data, opts, dist)
|
return exports.jim_bridge:createZoneTarget(data, opts, dist)
|
||||||
@@ -429,7 +474,7 @@ end
|
|||||||
---```
|
---```
|
||||||
function createModelTarget(models, opts, dist)
|
function createModelTarget(models, opts, dist)
|
||||||
|
|
||||||
-- if force target off, use jim_bridge buiilt in target functions
|
-- if force target off, use jim_bridge built in target functions
|
||||||
if Config.System.DontUseTarget then
|
if Config.System.DontUseTarget then
|
||||||
debugPrint("^6Bridge^7: ^2Creating new ^3Model ^2target with ^6jim_bridge^7")
|
debugPrint("^6Bridge^7: ^2Creating new ^3Model ^2target with ^6jim_bridge^7")
|
||||||
return exports.jim_bridge:createModelTarget(models, opts, dist)
|
return exports.jim_bridge:createModelTarget(models, opts, dist)
|
||||||
|
|||||||
Reference in New Issue
Block a user