From c4b16f86db5c55d24c1411bf603bf66cced0adc5 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 19 Dec 2019 16:54:27 -0600 Subject: [PATCH] feat(event): Wonderland 2019-20 --- website/client/src/app.vue | 4 +- website/client/src/assets/scss/variables.scss | 10 +- .../client/src/assets/svg/gifts-vertical.svg | 46 ++++++ .../components/achievements/chooseClass.vue | 30 ++-- .../src/components/settings/subscription.vue | 38 ++++- website/common/locales/en/content.json | 1 + website/common/locales/en/gear.json | 50 +++++- website/common/locales/en/limited.json | 5 + website/common/locales/sr/questscontent.json | 2 +- website/common/script/content/bundles.js | 2 +- website/common/script/content/constants.js | 7 + .../script/content/gear/sets/special/index.js | 154 +++++++++++++++++- .../common/script/content/hatching-potions.js | 54 +++--- website/common/script/content/quests.js | 5 +- .../script/content/shop-featuredItems.js | 62 ++++--- .../script/libs/shops-seasonal.config.js | 17 +- website/common/script/libs/shops.js | 2 +- .../broad_armor_special_winter2020Healer.png | Bin 0 -> 1048 bytes .../broad_armor_special_winter2020Mage.png | Bin 0 -> 1191 bytes .../broad_armor_special_winter2020Rogue.png | Bin 0 -> 628 bytes .../broad_armor_special_winter2020Warrior.png | Bin 0 -> 955 bytes .../winter/head_special_winter2020Healer.png | Bin 0 -> 717 bytes .../winter/head_special_winter2020Mage.png | Bin 0 -> 1531 bytes .../winter/head_special_winter2020Rogue.png | Bin 0 -> 585 bytes .../winter/head_special_winter2020Warrior.png | Bin 0 -> 910 bytes .../shield_special_winter2020Healer.png | Bin 0 -> 550 bytes .../winter/shield_special_winter2020Rogue.png | Bin 0 -> 1012 bytes .../shield_special_winter2020Warrior.png | Bin 0 -> 673 bytes .../shop_armor_special_winter2020Healer.png | Bin 0 -> 699 bytes .../shop_armor_special_winter2020Mage.png | Bin 0 -> 707 bytes .../shop_armor_special_winter2020Rogue.png | Bin 0 -> 529 bytes .../shop_armor_special_winter2020Warrior.png | Bin 0 -> 620 bytes .../shop_head_special_winter2020Healer.png | Bin 0 -> 459 bytes .../shop/shop_head_special_winter2020Mage.png | Bin 0 -> 981 bytes .../shop_head_special_winter2020Rogue.png | Bin 0 -> 466 bytes .../shop_head_special_winter2020Warrior.png | Bin 0 -> 564 bytes .../shop_shield_special_winter2020Healer.png | Bin 0 -> 403 bytes .../shop_shield_special_winter2020Rogue.png | Bin 0 -> 706 bytes .../shop_shield_special_winter2020Warrior.png | Bin 0 -> 498 bytes .../shop_weapon_special_winter2020Healer.png | Bin 0 -> 413 bytes .../shop_weapon_special_winter2020Mage.png | Bin 0 -> 438 bytes .../shop_weapon_special_winter2020Rogue.png | Bin 0 -> 704 bytes .../shop_weapon_special_winter2020Warrior.png | Bin 0 -> 511 bytes .../slim_armor_special_winter2020Healer.png | Bin 0 -> 1058 bytes .../slim_armor_special_winter2020Mage.png | Bin 0 -> 1255 bytes .../slim_armor_special_winter2020Rogue.png | Bin 0 -> 604 bytes .../slim_armor_special_winter2020Warrior.png | Bin 0 -> 947 bytes .../weapon_special_winter2020Healer.png | Bin 0 -> 592 bytes .../winter/weapon_special_winter2020Mage.png | Bin 0 -> 731 bytes .../winter/weapon_special_winter2020Rogue.png | Bin 0 -> 1032 bytes .../weapon_special_winter2020Warrior.png | Bin 0 -> 752 bytes .../spritesmith/npcs/npc_bailey.png | Bin 3673 -> 3639 bytes .../spritesmith/npcs/npc_justin.png | Bin 4371 -> 4364 bytes .../raw_sprites/spritesmith/npcs/npc_matt.png | Bin 5861 -> 6173 bytes .../mounts/body/Mount_Body_BearCub-Aurora.png | Bin 0 -> 1355 bytes .../mounts/body/Mount_Body_Cactus-Aurora.png | Bin 0 -> 1675 bytes .../mounts/body/Mount_Body_Dragon-Aurora.png | Bin 0 -> 1062 bytes .../body/Mount_Body_FlyingPig-Aurora.png | Bin 0 -> 1731 bytes .../mounts/body/Mount_Body_Fox-Aurora.png | Bin 0 -> 1630 bytes .../mounts/body/Mount_Body_LionCub-Aurora.png | Bin 0 -> 1981 bytes .../body/Mount_Body_PandaCub-Aurora.png | Bin 0 -> 1208 bytes .../body/Mount_Body_TigerCub-Aurora.png | Bin 0 -> 1330 bytes .../mounts/body/Mount_Body_Wolf-Aurora.png | Bin 0 -> 1793 bytes .../mounts/head/Mount_Head-Wolf_Aurora.png | Bin 0 -> 1406 bytes .../mounts/head/Mount_Head_BearCub-Aurora.png | Bin 0 -> 879 bytes .../mounts/head/Mount_Head_Cactus-Aurora.png | Bin 0 -> 1454 bytes .../mounts/head/Mount_Head_Dragon-Aurora.png | Bin 0 -> 1866 bytes .../head/Mount_Head_FlyingPig-Aurora.png | Bin 0 -> 976 bytes .../mounts/head/Mount_Head_Fox-Aurora.png | Bin 0 -> 785 bytes .../mounts/head/Mount_Head_LionCub-Aurora.png | Bin 0 -> 1104 bytes .../head/Mount_Head_PandaCub-Aurora.png | Bin 0 -> 1095 bytes .../head/Mount_Head_TigerCub-Aurora.png | Bin 0 -> 1047 bytes .../mounts/icon/Mount_Icon_BearCub-Aurora.png | Bin 0 -> 713 bytes .../mounts/icon/Mount_Icon_Cactus-Aurora.png | Bin 0 -> 930 bytes .../mounts/icon/Mount_Icon_Dragon-Aurora.png | Bin 0 -> 761 bytes .../icon/Mount_Icon_FlyingPig-Aurora.png | Bin 0 -> 747 bytes .../mounts/icon/Mount_Icon_Fox-Aurora.png | Bin 0 -> 764 bytes .../mounts/icon/Mount_Icon_LionCub-Aurora.png | Bin 0 -> 1084 bytes .../icon/Mount_Icon_PandaCub-Aurora.png | Bin 0 -> 724 bytes .../icon/Mount_Icon_TigerCub-Aurora.png | Bin 0 -> 875 bytes .../mounts/icon/Mount_Icon_Wolf-Aurora.png | Bin 0 -> 867 bytes .../stable/pets/Pet-Bear-Aurora.png | Bin 0 -> 966 bytes .../stable/pets/Pet-Cactus-Aurora.png | Bin 0 -> 853 bytes .../stable/pets/Pet-Dragon-Aurora.png | Bin 0 -> 1105 bytes .../stable/pets/Pet-FlyingPig-Aurora.png | Bin 0 -> 1148 bytes .../stable/pets/Pet-Fox-Aurora.png | Bin 0 -> 913 bytes .../stable/pets/Pet-LionCub-Aurora.png | Bin 0 -> 925 bytes .../stable/pets/Pet-PandaCub-Aurora.png | Bin 0 -> 888 bytes .../stable/pets/Pet-TigerCub-Aurora.png | Bin 0 -> 1082 bytes .../stable/pets/Pet-Wolf-Aurora.png | Bin 0 -> 1077 bytes .../potions/Pet_HatchingPotion_Aurora.png | Bin 0 -> 689 bytes .../promo_winter_potions_2020.png | Bin 0 -> 12420 bytes .../promo_winter_quests_bundle.png | Bin 0 -> 21448 bytes .../promo_winter_wonderland_2019.png | Bin 0 -> 19036 bytes .../promo_winter_wonderland_2020.png | Bin 0 -> 11034 bytes website/server/controllers/api-v3/news.js | 89 ++++++---- 96 files changed, 451 insertions(+), 127 deletions(-) create mode 100644 website/client/src/assets/svg/gifts-vertical.svg create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/broad_armor_special_winter2020Healer.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/broad_armor_special_winter2020Mage.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/broad_armor_special_winter2020Rogue.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/broad_armor_special_winter2020Warrior.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/head_special_winter2020Healer.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/head_special_winter2020Mage.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/head_special_winter2020Rogue.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/head_special_winter2020Warrior.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shield_special_winter2020Healer.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shield_special_winter2020Rogue.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shield_special_winter2020Warrior.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_armor_special_winter2020Healer.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_armor_special_winter2020Mage.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_armor_special_winter2020Rogue.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_armor_special_winter2020Warrior.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_head_special_winter2020Healer.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_head_special_winter2020Mage.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_head_special_winter2020Rogue.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_head_special_winter2020Warrior.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_shield_special_winter2020Healer.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_shield_special_winter2020Rogue.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_shield_special_winter2020Warrior.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_weapon_special_winter2020Healer.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_weapon_special_winter2020Mage.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_weapon_special_winter2020Rogue.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/shop/shop_weapon_special_winter2020Warrior.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/slim_armor_special_winter2020Healer.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/slim_armor_special_winter2020Mage.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/slim_armor_special_winter2020Rogue.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/slim_armor_special_winter2020Warrior.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/weapon_special_winter2020Healer.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/weapon_special_winter2020Mage.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/weapon_special_winter2020Rogue.png create mode 100644 website/raw_sprites/spritesmith/gear/events/winter/weapon_special_winter2020Warrior.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head-Wolf_Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Bear-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Aurora.png create mode 100644 website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Aurora.png create mode 100644 website/raw_sprites/spritesmith_large/promo_winter_potions_2020.png create mode 100644 website/raw_sprites/spritesmith_large/promo_winter_quests_bundle.png create mode 100644 website/raw_sprites/spritesmith_large/promo_winter_wonderland_2019.png create mode 100644 website/raw_sprites/spritesmith_large/promo_winter_wonderland_2020.png diff --git a/website/client/src/app.vue b/website/client/src/app.vue index 49b49c5b67..f2a433ecf0 100644 --- a/website/client/src/app.vue +++ b/website/client/src/app.vue @@ -332,7 +332,7 @@ export default { loading: true, currentTipNumber: 0, bannerHidden: false, - giftingHidden: getLocalSetting(CONSTANTS.keyConstants.GIFTING_BANNER_DISPLAY) === 'dismissed', + giftingHidden: getLocalSetting(CONSTANTS.keyConstants.GIFTING_BANNER_DISPLAY) === 'dismissed2019', }; }, computed: { @@ -727,7 +727,7 @@ export default { this.bannerHidden = true; }, hideGiftingBanner () { - setLocalSetting(CONSTANTS.keyConstants.GIFTING_BANNER_DISPLAY, 'dismissed'); + setLocalSetting(CONSTANTS.keyConstants.GIFTING_BANNER_DISPLAY, 'dismissed2019'); this.giftingHidden = true; }, resumeDamage () { diff --git a/website/client/src/assets/scss/variables.scss b/website/client/src/assets/scss/variables.scss index 573376536b..2a0f49aff9 100644 --- a/website/client/src/assets/scss/variables.scss +++ b/website/client/src/assets/scss/variables.scss @@ -2,8 +2,8 @@ // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer // more to be added on future seasons -$npc_market_flavor: 'normal'; -$npc_quests_flavor: 'normal'; -$npc_seasonal_flavor: 'normal'; -$npc_timetravelers_flavor: 'normal'; -$npc_tavern_flavor: 'normal'; +$npc_market_flavor: 'winter'; +$npc_quests_flavor: 'winter'; +$npc_seasonal_flavor: 'winter'; +$npc_timetravelers_flavor: 'winter'; +$npc_tavern_flavor: 'winter'; diff --git a/website/client/src/assets/svg/gifts-vertical.svg b/website/client/src/assets/svg/gifts-vertical.svg new file mode 100644 index 0000000000..96b1b8ddba --- /dev/null +++ b/website/client/src/assets/svg/gifts-vertical.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/website/client/src/components/achievements/chooseClass.vue b/website/client/src/components/achievements/chooseClass.vue index 913abb1b1d..5485a7e9b8 100644 --- a/website/client/src/components/achievements/chooseClass.vue +++ b/website/client/src/components/achievements/chooseClass.vue @@ -225,30 +225,30 @@ export default { classGear (heroClass) { if (heroClass === 'rogue') { return { - armor: 'armor_rogue_5', - head: 'head_rogue_5', - shield: 'shield_rogue_6', - weapon: 'weapon_rogue_6', + armor: 'armor_special_winter2020Rogue', + head: 'head_special_winter2020Rogue', + shield: 'shield_special_winter2020Rogue', + weapon: 'weapon_special_winter2020Rogue', }; } if (heroClass === 'wizard') { return { - armor: 'armor_wizard_5', - head: 'head_wizard_5', - weapon: 'weapon_wizard_6', + armor: 'armor_special_winter2020Mage', + head: 'head_special_winter2020Mage', + weapon: 'weapon_special_winter2020Mage', }; } if (heroClass === 'healer') { return { - armor: 'armor_healer_5', - head: 'head_healer_5', - shield: 'shield_healer_5', - weapon: 'weapon_healer_6', + armor: 'armor_special_winter2020Healer', + head: 'head_special_winter2020Healer', + shield: 'shield_special_winter2020Healer', + weapon: 'weapon_special_winter2020Healer', }; } return { - armor: 'armor_warrior_5', - head: 'head_warrior_5', - shield: 'shield_warrior_5', - weapon: 'weapon_warrior_6', + armor: 'armor_special_winter2020Warrior', + head: 'head_special_winter2020Warrior', + shield: 'shield_special_winter2020Warrior', + weapon: 'weapon_special_winter2020Warrior', }; }, selectionBox (selectedClass, heroClass) { diff --git a/website/client/src/components/settings/subscription.vue b/website/client/src/components/settings/subscription.vue index 4ffad1bcbc..4f895e60c2 100644 --- a/website/client/src/components/settings/subscription.vue +++ b/website/client/src/components/settings/subscription.vue @@ -1,5 +1,19 @@