Accessories disappearance #307

swkeep · 2023-05-14T07:56:42Z

While remaking one of my scripts, I stumbled upon a bug that caused accessories to disappear when changing the character's bag.
Bug: https://cdn.discordapp.com/attachments/1072115896706936963/1107204394828701717/bug.mp4

This fix should address the issue to some degree, If the tracker config is set to the correct value.
After: https://cdn.discordapp.com/attachments/1072115896706936963/1107204239727530054/fix-maybe.mp4

And I removed a duplicate code too.

fix(outfits): Prevent disappearance of accessories refactor(outfits/config): add TrackerClothingOptions

TheiLLeniumStudios

Thank you for the PR. I've requested a few changes but other than that, it looks good

TheiLLeniumStudios · 2023-05-14T07:59:52Z

client/defaults.lua

@@ -36,6 +36,7 @@ function GetDefaultConfig()
        tattoos = false,
        enableExit = true,
        hasTracker = Config.PreventTrackerRemoval and Framework.HasTracker(),
+        trackerClothingOptions = Config.TrackerClothingOptions,


This config gets passed into the UI so its not necessary to send the tracking options to it. You can just remove this and use Config.TrackerClothingOptions instead in client/outfits.lua

Sure, i'll move it on top of the if statement

local tracker = Config.TrackerClothingOptions if data["accessory"] ~= nil then

TheiLLeniumStudios · 2023-05-14T08:01:33Z

client/outfits.lua

@@ -50,28 +50,36 @@ function LoadJobOutfit(oData)
        SetPedComponentVariation(ped, 6, data["shoes"].item, data["shoes"].texture, 0)
    end

-    -- Bag


Doesn't this cause the outfits to not have a bag anymore?

I didn't test it because my script takes control of the backpacks on the server. However, I will test it without it to see what happens. But, I believe that shouldn't remove bags.

Yeah but what I mean is that this will not work anymore with the change above: https://github.com/iLLeniumStudios/illenium-appearance/blob/main/shared/config.lua#L610

As the table for the outfits goes through this event, it would not set the bag for that outfit and will keep whatever the user is wearing already

I tested it on qbcore load/logout and restarting the script works fine.

@swkeep can you try setting a different bag in the outfits and then see if putting on that outfit applies that bag? I think that is the case that I'm trying to make sure, is working

@swkeep Nevermind. It should work, I didn't check the full file and it was just a duplicate, my bad

TheiLLeniumStudios · 2023-05-14T08:03:02Z

shared/config.lua

@@ -43,6 +43,10 @@ Config.NearestShopBlipUpdateDelay = 10000
 Config.InvincibleDuringCustomization = true

 Config.PreventTrackerRemoval = true -- Disables "Scarf and Chains" section if the player has tracker
+Config.TrackerClothingOptions = {
+    item = 13,


Can you please rename this to drawable? I would like this to be more consistent, atleast in the config. And I have plans to change the item to drawable in other places as well so it will be a 1 less thing for me to modify

Sure, I have a question. Will something like data["accessory"].item be renamed to drawable and moved to the compatibility layer, or will it remain the same?

The outfit data format compatibility will stay the same for some time. I'm just trying to make sure that anything new that is added, doesn't use the old conventions with item as the key and follows the new data format

TheiLLeniumStudios · 2023-05-14T08:03:52Z

client/outfits.lua

        else
            SetPedComponentVariation(ped, 7, data["accessory"].item, data["accessory"].texture, 0)
        end
    else
+        local config = GetDefaultConfig()


Same here. You do not need to get the config here since that is strictly for the UI. Just use Config.TrackerClothingOptions

TheiLLeniumStudios · 2023-05-14T08:04:08Z

client/outfits.lua

    -- Badge
    if data["decals"] ~= nil then
        SetPedComponentVariation(ped, 10, data["decals"].item, data["decals"].texture, 0)
    end

    -- Accessory
    if data["accessory"] ~= nil then
+        local config = GetDefaultConfig()


Same as the comment above

…ions to UI

TheiLLeniumStudios · 2023-05-14T08:51:15Z

Awesome! LGTM

* refactor: remove duplicate code * fix(outfits): Prevent disappearance of accessories fix(outfits): Prevent disappearance of accessories refactor(outfits/config): add TrackerClothingOptions * refactor(outfits/config): remove redundant passing TrackerClothingOptions to UI * refactor(config): rename item to drawable * chore: change bag to default value

* chore(pipelines): Tekton CI pipeline for lint * chore(pipelines): Fix pipeline taskRef * Change name for the pipelinerun * Add secret to clone repo * Run as 0 * Use specific hash for arm64 image * Fix hash for lua lint action * Change image * feat(ui/radial): Add support for ox_lib radial menu (#268) Co-authored-by: iLLeniumStudios <104288623+TheiLLeniumStudios@users.noreply.github.com> * fix(framework/esx): Fix loadout bug (#271) Co-authored-by: iLLeniumStudios <104288623+TheiLLeniumStudios@users.noreply.github.com> * fix(cache): Set ped cache after SetPlayerPed (#292) * fix(locales): Typo in locale keys * fix(player): Armour not restoring properly * fix(cache/ped): Wait 150ms instead of setting ped cache manually * fix(playeroutfitrooms): Invalid reference to the target ped (#293) * feat(tattoos): Tattoos for Build 2802 * fix(ui): Radial menu shirt icon * fix(radialmenu): Radialmenu option not showing up for clothing rooms and player outfit rooms * feat(target): usePoly usage for targets (#295) * chore(release): Remove .tekton from release zip * feat(management/qbox): qbx-management support for BossManagedOutfits (#296) * refactor(radialmenu): Move logic to separate files for each framework (#297) * refactor(radialmenu): Move to logic separate files for each framework * refactor(client): Remove unused variable * refactor(client): Move logic to separate lua files (#300) * fix(radial): Remove check to not have redudant if statements in zones * fix(management): Nil value for args * fix(radial): qb and qbx compatibility issues * fix(esx): Loadout issue on load * fix(esx): Only restore loadout if exists * fix(outfits): Accessories disappearance (#307) * refactor: remove duplicate code * fix(outfits): Prevent disappearance of accessories fix(outfits): Prevent disappearance of accessories refactor(outfits/config): add TrackerClothingOptions * refactor(outfits/config): remove redundant passing TrackerClothingOptions to UI * refactor(config): rename item to drawable * chore: change bag to default value * Add path to workspace * Add dummy * Remove lint action * Enable fail on warnings * Disable colorized output * Remove dummy variable --------- Co-authored-by: Malcolm Keefe <27903055+Mkeefeus@users.noreply.github.com> Co-authored-by: AlfaRP <88886043+Alfita2021@users.noreply.github.com> Co-authored-by: swkeep <49286776+swkeep@users.noreply.github.com>

swkeep added 2 commits May 14, 2023 09:16

refactor: remove duplicate code

6604daf

fix(outfits): Prevent disappearance of accessories

5bc374a

fix(outfits): Prevent disappearance of accessories refactor(outfits/config): add TrackerClothingOptions

TheiLLeniumStudios requested changes May 14, 2023

View reviewed changes

swkeep added 3 commits May 14, 2023 12:13

refactor(outfits/config): remove redundant passing TrackerClothingOpt…

57d7e5d

…ions to UI

refactor(config): rename item to drawable

97992b0

chore: change bag to default value

befa8c3

TheiLLeniumStudios approved these changes May 14, 2023

View reviewed changes

TheiLLeniumStudios merged commit 86b7dad into iLLeniumStudios:main May 14, 2023
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Accessories disappearance #307

Accessories disappearance #307

swkeep commented May 14, 2023

TheiLLeniumStudios left a comment

TheiLLeniumStudios May 14, 2023

swkeep May 14, 2023

TheiLLeniumStudios May 14, 2023

swkeep May 14, 2023

TheiLLeniumStudios May 14, 2023

swkeep May 14, 2023

TheiLLeniumStudios May 14, 2023

TheiLLeniumStudios May 14, 2023

TheiLLeniumStudios May 14, 2023

swkeep May 14, 2023

TheiLLeniumStudios May 14, 2023

TheiLLeniumStudios May 14, 2023

TheiLLeniumStudios May 14, 2023

TheiLLeniumStudios commented May 14, 2023

Accessories disappearance #307

Accessories disappearance #307

Conversation

swkeep commented May 14, 2023

TheiLLeniumStudios left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheiLLeniumStudios commented May 14, 2023