chore(event): end Summer Splash

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

@@ -1,84 +1,30 @@
 .promo_armoire_backgrounds_201907 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -776px 0px;
+  background-position: 0px 0px;
-  width: 423px;
-  height: 147px;
-}
-.promo_glass_watery_potions {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -776px -148px;
   width: 423px;
   height: 147px;
 }
 .promo_mystery_201907 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -376px -286px;
+  background-position: -424px 0px;
   width: 282px;
   height: 144px;
 }
 .promo_naming_day_2018 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -776px -444px;
+  background-position: 0px -148px;
   width: 285px;
   height: 162px;
 }
-.promo_orcas {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -696px;
-  width: 219px;
-  height: 147px;
-}
-.promo_seafoam {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -313px -473px;
-  width: 425px;
-  height: 148px;
-}
-.promo_seasonal_shop {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -220px -696px;
-  width: 162px;
-  height: 132px;
-}
-.promo_splashy_pals_bundle {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -776px -296px;
-  width: 423px;
-  height: 147px;
-}
-.promo_splashy_skins {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -286px;
-  width: 375px;
-  height: 186px;
-}
-.customize-option.promo_splashy_skins {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -25px -301px;
-  width: 60px;
-  height: 60px;
-}
-.promo_summer_splash_2019 {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -367px 0px;
-  width: 408px;
-  height: 186px;
-}
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1062px -444px;
+  background-position: -424px -145px;
   width: 96px;
   height: 69px;
 }
-.scene_casting_spells {
+.scene_rewards {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -473px;
+  background-position: 0px -311px;
-  width: 312px;
+  width: 207px;
-  height: 222px;
+  height: 180px;
-}
-.scene_tools {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px 0px;
-  width: 366px;
-  height: 285px;
 }

website/client/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: 'summer';
+$npc_market_flavor: 'normal';
-$npc_quests_flavor: 'summer';
+$npc_quests_flavor: 'normal';
-$npc_seasonal_flavor: 'summer';
+$npc_seasonal_flavor: 'normal';
-$npc_timetravelers_flavor: 'summer';
+$npc_timetravelers_flavor: 'normal';
-$npc_tavern_flavor: 'summer';
+$npc_tavern_flavor: 'normal';

website/client/components/achievements/chooseClass.vue

@@ -164,31 +164,30 @@ export default {
     classGear (heroClass) {
       if (heroClass === 'rogue') {
         return {
-          armor: 'armor_special_summer2019Rogue',
+          armor: 'armor_rogue_5',
-          head: 'head_special_summer2019Rogue',
+          head: 'head_rogue_5',
-          shield: 'shield_special_summer2019Rogue',
+          shield: 'shield_rogue_6',
-          weapon: 'weapon_special_summer2019Rogue',
+          weapon: 'weapon_rogue_6',
         };
       } else if (heroClass === 'wizard') {
         return {
-          armor: 'armor_special_summer2019Mage',
+          armor: 'armor_wizard_5',
-          head: 'head_special_summer2019Mage',
+          head: 'head_wizard_5',
-          shield: 'shield_special_summer2019Mage',
+          weapon: 'weapon_wizard_6',
-          weapon: 'weapon_special_summer2019Mage',
         };
       } else if (heroClass === 'healer') {
         return {
-          armor: 'armor_special_summer2019Healer',
+          armor: 'armor_healer_5',
-          head: 'head_special_summer2019Healer',
+          head: 'head_healer_5',
-          shield: 'shield_special_summer2019Healer',
+          shield: 'shield_healer_5',
-          weapon: 'weapon_special_summer2019Healer',
+          weapon: 'weapon_healer_6',
         };
       } else {
         return {
-          armor: 'armor_special_summer2019Warrior',
+          armor: 'armor_warrior_5',
-          head: 'head_special_summer2019Warrior',
+          head: 'head_warrior_5',
-          shield: 'shield_special_summer2019Warrior',
+          shield: 'shield_warrior_5',
-          weapon: 'weapon_special_summer2019Warrior',
+          weapon: 'weapon_warrior_6',
         };
       }
     },

website/common/script/content/gear/sets/special/index.js

@@ -8,7 +8,7 @@ import takeThisGear from './special-takeThis';
 import wonderconGear from './special-wondercon';
 import t from '../../../translation';
 
-const CURRENT_SEASON = 'summer';
+const CURRENT_SEASON = '_NONE_';
 
 let armor = {
   0: backerGear.armorSpecial0,

website/common/script/content/hatching-potions.js

@@ -3,7 +3,7 @@ import defaults from 'lodash/defaults';
 import each from 'lodash/each';
 import t from './translation';
 
-const CURRENT_SEASON = 'July';
+const CURRENT_SEASON = '_NONE_';
 
 function hasQuestAchievementFunction (key) {
   return (user) => {
@@ -143,7 +143,7 @@ let premium = {
     value: 2,
     text: t('hatchingPotionGlass'),
     limited: true,
-    _season: 'July',
+    _season: '_PENDING_',
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndJuly'),
       previousDate: t('june2018'),
@@ -198,7 +198,7 @@ let premium = {
     value: 2,
     text: t('hatchingPotionWatery'),
     limited: true,
-    _season: 'July',
+    _season: '_PENDING_',
   },
 };
 

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

@@ -9,15 +9,15 @@ const featuredItems = {
     },
     {
       type: 'eggs',
-      path: 'eggs.BearCub',
+      path: 'eggs.LionCub',
     },
     {
-      type: 'premiumHatchingPotion',
+      type: 'hatchingPotions',
-      path: 'premiumHatchingPotions.Glass',
+      path: 'hatchingPotions.Desert',
     },
     {
-      type: 'premiumHatchingPotion',
+      type: 'food',
-      path: 'premiumHatchingPotions.Watery',
+      path: 'food.Potatoe',
     },
   ],
   quests: [

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

@@ -1,29 +1,23 @@
-import { SEASONAL_SETS } from '../content/constants';
+// import { SEASONAL_SETS } from '../content/constants';
 
 module.exports = {
-  opened: true,
+  opened: false,
 
-  currentSeason: 'Summer',
+  currentSeason: 'Closed',
 
-  dateRange: { start: '2019-06-18', end: '2019-07-31' },
+  dateRange: { start: '2018-09-20', end: '2018-10-31' },
 
   availableSets: [
-    ...SEASONAL_SETS.summer,
   ],
 
   pinnedSets: {
-    wizard: 'summer2019WaterLilyMageSet',
-    warrior: 'summer2019SeaTurtleWarriorSet',
-    rogue: 'summer2019HammerheadRogueSet',
-    healer: 'summer2019ConchHealerSet',
   },
 
   availableSpells: [
-    'seafoam',
   ],
 
   availableQuests: [
   ],
 
-  featuredSet: 'summer2018BettaFishWarriorSet',
+  featuredSet: 'mummyMedicSet',
 };

website/server/controllers/api-v3/news.js

@@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth';
 let api = {};
 
 // @TODO export this const, cannot export it from here because only routes are exported from controllers
-const LAST_ANNOUNCEMENT_TITLE = 'HABITICA NAMING DAY! AND LAST CHANCE FOR SUMMER LIMITED ITEMS';
+const LAST_ANNOUNCEMENT_TITLE = 'HABITICA OFFICIAL CHALLENGES AND BEHIND-THE-SCENES BLOG POST';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -30,29 +30,22 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>7/31/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>8/1/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_naming_day_2018 center-block"></div>
+        <div class="scene_rewards center-block"></div>
-        <h3>Habitica Naming Day!</h3>
+        <h3>August 2019 Resolution Success Challenge and New Take This Challenge</h3>
-        <p>Happy Habitica Naming Day! In honor of the day when we changed the name of the app from HabitRPG to Habitica, we've given everyone an achievement, as well as some delicious cake for your pets and mounts. Everyone has also received Royal Purple Gryphon rewards! Depending on how many Naming Days you've celebrated with us, you've received Melior (a Purple Gryphon mount), his little sister Meliora (a Purple Gryphon pet), a Purple Gryphon Helm, or the Purple Gryphon Wing Cloak!</p>
+        <p>The Habitica team has launched a special official Challenge series hosted in the <a href='/groups/guild/6e6a8bd3-9f5f-4351-9188-9f11fcd80a99' target='_blank'>Official New Year's Resolution Guild</a>. These Challenges are designed to help you build and maintain goals that are destined for success and then stick with them as the year progresses. For this month's Challenge, <a href='/challenges/08a170bb-b0bc-4bbe-b464-f2760dfeb3e0'>Count your Treasure</a>, we're focusing on the importance of rewards! It has a 15 Gem prize, which will be awarded to five lucky winners on September 2.</p>
-        <p>Thanks for being a Habitica user -- you all mean so much to us. We hope that you enjoy your presents!</p>
+        <p>Congratulations to the winners of July's Challenge, papachops, Krilae, mmlado, archalyus, and Roisinn!</p>
-        <div class="small mb-3">by Lemoness, Beffymaroo, and Baconsaur</div>
+        <p>The next Take This Challenge has also launched, "<a href='/challenges/6438d355-1b00-4987-a5da-b78a2c806293'>Enter Sandman!</a>", with a focus on sleep hygiene. Be sure to check it out to earn additional pieces of the Take This armor set!</p>
-        <div class="promo_mystery_201907 center-block"></div>
+        <p><a href='http://www.takethis.org/' target='_blank'>Take This</a> is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness.</p>
-        <h3>Last Chance for Beach Buddy Set</h3>
+        <p>Congratulations to the winners of the last Take This Challenge, "Rolling a Natural 1!": grand prize winner lemoneater, and runners-up @renan-eccel, @moments_1d, @Rynna, Krzysiek, and Iverina Falchion! Plus, all participants in that Challenge have received a piece of the <a href='http://habitica.wikia.com/wiki/Event_Item_Sequences#Take_This_Armor_Set' target='_blank'>Take This item set</a> if they hadn't completed it already. It is located in your Rewards column. Enjoy!</p>
-        <p>Reminder: this is the final day to <a href='/user/settings/subscription'>subscribe</a> and receive the three-piece Beach Buddy Set! Subscribing also lets you buy Gems for Gold. The longer your subscription, the more Gems you get!</p>
+        <div class="small mb-3">by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat</div>
-        <p>Thanks so much for your support! You help keep Habitica running.</p>
+        <div class="promo_take_this center-block"></div>
-        <div class="small mb-3">by Beffymaroo</div>
+        <h3>Behind the Scenes: How the Habitica Logo (and Melior) Came to Be</h3>
-        <div class="promo_summer_splash_2019 center-block"></div>
+        <p>There's a new <a href='https://habitica.wordpress.com/2019/07/31/how-the-habitica-logo-and-melior-came-to-be/' target='_blank'>Behind the Scenes post</a> on the Habitica Blog! Redphoenix shares the story of Habitica's purple gryphon logo and our beloved mascot Melior! Check it out to learn some fun Habitican history.</p>
-        <h3>Last Chance for Summer Splash Items and Hatching Potions</h3>
+        <div class="small mb-3">by redphoenix</div>
-        <p>This is also your last chance to get all Summer Splash goodies before they vanish at the end of July 31st! This includes Limited-Edition Outfits, Seasonal Shop purchases, Seasonal Edition Skins, and yes, even Watery and Glass Hatching Potions. Grab them all while you still can!</p>
-        <div class="promo_splashy_pals_bundle center-block"></div>
-        <h3>Last Chance for Splashy Pals Pet Quest Bundle</h3>
-        <p>This is also the final day to buy the discounted Splashy Pals Pet Quest Bundle, featuring the Seahorse, Sea Turtle, and Whale quests all for seven gems! Be sure to catch it in the <a href='/shops/quests'>Quest Shop</a> before it swims away!</p>
-        <div class="small">by Lemoness and SabreCat</div>
-        <div class="small">Art by McCoyly, krazjega, UncommonCriminal, zoebeagle, Kiwibot, JessicaChase, Scarabsi, and JaizakArpaik</div>
-        <div class="small mb-3">Writing by Calae, Ginger_Hanna, and Lemoness</div>
       </div>
       `,
     });

website/server/models/user/hooks.js

@@ -127,9 +127,6 @@ function _setUpNewUser (user) {
   user.items.quests.dustbunnies = 1;
   user.markModified('items.quests');
 
-  user.items.mounts['Orca-Base'] = true;
-  user.markModified('items.mounts');
-
   user.purchased.background.violet = true;
   user.preferences.background = 'violet';