From 0284e9a4e3d79f9911abf99e39c6d0c99112c094 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sat, 17 Dec 2016 02:54:29 +0000 Subject: [PATCH] fix(event): sell Santa scrolls --- website/common/script/content/index.js | 4 +-- website/common/script/libs/shops.js | 35 +++++++++++++++++++ .../options/inventory/seasonal-shop.jade | 2 +- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js index b0d36f25e3..1868a2e96c 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -698,7 +698,7 @@ api.quests = { }, evilsanta: { canBuy: (function() { - return false; + return true; }), text: t('questEvilSantaText'), notes: t('questEvilSantaNotes'), @@ -724,7 +724,7 @@ api.quests = { }, evilsanta2: { canBuy: (function() { - return false; + return true; }), text: t('questEvilSanta2Text'), notes: t('questEvilSanta2Notes'), diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js index 7c13eff9cf..e334f409c0 100644 --- a/website/common/script/libs/shops.js +++ b/website/common/script/libs/shops.js @@ -235,6 +235,11 @@ shops.getSeasonalShopCategories = function getSeasonalShopCategories (user, lang const AVAILABLE_SPELLS = [ ]; + const AVAILABLE_QUESTS = [ + 'evilsanta', + 'evilsanta2', + ]; + let categories = []; let flatGearArray = _.toArray(content.gear.flat); @@ -265,6 +270,36 @@ shops.getSeasonalShopCategories = function getSeasonalShopCategories (user, lang categories.push(category); } + let quests = pickBy(content.quests, (quest, key) => { + return _.indexOf(AVAILABLE_QUESTS, key) !== -1; + }); + + if (_.keys(quests).length > 0) { + let category = { + identifier: 'quests', + text: i18n.t('quests', language), + }; + + category.items = _.map(quests, (quest, key) => { + return { + key, + text: quest.text(language), + notes: quest.notes(language), + value: quest.value, + type: 'quests', + currency: 'gems', + locked: false, + drop: quest.drop, + boss: quest.boss, + collect: quest.collect, + class: `inventory_quest_scroll_${key}`, + purchaseType: 'quests', + }; + }); + + categories.push(category); + } + for (let key in AVAILABLE_SETS) { if (AVAILABLE_SETS.hasOwnProperty(key)) { let category = { diff --git a/website/views/options/inventory/seasonal-shop.jade b/website/views/options/inventory/seasonal-shop.jade index f69a0fe1f0..f67ac6d0d1 100644 --- a/website/views/options/inventory/seasonal-shop.jade +++ b/website/views/options/inventory/seasonal-shop.jade @@ -11,7 +11,7 @@ li.customize-menu.inventory-gear menu.pets-menu(label='{{category.text}}', ng-repeat='category in seasonalShopCategories') div(ng-repeat='item in category.items', ng-if='!user.items.gear.owned[item.key]') - button.customize-option(class='shop_{{item.key}}', + button.customize-option(class='{{item.class}} shop_{{item.key}}', popover='{{item.notes}}', popover-title='{{item.text}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true',