From 9934e59629038cc5d4af146d0128fe63be73e7da Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 11 Sep 2024 14:59:53 -0500 Subject: [PATCH] Squashed commit of the following: commit ddcc3a87451f60f6bc50759c56d8872b4e82496a Author: CuriousMagpie Date: Thu Sep 5 12:42:32 2024 -0400 update mixin to add onlyOwner and quest title commit bc1f75270bb4207a352fc9a24dad23e03d3f94c2 Author: CuriousMagpie Date: Wed Sep 4 16:15:42 2024 -0400 popover fix to difficulty but breaks img and quest title --- .../src/components/shops/quests/quest-helper.mixin.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/website/client/src/components/shops/quests/quest-helper.mixin.js b/website/client/src/components/shops/quests/quest-helper.mixin.js index fcaec8e4ec..9e53e7db4a 100644 --- a/website/client/src/components/shops/quests/quest-helper.mixin.js +++ b/website/client/src/components/shops/quests/quest-helper.mixin.js @@ -39,9 +39,16 @@ export const QuestHelperMixin = { return !drop.onlyOwner; }).map(item => { if (item.type === 'gear') { - const contentItem = this.content.gear.flat[item.key]; + return this.content.gear.flat[item.key]; + } - return contentItem; + if (item.type === 'quests') { + const questScroll = {}; + Object.assign(questScroll, this.content.quests[item.key]); + questScroll.type = 'quests'; + questScroll.text = item.text(); + questScroll.onlyOwner = item.onlyOwner; + return questScroll; } return {