FumeNodes/jim-consumables
1
0
Fork 0
mirror of https://github.com/jimathy/jim-consumables.git synced 2026-08-21 00:12:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
129 Commits 1 Branch 18 Tags
d7a8a204910f7a81e7e9ae4898a602e1d839ac11
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Shield d7a8a20491 Make GenerateRandomValues() return 0 
Its possible if no health, thirst or stress was set, it may sent back an empty table, which would then break the finish consume function in the server
 2025-10-10 01:57:01 +01:00
Jim Shield 38d0b04e71 Fix pack and return items not being given 2025-10-06 12:56:14 +01:00
Jim Shield 762240b500 Version Bump 
`2.0.07` - `2.0.08`
 2025-10-06 02:29:07 +01:00
Jim Shield 0a0f60468a Rework calculations and fix alcohol/drug effects 
This fixes calculation errors and implements support for jim_bridge built in synchronized alcohol/drug effects

Separates "drug control" `canOD` variable too
 2025-10-06 02:28:03 +01:00
Jim Shield 9b189d89f5 fix needStats calculcation 
My mad on this one, got `needTypes` and `needStats` confused, so made it just one table and included stress in it
 2025-10-04 01:12:19 +01:00
Jim Shield 62db9f6900 Version Bump 
`2.0.06` - `2.0.07`
 2025-10-01 21:44:20 +01:00
Jim Shield 6317dee667 Stop double calculation of hunger and thirst 
Missed this, it's doing the player stats + new stats and then in jim_bridge doing this again and doubling it all up
 2025-10-01 21:43:14 +01:00
Jim Shield 15bb54c206 Add support for jim_bridge setStress function 
Allows multiframework stress events
 2025-10-01 01:20:33 +01:00
Jim Shield 94023857ff Release Notifier Push 2025-09-24 18:18:14 +01:00
Jim Shield daa70a8844 Version Bump 
`2.0.05` - `2.0.06`
 2025-09-15 16:31:34 +01:00
Jim Shield 25e8d99839 Rework code to server side 
In an attempt to tackle exploiters, I reworked a lot of the code to server side

This will be tied to the new `jim_bridge` release but should function as normal now
 2025-09-13 02:54:36 +01:00
Jim Shield 2c2a486a41 Update notify-discord.yml 2025-09-04 16:59:41 +01:00
Jim Shield 16e957116e Create release.yml 
Automate release zips and make them generate the folder name correctly

This helps users download a correctly named script so they dont end up with a script with a version number in the title
 2025-09-01 10:22:10 +01:00
Jim Shield b4d65ff043 Update notify-discord.yml 2025-07-27 18:48:05 +01:00
Jim Shield 9d866c88ee Update README.md 2025-07-25 00:41:11 +01:00
Jim Shield 018dcca6cc Update README.md 2025-07-24 22:51:21 +01:00
Jim Shield e27b840a5e Try to fix props now spawning correctly 
Not sure what is going on, they are server synced
but Its possible its not loading the correctly because of the spawn location

I've changed it to make the props at the players location in hopes this fixes the issue
 2025-07-08 15:02:28 +01:00
Jim Shield e794d9a446 Version Bump 
`2.0.04` - `2.0.05`
 2025-06-22 16:37:46 +01:00
Jim Shield 541263b156 Fixes related to progressbars 2025-06-22 16:13:18 +01:00
Jim Shield 60c42b2506 Fix hunger being wrong on esx when consuming 2025-06-20 21:54:14 +01:00
Jim Shield 2a4de6fdc1 Version Bump 
`2.0.03` - `2.0.04`
 2025-06-16 11:19:07 +01:00
Jim Shield 4b015e5efa Revamp hunger and thirst events 
Realised I made a mistake, and the server function wasn't working fully on ESX

moved it to use the jim_bridge `setNeed` trigger and made the function smarter
 2025-06-14 22:29:40 +01:00
Jim Shield 518c5204ae Version Bump 
`2.0.02` - `2.0.03`
 2025-05-22 14:25:48 +01:00
Jim Shield 12642b7e7b Temp fix consumables not being usable randomly 
I believe, the imported consumables from other scripts were fighting with each other in the `createUsableItem` event

In theory, when syncing them (at least at the moment) the restaurant would try to make them usable, and also this script would try. Possibly cancelling each other out?

This removes the `createUsableItem` event from the sync add item event
 2025-05-22 14:23:12 +01:00
Jim Shield c2843eaee2 Try to fix hunger/thirst for essx 2025-05-22 14:12:27 +01:00
Jim Shield b92e26129f Convert to globalstatebag syncing for optimization 
When consumables are added from outside the script, it uses global statebags to ensure data is received successfully. This syncs live and for players who have just connected

This removes the callbacks in the script to help optimization
 2025-05-22 14:10:30 +01:00
Jim Shield 129b65deda Update version.txt 2025-05-19 17:10:56 +01:00
Jim Shield d83d0bbfc4 check and store variable 
If `jim-consumables:Consume` was triggered by an item with no information it would error and possibly break the script

This a check to instantly `return` when no consumable information is found
 2025-05-17 21:03:29 +01:00
Jim Shield 2b6d3f2825 Update README.md 2025-05-14 15:56:13 +01:00
Jim Shield cab1ddbe52 Update README.md 2025-05-14 15:54:58 +01:00
Jim Shield 868f322c8c Re-add dynamic string changer 
Removed this by accident when people were getting notification issues

Restored it to display the correct message when consuming
 2025-05-14 15:54:53 +01:00
Jim Shield 5bbd8a70e8 Version Bump 
`2.0.01` - `2.0.02`
 2025-05-14 15:38:08 +01:00
Jim Shield 9f5bde25ae Reset consumables.lua file 
The file contained a lot of files from a server I worked on, I've removed these and added the files back from the previous file

But kept the examples of "boxes" being used and a explanation of how to make them
 2025-05-14 15:33:27 +01:00
Jim Shield 445ddc82ac Change the "Stop Consuming" popup 
It was originally using `drawText` to use framework ui to display `[BACKSPACE] Stop Consuming`

Changed to display an instructional native ui popup on the bottom right of the screen
 2025-05-14 15:31:58 +01:00
Jim Shield d9b97dc14c Fix stats overriding itself 
The `stats` table was being overridden by the function to calculate random times for certain settings replacing the table with only `hunger` and `thirst`

Separated them now things like screen effects work again

Also refactored some sections to reduce amount of `if` statements
 2025-05-14 15:24:36 +01:00
Jim Shield c96d1ec277 place start functions behind onResourceStart() 2025-05-12 22:52:03 +01:00
Jim Shield cf3d3c4147 Update fxmanifest.lua to new format 
Removes core loading in `fxmanifest.lua` in favour of more "verbose" file loader in jim_bridge v`2.0.08+`
 2025-05-10 20:06:00 +01:00
Jim Shield 4e565268cd Version Bump 
`2.0` - `2.0.01`
 2025-05-06 10:35:00 +01:00
Jim Shield 9e8dcc39f9 Remove notify types 
I was hoping this wouldn't affect notification systems but it did

I left in code for a automated notification type, this was used on a server I worked on, forgot it was there and had a couple reports of it breaking qb-core nui
 2025-05-05 19:48:11 +01:00
Jim Shield c2d902c813 fix discord bot yml 2025-05-01 13:38:26 +01:00
Jim Shield 4d83c8c612 add gitbot yml 2025-05-01 00:19:02 +01:00
Jim Shield f23d2bbdd0 Merge pull request #20 from jimathy/2.0beta 2025-04-28 18:19:53 +01:00
Jim Shield 9323c46406 Create FUNDING.yml 2025-04-13 13:25:23 +01:00
Jim Shield 57ed8b2ae0 Create FUNDING.yml 2025-04-13 13:11:50 +01:00
Jim Shield 7492531621 Version 2.0 Bump + readability changes 2025-04-01 19:39:26 +01:00
Jim Shield 531c93377a 2.0Beta upload 2025-04-01 19:34:44 +01:00
Jim Shield 11f479d8f8 Fix reward item errors 2023-03-27 18:59:56 +01:00
Jim Shield d60a93448d Update README.md 2023-03-11 22:37:08 +00:00
Jim Shield 0b45087596 Update README.md 2023-03-11 22:27:47 +00:00
Jim Shield 5b1c949903 Update README.md 2023-03-11 22:27:21 +00:00
Jim Shield 61ca273b5f Merge pull request #13 from jellyton69/patch-1 
Exports not export
 2023-03-06 21:00:17 +00:00
Jim Shield 7f5383f90e emotes... 2023-03-02 15:22:15 +00:00
Jim Shield e988fb216a emotes. 2023-03-02 15:08:11 +00:00
Jim Shield 6a17162638 1.5 - ox_prog/correct emotes/import system update 
Refactor
Support for ox_progressbar
Sorted out the fucking default emotes
Item/Emote System update, works better and syncs better
Update Readme to reflect the chagnes
 2023-03-02 15:06:30 +00:00
Jim Shield cec84d4ba9 Merge pull request #12 from taylorrenee1/patch-3 
forgot a }
 2023-02-27 13:50:41 +00:00
Jim Shield 3565c9850f Merge pull request #11 from taylorrenee1/patch-2 
Putting default drugs back in
 2023-02-27 13:38:50 +00:00
Jim Shield d7ec8dd90c Merge pull request #10 from taylorrenee1/patch-1 
Fixes player being stuck when consuming
 2023-02-24 20:14:09 +00:00
Jim Shield e7d9946532 ox lib notify support - Config.Notify = "ox" 2023-02-21 17:20:20 +00:00
Jim Shield c10860f788 add shared ox inv support 2023-02-21 17:07:02 +00:00
Jim Shield 7e10b7835f Add server-side ox inv support 2023-02-21 17:06:12 +00:00
Jim Shield 80ffb27ac2 ox inv basic support 2023-02-21 17:04:52 +00:00
Jim Shield d263b1d156 v1.5 2023-02-19 21:47:06 +00:00
Jim Shield 7d8aa1bbc6 Fix version number print 2023-02-19 21:46:48 +00:00
Jim Shield 3330724d4e Fixes and support for RewardItems 2023-02-19 21:40:26 +00:00
Jim Shield 3e2eef8a38 Add options for RewardItem variables 2023-02-19 21:39:16 +00:00
Jim Shield b1730d24f1 Remove duplicate remove event causing kicks 2023-02-17 09:43:59 +00:00
Jim Shield 632fd1de5b Merge pull request #8 from jimathy/v1.4 
v1.4 Update
 2023-02-14 15:17:04 +00:00
Jim Shield d0fa6b750b Update README.md 2023-02-14 15:14:53 +00:00
Jim Shield 52816242fa Revert "v1.4 beta update info" 
This reverts commit c25cb643bc.
 2023-02-14 15:14:17 +00:00
Jim Shield 4e38c81645 Revert "Fix snippet formatting" 
This reverts commit 7996100dad.
 2023-02-14 15:14:13 +00:00
Jim Shield 7a6762ee08 Revert "Update item example snippet" 
This reverts commit 6ba9febb0a.
 2023-02-14 15:14:07 +00:00
Jim Shield 6ba9febb0a Update item example snippet 2023-02-14 15:10:13 +00:00
Jim Shield 7996100dad Fix snippet formatting 2023-02-14 15:08:18 +00:00
Jim Shield c25cb643bc v1.4 beta update info 2023-02-14 15:07:46 +00:00
Jim Shield a4901972b9 Update README.md 2023-02-14 14:56:50 +00:00
Jim Shield b56cce8951 v1.4 2023-02-14 14:55:32 +00:00
Jim Shield 4648083127 Add HasItem() exploit protection 2023-02-14 14:53:48 +00:00
Jim Shield e263aa3255 Add HasItem() exploit protection 2023-02-14 14:52:57 +00:00
Jim Shield 6654b9a3f5 Add HasItem() exploit protection 2023-02-14 14:52:10 +00:00
Jim Shield ad185183f7 Add support for exports itemSyncing 2023-02-14 14:40:09 +00:00
Jim Shield dbed114e05 Add support for returnItem and export item syncing 2023-02-14 14:38:57 +00:00
Jim Shield 3ffa295ca1 Add support for "return" items on item usage 2023-02-14 14:38:08 +00:00
Jim Shield 18c6401581 Merge pull request #7 from regalonefour/patch-1 
security enhancement
 2022-12-17 15:22:38 +00:00
Jim Shield b2c7c34e15 Try to fix props affecting vehicles 2022-10-12 12:21:12 +01:00
Jim Shield cba9a574bf Remove collisions to stop conflict with vehicles 2022-10-07 17:42:48 +01:00
Jim Shield 41136ce949 Fixes to 2nd model loading 2022-09-18 14:48:59 +01:00
Jim Shield 18d903abcc Merge pull request #4 from ARSSANTO/patch-1 
progress bar fix unloading props
 2022-09-17 19:13:42 +01:00
Jim Shield cec8165556 Merge pull request #3 from ARSSANTO/main 
2nd prop and lua54 support
 2022-09-17 16:52:40 +01:00
Jim Shield 4bdcc11d51 Update shared.lua 2022-09-17 16:50:06 +01:00
Jim Shield 68b17642a6 Version Bump 2022-09-17 16:49:15 +01:00
Jim Shield 5d084c3046 Tidy + upgrade 2022-09-17 16:48:42 +01:00
Jim Shield 1f9e16acf1 qs-inventory fix 2022-09-04 18:38:20 +01:00
Jim Shield 9fcc91e2bc ps progressbar support 2022-08-30 22:45:59 +01:00
Jim Shield 00332d0ca3 Progressbar Support 
a little updates
 2022-08-30 21:57:57 +01:00
Jim Shield 931ba14933 more buff time fixes 2022-08-29 15:25:21 +01:00
Jim Shield 50f5dab7cb remove useless variable 2022-08-29 10:29:55 +01:00
Jim Shield f1cf454687 buff time fix + notify fixes + New effects 2022-08-29 10:26:48 +01:00
Jim Shield a6f6492d5b debug mode. 2022-08-24 09:25:05 +01:00
Jim Shield 7da98b53e1 v1.3 Shared file, optimize, fix client item event 2022-08-24 09:23:43 +01:00
Jim Shield 1036f1dc21 Trying to get better overriding of item control 2022-08-15 10:06:30 +01:00