Commit Graph
98 Commits
Author SHA1 Message Date
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
Jim Shield 59540d95b6 v1.2 - ps-buffs support / screen effect changes 2022-07-21 17:23:47 +01:00
Jim Shield b15836d42e Version Bump 1.1 - Optimizations, Tidy, Fixes 2022-07-20 15:51:38 +01:00
Jim Shield d17334e6fe More specific model removal 2022-07-20 13:43:17 +01:00
Jim Shield 61de2ece5a lock inventory until done or cancelled 2022-07-14 15:25:20 +01:00
Jim Shield 03725029ef if 2022-07-06 20:48:08 +01:00
Jim Shield 5b5d0b84b3 Linting 2022-07-05 23:14:01 +01:00
Jim Shield 3147c4a74f Fix eating timer reset 2022-05-26 14:40:33 +01:00
Jim Shield d823ba907b put file in the wrong place.. 2022-05-26 14:40:19 +01:00
Jim Shield c0611f5aef Fix eating timer reset 2022-05-26 14:39:06 +01:00
Jim Shield 2582620a2a Update README.md 2022-05-25 10:34:28 +01:00
Jim Shield 0ae1f37242 Update README.md 2022-05-25 10:34:05 +01:00
Jim Shield 1e1e459d74 Fixes + remove default drugs and healing 2022-05-25 10:23:19 +01:00
jimathy b7b12ba15e Stress, Armor, Heal, Screen effects testing 2022-04-18 19:55:54 +01:00
jimathy 09b4de80bb Pre Alpha upload 2022-04-13 20:01:09 +01:00
jimathy 9b18bce533 Update README.md 2022-04-13 19:54:26 +01:00
jimathy 9df217f4a1 Initial commit 2022-04-13 19:50:30 +01:00