ND_AppearanceShops - #6
Open
Cljones2 wants to merge 8 commits into
Open
Conversation
ive added an update where you can block item numbers out in you shop so no one can but then with a cool message ?
in client chnage these like this
-- Define blocked items
local blockedItems = {
hats = {},
legs = {},
bags = {},
scarvesChains = {},
shirts = {1, 5, 7},
bodyArmor = {},
jackets = {}
}
Andyyy7666
requested changes
Jan 18, 2025
Andyyy7666
left a comment
Andyyy7666
left a comment
Member
There was a problem hiding this comment.
Thank you for the PR, I've reviewed this and left some feedback.
Comment on lines
+1
to
+300
| local wardrobeId = "ND_AppearanceShops:wardrobe" | ||
| local wardrobeSelectedId = ("%s_selected"):format(wardrobeId) | ||
| local wardrobe = json.decode(GetResourceKvpString(wardrobeId)) or {} | ||
| local currentOpenWardrobe | ||
| local fivemAppearance = exports["fivem-appearance"] | ||
|
|
||
|
|
||
| -- Define blocked items | ||
| local blockedItems = { | ||
| hats = {}, | ||
| legs = {}, | ||
| bags = {}, | ||
| scarvesChains = {}, | ||
| shirts = {}, | ||
| bodyArmor = {}, | ||
| jackets = {} | ||
| } | ||
|
|
||
| -- Helper function to check if a value is in a list | ||
| local function contains(list, value) | ||
| for _, v in ipairs(list) do | ||
| if v == value then | ||
| return true | ||
| end | ||
| end | ||
| return false | ||
| end | ||
|
|
||
| -- Function to notify the player when blocked items are detected | ||
| local function notifyBlockedItem() | ||
| lib.notify({ | ||
| title = "Blocked Item", | ||
| description = "You are not allowed to Buy these outfits. Your changes have been reverted.", | ||
| type = "error", | ||
| position = "bottom" | ||
| }) | ||
| end | ||
|
|
||
| -- Filter blocked items from appearance | ||
| local function filterBlockedItems(appearance) | ||
| local blockedAttempt = false | ||
|
|
||
| -- Filter props (hats) | ||
| if appearance.props then | ||
| local filteredProps = {} | ||
| for _, prop in ipairs(appearance.props) do | ||
| if prop.prop_id == 0 and contains(blockedItems.hats, prop.drawable) then | ||
| blockedAttempt = true | ||
| else | ||
| table.insert(filteredProps, prop) | ||
| end | ||
| end | ||
| appearance.props = filteredProps | ||
| end | ||
|
|
||
| -- Filter components (legs, bags, scarves/chains, shirts, body armor, jackets) | ||
| if appearance.components then | ||
| local filteredComponents = {} | ||
| for _, component in ipairs(appearance.components) do | ||
| if (component.component_id == 4 and contains(blockedItems.legs, component.drawable)) or | ||
| (component.component_id == 5 and contains(blockedItems.bags, component.drawable)) or | ||
| (component.component_id == 7 and contains(blockedItems.scarvesChains, component.drawable)) or | ||
| (component.component_id == 8 and contains(blockedItems.shirts, component.drawable)) or | ||
| (component.component_id == 9 and contains(blockedItems.bodyArmor, component.drawable)) or | ||
| (component.component_id == 11 and contains(blockedItems.jackets, component.drawable)) then | ||
| blockedAttempt = true | ||
| else | ||
| table.insert(filteredComponents, component) | ||
| end | ||
| end | ||
| appearance.components = filteredComponents | ||
| end | ||
|
|
||
| return blockedAttempt | ||
| end | ||
|
|
||
|
|
||
| local function inputOutfitName() | ||
| local input = lib.inputDialog("Save current outfit", {"Outfit name:"}) | ||
| local name = input?[1] | ||
| if name and name ~= "" then | ||
| return name | ||
| end | ||
| end | ||
|
|
||
| local function saveWardrobe(name) | ||
| if not name then return end | ||
| local appearance = fivemAppearance:getPedAppearance(cache.ped) | ||
| appearance.hair = nil | ||
| appearance.headOverlays = nil | ||
| appearance.tattoos = nil | ||
| appearance.faceFeatures = nil | ||
| appearance.headBlend = nil | ||
| wardrobe[#wardrobe+1] = { | ||
| name = name, | ||
| appearance = appearance | ||
| } | ||
| SetResourceKvp(wardrobeId, json.encode(wardrobe)) | ||
| return true | ||
| end | ||
|
|
||
| local function getWardrobe() | ||
| local options = { | ||
| { | ||
| title = "Save current outfit", | ||
| icon = "fa-solid fa-floppy-disk", | ||
| onSelect = function() | ||
| saveWardrobe(inputOutfitName()) | ||
| end | ||
| } | ||
| } | ||
| for i=1, #wardrobe do | ||
| local info = wardrobe[i] | ||
| options[#options+1] = { | ||
| title = info.name, | ||
| arrow = true, | ||
| onSelect = function() | ||
| currentOpenWardrobe = i | ||
| lib.showContext(wardrobeSelectedId) | ||
| end | ||
| } | ||
| end | ||
| return options | ||
| end | ||
|
|
||
| local function openWardrobe() | ||
| lib.registerContext({ | ||
| id = wardrobeId, | ||
| title = "Outfits", | ||
| options = getWardrobe() | ||
| }) | ||
| lib.showContext(wardrobeId) | ||
| end | ||
|
|
||
|
|
||
| local function startChange(coords, options, i) | ||
| local ped = cache.ped | ||
| local oldAppearance = { | ||
| model = GetEntityModel(ped), | ||
| tattoos = fivemAppearance:getPedTattoos(ped), | ||
| appearance = fivemAppearance:getPedAppearance(ped) | ||
| } | ||
| SetEntityCoords(ped, coords.x, coords.y, coords.z - 1.0) | ||
| SetEntityHeading(ped, coords.w) | ||
| Wait(250) | ||
|
|
||
| fivemAppearance:startPlayerCustomization(function(appearance) | ||
| if not appearance then return end | ||
|
|
||
| -- Check for blocked items | ||
| local blockedAttempt = filterBlockedItems(appearance) | ||
| if blockedAttempt then | ||
| notifyBlockedItem() | ||
| fivemAppearance:setPedAppearance(ped, oldAppearance) -- Revert to the old appearance | ||
| return | ||
| end | ||
|
|
||
| -- Charge the player for valid items | ||
| ped = PlayerPedId() | ||
| local clothing = { | ||
| model = GetEntityModel(ped), | ||
| tattoos = fivemAppearance:getPedTattoos(ped), | ||
| appearance = appearance | ||
| } | ||
|
|
||
| -- Call the server to handle the purchase | ||
| local success = lib.callback.await("ND_AppearanceShops:clothingPurchase", false, i, clothing) | ||
| if not lib.callback.await("ND_AppearanceShops:clothingPurchase", false, i, clothing) then | ||
| fivemAppearance:setPlayerModel(oldAppearance.model) | ||
| ped = PlayerPedId() | ||
| fivemAppearance:setPedTattoos(ped, oldAppearance.tattoos) | ||
| fivemAppearance:setPedAppearance(ped, oldAppearance.appearance) | ||
| end | ||
| end, options) | ||
| end | ||
|
|
||
|
|
||
| local function getStoreNumber(store) | ||
| for i=1, #Config do | ||
| if store == Config[i] then | ||
| return i | ||
| end | ||
| end | ||
|
|
||
| local number = #Config+1 | ||
| Config[number] = store | ||
| return number | ||
| end | ||
|
|
||
| local function createClothingStore(info) | ||
| local storeNumber = getStoreNumber(info) | ||
| for i=1, #info.locations do | ||
| local location = info.locations[i] | ||
| local options = { | ||
| { | ||
| name = "nd_core:appearanceShops", | ||
| icon = "fa-solid fa-bag-shopping", | ||
| label = info.text, | ||
| distance = 2.0, | ||
| onSelect = function(data) | ||
| startChange(location.change, info.appearance, storeNumber) | ||
| end | ||
| } | ||
| } | ||
| if info.appearance?.components then | ||
| options[#options+1] = { | ||
| name = "nd_core:appearanceOutfit", | ||
| icon = "fa-solid fa-shirt", | ||
| label = "View outfits", | ||
| distance = 2.0, | ||
| onSelect = function(data) | ||
| openWardrobe() | ||
| end | ||
| } | ||
| end | ||
| NDCore.createAiPed({ | ||
| resource = GetInvokingResource(), | ||
| model = location.model, | ||
| coords = location.worker, | ||
| distance = 25.0, | ||
| blip = info.blip, | ||
| options = options, | ||
| anim = { | ||
| dict = "anim@amb@casino@valet_scenario@pose_d@", | ||
| clip = "base_a_m_y_vinewood_01" | ||
| } | ||
| }) | ||
| end | ||
| end | ||
|
|
||
| lib.registerContext({ | ||
| id = wardrobeSelectedId, | ||
| title = "Outfits", | ||
| menu = wardrobeId, | ||
| options = { | ||
| { | ||
| title = "Wear", | ||
| icon = "fa-solid fa-shirt", | ||
| onSelect = function() | ||
| local selected = wardrobe[currentOpenWardrobe] | ||
| if not selected then return end | ||
| if GetHashKey(selected.appearance.model) ~= GetEntityModel(cache.ped) then | ||
| return lib.notify({ | ||
| title = "Incorrect player model", | ||
| description = "This saved outfit is not for the current player model", | ||
| type = "error" | ||
| }) | ||
| end | ||
| fivemAppearance:setPedAppearance(cache.ped, selected.appearance) | ||
| end | ||
| }, | ||
| { | ||
| title = "Edit name", | ||
| icon = "fa-solid fa-pen-to-square", | ||
| onSelect = function() | ||
| local selected = wardrobe[currentOpenWardrobe] | ||
| if not selected then return end | ||
| local name = inputOutfitName() | ||
| if not name then return end | ||
| selected.name = name | ||
| end | ||
| }, | ||
| { | ||
| title = "Remove", | ||
| icon = "fa-solid fa-trash-can", | ||
| onSelect = function() | ||
| local selected = wardrobe[currentOpenWardrobe] | ||
| if not selected then return end | ||
| local alert = lib.alertDialog({ | ||
| header = "Remove outfit?", | ||
| content = ("Are you sure you'd like to remove %s?"):format(selected.name), | ||
| centered = true, | ||
| cancel = true | ||
| }) | ||
| if alert ~= "confirm" then return end | ||
| table.remove(wardrobe, currentOpenWardrobe) | ||
| end | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| for i=1, #Config do | ||
| createClothingStore(Config[i]) | ||
| end | ||
|
|
||
| AddEventHandler("onResourceStop", function(resource) | ||
| if resource ~= cache.resource then return end | ||
| SetResourceKvp(wardrobeId, json.encode(wardrobe)) | ||
| end) | ||
|
|
||
|
|
||
| RegisterNetEvent("ND_AppearanceShops:ApplyAppearance", function(clothing) | ||
| if clothing then | ||
| fivemAppearance:setPedAppearance(PlayerPedId(), clothing.appearance) | ||
| end | ||
| end) | ||
|
|
||
|
|
||
| exports("openWardrobe", openWardrobe) | ||
| exports("createClothingStore", createClothingStore) |
Member
There was a problem hiding this comment.
client.lua outside of source folder seem to be a duplicated file.
|
|
||
| -- Client scripts | ||
| client_scripts { | ||
| "source/blockedItems.lua", -- Added blocked items script |
Member
There was a problem hiding this comment.
You don't need to add blockedItems into client_scripts you can simply add it to files and use lib.load function from ox_lib. See here ND_Characters/fxmanifest.lua#L20 and here ND_Characters/source/client.lua#L12 as example.
Comment on lines
+9
to
+17
| local blockedItems = { | ||
| hats = {19, 20, 21, 22, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 139, 140, 141, 142, 149, 160, 161, 170, 171, 172, 173, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233}, | ||
| legs = {16, 17, 18, 19, 20, 21, 22, 23, 24, 131, 132, 135, 188, 189, 191, 192, 194}, | ||
| bags = {9}, | ||
| scarvesChains = {12, 16, 18, 20, 21, 22, 48, 132, 133, 135, 140, 153, 154, 155, 182, 183, 184, 185, 186, 187, 188, 189, 190}, | ||
| shirts = {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 80, 144, 151, 152, 153, 173, 175, 176, 177, 221, 222, 223, 224, 225, 226}, | ||
| bodyArmor = {1, 10, 11, 12, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 45, 46, 49, 83, 84, 85, 88, 89, 90, 91}, | ||
| jackets = {16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 40, 41, 42, 43, 45, 46, 47, 48, 49, 89, 253, 348, 349, 350, 351, 352, 353, 354, 355, 356, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545} | ||
| } |
Member
There was a problem hiding this comment.
blockedItems.lua: you have that file for configuration but you have a copy of that data inside the client code, you need to use lib.load. Also needs a configuration option to disable/enable this feature.
Comment on lines
+30
to
+37
| local function notifyBlockedItem() | ||
| lib.notify({ | ||
| title = "Blocked Item", | ||
| description = "You are not allowed to use emergency outfits. Your changes have been reverted.", | ||
| type = "error", | ||
| position = "bottom" | ||
| }) | ||
| end |
Member
There was a problem hiding this comment.
Could also tell the user which options are not allowed, since some clothing options may not be obvious that they're emergency clothing. Also this feature might be used for more than emergency clothing so maybe a general notificaiton could be better for example "You're using restricted clothing items (Hat: 5), (Pants: 10)"
Comment on lines
-30
to
+36
| RegisterNetEvent("ND_AppearanceShops:updateAppearance", function(clothing) | ||
| local src = source | ||
| local player = NDCore.getPlayer(src) | ||
| if not player then return end | ||
|
|
||
| if clothing and type(clothing) == "table" then | ||
| player.setMetadata("clothing", clothing) | ||
| AddEventHandler("NDCore:CharacterLoaded", function(player) | ||
| local clothing = player.getMetadata("clothing") | ||
| if clothing then | ||
| TriggerClientEvent("ND_AppearanceShops:ApplyAppearance", player.source, clothing) |
Member
There was a problem hiding this comment.
Tis is unnecessary, updateAppearance is used to save the clothing data to the players metadata. Also the character selection menus should be using the character loaded event to apply clothing. Such as in ND_Characters/source/client.lua#L57-L70.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
update to the player keeps resting