chore(event): conclude

and fix rotten potatoe

website/client/src/assets/css/sprites/spritesmith-main-13.css

@@ -324,13 +324,13 @@
 }
 .Pet_Currency_Gem1x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1813px -543px;
+  background-position: -1825px -229px;
   width: 15px;
   height: 13px;
 }
 .Pet_Currency_Gem2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -659px;
+  background-position: -1784px -485px;
   width: 30px;
   height: 26px;
 }
@@ -630,122 +630,122 @@
 }
 .notif_inventory_present_02 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -340px;
+  background-position: -1813px -311px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_03 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -369px;
+  background-position: -1784px -340px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_04 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -398px;
+  background-position: -1813px -340px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_05 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -427px;
+  background-position: -1784px -369px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_06 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -456px;
+  background-position: -1813px -369px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_07 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -485px;
+  background-position: -1784px -398px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_08 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -514px;
+  background-position: -1813px -398px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_09 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -543px;
+  background-position: -1784px -427px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_10 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -572px;
+  background-position: -1813px -427px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_11 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -601px;
+  background-position: -1784px -456px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_12 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1784px -630px;
+  background-position: -1813px -456px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_special_birthday {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1813px -369px;
+  background-position: -1805px -512px;
   width: 20px;
   height: 24px;
 }
 .notif_inventory_special_congrats {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1813px -456px;
+  background-position: -1784px -564px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_getwell {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1813px -485px;
+  background-position: -1805px -564px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_goodluck {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1813px -340px;
+  background-position: -1784px -512px;
   width: 20px;
   height: 26px;
 }
 .notif_inventory_special_greeting {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1813px -514px;
+  background-position: -1784px -587px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_nye {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1813px -311px;
+  background-position: -1815px -485px;
   width: 24px;
   height: 26px;
 }
 .notif_inventory_special_thankyou {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1813px -398px;
+  background-position: -1784px -539px;
   width: 20px;
   height: 24px;
 }
 .notif_inventory_special_valentine {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1813px -427px;
+  background-position: -1805px -539px;
   width: 20px;
   height: 24px;
 }
 .npc_bailey {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
   background-position: -1784px 0px;
-  width: 54px;
+  width: 60px;
   height: 72px;
 }
 .npc_justin {

website/client/src/assets/scss/variables.scss

@@ -2,10 +2,10 @@
 // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, normal, normal
 // more to be added on future seasons
 
-$npc_market_flavor: 'habitoween';
-$npc_quests_flavor: 'habitoween';
-$npc_seasonal_flavor: 'habitoween';
-$npc_timetravelers_flavor: 'fall';
-$npc_tavern_flavor: 'habitoween';
+$npc_market_flavor: 'normal';
+$npc_quests_flavor: 'normal';
+$npc_seasonal_flavor: 'normal';
+$npc_timetravelers_flavor: 'normal';
+$npc_tavern_flavor: 'normal';
 
 $menuToolbarHeight: 56px;

website/client/src/components/achievements/chooseClass.vue

@@ -225,31 +225,30 @@ export default {
     classGear (heroClass) {
       if (heroClass === 'rogue') {
         return {
-          armor: 'armor_special_fall2020Rogue',
-          head: 'head_special_fall2020Rogue',
-          shield: 'shield_special_fall2020Rogue',
-          weapon: 'weapon_special_fall2020Rogue',
+          armor: 'armor_rogue_5',
+          head: 'head_rogue_5',
+          shield: 'shield_rogue_6',
+          weapon: 'weapon_rogue_6',
         };
       } if (heroClass === 'wizard') {
         return {
-          armor: 'armor_special_fall2020Mage',
-          head: 'head_special_fall2020Mage',
-          weapon: 'weapon_special_fall2020Mage',
-          shield: 'shield_warrior_0',
+          armor: 'armor_wizard_5',
+          head: 'head_wizard_5',
+          weapon: 'weapon_wizard_6',
         };
       } if (heroClass === 'healer') {
         return {
-          armor: 'armor_special_fall2020Healer',
-          head: 'head_special_fall2020Healer',
-          shield: 'shield_special_fall2020Healer',
-          weapon: 'weapon_special_fall2020Healer',
+          armor: 'armor_healer_5',
+          head: 'head_healer_5',
+          shield: 'shield_healer_5',
+          weapon: 'weapon_healer_6',
         };
       }
       return {
-        armor: 'armor_special_fall2020Warrior',
-        head: 'head_special_fall2020Warrior',
-        shield: 'shield_special_fall2020Warrior',
-        weapon: 'weapon_special_fall2020Warrior',
+        armor: 'armor_warrior_5',
+        head: 'head_warrior_5',
+        shield: 'shield_warrior_5',
+        weapon: 'weapon_warrior_6',
       };
     },
     selectionBox (selectedClass, heroClass) {

website/common/script/content/shop-featuredItems.js

@@ -39,7 +39,7 @@ const featuredItems = {
       },
       {
         type: 'food',
-        path: 'food.potatoe',
+        path: 'food.Potatoe',
       },
     ];
   },

website/common/script/libs/shops-seasonal.config.js

@@ -1,25 +1,19 @@
-import { SEASONAL_SETS } from '../content/constants';
+// import { SEASONAL_SETS } from '../content/constants';
 
 export default {
-  opened: true,
+  opened: false,
 
-  currentSeason: 'Fall',
+  currentSeason: 'Closed',
 
   dateRange: { start: '2020-09-22', end: '2020-10-31' },
 
   availableSets: [
-    ...SEASONAL_SETS.fall,
   ],
 
   pinnedSets: {
-    healer: 'fall2020DeathsHeadMothHealerSet',
-    rogue: 'fall2020TwoHeadedRogueSet',
-    warrior: 'fall2020WraithWarriorSet',
-    wizard: 'fall2020ThirdEyeMageSet',
   },
 
   availableSpells: [
-    'spookySparkles',
   ],
 
   availableQuests: [