Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: new features and implementations for ox_inventory #570

Merged
merged 1 commit into from
Nov 28, 2023
+5 −21
Merged

chore: new features and implementations for ox_inventory #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,6 @@
38. [es_extended]: refactor/fix: cleanup, remove useless code, formatting +
fix lint error: unused argument last; accessing undefined variable Invoke; unused variable targetCoords @bitpredator
39. [esx_taxijob]: refactor: Remove cb, use playerdata obj + fix formatting @bitpredator
40. [workflows]: delete: remove stale.yml + greetings.yml @bitpredator
40. [workflows]: delete: remove stale.yml + greetings.yml @bitpredator
41. [ox_inventory\data\shops.lua]: chore: the possibility of purchasing the radio has been added @bitpredator
[ox_inventory\data\stashes.lua]: fix: removed the inventory for the taxi job as it was included in the esx_taxijob resource @bitpredator
3 changes: 2 additions & 1 deletion server-data/resources/[ox]/ox_inventory/data/shops.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ return {
blip = {
id = 59, colour = 69, scale = 0.8
}, inventory = {
{ name = 'phone', price = 3000 },
{ name = 'phone', price = 3000 },
{ name = 'radio', price = 1600 },
}, locations = {
vec3(385.885712, -826.523071, 29.296753)
}, targets = {
Expand Down
19 changes: 0 additions & 19 deletions server-data/resources/[ox]/ox_inventory/data/stashes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,25 +113,6 @@ return {
groups = {['mechanic'] = 0}
},

{
coords = vec3(900.303284, -172.404388, 74.066650),
target = {
loc = vec3(900.303284, -172.404388, 74.066650),
length = 0.6,
width = 1.8,
heading = 340,
minZ = 43.34,
maxZ = 44.74,
label = 'Storage'
},
name = 'taxilocker',
label = 'Storage',
owner = false,
slots = 70,
weight = 70000,
groups = {['taxi'] = 0}
},

{
coords = vec3(1019.459351, -2392.589111, 30.122314),
target = {
Expand Down
Loading