Compare commits

...
67 Commits
Author SHA1 Message Date
Jim Shield 40eed38dc2 Strengthen toggleItem security
- locked down `addItem` to be a lot more strict to reduce exploits
- fixed issue for if no supported inventory was found it now uses the correct functions
2026-11-05 18:03:24 +00:00
Jim Shield 8c947aae73 fallback for searchCar if info couldn't be found 2026-11-05 17:39:26 +00:00
Jim Shield a96602d351 add batch of functions to control peds 2026-11-05 17:38:57 +00:00
Jim Shield b176f9d5ad Improve makeProp handling code 2026-11-05 17:37:47 +00:00
Jim Shield 41ac8d8d7f Improve makePed handling code 2026-11-05 17:36:31 +00:00
Jim Shield 08be58d14f improve loadModel() request code 2026-11-05 17:33:48 +00:00
Jim Shield b891701359 minor adjustments for backend code 2026-11-05 17:33:07 +00:00
Jim Shield 71c0abb32c add exploit protection to SellShop
- Added server registered prices to sellShops to stop clients ability to send false amounts (needs a small change to external scripts)
2026-10-19 21:47:17 +01:00
McKlean 949363c76a Merge pull request #70 from ChrisNewmanDev/main
Added Wasabi Banking
2026-03-03 23:36:42 +00:00
Chris Newman d21f4b22b5 Added Wasabi Banking
Added Wasabi Banking to societybank.lua
2026-02-18 14:56:51 +02:00
Jim Shield e84a9f1c60 Version Bump
`2.1.08` - `2.1.09`
2025-11-10 17:07:58 +00:00
Jim Shield 12c6648767 Merge pull request #64 from rukshanchamindu/patch-1 2025-11-10 17:00:52 +00:00
RuksH4n 9a57f852b1 fix: replace boolean logic with math.max for tempCarryTable aggregation
Replaced the old `and/or` logic in the recipe ingredient loop with `math.max`
to ensure tempCarryTable[k] always stores numeric values instead of booleans.
This prevents "attempt to compare boolean with number" errors during crafting
data aggregation.
2025-11-07 21:59:18 +05:30
Jim Shield 61aae4fa92 Change esx get status to statebag check 2025-11-03 22:37:55 +00:00
Jim Shield 606ad1d124 Update notify.lua 2025-11-02 22:43:02 +00:00
Jim Shield d2bf1c01bf Force slot to number
For inventories that report slot number as a string, this forces it to a number
2025-11-01 22:48:18 +00:00
Jim Shield 8f31c740bc Update cameras.lua 2025-10-29 03:05:10 +00:00
Jim Shield f9b9de0b57 Make distExploitCheck() more verbose
When accessing a shop or stash will now attempt to print the nearest coordinates it can find and how far the player is from it

This is more a debugging thing
2025-10-27 21:39:13 +00:00
Jim Shield 6f0949da21 Fix crafting allowing movement with progressBar 2025-10-26 21:28:14 +00:00
Jim Shield 27a0e147fb Add exploit check for removing items
Add a check for if a person is attempting to trigger remove minus of an item (possibly trying to give them selves items)

this will stop it in its tracks and warn the server console what happened
2025-10-24 21:40:26 +01:00
Jim Shield 960f73ad6d Actual working checks for hasJob()
`goto skip` is weird.
2025-10-24 14:25:17 +01:00
Jim Shield 18ecc1429e as nil value check for hasJob() function
Should now properly check if the player hasn't got `playerData` from loading in fully and just return that they don't have the requested job
2025-10-24 13:23:05 +01:00
Jim Shield a9403e5513 Fix qbox getPlayer hunger and thirst calls 2025-10-23 13:19:04 +01:00
Jim Shield 9ec7bddfe6 Merge pull request #61 from GhostInLowGear/GhostInLowGear-patch-1 2025-10-22 16:40:03 +01:00
Jim Shield d46aa8c2cb Merge pull request #60 from oosayeroo/main 2025-10-22 16:38:57 +01:00
Jim Shield 0793554855 Merge pull request #59 from desypher/rcore_clothing_support 2025-10-22 16:36:49 +01:00
GhostInLowGear 9efc3c94cd Update playerfunctions.lua
Add tgg billing
2025-10-22 11:34:06 -04:00
Jim Shield 7e320bcb99 Version Bump
`2.1.07` - `2.1.08`
2025-10-21 16:09:33 +01:00
oosayeroo 9c66499fab Merge branch 'jimathy:main' into main 2025-10-21 11:14:30 +01:00
Jim Shield 54f96f7e77 When using lookEnt() also face players head 2025-10-20 20:10:02 +01:00
Jim Shield dffed24fb3 Add callback to get society balance in client side 2025-10-18 23:12:38 +01:00
Jim Shield aae2bd5021 Fix debugMode never being set after last change 2025-10-18 12:16:05 +01:00
oosayeroo 258a510452 add hunger + thirst to getPlayer
- added for esx, qb, qbox, rsg
2025-10-14 14:06:16 +01:00
oosayeroo 2ac3843fb2 Merge branch 'jimathy:main' into main 2025-10-14 09:33:15 +01:00
Jim Shield 732b07c957 Create check for broken/missing config file 2025-10-14 03:51:22 +01:00
Jim Shield 8e8010f837 Start adding stashEditMetadata()
Need help with this one

`ox_inv` provides an easy function for this but most inventories don't seem to support editing specific items in a stash

`qb-inv` currently you need to forcibly edit the sql

others I'm I'm not too sure about yet
2025-10-13 12:33:04 +01:00
desypher 696b469309 Added support for rcore_clothing in wardrobe
I have tested this on my local, feel free to merge it if you're happy to add support for rcore_clothing!
2025-10-12 01:15:30 +02:00
Jim Shield e05815cfbd Fix getStash forcing fallback functions to run 2025-10-11 17:23:26 +01:00
Jim Shield 8594ba12ec Version Bump
`2.1.06` - `2.1.07`
2025-10-10 13:27:29 +01:00
Jim Shield 9f914bd497 Fix embedded store handling 2025-10-10 02:55:16 +01:00
Jim Shield ad47836232 All grabbox to recieve slot and maxweight 2025-10-10 01:41:52 +01:00
Jim Shield ae4637f9c4 Fix OrigenInv getPlayerInv() func calling OX_Inv 2025-10-10 00:40:35 +01:00
Jim Shield a13284d0e0 Add support for 17mov progressbars 2025-10-09 20:12:05 +01:00
Jim Shield 98f8944a79 Add codem option for billing 2025-10-09 20:05:15 +01:00
Jim Shield 13b0f796ff createPropTarget also makes the prop 2025-10-09 20:04:54 +01:00
Jim Shield b282d3393f make the auto check for minZ and maxZ more lenient 2025-10-09 17:55:54 +01:00
Jim Shield 180cc7b2a2 Add new createPropTarget() function
This is intended to help create automated prop based targets

Using the coordinates and specified prop models dimensions to create a correctly sized box target.

```lua
createPropTarget({
	name,
	target.prop.coords,
	target.prop.model,
}, options, 2.0)
```
2025-10-08 22:53:36 +01:00
Jim Shield beb67b79a5 Auto adjust boxes with poorly set minZ and maxZ
Automatically adjusts box targets for custom locations that have been set wrong

if minZ is too high, adjust it
if maxZ is too low, adjust it

and warn the client that the target has to be adjusted.

Solves people opening tickets because they half edited a location without reading my docs
2025-10-07 21:07:31 +01:00
oosayeroo 8d48b0d692 Merge branch 'jimathy:main' into main 2025-10-07 15:23:02 +01:00
Jim Shield c359bc4342 Support embedded shops in other scripts 2025-10-07 13:54:31 +01:00
oosayeroo 40ca0eb04d Merge branch 'jimathy:main' into main 2025-10-06 15:37:57 +01:00
Jim Shield 2404fff002 Version Bump
`2.1.05` - `2.1.06`
2025-10-06 02:33:37 +01:00
Jim Shield 03ca409bf3 Fix AnimSet loading for effects 2025-10-06 02:28:30 +01:00
Jim Shield 9a78b057dd Create alcohol.lua
Starting a "alcohol/drug" file to handle alcohol effects between scripts using exports to keep the "amount drunk/used" synchronized between scripts that use jim_bridge
2025-10-06 02:15:19 +01:00
Jim Shield 45f390c177 Update playerfunctions.lua 2025-10-04 22:10:39 +01:00
Jim Shield 803c612cbb Change stress to take away instead of increase 2025-10-04 19:12:50 +01:00
Jim Shield 63bcb86ac1 ESX Fallback functions are very basic.
There aren't many native functions for what the script can do, if anyone has any better ideas

- go to `itemcontrol.lua`
- search `ESX` and tell me what could be done better/right
2025-10-04 01:31:14 +01:00
Jim Shield 0bc3c0f9b4 Update itemcontrol.lua 2025-10-03 17:44:29 +01:00
Jim Shield 672dd7684b Fix ESX authtoken callback saying possible exploit 2025-10-03 13:51:15 +01:00
oosayeroo f53f29a4b2 Merge branch 'jimathy:main' into main 2025-10-03 13:42:13 +01:00
Jim Shield c040390d1f Start working on inventory fallback functions
NEEDS TESTING

A lot of ESX stuff not done yet
2025-10-03 12:22:05 +01:00
Jim Shield 26b1f36029 Version Bump
`2.1.04` - `2.1.05`
2025-10-02 12:24:27 +01:00
Jim Shield 331dc94e2f Revert Crafting
I realised in trying to increase readability and optimize, I broke crafting recipes that supported different multiple recipes in the same list

eg. Mining has 3 recipes in the smelter for `goldingot`

This reverts the system back to the previous recipe style but keeps all the fixes/features from the latest updates
2025-10-02 12:20:58 +01:00
Jim Shield d1dab48acc Fix singleprogress multiplying crafting recipes
Adds a `cloneTable()` function to make a "deep copy" of the crafting recipes when calculating the multiple amounts to be taken when multicrafting
2025-10-02 00:14:13 +01:00
Jim Shield 7e595df143 Remove gta progressbar print from testing 2025-10-01 17:04:59 +01:00
Jim Shield d791a2e09f quick fix converting old crafting style 2025-10-01 11:42:47 +01:00
oosayeroo 2cf80881e4 Input.lua : allow default in oxlib "number" type 2025-09-25 02:17:48 +01:00
29 changed files with 3226 additions and 301 deletions

No files matched your search

+13 -9
View File
@@ -1,12 +1,16 @@
# VCS / CI noise # VCS / CI noise
.gitattributes export-ignore /.gitattributes export-ignore
.gitignore export-ignore /.gitignore export-ignore
.github/** export-ignore /.gitmodules export-ignore
.gitmodules export-ignore /.github export-ignore
# Dev tooling/config # Dev tooling/config
.vscode/** export-ignore /.vscode export-ignore
*.code-workspace export-ignore *.code-workspace export-ignore
.editorconfig export-ignore /.editorconfig export-ignore
.eslintrc* export-ignore /.eslintrc* export-ignore
.prettier* export-ignore /.prettier* export-ignore
# Omit release-only helpers
/server/restaurantchecker.lua export-ignore
/server/installitems.lua export-ignore
+372
View File
@@ -0,0 +1,372 @@
### pedTasks.lua
This module wraps the GTA V `Task*` natives so scripted peds can be given orders without having to remember each native's argument list.
Every task is registered against its ped, so it can be queried and cancelled later. Finite tasks accept an `onComplete` callback and an optional `timeout`, and every function returns `false, "reason"` when it cannot run.
Coordinates can be passed as a `vector3`, a `vector4`, a plain `{x=,y=,z=}` table, or an entity handle, and are normalised automatically.
> ⚠️ **The ped must not be frozen.** GTA ignores movement and animation tasks on a frozen
> ped, so create peds with `makePed(..., freeze = false, ...)` or call
> `FreezeEntityPosition(ped, false)` before giving them tasks.
> ⚠️ **Peds need a weapon and `canShoot`** before `pedTaskShootAt` will make them fire.
> Use `GiveWeaponToPed(ped, `WEAPON_PISTOL`, 50, false, true)` and
> `pedCombatAttributes(ped, { canShoot = true, canAim = true })`.
> GTA also refuses to let a ped fire unless it is already aiming, so pass `aim = true`
> or call `pedTaskAimAt` first.
#### Movement
- **pedTaskGoTo(ped, coords, opts)**
- Sends a ped to walk or run to a set of coordinates. The task completes once the ped is within `opts.radius` of the destination.
- **Options:** `run`, `speed`, `radius`, `heading`, `slide`, `nativeTimeout`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskGoTo(ped, vec3(455.0, -975.0, 30.0), {
run = true,
onComplete = function(p) print("arrived") end,
})
```
- **pedTaskGoToEntity(ped, target, opts)**
- Sends a ped towards an entity for a set time or until it is within range.
- **Options:** `duration`, `distance`, `speed`, `run`
- **Example:**
```lua
pedTaskGoToEntity(ped, vehicle, { run = true })
```
- **pedTaskFollow(ped, target, opts)**
- Makes a ped follow another entity at a set offset. Completes when the ped catches up.
- **Options:** `offset`, `run`, `speed`, `radius`, `nativeTimeout`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskFollow(ped, targetPed, { offset = vec3(2.0, 0.0, 0.0), run = true })
```
- **pedTaskWander(ped, coords, opts)**
- Sends a ped wandering randomly inside a radius. Continuous task, no completion callback.
- **Options:** `radius`, `length`, `betweenWalks`
- **Example:**
```lua
pedTaskWander(ped, vec3(455.0, -975.0, 30.0), { radius = 10.0 })
```
- **pedTaskFlee(ped, threat, opts)**
- Makes a ped run away from a threat, which can be an entity or a set of coordinates.
- **Options:** `distance`, `time`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskFlee(ped, threatPed, { distance = 60.0 })
```
- **pedTaskFace(ped, target, opts)**
- Makes a ped turn to face an entity, or to reach a heading in degrees.
- **Options:** `duration`
- **Example:**
```lua
pedTaskFace(ped, targetPed)
```
#### Vehicles
- **pedTaskEnterVehicle(ped, vehicle, opts)**
- Tells a ped to get into a vehicle. Completes once the ped is seated.
- **Options:** `seat` ("any", "driver", "passenger", "rearLeft", "rearRight"), `speed`, `flag` ("normal", "teleportToVehicle", "carjackFromSeat", "teleportDirectly"), `nativeTimeout`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskEnterVehicle(ped, vehicle, { seat = "driver" })
```
- **pedTaskLeaveVehicle(ped, opts)**
- Tells a ped to get out of a vehicle. Completes once the ped is out.
- **Options:** `vehicle`, `flag` ("normal", "normalSlow", "keepDoorOpen", "teleportOutside", "throwOutOfVehicle", "moveToPassengerFirst"), `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskLeaveVehicle(ped)
```
- **pedTaskOpenDoor(ped, vehicle, door, opts)**
- Tells a ped to open a vehicle door. GTA opens the door nearest to the given seat, so use seat names rather than door names. Asking for "driver" may still open the passenger door if that one is closer.
- **Options:** `speed`, `nativeTimeout`, `timeout`, `onComplete`
- **Example:**
```lua
pedTaskOpenDoor(ped, vehicle, "passenger")
```
- **pedCloseDoor(vehicle, door, opts)**
- Closes a vehicle door. GTA has no "close door" task, so this uses the door native directly.
- **Options:** `instant` (snap it shut), `ped` (a ped whose tasks should be cancelled first, so they stop fighting the close)
- **Example:**
```lua
pedCloseDoor(vehicle, "passenger", { ped = ped })
```
- **pedTaskDriveTo(ped, vehicle, coords, opts)**
- Makes a ped drive a vehicle to a set of coordinates.
- **Options:** `speed`, `drivingMode`, `model`, `stopRange`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskDriveTo(ped, vehicle, vec3(100.0, 200.0, 30.0))
```
- **pedTaskPark(ped, vehicle, coords, opts)**
- Makes a ped park a vehicle at a set of coordinates.
- **Options:** `heading`, `mode` ("ignoreHeading", "forward", "reverse"), `radius`, `keepEngineOn`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskPark(ped, vehicle, vec3(100.0, 200.0, 30.0), { heading = 90.0 })
```
- **pedTaskChase(ped, target)**
- Makes a ped in a vehicle chase another entity. Continuous task.
- **Example:**
```lua
pedTaskChase(ped, targetVehicle)
```
#### Combat
- **pedTaskCombat(ped, target, opts)**
- Sends a ped to attack a target. Continuous task.
- **Options:** `style` ("melee" or "ranged")
- **Example:**
```lua
pedTaskCombat(ped, targetPed, { style = "melee" })
```
- **pedTaskShootAt(ped, target, opts)**
- Makes a ped shoot at an entity or a set of coordinates. Continuous task.
- **Options:** `duration`, `pattern` (e.g. "FIRING_PATTERN_FULL_AUTO"), `aim` (aim at the target first, required for the ped to actually fire)
- **Example:**
```lua
pedTaskShootAt(ped, targetPed, { pattern = "FIRING_PATTERN_BURST_FIRE", aim = true })
```
- **pedTaskAimAt(ped, target, opts)**
- Makes a ped aim a weapon at an entity or a set of coordinates. Continuous task.
- **Options:** `duration`, `instant`, `intro`
- **Example:**
```lua
pedTaskAimAt(ped, vec3(100.0, 200.0, 30.0))
```
- **pedTaskAccuracy(ped, level)**
- Sets how accurate a ped is when shooting, `0` is poor and `100` is perfect.
- **Example:**
```lua
pedTaskAccuracy(ped, 80)
```
- **pedTaskFiringPattern(ped, pattern)**
- Sets the firing pattern a ped uses, by name or hash.
- **Example:**
```lua
pedTaskFiringPattern(ped, "FIRING_PATTERN_BURST_FIRE")
```
#### Animation
- **pedTaskPlayAnim(ped, dict, anim, opts)**
- Plays an animation on a ped. Completes once the animation has finished, unless `opts.loop` is set.
- **Options:** `blendIn`, `blendOut`, `duration`, `flag` ("looping", "holdLastFrame", "repositionWhenFinished", "notInterruptable", "upperBody"), `playbackRate`, `lock`, `loop`, `timeout`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskPlayAnim(ped, "amb@world_human_clipboard@male@idle_a", "idle_c")
```
- **pedTaskScenario(ped, scenario, opts)**
- Starts a scenario on a ped, such as a sitting or leaning animation. Continuous task.
- **Options:** `duration`, `intro`
- **Example:**
```lua
pedTaskScenario(ped, "WORLD_HUMAN_STAND_IMPATIENT")
```
- **pedTaskLookAt(ped, target, opts)**
- Makes a ped look at an entity or a set of coordinates.
- **Options:** `duration`
- **Example:**
```lua
pedTaskLookAt(ped, targetPed, { duration = 3000 })
```
- **pedTaskRagdoll(ped, duration, opts)**
- Makes a ped ragdoll for a set duration.
- **Options:** `type`
- **Example:**
```lua
pedTaskRagdoll(ped, 3000)
```
- **pedTaskStandStill(ped, duration)**
- Makes a ped stand still for a set duration.
- **Example:**
```lua
pedTaskStandStill(ped, 3000)
```
#### Behaviour
- **pedCombatAttributes(ped, opts)**
- Sets what a ped is allowed to do in combat. The native takes one attribute at a time, so every option provided is applied individually and anything left out is not changed.
- **Options:** any of `alwaysFight`, `canShoot`, `canAim`, `canUseCover`, `aggressive`, `perfectAccuracy`, `disableFleeFromCombat`, `canFlank`, `canCharge` and the rest of the game's combat attributes.
- **Example:**
```lua
pedCombatAttributes(ped, { alwaysFight = true, canShoot = true, canUseCover = true })
```
- **pedFleeAttributes(ped, opts)**
- Sets what a ped is allowed to do when it is fleeing. The native takes a bitmask, so each attribute is applied as `1 << bit`.
- FiveM only documents bit `15` as "force cower", the rest follow the game's flee attribute ordering. Use `pedSetFleeAttribute` if you need a specific bit.
- **Example:**
```lua
pedFleeAttributes(ped, { [15] = true })
```
- **pedSetFleeAttribute(ped, bit, enabled)**
- Sets a single flee attribute on a ped by its bit position.
- **Example:**
```lua
pedSetFleeAttribute(ped, 15, true)
```
- **pedCombatRange(ped, range)**
- Sets how far a ped will engage in combat. Accepts "melee", "preferred", "far" or a raw value 0-2.
- **Example:**
```lua
pedCombatRange(ped, "melee")
```
- **pedCombatAbility(ped, level)**
- Sets how well a ped fights, from `0` (poor) to `4` (very good).
- **Example:**
```lua
pedCombatAbility(ped, 3)
```
- **pedCombatMovement(ped, mode)**
- Sets how a ped moves while fighting. Accepts "hold", "strafe", "advance" or a raw value 0-2.
- **Example:**
```lua
pedCombatMovement(ped, "strafe")
```
- **pedSetConfigFlag(ped, flag, value)** / **pedGetConfigFlag(ped, flag)**
- Reads and writes raw ped config flags, for anything the helpers above do not cover.
- **Example:**
```lua
pedSetConfigFlag(ped, 17, true) -- block non temporary events
```
- **pedState(ped, opts)**
- Sets a group of general states on a ped. Only the options provided are applied.
- **Options:** `invincible`, `canRagdoll`, `dropsWeapons`, `criticalHits`, `canSwitchWeapon`, `drunk`, `armour`, `health`, `canBeDamaged`, `blocksEvents`, `moveRate`, `density`
- **Example:**
```lua
pedState(ped, { invincible = true, canRagdoll = false, armour = 100 })
```
#### Tracking
- **pedTaskStatus(ped)**
- Returns the name of the task currently assigned to a ped, or nil.
- **Example:**
```lua
if pedTaskStatus(ped) == "goTo" then print("on the move") end
```
- **pedTaskIsRunning(ped, name)**
- Checks if a named task is currently assigned to a ped.
- **Example:**
```lua
if pedTaskIsRunning(ped, "combat") then print("fighting") end
```
- **pedTaskActive(ped, index)**
- Checks if a native task is active on a ped by its task index.
- **Example:**
```lua
if pedTaskActive(ped, pedTaskWanderIndex()) then print("wandering") end
```
- **pedTaskWanderIndex()**
- Returns the native task index used by the wander task, for use with `pedTaskActive`.
- **pedTaskCancel(ped, name)**
- Cancels a task on a ped. GTA has no per task cancellation, so the ped's whole task queue is cleared. The name confirms the task is still the one running first.
- **Example:**
```lua
pedTaskCancel(ped, "goTo")
```
- **pedTaskClear(ped)**
- Clears every task on a ped and resets its tracking.
- **Example:**
```lua
pedTaskClear(ped)
```
- **pedTaskWait(ped, condition, opts)**
- Waits for a condition to become true for a ped. Useful for chaining tasks together without a separate script thread.
- **Options:** `timeout`, `interval`, `onComplete`, `onTimeout`
- **Example:**
```lua
pedTaskWait(ped, function(p) return #(GetEntityCoords(p) - target) < 3.0 end, {
onComplete = function(p) pedTaskPlayAnim(p, "dict", "anim") end,
})
```
#### Chaining tasks together
```lua
pedTaskGoTo(ped, coords, {
run = true,
onComplete = function(p)
pedTaskPlayAnim(p, "amb@world_human_clipboard@male@idle_a", "idle_c", {
onComplete = function(p2)
pedTaskGoTo(p2, coords2)
end,
})
end,
})
```
+1 -1
View File
@@ -462,7 +462,7 @@ local invWeightTable = {
[Exports.PSInv] = { file = "config.lua", path = { "MaxInventoryWeight" }, slotPath = { "MaxInventorySlots" } }, [Exports.PSInv] = { file = "config.lua", path = { "MaxInventoryWeight" }, slotPath = { "MaxInventorySlots" } },
[Exports.TgiannInv] = { file = "configs/config.lua", path = { "slotsMaxWeights", "player", "maxWeight" }, slotPath = { "slotsMaxWeights", "player", "slots" } }, [Exports.TgiannInv] = { file = "configs/config.lua", path = { "slotsMaxWeights", "player", "maxWeight" }, slotPath = { "slotsMaxWeights", "player", "slots" } },
[Exports.CodeMInv] = { file = "config/config.lua", path = { "MaxWeight" }, slotPath = { "MaxSlots" } }, [Exports.CodeMInv] = { file = "config/config.lua", path = { "MaxWeight" }, slotPath = { "MaxSlots" } },
[Exports.RSGInv] = { file = "config/config.lua", path = { "MaxWeight" }, slotPath = { "MaxSlots" } }, [Exports.RSGInv] = { file = "shared/config.lua", path = { "MaxWeight" }, slotPath = { "MaxSlots" } },
--[Exports.OrigenInv] = { file = "config.lua", path = { "MaxWeight" } }, --[Exports.OrigenInv] = { file = "config.lua", path = { "MaxWeight" } },
} }
+5 -1
View File
@@ -1,6 +1,6 @@
name "Jim_Bridge" name "Jim_Bridge"
author "Jimathy" author "Jimathy"
version "2.1.04" version "2.1.09"
description "Framework Bridge By Jimathy" description "Framework Bridge By Jimathy"
fx_version "cerulean" fx_version "cerulean"
rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.' rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
@@ -11,7 +11,11 @@ files {
'starter.lua', 'starter.lua',
'shared/*.lua', 'shared/*.lua',
'shared/make/*.lua', 'shared/make/*.lua',
'shared/auth/*.lua',
'shared/make/*.lua',
'shared/modules/*.lua',
'shared/scaleforms/*.lua', 'shared/scaleforms/*.lua',
'shared/wrappers/*.lua',
} }
-- Version checker -- Version checker
+30 -12
View File
@@ -7,14 +7,22 @@ AuthEvent = nil
currentToken = nil currentToken = nil
if isServer() then if isServer() then
local excludeRes = {
[Exports.QBExport] = true,
[Exports.ESXExport] = true,
[Exports.VorpExport] = true,
}
local AuthEvent = getScript()..":"..keyGen()..keyGen()..keyGen()..keyGen()..":"..keyGen()..keyGen()..keyGen()..keyGen() local AuthEvent = getScript()..":"..keyGen()..keyGen()..keyGen()..keyGen()..":"..keyGen()..keyGen()..keyGen()..keyGen()
validTokens = validTokens or {} validTokens = validTokens or {}
createCallback(AuthEvent, function(source) createCallback(AuthEvent, function(source)
local src = source local src = source
local token = keyGen()..keyGen()..keyGen()..keyGen() -- Use a secure random generator here local token = keyGen()..keyGen()..keyGen()..keyGen() -- Use a secure random generator here
--debugPrint(GetInvokingResource()) local invokingRes = GetInvokingResource()
if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= Exports.QBExport and GetInvokingResource() ~= Exports.VorpExport then
debugPrint(invokingRes)
if invokingRes and invokingRes ~= getScript() and not excludeRes[invokingRes] then
debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7") debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7")
return "" return ""
end end
@@ -47,9 +55,9 @@ if isServer() then
createCallback(getScript()..":callback:GetAuthEvent", function(source) createCallback(getScript()..":callback:GetAuthEvent", function(source)
local src = source local src = source
--debugPrint(GetInvokingResource()) local invokingRes = GetInvokingResource()
if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= Exports.QBExport and GetInvokingResource() ~= Exports.VorpExport then if invokingRes and invokingRes ~= getScript() and not excludeRes[invokingRes] then
debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital callback was called from an external resource^7") debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital callback was called from an external resource^7")
return "" return ""
end end
@@ -129,21 +137,31 @@ function distExploitCheck(table, src)
return false return false
end end
local maxDist = 10.0
local nearestDist = 999999.0
local nearestCoords = nil
local ped = src and GetPlayerPed(src) or PlayerPedId() local ped = src and GetPlayerPed(src) or PlayerPedId()
local srcCoords = GetEntityCoords(ped) local srcCoords = GetEntityCoords(ped)
local allow = false
for i = 1, #table do for i = 1, #table do
if #(table[i].xy - srcCoords.xy) <= 10 then
local dist2d = #(table[i].xy - srcCoords.xy)
-- Track the nearestDist
if dist2d < nearestDist then
nearestDist = dist2d
nearestCoords = table[i]
end
if dist2d <= maxDist then
debugPrint("^1Found location^7: ^3"..nearestDist.." ^7away from player - "..formatCoord(nearestCoords))
return true return true
else
allow = false
end end
end end
if not allow then print(src and ("^1Src ^3"..src.." ") or "", "^1Tried to open a registered shop/stash from over the distance limit^7")
print(src and ("^1Src ^3"..src.." ") or "", "^1Tried to open a registered shop/stash from over the distance limit^7") print("^1Nearest Possible Location^7: ^3"..nearestDist.." ^7away from player - "..formatCoord(nearestCoords))
return false return false
end
end end
+3 -3
View File
@@ -57,8 +57,8 @@ function RegisterNetEvent(name, funct)
end end
function TriggerEvent(name, ...) function TriggerEvent(name, ...)
local data = {...}
if Config.System.EventDebug then if Config.System.EventDebug then
local data = {...}
if name:find("__cfx_export") then if name:find("__cfx_export") then
print("^6Bridge^7: "..GetPrintTime().." ^2Triggering ^3"..(isServer() and "Server" or "Client").." ^2Export^7: ^6"..name:gsub("__cfx_export_", ""):gsub("%:", "^7:^4").."^7"..getDebugInfo(debug.getinfo(2, "nSl"))) print("^6Bridge^7: "..GetPrintTime().." ^2Triggering ^3"..(isServer() and "Server" or "Client").." ^2Export^7: ^6"..name:gsub("__cfx_export_", ""):gsub("%:", "^7:^4").."^7"..getDebugInfo(debug.getinfo(2, "nSl")))
else else
@@ -74,8 +74,8 @@ function TriggerEvent(name, ...)
end end
function TriggerServerEvent(name, ...) -- Client side, trigger a server event function TriggerServerEvent(name, ...) -- Client side, trigger a server event
local data = {...}
if Config.System.EventDebug then if Config.System.EventDebug then
local data = {...}
if name:find("__ox_cb") then if name:find("__ox_cb") then
print("^6Bridge^7: "..GetPrintTime().." ^2Triggered ^3Server ^2Callback: ^6"..name:gsub("__ox_cb_", "").."^7"..getDebugInfo(debug.getinfo(2, "nSl"))) print("^6Bridge^7: "..GetPrintTime().." ^2Triggered ^3Server ^2Callback: ^6"..name:gsub("__ox_cb_", "").."^7"..getDebugInfo(debug.getinfo(2, "nSl")))
else else
@@ -91,8 +91,8 @@ function TriggerServerEvent(name, ...) -- Client side, trigger a server event
end end
function TriggerClientEvent(name, ...) -- Server side, trigger a client event function TriggerClientEvent(name, ...) -- Server side, trigger a client event
local data = {...}
if Config.System.EventDebug then if Config.System.EventDebug then
local data = {...}
if name:find("__ox_cb") then if name:find("__ox_cb") then
print("^6Bridge^7: "..GetPrintTime().." ^2Triggered ^3Client ^2Callback: ^6"..name:gsub("__ox_cb_", "").."^7"..getDebugInfo(debug.getinfo(2, "nSl"))) print("^6Bridge^7: "..GetPrintTime().." ^2Triggered ^3Client ^2Callback: ^6"..name:gsub("__ox_cb_", "").."^7"..getDebugInfo(debug.getinfo(2, "nSl")))
else else
+3 -2
View File
@@ -33,8 +33,9 @@ if not SUPPRESS_UPDATES then
end end
local scriptName = ("^2"..capitalize(getScript()):gsub("%-", "^7-^2"):gsub("%_", "^7_^2")) or "" local scriptName = ("^2"..capitalize(getScript()):gsub("%-", "^7-^2"):gsub("%_", "^7_^2")) or ""
local scriptVersion = ("^5"..GetResourceMetadata(getScript(), 'version', nil):gsub("%.", "^7.^5")) or "" local rawVersion = GetResourceMetadata(getScript(), 'version', nil) or "?"
local scriptDescription = ("^2"..GetResourceMetadata(getScript(), 'description', nil)) or "" local scriptVersion = ("^5"..rawVersion:gsub("%.", "^7.^5")) or ""
local scriptDescription = ("^2"..(GetResourceMetadata(getScript(), 'description', nil) or "")) or ""
local scriptAuthor = ("^2by ^4"..GetResourceMetadata(getScript(), 'author', nil):gsub("%and", "^7and^4")) or "" local scriptAuthor = ("^2by ^4"..GetResourceMetadata(getScript(), 'author', nil):gsub("%and", "^7and^4")) or ""
print(scriptName.." ^7v"..scriptVersion.."^7 - "..scriptDescription.." "..scriptAuthor.."^7") print(scriptName.." ^7v"..scriptVersion.."^7 - "..scriptDescription.." "..scriptAuthor.."^7")
+105
View File
@@ -0,0 +1,105 @@
-- Client Item Registry
-- ---------------------------------------------------------------------------
-- Dynamically derived list of items a client is allowed to request through the
-- ":server:toggleItem" net event.
--
-- There is no hardcoded item list. The registry is built once, on first use,
-- from the host resource's own tables:
--
-- * Crafting - recipe results and ingredients
-- * Stores - shop item definitions ({ name = "item" })
-- * MaterialRecieve - material returns
-- * createUseableItem() registrations
-- * allowClientItem() calls
--
-- Because it reads the script's existing definitions, adding a new recipe or
-- shop item automatically makes it grantable. Servers do not need to maintain
-- a second list.
--
-- Items that are not found in any of the above are refused.
-- ---------------------------------------------------------------------------
ClientItemAllowlist = ClientItemAllowlist or {}
ClientItemUseable = ClientItemUseable or {}
local built = false
--- Default maximum a client may request of a dynamically discovered item.
ClientItemDefaultMax = ClientItemDefaultMax or 10
local function add(item, max)
if type(item) ~= "string" or item == "" then return end
if ClientItemAllowlist[item] == nil then
ClientItemAllowlist[item] = tonumber(max) or ClientItemDefaultMax
end
end
-- Walks a table and treats every string key and string value as a candidate
-- item name. Non-item strings are harmless because the caller still runs
-- doesItemExist() before granting anything.
local function scan(tbl, seen, depth)
if type(tbl) ~= "table" or seen[tbl] then return end
if depth and depth > 12 then return end
seen[tbl] = true
for k, v in pairs(tbl) do
if type(k) == "string" then add(k) end
if type(v) == "table" then
scan(v, seen, (depth or 0) + 1)
elseif type(v) == "string" then
add(v)
end
end
end
--- Builds the registry from whatever item tables the host resource exposes.
local function build()
if built then return end
built = true
local seen = {}
if type(Crafting) == "table" then scan(Crafting, seen, 0) end
if type(Stores) == "table" then scan(Stores, seen, 0) end
if type(MaterialRecieve) == "table" then scan(MaterialRecieve, seen, 0) end
-- Scripts keep item names in Config too (shops, sell tables, processing).
-- This is what makes the registry follow each server's own configuration.
if type(Config) == "table" then scan(Config, seen, 0) end
for item in pairs(ClientItemUseable) do add(item) end
local count = 0
for _ in pairs(ClientItemAllowlist) do count = count + 1 end
debugPrint("^6Bridge^7: ^2Client item registry built for ^3"..tostring(getScript()).."^7 - ^6"..count.."^7 entries")
if count == 0 then
print("^6Bridge^7: ^3"..tostring(getScript()).." ^1has no item definitions to build a client registry from^7.")
print("^6Bridge^7: ^1Client-side addItem/removeItem grants are disabled for this resource^7.")
print("^6Bridge^7: ^2Call ^3allowClientItem(\"item_name\", maxAmount)^2 if this resource needs them^7.")
end
end
--- Registers an item as client-grantable. Use this for items that are not
--- covered by the host resource's Crafting/Stores/MaterialRecieve tables.
--- @param item string
--- @param maxAmount number|nil
function allowClientItem(item, maxAmount)
if type(item) ~= "string" or item == "" then return end
ClientItemAllowlist[item] = tonumber(maxAmount) or ClientItemDefaultMax
end
--- Records an item registered through createUseableItem().
--- @param item string
function registerClientUseableItem(item)
if type(item) == "string" and item ~= "" then
ClientItemUseable[item] = true
end
end
--- Returns the maximum amount a client may request, or nil if not allowed.
--- Triggers the one-time build on first call.
--- @param item string
--- @return number|nil
function isClientItemAllowed(item)
if not built then build() end
return ClientItemAllowlist[item]
end
+94 -91
View File
@@ -65,7 +65,7 @@ local excludeKeys = {
--- ``` --- ```
function craftingMenu(data) function craftingMenu(data)
if CraftLock then return end if CraftLock then return end
local data = cloneTable(data)
-- Job or gang check; exit if not authorized. -- Job or gang check; exit if not authorized.
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
@@ -80,48 +80,48 @@ function craftingMenu(data)
data.stashName = data.stashTable or data.stashName data.stashName = data.stashTable or data.stashName
-- Wrapper to convert old style crafting recipes to be handled by the menu properly -- Wrapper to convert old style crafting recipes to be handled by the menu properly
if data.craftable.Recipes[1] then -- assume old style crafting table --if data.craftable.Recipes[1] then -- assume old style crafting table
local compatTable = {} -- local compatTable = {}
local id = 0 -- local id = 0
for k, v in ipairs(data.craftable.Recipes) do -- for k, v in ipairs(data.craftable.Recipes) do
local Recipe = v -- local Recipe = v
for l, b in pairs(Recipe) do -- for l, b in pairs(Recipe) do
id += 1 -- if doesItemExist(l) then
if doesItemExist(l) then -- id += 1
compatTable[l] = { -- compatTable[l] = {
ingredients = b, -- ingredients = b,
id = id, -- id = id,
info = { -- info = {
amount = Recipe.amount or 1, -- amount = Recipe.amount or 1,
metadata = Recipe.metadata or nil, -- metadata = Recipe.metadata or nil,
job = Recipe.job or nil, -- job = Recipe.job or nil,
gang = Recipe.gang or nil, -- gang = Recipe.gang or nil,
hasCrafted = Recipe.hasCrafted or nil, -- hasCrafted = Recipe.hasCrafted or nil,
}, -- },
} -- }
end -- end
end -- end
end -- end
data.craftable.Recipes = compatTable -- data.craftable.Recipes = compatTable
end --end
-- Convert to array -- Convert to array
local RecipesArray = {} --local RecipesArray = {}
for k, v in pairs(data.craftable.Recipes) do --for k, v in pairs(data.craftable.Recipes) do
RecipesArray[v.id] = { [k] = v } -- RecipesArray[v.id] = { [k] = v }
end --end
local Menu = {} local Menu = {}
local Recipes = data.craftable.Recipes local Recipes = cloneTable(data.craftable.Recipes)
local craftedItems = {} local craftedItems = {}
local tempCarryTable = {} local tempCarryTable = {}
-- Build a temporary table of all required ingredients (default quantity is 1). -- Build a temporary table of all required ingredients (default quantity is 1).
for i = 1, #RecipesArray do for i = 1, #Recipes do
for k, v in pairs(RecipesArray[i]) do for k, v in pairs(Recipes[i]) do
if doesItemExist(k) then if not excludeKeys[k] then
if not v.info.amount then v.info.amount = 1 end if not Recipes[i].amount then Recipes[i].amount = 1 end
tempCarryTable[k] = tempCarryTable[k] and (tempCarryTable[k] < v.info.amount) or v.info.amount tempCarryTable[k] = math.max(tempCarryTable[k] or 0, Recipes[i].amount)
end end
end end
end end
@@ -136,27 +136,29 @@ function craftingMenu(data)
header = "Material Source: "..(usingStash and "Job Stash" or "Player Inventory"), header = "Material Source: "..(usingStash and "Job Stash" or "Player Inventory"),
disabled = true, disabled = true,
} }
for i = 1, #Recipes do
for i = 1, #RecipesArray do local menuId = #Menu+1
local item = "" local item = ""
for k in pairs(RecipesArray[i]) do local Recipe = {}
for k, v in pairs(Recipes[i]) do
if not excludeKeys[k] then if not excludeKeys[k] then
item = k item = k
Recipe = Recipes[i]
Recipe.amount = Recipe.amount or 1
break break
end end
end end
local Recipe = RecipesArray[i][item]
-- Job Check -- Job Check
local hasGroup = true local hasGroup = true
if Recipe.info.job then if Recipe.job then
for l, b in pairs(Recipe.info.job) do for l, b in pairs(Recipe.job) do
hasGroup = hasJob(l, nil, b) hasGroup = hasJob(l, nil, b)
if hasGroup then goto skipcheck end if hasGroup then goto skipcheck end
end end
end end
if Recipe.info.gang then if Recipe.gang then
for l, b in pairs(Recipe.info.gang) do for l, b in pairs(Recipe.gang) do
hasGroup = hasJob(l, nil, b) hasGroup = hasJob(l, nil, b)
if hasGroup then goto skipcheck end if hasGroup then goto skipcheck end
end end
@@ -165,12 +167,11 @@ function craftingMenu(data)
-- if has group requirement, continue -- if has group requirement, continue
if hasGroup then if hasGroup then
local setheader, settext, disable, metadata = "", "", false, (Recipe.info.metadata or Recipe.info.info or nil) local setheader, settext, disable, metadata = "", "", false, (Recipe.metadata or Recipe.info or nil)
local itemTable = {} local itemTable = {}
local metaTable = {} local metaTable = {}
-- Build ingredient details. -- Build ingredient details.
for l, b in pairs(Recipe[item]) do
for l, b in pairs(Recipe.ingredients) do
local label = getItemLabel(l) local label = getItemLabel(l)
local hasItem = checkStashItem(data.stashName, { [l] = b }) local hasItem = checkStashItem(data.stashName, { [l] = b })
local missingMark = not hasItem and " ❌" or " " local missingMark = not hasItem and " ❌" or " "
@@ -182,17 +183,16 @@ function craftingMenu(data)
-- Make sure "canCarryTable" exists -- Make sure "canCarryTable" exists
while not canCarryTable do Wait(10) end while not canCarryTable do Wait(10) end
disable = not checkStashItem(data.stashName, itemTable) disable = not checkStashItem(data.stashName, itemTable)
setheader = ((metadata and metadata.label) or getItemLabel(item)) setheader = ((metadata and metadata.label) or getItemLabel(item))
..(Recipe.info.amount > 1 and " x"..Recipe.info.amount or "") ..(Recipe.amount > 1 and " x"..Recipe.amount or "")
local statusEmoji = disable and " " or not canCarryTable[item] and " 📦" or " ✔️" local statusEmoji = disable and " " or not canCarryTable[item] and " 📦" or " ✔️"
local isNew = (Recipe.info.hasCrafted ~= nil and craftedItems[item] == nil) and "✨ " or "" local isNew = (Recipe.hasCrafted ~= nil and craftedItems[item] == nil) and "✨ " or ""
setheader = isNew .. setheader .. statusEmoji setheader = isNew .. setheader .. statusEmoji
-- Build menu option using info -- Build menu option using info
Menu[#Menu + 1] = { Menu[menuId] = {
arrow = isOx() and (not disable and canCarryTable[item]), arrow = isOx() and (not disable and canCarryTable[item]),
isMenuHeader = disable or not canCarryTable[item], isMenuHeader = disable or not canCarryTable[item],
icon = invImg((metadata and metadata.image) or item), icon = invImg((metadata and metadata.image) or item),
@@ -203,9 +203,10 @@ function craftingMenu(data)
onSelect = (not disable and canCarryTable[item]) and function() onSelect = (not disable and canCarryTable[item]) and function()
local transdata = { local transdata = {
item = item, item = item,
craft = RecipesArray[i][item], craft = Recipe,
craftable = data.craftable, craftable = data.craftable,
coords = data.coords, coords = data.coords,
amount = Recipe.amount,
stashName = data.stashName, stashName = data.stashName,
onBack = data.onBack, onBack = data.onBack,
metadata = metadata, metadata = metadata,
@@ -270,7 +271,7 @@ function multiCraft(data)
for i = 1, maxCreation do for i = 1, maxCreation do
multiItemTable[i] = {} multiItemTable[i] = {}
for l, b in pairs(data.craft.ingredients) do for l, b in pairs(data.craft[data.item]) do
multiItemTable[i][l] = (b * i) multiItemTable[i][l] = (b * i)
end end
end end
@@ -376,7 +377,10 @@ end
--- }) --- })
--- ``` --- ```
function makeItem(data) function makeItem(origData)
local data = cloneTable(origData)
local Ped = PlayerPedId() local Ped = PlayerPedId()
if CraftLock then return end if CraftLock then return end
CraftLock = true CraftLock = true
@@ -391,7 +395,7 @@ function makeItem(data)
local craftAmount = (data.amount and data.amount ~= 1) and data.amount or 1 local craftAmount = (data.amount and data.amount ~= 1) and data.amount or 1
local metadata = data.metadata or nil local metadata = data.metadata or nil
local prop = data.craftable.Anims and data.craftable.Anims.prop or nil local prop = data.craftable.Anims and data.craftable.Anims.prop or nil
jsonPrint(prop)
local canReturn = true local canReturn = true
local crafted, crafting = true, true local crafted, crafting = true, true
@@ -413,12 +417,12 @@ function makeItem(data)
if not Config.Crafting.SingleProgress then -- if SingleProgress is disabled, dont do ingredient progressbars if not Config.Crafting.SingleProgress then -- if SingleProgress is disabled, dont do ingredient progressbars
-- Run ingredient check and usage separately first -- Run ingredient check and usage separately first
for i = 1, craftAmount do for i = 1, craftAmount do
for k, v in pairs(data.craft.ingredients) do for k, v in pairs(data.craft[data.item]) do
if isInventoryOpen() then if isInventoryOpen() then
print("^1Error^7: ^2Inventory is open, you tried to break things") print("^1Error^7: ^2Inventory is open, you tried to break things")
stopCam(0) stopCam(100)
ClearPedTasks(Ped) ClearPedTasks(Ped)
if canReturn then craftingMenu(data) end if canReturn then craftingMenu(origData) end
CraftLock = false CraftLock = false
return return
end end
@@ -430,6 +434,7 @@ function makeItem(data)
anim = "putdown_low", anim = "putdown_low",
flag = 49, flag = 49,
icon = k, icon = k,
disableMovement = true,
}) then }) then
TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "")..'inventory:client:ItemBox', Items[k], "use", v) TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "")..'inventory:client:ItemBox', Items[k], "use", v)
else else
@@ -440,11 +445,7 @@ function makeItem(data)
end end
if not crafted then if not crafted then
stopCam(0) goto finishEarly
ClearPedTasks(Ped)
if canReturn then craftingMenu(data) end
CraftLock = false
return
end end
if crafting and progressBar({ if crafting and progressBar({
@@ -455,26 +456,24 @@ function makeItem(data)
anim = anim, anim = anim,
flag = 49, flag = 49,
icon = data.item, icon = data.item,
disableMovement = true,
request = true, request = true,
}) then }) then
TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken) TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
currentToken = nil currentToken = nil
if data.craft.info.hasCrafted ~= nil then if data.craft.hasCrafted ~= nil then
data.craftable.craftedItems[data.item] = true data.craftable.craftedItems[data.item] = true
triggerCallback(getScript()..":server:setPlayerMetadata", "craftedItems", data.craftable.craftedItems) triggerCallback(getScript()..":server:setPlayerMetadata", "craftedItems", data.craftable.craftedItems)
end end
if data.craft.info.exp ~= nil then if data.craft.exp ~= nil then
craftingLevel += data.craft.exp.give craftingLevel += data.craft.exp.give
triggerCallback(getScript()..":server:setPlayerMetadata", "craftingLevel", craftingLevel) triggerCallback(getScript()..":server:setPlayerMetadata", "craftingLevel", craftingLevel)
end end
--if data.craftable.Recipes[1].oneUse == true then if data.craftable.Recipes[1].oneUse == true then
-- removeItem("craftrecipe", 1, nil, data.craftable.Recipes[1].slot) removeItem("craftrecipe", 1, nil, data.craftable.Recipes[1].slot)
-- local breakId = GetSoundId() local breakId = GetSoundId()
-- PlaySoundFromEntity(breakId, "Drill_Pin_Break", Ped, "DLC_HEIST_FLEECA_SOUNDSET", 1, 0) PlaySoundFromEntity(breakId, "Drill_Pin_Break", Ped, "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
-- canReturn = false canReturn = false
--end
if data.requiredItemfunc then
data.requiredItemfunc()
end end
else else
break break
@@ -490,21 +489,22 @@ function makeItem(data)
anim = anim, anim = anim,
flag = 49, flag = 49,
icon = data.item, icon = data.item,
disableMovement = true,
request = true, request = true,
}) then }) then
data.craft.info.amount = craftAmount data.craft.amount *= craftAmount
for k, v in pairs(data.craft.ingredients) do for k, v in pairs(data.craft[data.item]) do
-- multiply igredient requirement in sent crafting table for removal -- multiply igredient requirement in sent crafting table for removal
data.craft.ingredients[k] = (v * craftAmount) data.craft[data.item][k] = (v * craftAmount)
end end
TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken) TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
currentToken = nil -- clear client cached token currentToken = nil -- clear client cached token
-- handle metadata and experience in a single go -- handle metadata and experience in a single go
if data.craft.info.hasCrafted ~= nil then if data.craft.hasCrafted ~= nil then
data.craftable.craftedItems[data.item] = true data.craftable.craftedItems[data.item] = true
triggerCallback(getScript()..":server:setPlayerMetadata", "craftedItems", data.craftable.craftedItems) triggerCallback(getScript()..":server:setPlayerMetadata", "craftedItems", data.craftable.craftedItems)
end end
if data.craft.info.exp ~= nil then if data.craft.exp ~= nil then
craftingLevel += data.craft["exp"].give * craftAmount craftingLevel += data.craft["exp"].give * craftAmount
triggerCallback(getScript()..":server:setPlayerMetadata", "craftingLevel", craftingLevel) triggerCallback(getScript()..":server:setPlayerMetadata", "craftingLevel", craftingLevel)
end end
@@ -514,20 +514,22 @@ function makeItem(data)
-- PlaySoundFromEntity(breakId, "Drill_Pin_Break", Ped, "DLC_HEIST_FLEECA_SOUNDSET", 1, 0) -- PlaySoundFromEntity(breakId, "Drill_Pin_Break", Ped, "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
-- canReturn = false -- canReturn = false
--end --end
if data.sound then
StopSound(data.sound.soundId)
end
if data.requiredItemfunc then
data.requiredItemfunc()
end
end end
end end
::finishEarly::
if craftProp then destroyProp(craftProp) end if craftProp then destroyProp(craftProp) end
if data.sound then
StopSound(data.sound.soundId)
end
if data.requiredItemfunc then
data.requiredItemfunc()
end
--Wait(500) --Wait(500)
stopCam(0) stopCam(100)
CraftLock = false CraftLock = false
if canReturn then craftingMenu(data) end if canReturn then craftingMenu(origData) end
ClearPedTasks(Ped) ClearPedTasks(Ped)
end end
@@ -564,7 +566,7 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
if type(stashName) == "table" then if type(stashName) == "table" then
for _, name in pairs(stashName) do for _, name in pairs(stashName) do
stashItems = getStash(name) stashItems = getStash(name)
for k, v in pairs(craftable.ingredients) do for k, v in pairs(craftable[ItemMake]) do
for _, b in pairs(stashItems or {}) do for _, b in pairs(stashItems or {}) do
if k == b.name then if k == b.name then
itemRemove[k] = v itemRemove[k] = v
@@ -574,7 +576,7 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
end end
else else
stashItems = getStash(stashName) stashItems = getStash(stashName)
for k, v in pairs(craftable.ingredients) do for k, v in pairs(craftable[ItemMake]) do
for _, b in pairs(stashItems or {}) do for _, b in pairs(stashItems or {}) do
if k == b.name then if k == b.name then
itemRemove[k] = v itemRemove[k] = v
@@ -584,14 +586,15 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
end end
stashRemoveItem(stashItems, stashName, itemRemove) stashRemoveItem(stashItems, stashName, itemRemove)
else else
if craftable then if craftable[ItemMake] then
for k, v in pairs(craftable.ingredients or {}) do for k, v in pairs(craftable[ItemMake]) do
removeItem(tostring(k), v, src) removeItem(tostring(k), v, src)
end end
end end
end end
addItem(ItemMake, craftable.info.amount or 1, metadata, src) addItem(ItemMake, craftable.amount or 1, metadata, src)
-- Optionally, add experience here: -- Optionally, add experience here:
-- for example: -- for example:
-- if isStarted("core_skills") then exports["core_skills"]:AddExperience(src, 2) end -- if isStarted("core_skills") then exports["core_skills"]:AddExperience(src, 2) end
end)
end)
+4 -1
View File
@@ -7,7 +7,10 @@ function AlienEffect()
Wait(math.random(5000, 8000)) Wait(math.random(5000, 8000))
local Ped = PlayerPedId() local Ped = PlayerPedId()
local animDict = "MOVE_M@DRUNK@VERYDRUNK" local animDict = "MOVE_M@DRUNK@VERYDRUNK"
loadAnimDict(animDict) RequestAnimSet(animDict)
while not HasAnimSetLoaded(animDict) do
Wait(100)
end
SetPedCanRagdoll(Ped, true) SetPedCanRagdoll(Ped, true)
ShakeGameplayCam('DRUNK_SHAKE', 2.80) ShakeGameplayCam('DRUNK_SHAKE', 2.80)
SetTimecycleModifier("Drunk") SetTimecycleModifier("Drunk")
+42
View File
@@ -638,6 +638,8 @@ function lookEnt(entity)
debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..formatCoord(entity).."^7'") debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..formatCoord(entity).."^7'")
Wait(1500) Wait(1500)
end end
-- Make players head face the coord for 5 seconds
TaskLookAtCoord(ped, entity.x, entity.y, entity.z, 5000, 1, 1)
else else
if DoesEntityExist(entity) then if DoesEntityExist(entity) then
local entCoords = GetEntityCoords(entity) local entCoords = GetEntityCoords(entity)
@@ -646,11 +648,37 @@ function lookEnt(entity)
debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..entity.."^7' - '"..formatCoord(entCoords).."^7'") debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..entity.."^7' - '"..formatCoord(entCoords).."^7'")
Wait(1500) Wait(1500)
end end
-- Make players head face the coord for 5 seconds
TaskLookAtEntity(ped, entity, 5000, 1, 1)
end end
end end
end end
end end
-- Function to clone tables, to use when referencing tables that need to be hard set
function cloneTable(obj, opts, seen)
if type(obj) ~= "table" then return obj end
seen = seen or {}
if seen[obj] then return seen[obj] end
local copy = {}
seen[obj] = copy
-- Copy entries
for k, v in pairs(obj) do
local k2 = (opts and opts.copy_keys) and cloneTable(k, opts, seen) or k
copy[k2] = cloneTable(v, opts, seen)
end
-- Preserve metatable unless told not to
if not (opts and opts.strip_meta) then
local mt = getmetatable(obj)
if mt ~= nil then setmetatable(copy, mt) end
end
return copy
end
------------------------------------------------------------- -------------------------------------------------------------
-- Material and Prop Functions -- Material and Prop Functions
@@ -933,4 +961,18 @@ end
function GetEntityForwardVector(entity) 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
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 end
+1
View File
@@ -64,6 +64,7 @@ function createInput(title, opts)
label = (opts[i].label or opts[i].text)..(opts[i].txt and " - "..opts[i].txt or ""), label = (opts[i].label or opts[i].text)..(opts[i].txt and " - "..opts[i].txt or ""),
isRequired = opts[i].isRequired, isRequired = opts[i].isRequired,
name = opts[i].name, name = opts[i].name,
default = opts[i].default,
options = opts[i].options, options = opts[i].options,
} }
end end
+426 -72
View File
@@ -103,6 +103,10 @@ local InvFunc = {
-- Add fallback if ox can't find the stash and returns a boolean -- Add fallback if ox can't find the stash and returns a boolean
return type(stash) == "table" and stash.items or {} return type(stash) == "table" and stash.items or {}
end, end,
stashEditMetadata =
function(stash, slot, metadata)
exports[OXInv]:SetMetadata(stash, slot, metadata)
end,
stashAddItem = stashAddItem =
function(stashItems, stashName, items) function(stashItems, stashName, items)
@@ -207,6 +211,13 @@ local InvFunc = {
function(stashName) function(stashName)
return exports[CoreInv]:getInventory(stashName) return exports[CoreInv]:getInventory(stashName)
end, end,
stashEditMetadata =
function(stash, slot, metadata)
local itemData = exports[CoreInv]:getItemBySlot(stash, slot) or {}
if itemData then
exports[CoreInv]:setItem(stash, itemData.item, itemData.count, metadata)
end
end,
stashAddItem = stashAddItem =
function(stashItems, stashName, items) function(stashItems, stashName, items)
-- --
@@ -272,15 +283,15 @@ local InvFunc = {
function(src) function(src)
local grabInv = nil local grabInv = nil
if src then if src then
grabInv = exports[OXInv]:GetInventoryItems(src) grabInv = exports[OrigenInv]:GetInventoryItems(src)
else else
grabInv = exports[OXInv]:GetPlayerItems() grabInv = exports[OrigenInv]:GetInventory()
end end
return grabInv return grabInv
end, end,
invImg = invImg =
function(item) function(item)
return "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "") return "nui://"..OrigenInv.."/html/images/"..(Items[item].image or "")
end, end,
openShop = openShop =
function(name, label, items) function(name, label, items)
@@ -306,6 +317,10 @@ local InvFunc = {
function(stashName) function(stashName)
return exports[OrigenInv]:getInventory(stashName) return exports[OrigenInv]:getInventory(stashName)
end, end,
stashEditMetadata =
function(stash, slot, metadata)
exports[OrigenInv]:setMetadata(stash, slot, metadata)
end,
stashAddItem = stashAddItem =
function(stashItems, stashName, items) function(stashItems, stashName, items)
-- --
@@ -416,6 +431,10 @@ local InvFunc = {
function(stashName) function(stashName)
return exports[CodeMInv]:GetStashItems(stashName) return exports[CodeMInv]:GetStashItems(stashName)
end, end,
stashEditMetadata =
function(stash, slot, metadata)
end,
stashAddItem = stashAddItem =
function(stashItems, stashName, items) function(stashItems, stashName, items)
-- --
@@ -529,6 +548,10 @@ local InvFunc = {
function(stashName) function(stashName)
return exports[TgiannInv]:GetSecondaryInventoryItems("stash", stashName) return exports[TgiannInv]:GetSecondaryInventoryItems("stash", stashName)
end, end,
stashEditMetadata =
function(stash, slot, metadata)
end,
stashAddItem = stashAddItem =
function(stashItems, stashName, items) function(stashItems, stashName, items)
-- --
@@ -692,6 +715,10 @@ local InvFunc = {
return result and json.decode(result) or {} return result and json.decode(result) or {}
end end
end, end,
stashEditMetadata =
function(stash, slot, metadata)
end,
stashAddItem = stashAddItem =
function(stashItems, stashName, items) function(stashItems, stashName, items)
-- --
@@ -880,6 +907,23 @@ local InvFunc = {
end end
end end
end, end,
stashEditMetadata =
function(stash, slot, metadata)
local stashData = getStash(stash)
for i = 1, #stashData do
if stashData[i].slot == slot then
print("found slot")
stashData[i].info = metadata
end
jsonPrint(stashData[i])
end
debugPrint("^6Bridge^7: ^3stashEditMetadata^7: ^2Saving ^3QB^2 stash '^6"..stash.."^7'")
MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
['stash'] = stash,
['items'] = json.encode(stashData)
})
end,
stashAddItem = stashAddItem =
function(stashItems, stashName, items) function(stashItems, stashName, items)
-- --
@@ -1147,7 +1191,7 @@ local InvFunc = {
function(itemTable, src) function(itemTable, src)
local resultTable = {} local resultTable = {}
for k, v in pairs(itemTable) do for k, v in pairs(itemTable) do
resultTable[k] = exports[OXInv]:CanCarryItem(src, k, v) resultTable[k] = exports[RSGInv]:CanCarryItem(src, k, v)
end end
return resultTable return resultTable
end, end,
@@ -1301,6 +1345,32 @@ function hasItem(items, amount, src)
end end
end end
end end
-- Fallback to default hasItem function
if not hasTable or not next(hasTable) then
if isStarted(ESXExport) then
for item, amt in pairs(items) do
local count = 0
for itemName, amount in pairs(grabInv) do
if itemName and itemName == item then
count += (amount or 1)
end
end
hasTable[item] = { hasItem = count >= amt, count = count }
end
else
for item, amt in pairs(items) do
local count = 0
for _, itemData in pairs(grabInv) do
if itemData and itemData.name == item then
count += (itemData.amount or itemData.count or 1)
end
end
hasTable[item] = { hasItem = count >= amt, count = count }
end
end
end
for _, v in pairs(hasTable) do for _, v in pairs(hasTable) do
if not v.hasItem then if not v.hasItem then
return false, hasTable return false, hasTable
@@ -1334,12 +1404,40 @@ function getPlayerInv(src)
break break
end end
end end
if foundInv == "" then
-- Fallback to framework functions
if not grabInv then
if isStarted(QBExport) then
if src then
grabInv = Core.Functions.GetPlayer(src).PlayerData.items
else
grabInv = Core.Functions.GetPlayerData().items
end
elseif isStarted(ESXExport) then
if src then
local xPlayer = ESX.GetPlayerFromId(src)
grabInv = xPlayer and xPlayer.getInventory() or {}
else
grabInv = triggerCallback(getScript()..":GetESXInv")
end
end
end
if grabInv == nil then
print("^4ERROR^7: ^2No Supported Inventory detected ^7- ^2Check ^3starter^1.^2lua^7") print("^4ERROR^7: ^2No Supported Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
end end
return grabInv, foundInv return grabInv, foundInv
end end
if isServer() then
createCallback(getScript()..":GetESXInv", function(source)
local src = source
local xPlayer = ESX.GetPlayerFromId(src)
local inv = xPlayer.getInventory()
return xPlayer.getInventory(src)
end)
end
function isInventoryOpen() function isInventoryOpen()
return IsNuiFocused() return IsNuiFocused()
@@ -1391,6 +1489,10 @@ end
--- ``` --- ```
function createUseableItem(item, funct) function createUseableItem(item, funct)
if doesItemExist(item) then if doesItemExist(item) then
-- Record it in the client item registry. Items a script makes usable are
-- part of its own item definitions, so this keeps the registry dynamic.
if registerClientUseableItem then registerClientUseableItem(item) end
local useableFunc = { local useableFunc = {
{ framework = ESXExport, { framework = ESXExport,
func = function(item, funct) func = function(item, funct)
@@ -1423,6 +1525,17 @@ function createUseableItem(item, funct)
return return
end end
end end
-- Fallback to framework functiosn
if isStarted(QBExport) then
debugPrint("^6Bridge^7: ^2Registering ^3UsableItem^2 with ^4"..QBExport.."^7:", item)
Core.Functions.CreateUseableItem(item, funct)
elseif isStarted(ESXExport) then
debugPrint("^6Bridge^7: ^2Registering ^3UsableItem^2 with ^4"..ESXExport.."^7:", item)
while not ESX do Wait(0) end
ESX.RegisterUsableItem(item, funct)
end
debugPrint("^4ERROR^7: No supported framework detected for registering usable item: ^3"..item.."^7") debugPrint("^4ERROR^7: No supported framework detected for registering usable item: ^3"..item.."^7")
else else
print("^1ERROR^7: ^1Tried to make item usable but it didn't exist^7: "..item) print("^1ERROR^7: ^1Tried to make item usable but it didn't exist^7: "..item)
@@ -1448,7 +1561,7 @@ end
--- addItem("health_potion", 2, { quality = "high" }) --- addItem("health_potion", 2, { quality = "high" })
--- ``` --- ```
function addItem(item, amount, info, src) function addItem(item, amount, info, src)
if not Items[item] then if not doesItemExist(item) then
print("^6Bridge^7: ^1Error^7 - ^2Tried to give ^7'^3"..item.."^7'^2 but it doesn't exist") print("^6Bridge^7: ^1Error^7 - ^2Tried to give ^7'^3"..item.."^7'^2 but it doesn't exist")
return return
end end
@@ -1477,7 +1590,7 @@ end
--- removeItem("health_potion", 1) --- removeItem("health_potion", 1)
--- ``` --- ```
function removeItem(item, amount, src, slot) function removeItem(item, amount, src, slot)
if not Items[item] then if not doesItemExist(item) then
print("^6Bridge^7: ^1Error^7 - ^2Tried to remove ^7'^3"..item.."^7'^2 but it doesn't exist") print("^6Bridge^7: ^1Error^7 - ^2Tried to remove ^7'^3"..item.."^7'^2 but it doesn't exist")
return return
end end
@@ -1512,67 +1625,78 @@ end
--- ``` --- ```
local MAX_ITEM_REQUEST = 1000
RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount, newsrc, info, slot, token) RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount, newsrc, info, slot, token)
--debugPrint(GetInvokingResource()) local excludeRes = {
if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= "qb-core" then [QBExport] = true,
[ESXExport] = true,
[VorpExport] = true,
}
-- A client-triggered net event has no invoking resource.
local invokingRes = GetInvokingResource()
local isClient = (invokingRes == nil or invokingRes == "")
-- Server-side callers must be this resource or an allowed core.
if not isClient and invokingRes ~= getScript() and not excludeRes[invokingRes] then
debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7") debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7")
return return
end end
if not Items[item] then if type(item) ~= "string" or not doesItemExist(item) then
print("^6Bridge^7: ^1Error^7 - ^2Tried to "..(tostring(give) == "true" and "add" or "remove").." '^3"..item.."^7' but it doesn't exist") print("^1Error^7 - ^2Tried to "..(give and "add" or "remove").." '^3"..tostring(item).."^7' but it doesn't exist")
return return
end end
local src = (newsrc and tonumber(newsrc)) or source local giveItem = (give == true or give == 1)
if (give == true or give == 1) then -- Resolve the target. Clients may only ever affect themselves.
if newsrc == nil then -- this must be coming from client this would be blank local src
if isClient then
src = source
if not src or src <= 0 then return end
if newsrc ~= nil then
print("^1Exploit^7: ^3"..tostring(src).." ^1tried to target another player through toggleItem^7")
return
end
else
src = (newsrc and tonumber(newsrc)) or source
end
if not src or src <= 0 then return end
-- Bound and validate the amount.
local reqAmount = tonumber(amount) or 1
if reqAmount ~= math.floor(reqAmount) or reqAmount <= 0 or reqAmount > MAX_ITEM_REQUEST then
print("^1Exploit^7: ^3"..tostring(src).." ^1sent an invalid amount to toggleItem^7: "..tostring(amount).." ("..(giveItem and "add" or "remove").." "..item..")")
return
end
if type(info) ~= "table" then info = nil end
if type(slot) ~= "number" then slot = nil end
local action = giveItem and "addItem" or "removeItem"
local invName = ""
if giveItem then
if isClient then
-- Single-use token (10 second expiry).
if not checkToken(src, token, "item", item) then if not checkToken(src, token, "item", item) then
return return
end end
end -- Only items this resource actually defines may be granted.
end local allowedMax = isClientItemAllowed(item)
if not allowedMax then
local action = (tostring(give) == "true" and "addItem" or "removeItem") print("^1Exploit^7: ^3"..tostring(src).." ^1requested ^3"..item.." ^1via toggleItem but it is not in this resource's item registry^7")
local remamount = amount or 1 return
if item == nil then return end
local invName = ""
if give == 0 or give == false then
if not hasItem(item, amount or 1, src) then
dupeWarn(src, item, amount)
else
for i = 1, #InvFunc do
local inv = InvFunc[i]
if isStarted(inv.invName) then
invName = inv.invName
inv.removeItem(src, item, remamount)
break
end
end end
if reqAmount > allowedMax then
----- print("^1Exploit^7: ^3"..tostring(src).." ^1requested x"..reqAmount.." of ^3"..item.." ^1(max ^3"..allowedMax.."^7)")
-- Fallback for if no inventory found: return
-----
if invName == "" then
print("^4ERROR^7: No Supported Inventory detected - ^2Falling back to core functions")
if isStarted(QBExport) or isStarted(QBXExport) then -- if qbcore or qbxcore, just use core functions
invName = isStarted(QBXExport) and QBXExport or isStarted(QBExport) and QBExport
Core.Functions.GetPlayer(src).Functions.RemoveItem(item, remamount, slot)
elseif ESX and isStarted(ESXExport) then -- if esx then use core functions
invName = ESX
ESX.GetPlayerFromId(src).removeInventoryItem(item, remamount)
end
else
debugPrint("^6Bridge^7: ^3"..action.."^7[^6"..invName.."^7] Player(^3"..src.."^7) "..getItemLabel(item).."("..item..") x"..(amount or 1))
end end
end end
else
local amountToAdd = amount or 1 local amountToAdd = reqAmount
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
@@ -1593,7 +1717,39 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
ESX.GetPlayerFromId(src).addInventoryItem(item, amountToAdd) ESX.GetPlayerFromId(src).addInventoryItem(item, amountToAdd)
end end
else else
debugPrint("^6Bridge^7: ^3"..action.."^7[^6"..invName.."^7] Player(^3"..src.."^7) "..getItemLabel(item).."("..item..") x"..(amount or 1)) debugPrint("^6Bridge^7: ^3"..action.."^7[^6"..invName.."^7] Player(^3"..src.."^7) "..getItemLabel(item).."("..item..") x"..amountToAdd)
end
else
if not hasItem(item, reqAmount, src) then
dupeWarn(src, item, amount)
else
for i = 1, #InvFunc do
local inv = InvFunc[i]
if isStarted(inv.invName) then
invName = inv.invName
inv.removeItem(src, item, reqAmount)
break
end
end
-----
-- Fallback for if no inventory found:
-----
if invName == "" then
print("^4ERROR^7: No Supported Inventory detected - ^2Falling back to core functions")
if isStarted(QBExport) or isStarted(QBXExport) then -- if qbcore or qbxcore, just use core functions
invName = isStarted(QBXExport) and QBXExport or isStarted(QBExport) and QBExport
Core.Functions.GetPlayer(src).Functions.RemoveItem(item, reqAmount, slot)
elseif ESX and isStarted(ESXExport) then -- if esx then use core functions
invName = ESX
ESX.GetPlayerFromId(src).removeInventoryItem(item, reqAmount)
end
else
debugPrint("^6Bridge^7: ^3"..action.."^7[^6"..invName.."^7] Player(^3"..src.."^7) "..getItemLabel(item).."("..item..") x"..reqAmount)
end
end end
end end
end) end)
@@ -1612,8 +1768,11 @@ end)
--- dupeWarn(playerId, "health_potion") --- dupeWarn(playerId, "health_potion")
--- ``` --- ```
function dupeWarn(src, item, message) function dupeWarn(src, item, message)
local name = getPlayer(src).name src = tonumber(src)
print(message or "^5DupeWarn^7: "..name.." (^1"..tostring(src).."^7) ^2Tried to remove item '^3"..item.."^7'^2 but it wasn't there^7") if not src or src <= 0 then return end
local player = getPlayer(src)
local name = (player and player.name) or ("Unknown("..tostring(src)..")")
print(message or "^5DupeWarn^7: "..name.." (^1"..tostring(src).."^7) ^2Tried to remove item '^3"..tostring(item).."^7'^2 but it wasn't there^7")
if not debugMode then if not debugMode then
DropPlayer(src, name.."("..tostring(src)..") kicked by exploit protection") DropPlayer(src, name.."("..tostring(src)..") kicked by exploit protection")
end end
@@ -1687,6 +1846,7 @@ function getItemMetadata(item, slot, src)
if chosenSlot then if chosenSlot then
for k, v in pairs(itemcheck) do for k, v in pairs(itemcheck) do
v.slot = tonumber(v.slot)
if v.name == item and v.slot == chosenSlot then if v.name == item and v.slot == chosenSlot then
lowestSlot = v.slot lowestSlot = v.slot
metadata = itemcheck[k].info or itemcheck[k].metadata or {} metadata = itemcheck[k].info or itemcheck[k].metadata or {}
@@ -1695,6 +1855,7 @@ function getItemMetadata(item, slot, src)
end end
else else
for k, v in pairs(itemcheck) do for k, v in pairs(itemcheck) do
v.slot = tonumber(v.slot)
if v.name == item then if v.name == item then
if v.slot <= lowestSlot then if v.slot <= lowestSlot then
lowestSlot = v.slot lowestSlot = v.slot
@@ -1725,9 +1886,22 @@ RegisterNetEvent(getScript()..":server:setItemMetaData", function(data, src)
local inv = InvFunc[i] local inv = InvFunc[i]
if isStarted(inv.invName) then if isStarted(inv.invName) then
inv.setItemMetadata(data, src) inv.setItemMetadata(data, src)
break return
end end
end end
-- Fallback functions
if isStarted(QBExport) or isStarted(QBXExport) then -- if qbcore or qbxcore, just use core functions
local Player = Core.Functions.GetPlayer(src)
Player.PlayerData.items[data.slot].info = data.metadata
if data.metadata.durability then
Player.PlayerData.items[data.slot].description = "HP : "..data.metadata.durability
end
Player.Functions.SetInventory(Player.PlayerData.items)
elseif ESX and isStarted(ESXExport) then -- if esx then use core functions
--?
end
end) end)
------------------------------------------------------------- -------------------------------------------------------------
@@ -1804,6 +1978,22 @@ function canCarry(itemTable, src)
return inv.canCarry(itemTable, src) return inv.canCarry(itemTable, src)
end end
end end
-- Fallback to default canCarry function
local items = getPlayerInv(src)
local totalWeight = 0
if not items then return false end
for _, item in pairs(items) do
totalWeight += (item.weight * item.amount)
end
for k, v in pairs(itemTable) do
local itemInfo = Items[k]
if not itemInfo then
resultTable[k] = true
else
resultTable[k] = (totalWeight + (itemInfo.weight * v)) <= InventoryWeight
end
end
return resultTable return resultTable
end end
@@ -1855,6 +2045,11 @@ function getMaxInvWeight()
break break
end end
end end
-- Fallback function
if weight == 0 then
weight = InventoryWeight
end
return weight return weight
end end
@@ -1877,6 +2072,19 @@ function getCurrentInvWeight(src)
end end
end end
-- fallback function
if weight == 0 then
local itemcheck = getPlayerInv(src)
if isStarted(ESXExport) then
for _, amount in pairs(itemcheck) do
weight += (amount or 0)
end
else
for _, v in pairs(itemcheck) do
weight += ((v.weight * (v.amount or v.count)) or 0)
end
end
end
return weight return weight
end end
@@ -2127,6 +2335,16 @@ function openStash(data)
end end
function stashEditMetadata(stash, slot, metadata)
for i = 1, #InvFunc do
local inv = InvFunc[i]
if isStarted(inv.invName) then
inv.stashEditMetadata(stash, slot, metadata)
return
end
end
end
-- Wrapper function for opening stash from the server. -- Wrapper function for opening stash from the server.
-- Messy but not much else I can do about it. -- Messy but not much else I can do about it.
RegisterNetEvent(getScript()..":server:openServerStash", function(data) RegisterNetEvent(getScript()..":server:openServerStash", function(data)
@@ -2185,7 +2403,6 @@ end
--- local items = getStash("playerStash") --- local items = getStash("playerStash")
--- ``` --- ```
function getStash(stashName) function getStash(stashName)
local stashResource = ""
if stashName == "" or type(stashName) ~= "string" then if stashName == "" or type(stashName) ~= "string" then
print("^6Bridge^7: ^2Stash name was not a string ^3"..stashName.."^7(^3"..type(stashName).."^7)") print("^6Bridge^7: ^2Stash name was not a string ^3"..stashName.."^7(^3"..type(stashName).."^7)")
return {} return {}
@@ -2197,10 +2414,23 @@ function getStash(stashName)
if isStarted(inv.invName) then if isStarted(inv.invName) then
debugPrint("^6Bridge^7: ^2Retrieving ^3"..inv.invName.." ^2Stash^7:", stashName) debugPrint("^6Bridge^7: ^2Retrieving ^3"..inv.invName.." ^2Stash^7:", stashName)
stashItems = inv.getStash(stashName) stashItems = inv.getStash(stashName)
break goto skip
end end
end end
-- Fallback to sql checks if no supported inventory found
if not stashItems or not next(stashItems) then
if isStarted(QBExport) or isStarted(QBXExport) then
local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName })
if result then
stashItems = json.decode(result)
end
elseif ESX and isStarted(ESXExport) then -- if esx then use core functions
--?
end
end
::skip::
if stashItems then if stashItems then
for _, item in pairs(stashItems) do for _, item in pairs(stashItems) do
local itemInfo = Items[item.name:lower()] local itemInfo = Items[item.name:lower()]
@@ -2224,7 +2454,6 @@ function getStash(stashName)
end end
debugPrint("^6Bridge^7: ^3GetStashItems^7: ^2Stash information for '^6"..stashName.."^7' retrieved") debugPrint("^6Bridge^7: ^3GetStashItems^7: ^2Stash information for '^6"..stashName.."^7' retrieved")
end end
jsonPrint(items)
return items return items
end end
@@ -2261,10 +2490,37 @@ function stashRemoveItem(stashItems, stashName, items)
end end
end end
-- Fallback to core functions
if isStarted(QBExport) then
local stashItems = getStash(stashName[1])
for k, v in pairs(items) do
for l in pairs(stashItems) do
if stashItems[l].name == k then
if (stashItems[l].amount - v) <= 0 then
stashItems[l] = nil
else
debugPrint("^6Bridge^7: ^2Removing ^3"..PSInv.." ^2Stash item^7:", k, v)
stashItems[l].amount -= v
end
end
end
end
debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QBCORE^2 stash ^7'^6"..stashName[1].."^7'")
MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
['stash'] = stashName[1],
['items'] = json.encode(stashItems)
})
elseif isStarted(ESXExport) then
--?
end
print("^4ERROR^7: ^2No supported Inventory detected ^7- ^2Check ^3starter^1.^2lua^7") print("^4ERROR^7: ^2No supported Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
end end
RegisterNetEvent(getScript()..":server:stashRemoveItem", stashRemoveItem) RegisterNetEvent(getScript()..":server:stashRemoveItem", stashRemoveItem)
function stashAddItem(stashItems, stashName, items)
-- wip
end
------------------------------------------------------------- -------------------------------------------------------------
-- Stash Item Availability Check -- Stash Item Availability Check
------------------------------------------------------------- -------------------------------------------------------------
@@ -2389,18 +2645,20 @@ if isServer() then
end) end)
end end
RegisterNetEvent(getScript()..":openGrabBox", function(data) RegisterNetEvent(getScript()..":openGrabBox", function(data, stashData)
local Ped = PlayerPedId() local Ped = PlayerPedId()
local id = data.metadata and data.metadata.id or data.info and data.info.id or "" local id = data.metadata and data.metadata.id or data.info and data.info.id or ""
if isStarted(OXInv) then if isStarted(OXInv) then
-- this SHOLD be handled within ox_inventory if set up right
return return
end end
openStash({ openStash({
stash = id, stash = id,
coords = GetEntityCoords(Ped) coords = GetEntityCoords(Ped),
maxWeight = stashData and stashData.maxWeight or 100000,
slots = stashData and stashData.slots or 5,
}) })
end) end)
@@ -2464,7 +2722,7 @@ function sellMenu(data)
onSelect = function() onSelect = function()
local token = triggerCallback(AuthEvent) local token = triggerCallback(AuthEvent)
sellAnim({ item = k, price = v, ped = data.ped, onBack = function() sellMenu(data) end }, token) sellAnim({ item = k, price = v, ped = data.ped, shopName = data.name, onBack = function() sellMenu(data) end }, token)
end, end,
} }
end end
@@ -2557,8 +2815,37 @@ local bannedItems = {
markedbills = true markedbills = true
} }
-- Server-defined sell price registry
-- Supports per-shop pricing: { [shopName] = { [itemName] = price } }
-- Or global pricing: { [itemName] = price }
-- Use registerSellPrice() to register prices from your shop configs
local sellPriceRegistry = {}
-- Register sell price for an item at a specific shop
-- Usage: registerSellPrice("shopName", "item_name", 50)
-- Usage: registerSellPrice(nil, "item_name", 50) -- nil = global price
function registerSellPrice(shopName, itemName, price)
sellPriceRegistry[tostring(shopName)] = sellPriceRegistry[tostring(shopName)] or {}
sellPriceRegistry[tostring(shopName)][tostring(itemName)] = tonumber(price)
debugPrint("^6Bridge^7: ^2Registered price^7: ^3"..tostring(itemName).."^7[^3"..tostring(price).."^7] - "..tostring(shopName or "global").."^7")
end
-- Get sell price from registry (checks per-shop first, then global)
function GetSellPrice(shopName, itemName)
-- Check for per-shop price (only if shopName is not nil/empty)
if shopName and shopName ~= "" then
local shopPrices = sellPriceRegistry[tostring(shopName)]
if shopPrices then
return shopPrices[tostring(itemName)]
end
end
-- Fallback to global registry (no shop specified, or shop not found in registry)
return sellPriceRegistry[tostring(itemName)]
end
--- Server event handler for processing item sales. --- Server event handler for processing item sales.
--- Removes sold items from inventory and funds the player based on the sale. --- Removes sold items from inventory and funds the player based on the sale.
--- Uses server-defined prices from the registry, ignoring client-supplied price.
RegisterNetEvent(getScript()..":Sellitems", function(data, token) RegisterNetEvent(getScript()..":Sellitems", function(data, token)
local src = source local src = source
@@ -2576,18 +2863,47 @@ RegisterNetEvent(getScript()..":Sellitems", function(data, token)
local hasItems, hasTable = hasItem(data.item, 1, src) local hasItems, hasTable = hasItem(data.item, 1, src)
if hasItems then if hasItems then
removeItem(data.item, hasTable[data.item].count, src) removeItem(data.item, hasTable[data.item].count, src)
print((hasTable[data.item].count * data.price), data.price)
fundPlayer((hasTable[data.item].count * data.price), "cash", src) -- FIX: Use server-defined price from registry, NOT client-supplied data.price
-- data.shopName comes from sellMenu's 'name' parameter
local pricePerUnit = GetSellPrice(data.shopName, data.item)
if not pricePerUnit then
debugPrint("^1ERROR^7: No sell price registered for item: ^3"..data.item.."^7 at shop: ^3"..tostring(data.shopName or "global"))
-- Try to find available prices for debugging
for shop, items in pairs(sellPriceRegistry) do
if items[tostring(data.item)] then
debugPrint("^6Available price for "..data.item..": ^7at shop ^3"..shop)
end
end
triggerNotify(nil, "This item cannot be sold", "error", src)
return
end
local totalPrice = hasTable[data.item].count * pricePerUnit
fundPlayer(totalPrice, "cash", src)
triggerNotify(nil, "Sold "..hasTable[data.item].count.."x "..data.item.." for $"..cv(totalPrice), "success", src)
else else
triggerNotify(nil, Loc[Config.Lan].error["dont_have"].." "..getItemLabel(data.item), "error", src) triggerNotify(nil, Loc[Config.Lan].error["dont_have"].." "..getItemLabel(data.item), "error", src)
end end
end) end)
function registerSellShop(name, coords) function registerSellShop(name, coords, items)
if coords then if coords then
debugPrint("^6Bridge^7: ^2Registering ^3Sell Store^7: "..name, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET") debugPrint("^6Bridge^7: ^2Registering ^3Sell Store^7: "..name, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
sellShopExploitCheck[name] = sellShopExploitCheck[name] or {} sellShopExploitCheck[name] = sellShopExploitCheck[name] or {}
sellShopExploitCheck[name][#sellShopExploitCheck[name]+1] = coords sellShopExploitCheck[name][#sellShopExploitCheck[name]+1] = coords
if items then
for k, v in pairs(items) do
if type(v) == "table" then
for l, b in pairs(v.Items) do
registerSellPrice(name, l, b)
end
else
registerSellPrice(name, k, v)
end
end
end
end end
end end
@@ -2622,7 +2938,6 @@ end
--- }) --- })
--- ``` --- ```
function openShop(data) function openShop(data)
--jsonPrint(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
@@ -2631,6 +2946,7 @@ function openShop(data)
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
@@ -2640,16 +2956,44 @@ function openShop(data)
lookEnt(data.coords) lookEnt(data.coords)
return return
end end
if not data.items.items[1] then
local shopMenu = {}
for k, v in pairs(data.items.items) do
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]
if isStarted(inv.invName) then if isStarted(inv.invName) then
inv.openShop(data.shop, data.items.label, data.items) inv.openShop(data.shop, data.items.label, data.items)
lookEnt(data.coords) lookEnt(data.coords)
break return
end end
end end
if isStarted(QBExport) then
TriggerServerEvent(getScript()..':server:openServerShop', data.shop)
TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)
elseif isStarted(ESXExport) then
--?
end
end end
RegisterNetEvent(getScript()..':server:openServerShop', function(shopName) RegisterNetEvent(getScript()..':server:openServerShop', function(shopName)
@@ -2657,7 +3001,7 @@ RegisterNetEvent(getScript()..':server:openServerShop', function(shopName)
-- 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
if not shopExploitCheck[shopName] then if not shopExploitCheck[shopName] then
print("^3Warning^7: ^1Source^7: ^3"..src.." ^1Tried to open a shop^7: ^2This isn't a registered store^1, refusing call^7") print("^3Warning^7: ^1Source^7: ^3"..src.." ^1Tried to open a shop ^7'"..shopName.."' ^2This isn't a registered store^7, ^1refusing call^7")
return return
end end
if not distExploitCheck(shopExploitCheck[shopName], src) then if not distExploitCheck(shopExploitCheck[shopName], src) then
@@ -2699,8 +3043,18 @@ 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)
shopExploitCheck[name.."_"..k] = shopExploitCheck[name.."_"..k] or {}
shopExploitCheck[name.."_"..k][#shopExploitCheck[name.."_"..k]+1] = coords
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
+2 -2
View File
@@ -19,7 +19,7 @@ local camCache = {}
-- ``` -- ```
function createTempCam(ent, coords) function createTempCam(ent, coords)
local camID = nil local camID = nil
if Config.Crafting?.craftCam or Config.System.enableCam then if (Config.Crafting and Config.Crafting.craftCam) or Config.System.enableCam then
-- if not ent or coords are provided, make a basic camera to control later -- if not ent or coords are provided, make a basic camera to control later
if not ent and not coords then if not ent and not coords then
@@ -171,7 +171,7 @@ function stopTempCam(renderTime)
clearLoadLocation() clearLoadLocation()
Wait(renderTime or 0) Wait(renderTime or 500)
for i = 1, #camCache do for i = 1, #camCache do
DestroyCam(camCache[i], true) DestroyCam(camCache[i], true)
end end
+15 -10
View File
@@ -1,4 +1,3 @@
local time = 500
--- Loads a specified model into memory. --- Loads a specified model into memory.
--- ---
@@ -11,16 +10,22 @@ local time = 500
--- ```lua --- ```lua
--- loadModel('prop_chair_01a') --- loadModel('prop_chair_01a')
--- ``` --- ```
function loadModel(model) function loadModel(model, timeout)
if not IsModelValid(model) then print("^6Bridge^7: ^1ERROR^7: ^2Model^7 - '^6"..model.."^7' ^2does not exist in server") return if not IsModelValid(model) then print("^6Bridge^7: ^1ERROR^7: ^2Model^7 - '^6"..model.."^7' ^2does not exist in server") return false end
else if HasModelLoaded(model) then return true end
if not HasModelLoaded(model) then
debugPrint("^6Bridge^7: ^2Loading Model^7: '^6"..model.."^7'") debugPrint("^6Bridge^7: ^2Loading Model^7: '^6"..model.."^7'")
while not HasModelLoaded(model) and time > 0 do time -= 1 RequestModel(model) Wait(0) end local deadline = GetGameTimer() + (timeout or 10000)
if not HasModelLoaded(model) then print("^6Bridge^7: ^3LoadModel^7: ^2Timed out loading model ^7'^6"..model.."^7'") end while not HasModelLoaded(model) and GetGameTimer() < deadline do
end RequestModel(model)
time = 500 Wait(0)
end end
if not HasModelLoaded(model) then
print("^6Bridge^7: ^3LoadModel^7: ^2Timed out loading model ^7'^6"..model.."^7'")
return false
end
return true
end end
--- Unloads a model from memory. --- Unloads a model from memory.
+23 -8
View File
@@ -14,6 +14,8 @@ local distPeds = {}
---@param scenario boolean (optional) String specifying the scenario the Ped should perform. ---@param scenario boolean (optional) String specifying the scenario the Ped should perform.
---@param anim table (optional) A table containing animation dictionary and name `{animDict, animName}`. ---@param anim table (optional) A table containing animation dictionary and name `{animDict, animName}`.
---@param synced boolean (optional) Boolean indicating whether the Ped is synced across clients. Default is `false`. ---@param synced boolean (optional) Boolean indicating whether the Ped is synced across clients. Default is `false`.
---@param fade boolean (optional) Boolean indicating whether the Ped fades in. Default is `true`.
---@param keepModel boolean (optional) Boolean indicating whether the model stays loaded after the Ped is made. Default is `false`.
-- --
---@usage ---@usage
-- ```lua -- ```lua
@@ -58,7 +60,7 @@ end
-- ```lua -- ```lua
-- local ped = makePed(pedData, pedCoords, true, false, nil, {'animDict', 'animName'}, true) -- local ped = makePed(pedData, pedCoords, true, false, nil, {'animDict', 'animName'}, true)
-- ``` -- ```
function makePed(data, coords, freeze, collision, scenario, anim, synced, fade) function makePed(data, coords, freeze, collision, scenario, anim, synced, fade, keepModel)
local ped = nil local ped = nil
local model = nil local model = nil
if type(data) == "table" then if type(data) == "table" then
@@ -129,7 +131,7 @@ function makePed(data, coords, freeze, collision, scenario, anim, synced, fade)
SetEntityInvincible(ped, true) SetEntityInvincible(ped, true)
SetBlockingOfNonTemporaryEvents(ped, true) SetBlockingOfNonTemporaryEvents(ped, true)
FreezeEntityPosition(ped, freeze and freeze or true) FreezeEntityPosition(ped, not (freeze == false))
if collision then SetEntityNoCollisionEntity(ped, PlayerPedId(), false) end if collision then SetEntityNoCollisionEntity(ped, PlayerPedId(), false) end
if scenario then TaskStartScenarioInPlace(ped, scenario, 0, true) end if scenario then TaskStartScenarioInPlace(ped, scenario, 0, true) end
@@ -142,8 +144,9 @@ function makePed(data, coords, freeze, collision, scenario, anim, synced, fade)
else else
print("error ped") print("error ped")
end end
unloadModel(model) -- if keep model is true, don't unload the model from cache, scripts that spawn alot of the same model end up causing issues.
Peds[keyGen()..keyGen()] = ped if not keepModel then unloadModel(model) end
Peds[ped] = ped
if fade ~= false and gameName ~= "rdr3" then if fade ~= false and gameName ~= "rdr3" then
SetEntityAlpha(ped, 0, false) SetEntityAlpha(ped, 0, false)
CreateThread(function() CreateThread(function()
@@ -248,8 +251,9 @@ function GenerateRandomPedData(data)
end end
onPlayerUnload(function() onPlayerUnload(function()
for k in pairs(Peds) do for k, ped in pairs(Peds) do
DeletePed(Peds[k]) if DoesEntityExist(ped) then DeletePed(ped) end
Peds[k] = nil
end end
for i = 1, #distPeds do for i = 1, #distPeds do
removeZoneTarget(distPeds[i]) removeZoneTarget(distPeds[i])
@@ -259,7 +263,18 @@ end)
--- Cleans up all created Peds when the resource stops. --- Cleans up all created Peds when the resource stops.
onResourceStop(function() onResourceStop(function()
for k in pairs(Peds) do for k, ped in pairs(Peds) do
DeletePed(Peds[k]) if DoesEntityExist(ped) then DeletePed(ped) end
Peds[k] = nil
end end
end, true) end, true)
-- Drop the peds that are already gone
CreateThread(function()
while true do
Wait(5000)
for k, ped in pairs(Peds) do
if type(k) == "number" and not DoesEntityExist(ped) then Peds[k] = nil end
end
end
end)
+17 -5
View File
@@ -29,7 +29,7 @@ function makeProp(data, freeze, synced, fade)
debugPrint("^6Bridge^7: ^1Prop ^2Created^7: '^6"..prop.."^7' | ^2Hash^7: ^7'^6"..data.prop.."^7' | ^2Coord^7: "..formatCoord(data.coords)) debugPrint("^6Bridge^7: ^1Prop ^2Created^7: '^6"..prop.."^7' | ^2Hash^7: ^7'^6"..data.prop.."^7' | ^2Coord^7: "..formatCoord(data.coords))
SetModelAsNoLongerNeeded(data.prop) SetModelAsNoLongerNeeded(data.prop)
Props[keyGen()..keyGen()] = prop Props[prop] = prop
if fade ~= false and gameName ~= "rdr3" then if fade ~= false and gameName ~= "rdr3" then
SetEntityAlpha(prop, 0, false) SetEntityAlpha(prop, 0, false)
CreateThread(function() CreateThread(function()
@@ -94,12 +94,14 @@ function destroyProp(entity)
DetachEntity(entity, true, true) DetachEntity(entity, true, true)
end end
DeleteObject(entity) DeleteObject(entity)
Props[entity] = nil
end end
end end
onPlayerUnload(function() onPlayerUnload(function()
for k in pairs(Props) do for k, prop in pairs(Props) do
DeleteObject(Props[k]) if DoesEntityExist(prop) then DeleteObject(prop) end
Props[k] = nil
end end
for i = 1, #distProps do for i = 1, #distProps do
removeZoneTarget(distProps[i]) removeZoneTarget(distProps[i])
@@ -109,7 +111,17 @@ end)
--- Cleans up all created props when the resource stops. --- Cleans up all created props when the resource stops.
onResourceStop(function() onResourceStop(function()
for k in pairs(Props) do for k, prop in pairs(Props) do
destroyProp(Props[k]) destroyProp(prop)
end end
end, true) end, true)
-- Drop the props that are already gone
CreateThread(function()
while true do
Wait(5000)
for k, prop in pairs(Props) do
if type(k) == "number" and not DoesEntityExist(prop) then Props[k] = nil end
end
end
end)
File diff suppressed because it is too large. Load diff
+46
View File
@@ -206,6 +206,52 @@ local progressFunc = {
exports.jim_bridge:stopProgressBar() exports.jim_bridge:stopProgressBar()
end, end,
}, },
["17mov"] = {
start =
function(data)
if exports["17mov_Hud"]:StartProgress({
duration = debugMode and 1000 or data.time,
label = data.label,
useWhileDead = data.dead or false,
canCancel = data.cancel or true,
controlDisables = {
disableMovement = data.disableMovement or false,
disableCarMovement = data.disableMovement or false,
disableMouse = data.mouse or false,
disableCombat = data.combat or true,
},
animation = {
animDict = data.dict,
anim = data.anim,
flags = (data.flag == 8 and 32 or data.flag) or nil,
task = data.task,
},
prop = data.prop and {
model = data.prop.model,
bone = data.prop.bone or 0,
coords = data.prop.pos or vec3(0, 0, 0),
rotation = data.prop.rot or vec3(0, 0, 0),
} or nil,
propTwo = data.propTwo and {
model = data.propTwo.model,
bone = data.propTwo.bone or 0,
coords = data.propTwo.pos or vec3(0, 0, 0),
rotation = data.propTwo.rot or vec3(0, 0, 0),
} or nil,
}, nil, nil) then
return true
else
return false
end
end,
stop =
function()
exports["17mov_Hud"]:StopProgress()
end,
},
} }
--- Displays a progress bar using the configured progress bar system. --- Displays a progress bar using the configured progress bar system.
+1 -1
View File
@@ -122,7 +122,7 @@ function GetPlayer(source)
return framework.GetPlayer(source) return framework.GetPlayer(source)
end end
end end
return nil return {}
end end
------------------------------------------------------------- -------------------------------------------------------------
+6 -1
View File
@@ -111,11 +111,16 @@ local notifyFunc = {
--- triggerNotify("Alert", "You have been warned for misconduct.", "error", playerId) --- triggerNotify("Alert", "You have been warned for misconduct.", "error", playerId)
--- ``` --- ```
function triggerNotify(title, message, type, src) function triggerNotify(title, message, type, src)
if not Config.System?.Notify then debugPrint("Notify triggered but not set up") return end if not Config or not Config.System or not Config.System.Notify then
print("Notify triggered but not set up")
return
end
if src then if src then
if Config.System.EventDebug then print(tostring(title).." - "..tostring(message).." - "..tostring(type).." - "..tostring(src)) end
notifyFunc[Config.System.Notify].server(title, message, type, src) notifyFunc[Config.System.Notify].server(title, message, type, src)
else else
if Config.System.EventDebug then print(tostring(title).." - "..tostring(message).." - "..tostring(type).." - "..tostring(src)) end
notifyFunc[Config.System.Notify].client(title, message, type) notifyFunc[Config.System.Notify].client(title, message, type)
end end
end end
+110 -67
View File
@@ -32,7 +32,7 @@ local hungerThirstFunc = {
setStress = setStress =
function(src, stress) function(src, stress)
local Player = Core.Functions.GetPlayer(src) local Player = Core.Functions.GetPlayer(src)
local newStress = Player.PlayerData.metadata.stress + stress local newStress = Player.PlayerData.metadata.stress - stress
newStress = (newStress >= 100.0 and 100.0)or (newStress <= 0 and 0) or newStress newStress = (newStress >= 100.0 and 100.0)or (newStress <= 0 and 0) or newStress
Player.Functions.SetMetaData('stress', newStress) Player.Functions.SetMetaData('stress', newStress)
TriggerClientEvent('hud:client:UpdateStress', src, newStress) TriggerClientEvent('hud:client:UpdateStress', src, newStress)
@@ -59,7 +59,7 @@ local hungerThirstFunc = {
setStress = setStress =
function(src, stress) function(src, stress)
local Player = Core.Functions.GetPlayer(src) local Player = Core.Functions.GetPlayer(src)
local newStress = Player.PlayerData.metadata.stress + stress local newStress = Player.PlayerData.metadata.stress - stress
newStress = (newStress >= 100.0 and 100.0)or (newStress <= 0 and 0) or newStress newStress = (newStress >= 100.0 and 100.0)or (newStress <= 0 and 0) or newStress
Player.Functions.SetMetaData('stress', newStress) Player.Functions.SetMetaData('stress', newStress)
TriggerClientEvent('hud:client:UpdateStress', src, newStress) TriggerClientEvent('hud:client:UpdateStress', src, newStress)
@@ -86,7 +86,7 @@ local hungerThirstFunc = {
setStress = setStress =
function(src, stress) function(src, stress)
local Player = Core.Functions.GetPlayer(src) local Player = Core.Functions.GetPlayer(src)
local newStress = Player.PlayerData.metadata.stress + stress local newStress = Player.PlayerData.metadata.stress - stress
newStress = (newStress >= 100.0 and 100.0) or (newStress <= 0 and 0) or newStress newStress = (newStress >= 100.0 and 100.0) or (newStress <= 0 and 0) or newStress
Player.Functions.SetMetaData('stress', newStress) Player.Functions.SetMetaData('stress', newStress)
TriggerClientEvent('hud:client:UpdateStress', src, newStress) TriggerClientEvent('hud:client:UpdateStress', src, newStress)
@@ -187,10 +187,10 @@ end)
--- Server event handler for setting player needs (thirst or hunger). --- Server event handler for setting player needs (thirst or hunger).
--- ---
--- @event --- @event
--- @param type string "thirst" or "hunger". --- @param needType string "thirst" or "hunger".
--- @param amount number New value to set. --- @param amount number New value to set.
RegisterNetEvent(getScript()..":server:setNeed", function(needType, amount) RegisterNetEvent(getScript()..":server:setNeed", function(needType, amount)
print("^1Deprecated function ':server:setNeed' called, please update your scripts^7") print("^1Deprecated function ':server:setNeed' called, please update the scripts that use it^7")
-- local src = source -- local src = source
-- if needType == "thirst" then -- if needType == "thirst" then
-- setThirst(src, amount) -- setThirst(src, amount)
@@ -217,6 +217,14 @@ local billPlayerFunc = {
function(data) function(data)
TriggerEvent("okokBilling:ToggleCreateInvoice") TriggerEvent("okokBilling:ToggleCreateInvoice")
end, end,
codem =
function(data)
TriggerEvent("codem-billing:client:OpenMenu")
end,
tgg =
function(data)
exports["tgg-billing"]:OpenBillingMenu()
end,
} }
--- BillPlayer --- BillPlayer
@@ -351,7 +359,7 @@ function fundPlayer(fund, moneyType, newsrc)
local framework = moneyFunc[i] local framework = moneyFunc[i]
if framework.framework == OXInv and moneyType == "bank" then goto skip end if framework.framework == OXInv and moneyType == "bank" then goto skip end
if isStarted(framework.framework) then if isStarted(framework.framework) then
debugPrint("^6Bridge^7: ^2Funding ^3"..framework.framework.." ^2Player^7: '^6"..fund.."^7'", moneyType) debugPrint("^6Bridge^7: ^2Funding ^3"..framework.framework.." ^2Player^7(^3"..src.."^7): '^6"..fund.."^7'", moneyType)
is_success = framework.fundPlayer(src, fund, moneyType) is_success = framework.fundPlayer(src, fund, moneyType)
break break
end end
@@ -384,41 +392,6 @@ end
--- ``` --- ```
function ConsumeSuccess(itemName, type, data) function ConsumeSuccess(itemName, type, data)
print("^1Deprecated function 'ConsumeSuccess' called, please update your scripts^7") print("^1Deprecated function 'ConsumeSuccess' called, please update your scripts^7")
--local hunger = data and data.hunger or Items[itemName].hunger
--local thirst = data and data.thirst or Items[itemName].thirst
--
--ExecuteCommand("e c")
--removeItem(itemName, 1)
--
--if isStarted(ESXExport) then
-- if hunger then
-- TriggerServerEvent(getScript()..":server:setNeed", "hunger", tonumber(hunger) * 10000)
-- end
-- if thirst then
-- TriggerServerEvent(getScript()..":server:setNeed", "thirst", tonumber(thirst) * 10000)
-- end
--else
-- if hunger then
-- TriggerServerEvent(getScript()..":server:setNeed", "hunger", Core.Functions.GetPlayerData().metadata["hunger"] + tonumber(hunger))
-- end
-- if thirst then
-- TriggerServerEvent(getScript()..":server:setNeed", "thirst", Core.Functions.GetPlayerData().metadata["thirst"] + tonumber(thirst))
-- end
--end
--
--if type == "alcohol" then
-- alcoholCount = (alcoholCount or 0) + 1
-- if alcoholCount > 1 and alcoholCount < 4 then
-- TriggerEvent("evidence:client:SetStatus", "alcohol", 200)
-- elseif alcoholCount >= 4 then
-- TriggerEvent("evidence:client:SetStatus", "heavyalcohol", 200)
-- AlienEffect()
-- end
--end
--
--if Config.Reward then
-- getRandomReward(itemName)
--end
end end
------------------------------------------------------------- -------------------------------------------------------------
@@ -431,19 +404,26 @@ local hasGroupFunc = {
function(group, grade, src) function(group, grade, src)
local hasJobFlag, duty = false, true local hasJobFlag, duty = false, true
local playerInfo = GetPlayer(src) local playerInfo = GetPlayer(src)
local jobinfo = playerInfo.job or playerInfo.PlayerData.job local jobInfo, gangInfo = nil, nil
if jobinfo and jobinfo.name == group then 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 hasJobFlag = true
duty = jobinfo.onduty duty = jobInfo.onduty
if grade and not (grade <= jobinfo.grade.level) then if grade and not (grade <= jobInfo.grade.level) then
hasJobFlag = false hasJobFlag = false
end end
return hasJobFlag, duty return hasJobFlag, duty
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 hasJobFlag = true
if grade and not (grade <= ganginfo.grade.level) then if grade and not (grade <= gangInfo.grade.level) then
hasJobFlag = false hasJobFlag = false
end end
return hasJobFlag, duty return hasJobFlag, duty
@@ -457,21 +437,29 @@ local hasGroupFunc = {
function(group, grade, src) function(group, grade, src)
local hasJobFlag, duty = false, true local hasJobFlag, duty = false, true
local playerInfo = GetPlayer(src) local playerInfo = GetPlayer(src)
local jobinfo = playerInfo.job or playerInfo.PlayerData.job local jobInfo, gangInfo = nil, nil
if jobinfo and jobinfo.name == group then 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 hasJobFlag = true
duty = jobinfo.onduty duty = jobInfo.onduty
if grade and not (grade <= jobinfo.grade.level) then if grade and not (grade <= jobInfo.grade.level) then
hasJobFlag = false hasJobFlag = false
end end
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 hasJobFlag = true
if grade and not (grade <= ganginfo.grade.level) then if grade and not (grade <= gangInfo.grade.level) then
hasJobFlag = false hasJobFlag = false
end end
end end
::skip::
return hasJobFlag, duty return hasJobFlag, duty
end, end,
}, },
@@ -500,9 +488,8 @@ local hasGroupFunc = {
hasGroup = hasGroup =
function(group, grade, src) function(group, grade, src)
local hasJobFlag, duty = false, true local hasJobFlag, duty = false, true
local playerInfo = GetPlayer(src) local playerInfo = GetPlayer(src)
local info = playerInfo.job local info = playerInfo and playerInfo.job
while not info do while not info do
info = GetPlayer(src).job info = GetPlayer(src).job
Wait(100) Wait(100)
@@ -510,7 +497,6 @@ local hasGroupFunc = {
if info.name == group then if info.name == group then
hasJobFlag = true hasJobFlag = true
end end
return hasJobFlag, duty return hasJobFlag, duty
end, end,
}, },
@@ -520,18 +506,25 @@ local hasGroupFunc = {
function(group, grade, src) function(group, grade, src)
local hasJobFlag, duty = false, true local hasJobFlag, duty = false, true
local playerInfo = GetPlayer(src) local playerInfo = GetPlayer(src)
local jobinfo = playerInfo.job or playerInfo.PlayerData.job local jobInfo, gangInfo = nil, nil
if jobinfo and jobinfo.name == group then 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 hasJobFlag = true
duty = jobinfo.onduty duty = jobInfo.onduty
if grade and not (grade <= jobinfo.grade.level) then if grade and not (grade <= jobInfo.grade.level) then
hasJobFlag = false hasJobFlag = false
end end
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 hasJobFlag = true
if grade and not (grade <= ganginfo.grade.level) then if grade and not (grade <= gangInfo.grade.level) then
hasJobFlag = false hasJobFlag = false
end end
end end
@@ -585,6 +578,7 @@ local getPlayerFunc = {
local Player = {} local Player = {}
local info = ESX.GetPlayerFromId(src) local info = ESX.GetPlayerFromId(src)
if not info then return {} end if not info then return {} end
Player = { Player = {
name = info.getName(), name = info.getName(),
cash = info.getMoney(), cash = info.getMoney(),
@@ -601,6 +595,8 @@ local getPlayerFunc = {
onDuty = info.job.onDuty, onDuty = info.job.onDuty,
--account = info.charinfo.account, --account = info.charinfo.account,
citizenId = info.identifier, citizenId = info.identifier,
hunger = Player(src).state.hunger or 0,
thirst = Player(src).state.thirst or 0,
} }
return Player return Player
end, end,
@@ -616,6 +612,7 @@ local getPlayerFunc = {
if v.name == "money" then cash = v.money end if v.name == "money" then cash = v.money end
if v.name == "bank" then bank = v.money end if v.name == "bank" then bank = v.money end
end end
Player = { Player = {
firstname = info.firstName, firstname = info.firstName,
lastname = info.lastName, lastname = info.lastName,
@@ -631,7 +628,9 @@ local getPlayerFunc = {
--account = info.charinfo.account, --account = info.charinfo.account,
citizenId = info.identifier, citizenId = info.identifier,
isDead = IsEntityDead(PlayerPedId()), isDead = IsEntityDead(PlayerPedId()),
isDown = IsPedDeadOrDying(PlayerPedId(), true) isDown = IsPedDeadOrDying(PlayerPedId(), true),
hunger = LocalPlayer.state.hunger or 0,
thirst = LocalPlayer.state.thirst or 0,
} }
return Player return Player
end, end,
@@ -715,6 +714,8 @@ local getPlayerFunc = {
isDead = info.PlayerData.metadata["isdead"], isDead = info.PlayerData.metadata["isdead"],
isDown = info.PlayerData.metadata["inlaststand"], isDown = info.PlayerData.metadata["inlaststand"],
charInfo = info.charinfo, charInfo = info.charinfo,
hunger = info.PlayerData.metadata["hunger"],
thirst = info.PlayerData.metadata["thirst"],
} }
return Player return Player
end, end,
@@ -743,6 +744,8 @@ local getPlayerFunc = {
isDead = info.metadata["isdead"], isDead = info.metadata["isdead"],
isDown = info.metadata["inlaststand"], isDown = info.metadata["inlaststand"],
charInfo = info.charinfo, charInfo = info.charinfo,
hunger = info.metadata["hunger"],
thirst = info.metadata["thirst"],
} }
return Player return Player
end, end,
@@ -774,6 +777,8 @@ local getPlayerFunc = {
isDead = info.metadata["isdead"], isDead = info.metadata["isdead"],
isDown = info.metadata["inlaststand"], isDown = info.metadata["inlaststand"],
charInfo = info.charinfo, charInfo = info.charinfo,
hunger = info.metadata["hunger"],
thirst = info.metadata["thirst"],
} }
end end
return Player return Player
@@ -805,6 +810,8 @@ local getPlayerFunc = {
isDead = info.metadata["isdead"], isDead = info.metadata["isdead"],
isDown = info.metadata["inlaststand"], isDown = info.metadata["inlaststand"],
charInfo = info.charinfo, charInfo = info.charinfo,
hunger = info.metadata["hunger"],
thirst = info.metadata["thirst"],
} }
return Player return Player
end, end,
@@ -836,6 +843,8 @@ local getPlayerFunc = {
isDead = info.metadata["isdead"], isDead = info.metadata["isdead"],
isDown = info.metadata["inlaststand"], isDown = info.metadata["inlaststand"],
charInfo = info.charinfo, charInfo = info.charinfo,
hunger = info.metadata["hunger"],
thirst = info.metadata["thirst"],
} }
end end
return Player return Player
@@ -867,6 +876,8 @@ local getPlayerFunc = {
isDead = info.metadata["isdead"], isDead = info.metadata["isdead"],
isDown = info.metadata["inlaststand"], isDown = info.metadata["inlaststand"],
charInfo = info.charinfo, charInfo = info.charinfo,
hunger = info.metadata["hunger"],
thirst = info.metadata["thirst"],
} }
return Player return Player
end, end,
@@ -918,6 +929,31 @@ function getPlayer(source)
return Player return Player
end end
--- Finds an online player by their citizen ID.
---
--- Iterates all connected players and returns the matching player info table
--- (the same shape as getPlayer()). Returns nil if nobody matches.
--- @param citizenId string The citizen ID to search for.
--- @return table|nil player The matching player info table.
--- @return number|nil src The matching player's server ID.
---
--- @usage
--- ```lua
--- local player, src = getPlayerByCitizenId("ABC12345")
--- if player then print("Found", player.name) end
--- ```
function getPlayerByCitizenId(citizenId)
if not citizenId then return nil, nil end
for _, v in ipairs(GetPlayers()) do
local src = tonumber(v)
local Player = getPlayer(src)
if Player and Player.citizenId == citizenId then
return Player, src
end
end
return nil, nil
end
--- Retrieves all active players within a given radius from the specified coordinates. --- Retrieves all active players within a given radius from the specified coordinates.
--- ---
--- @param coords vector3 The reference coordinates. --- @param coords vector3 The reference coordinates.
@@ -968,6 +1004,12 @@ local wardrobeFunc = {
TriggerEvent("illenium-appearance:client:openOutfitMenu") TriggerEvent("illenium-appearance:client:openOutfitMenu")
end, end,
}, },
{
name = "rcore_clothing",
openWardrobe = function()
TriggerEvent('rcore_clothing:openChangingRoom')
end,
}
} }
--- Opens the clothing customization menu --- Opens the clothing customization menu
@@ -980,4 +1022,5 @@ function openClothing()
break break
end end
end end
end
end
+25
View File
@@ -192,6 +192,21 @@ local societyFunc = {
end, end,
}, },
{ bankName = "wasabi_banking",
getAccount =
function(society)
return exports['wasabi_banking']:GetAccountBalance(society, 'society')
end,
chargeSociety =
function(society, amount)
exports['wasabi_banking']:RemoveMoney('society', society, amount)
end,
fundSociety =
function(society, amount)
exports['wasabi_banking']:AddMoney('society', society, amount)
end,
},
} }
@@ -263,4 +278,14 @@ function fundSociety(society, amount)
end end
print("^1Error^7: ^3FundSociety^7: ^2No supported banking script found") print("^1Error^7: ^3FundSociety^7: ^2No supported banking script found")
end
if isServer() then
createCallback(getScript()..":server:getAccount", function(source, society)
if society then
local getMoney = getSocietyAccount(society)
return getMoney
end
return 0
end)
end end
+55 -5
View File
@@ -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,50 @@ 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 data[3] then -- If spawning a prop, make entity target instead (ignores depth and width stuff)
makeDistProp({ prop = data[3], coords = data[2] }, true, false)
end
-- 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 +432,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 +479,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)
+3
View File
@@ -80,6 +80,9 @@ function searchCar(vehicle)
carInfo.price = 0 carInfo.price = 0
carInfo.class = classlist[GetVehicleClass(vehicle) + 1], GetVehicleClass(vehicle) carInfo.class = classlist[GetVehicleClass(vehicle) + 1], GetVehicleClass(vehicle)
end end
-- without this the function returned nil and anything doing
-- searchCar(vehicle).class would throw
return carInfo
end end
else else
return carInfo return carInfo
+39 -2
View File
@@ -33,15 +33,51 @@ Exports = {
} }
-- Required variables -- Required variables
debugMode = Config.System.Debug debugMode = true
QBInvNew = true QBInvNew = true
InventoryWeight = 120000 InventoryWeight = 120000
-- Corruptted transfer file Checks -- Not Ready Yet ⚠️
--CreateThread(function()
-- local res = GetCurrentResourceName()
-- local ok, val = pcall(function()
-- return exports[res]:ping_encrypted()
-- end)
--
-- if not ok or val ~= "ok" then
-- print("\n^6===============================================================================")
-- print(("\n^1Corruption Warning^7: ^1[^7%s^1] Encrypted files failed to initialize.^7\n"):format(res))
-- print("^3Common causes^7:")
-- print(" • Possible corrupt files")
-- print(" • Damaged or partial upload (FTP/zip/unzip issue).")
-- print(" • Outdated artifact version\n")
-- print("^2How To Fix^7:")
-- print(" • Update your server artifact version")
-- print(" • Re-download asset from Keymaster")
-- print(" • Use WinSCP to upload")
-- print(" • Avoid editing any encrypted files")
-- print(" • Restart the server")
-- print("\n^6===============================================================================^7\n")
-- end
--end)
-- Missing/Broken Config file check
if not Config or not Config.System then
print("\n^6=================================================================================")
print("^6=================================================================================\n")
print(" ^1ERROR^7: jim_bridge ^1can't find the ^7Config^1 table in ^7"..GetCurrentResourceName())
print(" ^1It is either missing, or there is an error inside it stopping it from loading^7\n")
print("^6=================================================================================")
print("^6=================================================================================^7\n")
end
-- [[ Server.Cfg Convar Check ]]-- -- [[ Server.Cfg Convar Check ]]--
-- Check server convars for hard set defaults, otherwise it uses per script configurations -- Check server convars for hard set defaults, otherwise it uses per script configurations
if Config and Config.System then if Config and Config.System then
debugMode = Config.System.Debug
if Config.System.Debug then if Config.System.Debug then
if GetConvar("jim_DisableDebug", "false") == "true" then if GetConvar("jim_DisableDebug", "false") == "true" then
debugMode = false debugMode = false
@@ -50,7 +86,6 @@ if Config and Config.System then
Config.System.EventDebug = false Config.System.EventDebug = false
end end
end end
Config.System.Menu = GetConvar("jim_menuScript", Config.System.Menu) Config.System.Menu = GetConvar("jim_menuScript", Config.System.Menu)
Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify or "gta") Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify or "gta")
Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar or "gta") Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar or "gta")
@@ -146,6 +181,7 @@ for _, v in pairs({ -- This is a specific load order
'make/loaders.lua', 'make/loaders.lua',
'make/makeBlip.lua', 'make/makeBlip.lua',
'make/makePed.lua', 'make/makePed.lua',
'make/pedTasks.lua',
'make/makeProp.lua', 'make/makeProp.lua',
'make/makeVeh.lua', 'make/makeVeh.lua',
'make/cameras.lua', 'make/cameras.lua',
@@ -153,6 +189,7 @@ for _, v in pairs({ -- This is a specific load order
'wrapperfunctions.lua', 'wrapperfunctions.lua',
'polyZone.lua', 'polyZone.lua',
'clientItemAllowlist.lua',
'itemcontrol.lua', 'itemcontrol.lua',
'playerfunctions.lua', 'playerfunctions.lua',
'metaHandlers.lua', 'metaHandlers.lua',
+289
View File
@@ -0,0 +1,289 @@
local alcoholCount = 0
local drugCount = 0
local purgeTimer = 300000
local minDrugCount = 3
local maxDrugCount = 7
local minAlcoholCount = 2
local midAlcoholCount = 4
local maxAlcoholCount = 7
local alcoholEffectData = {
levels = {
["min"] = {
effect = "DrugsMichaelAliensFightIn",
movement = "move_m@drunk@slightlydrunk",
camShake = 0.5,
canStumble = false,
},
["mid"] = {
effect = "DrugsMichaelAliensFightIn",
movement = "move_m@drunk@moderatedrunk",
canRagdoll = true,
camShake = 0.5,
canStumble = true,
stumbleChance = 0.8,
drunkDriving = true,
},
["max"] = {
effect = "DrugsMichaelAliensFightIn",
movement = "move_m@drunk@verydrunk",
canRagdoll = true,
camShake = 2.8,
canStumble = true,
stumbleChance = 0.6,
drunkDriving = true,
},
},
}
local drugEffectData = {
levels = {
["min"] = {
--effect = "SwitchHUDTrevorIn",
--movement = "move_m@drunk@slightlydrunk",
},
["max"] = {
effect = "SwitchHUDTrevorIn",
movement = "move_m@drunk@slightlydrunk",
camShake = 0.2,
},
}
}
-- Alcohol Thread
function addAlocholCount(count, canOD)
alcoholCount = alcoholCount + count
--print("Alcohol count increased, current amount:", alcoholCount)
CreateThread(function()
runAlcoholThread()
end)
if alcoholCount >= maxAlcoholCount then
-- max
startAlcoholEffect(alcoholEffectData.levels["max"], "max")
if canOD then
SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) - math.random(10, 15))
end
elseif alcoholCount < maxAlcoholCount and alcoholCount >= midAlcoholCount then
-- mid
startAlcoholEffect(alcoholEffectData.levels["mid"], "mid")
TriggerEvent("evidence:client:SetStatus", "heavyalcohol", 200)
if canOD then
SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) - math.random(5, 10))
end
elseif alcoholCount >= 1 then
-- min
TriggerEvent("evidence:client:SetStatus", "alcohol", 200)
startAlcoholEffect(alcoholEffectData.levels["min"], "min")
end
end
function getAlcoholCount()
return alcoholCount
end
function removeAlcoholCount(count)
alcoholCount = alcoholCount - count
if alcoholCount < minAlcoholCount then
clearCurrentAlcoholEffect()
end
--print("Alcohol count decreased, current amount:", alcoholCount)
end
local alcoholThreadRun = false
function runAlcoholThread()
if alcoholThreadRun == true then
return
else
alcoholThreadRun = true
end
--print("Alcohol Thread triggered")
while alcoholCount > 0 do
Wait(purgeTimer)
removeAlcoholCount(1)
if alcoholCount <= 0 then
clearCurrentAlcoholEffect()
alcoholThreadRun = false
break
end
end
end
exports("getAlcoholCount",getAlcoholCount)
exports("addAlocholCount", addAlocholCount)
exports("removeAlcoholCount", removeAlcoholCount)
-- EFFECT Management
local currentAlcoholEffect = ""
local alcoholEffect = ""
function clearCurrentAlcoholEffect()
local Ped = PlayerPedId()
if alcoholEffect ~= "" then
AnimpostfxStop(alcoholEffect)
ResetPedMovementClipset(Ped, 0.0)
ClearTimecycleModifier()
ResetScenarioTypesEnabled()
SetPedIsDrunk(Ped, false)
SetPedMotionBlur(Ped, false)
end
currentAlcoholEffect = ""
alcoholEffect = ""
end
function startAlcoholEffect(data, level)
local Ped = PlayerPedId()
if currentAlcoholEffect == level then
return
else
clearCurrentAlcoholEffect()
currentAlcoholEffect = level
end
-- Start effect using sent data
if alcoholEffect ~= data.effect then
alcoholEffect = data.effect
AnimpostfxPlay(data.effect, 0, true)
if data.movement then
RequestAnimSet(data.movement)
while not HasAnimSetLoaded(data.movement) do
Wait(100)
end
SetPedMovementClipset(Ped, data.movement, 3.0)
end
SetPedCanRagdoll(Ped, true)
if data.camShake then
ShakeGameplayCam("DRUNK_SHAKE", data.camShake)
end
SetTimecycleModifier("Drunk")
SetPedMotionBlur(Ped, true)
SetPedIsDrunk(Ped, true)
if data.drivingEffect or data.canStumble then
CreateThread(function()
local effectCheck = level
local lastStumbleTime = GetGameTimer() + 1200
local lastDriveTime = GetGameTimer() + 6000
while effectCheck == currentAlcoholEffect do
if data.camStumble and GetGameTimer() > lastStumbleTime and math.random() > (data.stumbleChance or 0.8) then
lastStumbleTime = GetGameTimer() + 1200
SetPedToRagdoll(Ped, 5000, 5000, 0, true, true, false)
end
if data.driving and GetGameTimer() > lastDriveTime then
local inVeh, veh, seat = GetSeatPedIsIn()
if inVeh then
lastDriveTime = GetGameTimer() + 6000
if seat == -1 then
if math.random() < 0.62 then
StartVehicleHorn(veh, 1000, "NORMAL", false)
end
end
end
end
Wait(1000)
end
--print("Effect loop broken")
end)
end
end
end
-- Helper
function GetSeatPedIsIn()
local inVeh, veh, seat = false, 0, 0
local veh = GetVehiclePedIsIn(PlayerPedId(), false)
if veh ~= 0 then
if GetPedInVehicleSeat(veh, -1) == PlayerPedId() then
inVeh = true
seat = -1
end
end
return inVeh, veh, seat
end
-- Drug thread
function addDrugCount(count, canOD)
drugCount = drugCount + count
--print("Drug count increased, current amount:", drugCount)
if drugCount >= minDrugCount and drugCount <= maxDrugCount then
startDrugEffect(drugEffectData.levels["min"], "min")
elseif drugCount > maxDrugCount then
if canOD then
SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) - math.random(10, 15))
end
startDrugEffect(drugEffectData.levels["max"], "max")
end
end
function getDrugCount()
return drugCount
end
function removeDrugCount(count)
--print("Drug count decreased, current amount:", drugCount)
drugCount = drugCount - count
end
local drugThreadRun = false
function runDrugThread()
if drugThreadRun == true then
return
else
drugThreadRun = true
end
--print("Drug Thread triggered")
while drugCount > 0 do
Wait(purgeTimer)
removeDrugCount(1)
if drugCount <= 0 then
drugThreadRun = false
break
end
end
end
exports("getDrugCount", getDrugCount)
exports("addDrugCount", addDrugCount)
exports("removeDrugCount", removeDrugCount)
-- EFFECT Management
local currentDrugEffect = ""
local drugEffect = ""
function startDrugEffect(data, level)
local Ped = PlayerPedId()
if currentDrugEffect == level then
return
else
clearCurrentAlcoholEffect()
currentDrugEffect = level
end
-- Start effect using sent data
if drugEffect ~= data.effect then
drugEffect = data.effect
AnimpostfxPlay(data.effect, 0, true)
if data.movement then
RequestAnimSet(data.movement)
while not HasAnimSetLoaded(data.movement) do
Wait(100)
end
SetPedMovementClipset(Ped, data.movement, 3.0)
end
SetPedCanRagdoll(Ped, true)
if data.camShake then
ShakeGameplayCam("DRUNK_SHAKE", data.camShake)
end
SetTimecycleModifier("Drunk")
SetPedMotionBlur(Ped, true)
SetPedIsDrunk(Ped, true)
end
end
-2
View File
@@ -231,7 +231,6 @@ function gtaProgressBar(data)
while result == nil do Wait(10) end while result == nil do Wait(10) end
inProgress = false inProgress = false
print(tostring(result))
-- Cleanup animations/tasks -- Cleanup animations/tasks
if data.dict then if data.dict then
stopAnim(data.dict, data.anim, ped) stopAnim(data.dict, data.anim, ped)
@@ -240,7 +239,6 @@ function gtaProgressBar(data)
ClearPedTasks(ped) ClearPedTasks(ped)
end end
-- Cleanup -- Cleanup
FreezeEntityPosition(ped, false) FreezeEntityPosition(ped, false)
+11 -6
View File
@@ -1,9 +1,14 @@
2.1.04 2.1.09
- Crafting fixes (prop/sound/remove ingredients) - Add 100 wait for stopCam to reduce slow movement
- "SingleProgress" is now one progressbar - Add support for rcore_clothing in openClothing() - Thanks desypher
- Add ropeControl.lua - to help create and edit custom ropes/wires - Add hunger and thirst calls to getPlayer() - Thanks oosayeroo
- Support for new crafting recipe style - Add support for tgg-billing - Thanks GhostInLowGear
- create setStress() multiframework function - Fix hasJob() checking players who haven't logged in yet
- Add exploit possibility for removeItem with minus numbers
- Fix movement being allowed when crafting
- Make distExploitCheck() more verbose
- CodeM slot fix, force to number (because numbers are apparently strings)
- ESX change to check statebag for hunger and thirst info
https://github.com/jimathy/jim_bridge/releases/latest https://github.com/jimathy/jim_bridge/releases/latest