feat(content): Mythical Marvels Bundle

and end Valentine's miscellany

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

website/client/components/shops/market/index.vue

@@ -246,8 +246,8 @@ export default {
         categories.push({
           identifier: 'cards',
           text: this.$t('cards'),
-          items: _map(_filter(this.content.cardTypes, (value, key) => {
-            return value.yearRound || key === 'valentine';
+          items: _map(_filter(this.content.cardTypes, (value) => {
+            return value.yearRound;
           }), (value) => {
             return {
               ...getItemInfo(this.user, 'card', value),

website/common/locales/en/questsContent.json

@@ -737,5 +737,8 @@
   "questVelociraptorCompletion": "You burst through the grass, confronting the Veloci-Rapper.<br><br><em>See here, rapper, you’re no quitter,<br>You’re Bad Habits' hardest hitter!<br>Check off your To-Dos like a boss,<br>Don’t mourn over one day’s loss!</em><br><br>Filled with renewed confidence, it bounds off to freestyle another day, leaving behind three eggs where it sat.",
   "questVelociraptorBoss": "Veloci-Rapper",
   "questVelociraptorDropVelociraptorEgg": "Velociraptor (Egg)",
-  "questVelociraptorUnlockText": "Unlocks purchasable Velociraptor eggs in the Market"
+  "questVelociraptorUnlockText": "Unlocks purchasable Velociraptor eggs in the Market",
+
+  "mythicalMarvelsText": "Mythical Marvels Quest Bundle",
+  "mythicalMarvelsNotes": "Contains 'Convincing the Unicorn Queen,' 'The Fiery Gryphon,' and 'Danger in the Depths: Sea Serpent Strike!' Available until February 28."
 }

website/common/script/content/index.js

@@ -227,6 +227,21 @@ api.bundles = {
     type: 'quests',
     value: 7,
   },
+  mythicalMarvels: {
+    key: 'mythicalMarvels',
+    text: t('mythicalMarvelsText'),
+    notes: t('mythicalMarvelsNotes'),
+    bundleKeys: [
+      'unicorn',
+      'seaserpent',
+      'gryphon',
+    ],
+    canBuy () {
+      return moment().isBetween('2019-02-19', '2019-03-02');
+    },
+    type: 'quests',
+    value: 7,
+  },
 };
 
 /*

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 = 'BLOG POSTS! WIKI AND GUILD SPOTLIGHTS';
+const LAST_ANNOUNCEMENT_TITLE = 'NEW DISCOUNTED PET QUEST BUNDLE: MYTHICAL MARVELS!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -30,18 +30,14 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>2/14/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>2/19/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="scene_office center-block"></div>
-        <h3>Blog Post: Group Plans</h3>
-        <p>This month's <a href='https://habitica.wordpress.com/2019/02/06/group-plans/' target='_blank'>featured Wiki article</a> is about Group Plans! We hope that it will help you as share tasks with friends and family. Be sure to check it out, and let us know what you think by reaching out on <a href='https://twitter.com/habitica' target='_blank'>Twitter</a>, <a href='http://blog.habitrpg.com' target='_blank'>Tumblr</a>, and <a href='https://facebook.com/habitica' target='_blank'>Facebook</a>.</p>
-        <div class="small mb-3">by shanaqui and the Wiki Wizards</div>
-        <div class="scene_coding center-block"></div>
-        <h3>Guild Spotlight: More New and Notable Guilds</h3>
-        <p>There's a new <a href='https://habitica.wordpress.com/2019/02/14/new-and-notable-guild-spotlight-2/' target='_blank'>Guild Spotlight on the blog</a> that highlights some of the new movers and shakers in our community! Check it out now to find some cool new places to hang out in Habitica with folks who share your interests and goals.</p>
-        <div class="small mb-3">by shanaqui</div>
+        <div class="promo_mythical_marvels_bundle center-block"></div>
+        <p>If you're looking to add some magical pets to your Habitica stable, you're in luck! From now until February 28, you can purchase the Mythical Marvels Pet Quest Bundle and receive the Gryphon, Sea Serpent, and Unicorn quests, all for only 7 Gems! That's a discount of 5 Gems from the price of purchasing them separately. Check it out in the <a href='/shops/quests'>Quest Shop</a> today!</p>
+        <div class="small">Art by greenpencil, UncommonCriminal, RosieSully, Lukreja, Baconsaur, Witticaster, Aries Faries, Mara, Seraphina, 1920-kun, RBrinks, and Erikari</div>
+        <div class="small mb-3">Writing by Laurel, Daniel the Bard, and gwyllgi</div>
       </div>
       `,
     });