Commit Graph

539 Commits

Author SHA1 Message Date
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
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`
v2.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`
v2.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`
v2.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
Jim Shield
7738bb4fca Version Bump
`2.1.03` - `2.1.04`
v2.1.04
2025-09-30 23:39:55 +01:00
Jim Shield
3ad65810c3 Rework crafting.lua
Changes:
- Crafting prop not spawning
- Crafting "sound" not playing
- `SingleProgress` is now "one progressbar"

I'm working on refactoring crafting table's layout style too

I'm updating my scripts crafting recipes to a new format, this commit basically makes use of it and makes it slightly easier to edit later if needed

It *should* increase readability and users ability to edit these recipes

# "old style" crafting recipes should still be compatible thanks to a wrapper I added so you shouldn't notice a difference.
2025-09-28 14:03:23 +01:00
Jim Shield
45eeaf8f0d update a couple debug prints 2025-09-28 13:48:17 +01:00
Jim Shield
37f7eb1116 add testing code for new crafting table style 2025-09-28 03:22:12 +01:00
Jim Shield
145e3aa156 add new module ropeControl.lua
**Needs work** but adds the ability to easily create ropes/wires from one coord to another
2025-09-27 13:01:09 +01:00
Jim Shield
bb176addbf Create setStress function
This allows per framework stress functions to be set, including ESX

For ESX the math is done in this function as their values are insanely high instead of 0 - 100
2025-09-27 12:35:56 +01:00
Jim Shield
178040348e Rework SingleProgress slightly
Realised it wasn't doing the math to take the correct amount of required items, so this fixes it

also if `SingleProgress` is enabled, it won't show the "Ingredient Progress bars" any more
2025-09-27 12:34:46 +01:00
oosayeroo
2cf80881e4 Input.lua : allow default in oxlib "number" type 2025-09-25 02:17:48 +01:00
Jim Shield
ee15f3b076 Version Bump
`2.1.02` - `2.1.03`
v2.1.03
2025-09-24 23:12:34 +01:00
Jim Shield
6919f038ee Release Notifier Push 2025-09-24 18:20:02 +01:00
Jim Shield
47029da6ed Revert "Version Bump"
This reverts commit f08638812c.
2025-09-24 14:23:43 +01:00
Jim Shield
e1d292d1bf Remove testing debug print 2025-09-24 14:09:19 +01:00
Jim Shield
f08638812c Version Bump
`2.1.02` - `2.1.03`
2025-09-24 13:36:14 +01:00