Merge branch 'release' into develop

website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css

@@ -1,60 +1,66 @@
 .promo_achievement_white {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -910px 0px;
+  background-position: -862px -233px;
   width: 204px;
   height: 102px;
 }
 .promo_armoire_backgrounds_201912 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -327px;
+  background-position: -424px -475px;
   width: 423px;
   height: 147px;
 }
 .promo_g1g1_2019 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -403px -475px;
+  background-position: -469px -327px;
   width: 357px;
   height: 144px;
 }
 .promo_mystery_201912 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -462px -623px;
+  background-position: -424px -623px;
   width: 282px;
   height: 147px;
 }
+.promo_snowballs {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -441px 0px;
+  width: 420px;
+  height: 174px;
+}
 .promo_take_this {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -910px -103px;
+  background-position: -862px -336px;
   width: 96px;
   height: 69px;
 }
 .promo_winter_potions_2020 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -327px;
+  background-position: 0px -475px;
   width: 423px;
   height: 147px;
 }
 .promo_winter_quests_bundle {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -441px -148px;
+  background-position: 0px -623px;
   width: 423px;
   height: 147px;
 }
 .promo_winter_wonderland_2019 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -475px;
+  background-position: -441px -175px;
   width: 402px;
   height: 147px;
 }
 .promo_winter_wonderland_2020 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -441px 0px;
+  background-position: 0px -327px;
   width: 468px;
   height: 147px;
 }
 .scene_studying_hard {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -623px;
+  background-position: -862px 0px;
   width: 220px;
   height: 232px;
 }
@@ -66,7 +72,7 @@
 }
 .scene_todos {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -221px -623px;
+  background-position: 0px -771px;
   width: 240px;
   height: 195px;
 }

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: 'winter';
-$npc_quests_flavor: 'winter';
-$npc_seasonal_flavor: 'winter';
+$npc_market_flavor: 'nye';
+$npc_quests_flavor: 'nye';
+$npc_seasonal_flavor: 'nye';
 $npc_timetravelers_flavor: 'winter';
-$npc_tavern_flavor: 'winter';
+$npc_tavern_flavor: 'nye';

website/client/src/components/avatar.vue

@@ -212,7 +212,7 @@ export default {
     },
     visualBuffs () {
       return {
-        snowball: 'snowman',
+        snowball: `avatar_snowball_${this.member.stats.class}`,
         spookySparkles: 'ghost',
         shinySeed: `avatar_floral_${this.member.stats.class}`,
         seafoam: 'seafoam_star',