Merge branch 'release' into develop

migrations/users/mystery-items.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
-const MIGRATION_NAME = 'mystery_items_201902';
-const MYSTERY_ITEMS = ['eyewear_mystery_201902', 'shield_mystery_201902'];
+const MIGRATION_NAME = 'mystery_items_201903';
+const MYSTERY_ITEMS = ['armor_mystery_201903', 'head_mystery_201903'];
 import { model as User } from '../../website/server/models/user';
 import { model as UserNotification } from '../../website/server/models/userNotification';
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.89.0",
+  "version": "4.90.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.89.0",
+  "version": "4.90.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@google-cloud/trace-agent": "^3.5.2",

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

@@ -24,19 +24,25 @@
 }
 .promo_mystery_201902 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -433px -327px;
+  background-position: -769px -444px;
   width: 240px;
   height: 147px;
 }
+.promo_mystery_201903 {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -769px -296px;
+  width: 351px;
+  height: 147px;
+}
 .promo_seasonalshop_spring {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1010px -296px;
+  background-position: -1010px -444px;
   width: 162px;
   height: 138px;
 }
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -769px -492px;
+  background-position: -433px -327px;
   width: 96px;
   height: 69px;
 }
@@ -54,7 +60,7 @@
 }
 .scene_todos {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -769px -296px;
+  background-position: 0px -638px;
   width: 240px;
   height: 195px;
 }

website/common/locales/en/gear.json

@@ -793,6 +793,8 @@
   "armorMystery201809Notes": "You are not only a small and fearsome leaf puff, you are sporting the most beautiful colors of the season! Confers no benefit. September 2018 Subscriber Item.",
   "armorMystery201810Text": "Dark Forest Robes",
   "armorMystery201810Notes": "These robes are extra warm to protect you from the ghastly cold of haunted realms. Confers no benefit. October 2018 Subscriber Item.",
+  "armorMystery201903Text": "Shell-ebration Armor",
+  "armorMystery201903Notes": "People are dye-ing to know where you got this egg-cellent outfit! Confers no benefit. March 2019 Subscriber Item.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
   "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1291,6 +1293,8 @@
   "headMystery201811Notes": "Wear this feathered hat to stand out at even the fanciest wizardly gatherings! Confers no benefit. November 2018 Subscriber Item.",
   "headMystery201901Text": "Polaris Helm",
   "headMystery201901Notes": "The glowing gems on this helm contain light magically captured from winter auroras. Confers no benefit. January 2019 Subscriber Item.",
+  "headMystery201903Text": "Sunny Side Up Helm",
+  "headMystery201903Notes": "Some may call you an egghead, but that's OK because you know how to take a yolk. Confers no benefit. March 2019 Subscriber Item.",
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
   "headMystery301405Text": "Basic Top Hat",

website/common/locales/en/subscriber.json

@@ -155,6 +155,7 @@
     "mysterySet201812": "Arctic Fox Set",
     "mysterySet201901": "Polaris Set",
     "mysterySet201902": "Cryptic Crush Set",
+    "mysterySet201903": "Egg-squisite Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

website/common/script/content/gear/sets/mystery.js

@@ -223,6 +223,12 @@ let armor = {
     mystery: '201810',
     value: 0,
   },
+  201903: {
+    text: t('armorMystery201903Text'),
+    notes: t('armorMystery201903Notes'),
+    mystery: '201903',
+    value: 0,
+  },
   301404: {
     text: t('armorMystery301404Text'),
     notes: t('armorMystery301404Notes'),
@@ -673,6 +679,12 @@ let head = {
     mystery: '201901',
     value: 0,
   },
+  201903: {
+    text: t('headMystery201903Text'),
+    notes: t('headMystery201903Notes'),
+    mystery: '201903',
+    value: 0,
+  },
   301404: {
     text: t('headMystery301404Text'),
     notes: t('headMystery301404Notes'),

website/common/script/content/mystery-sets.js

@@ -246,6 +246,10 @@ let mysterySets = {
     start: '2019-02-25',
     end: '2019-03-02',
   },
+  201903: {
+    start: '2019-03-26',
+    end: '2019-04-02',
+  },
   301404: {
     start: '3014-03-24',
     end: '3014-04-02',

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 = 'CELESTIAL AND RAINBOW HATCHING POTIONS! PLUS USE CASE SPOTLIGHT ON MAKING ROUTINES';
+const LAST_ANNOUNCEMENT_TITLE = 'MARCH SUBSCRIBER ITEMS REVEALED!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -30,20 +30,14 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>3/21/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>3/26/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_celestial_rainbow_potions center-block"></div>
-        <h3>Celestial and Rainbow Hatching Potions</h3>
-        <p>There's a new pet breed in town! Check out the brand-new Celestial Potions and the return of Rainbow Potions to brighten your Spring avatar look from <a href='/shops/market'>the Market</a> and use them to hatch any standard pet egg. (Magic Hatching Potions do not work on Quest Pet eggs.) Magic Hatching Potion Pets aren't picky, so they'll happily eat any kind of food that you feed them!</p>
-        <p>After they're gone, it will be at least a year before the Celestial or Rainbow Hatching Potions are available again, so be sure to get them now!</p>
-        <div class="small mb-3">by Bonogo, Mara, Beffymaroo, and SabreCat</div>
-        <div class="scene_todos center-block"></div>
-        <h3>Use Case Spotlight: Routines</h3>
-        <p>This month's <a href='https://habitica.wordpress.com/2019/03/21/use-case-spotlight-setting-up-a-routine/' target='_blank'>Use Case Spotlight</a> is about Routines! It features a number of great suggestions submitted by Habiticans in the <a href='/groups/guild/1d3a10bf-60aa-4806-a38b-82d1084a59e6'>Use Case Spotlights Guild</a>. We hope it helps any of you who might be looking for new ideas to set up related tasks.</p>
-        <p>Plus, we're collecting user submissions for the next spotlight! How do you use Habitica to review and evaluate your tasks? We’ll be featuring player-submitted examples in Use Case Spotlights on the Habitica Blog next month, so post your suggestions in the Use Case Spotlight Guild now. We look forward to learning more about how you use Habitica to improve your life and get things done!</p>
-        <div class="small mb-3">by shanaqui</div>
+        <div class="promo_mystery_201903 center-block"></div>
+        <p>The March Subscriber Items have been revealed: the Egg-squisite Item Set! You only have five days to receive the item set when you <a href='/user/settings/subscription'>subscribe</a>. If you're already an active subscriber, reload the site and then head to Inventory > Items to claim your gear!</p>
+        <p>Subscribers also receive the ability to buy Gems for Gold -- the longer you subscribe, the more Gems you can buy per month! There are other perks as well, such as longer access to uncompressed data and a cute Jackalope pet. Best of all, subscriptions let us keep Habitica running. Thank you very much for your support -- it means a lot to us.</p>
+        <div class="small mb-3">by Beffymaroo</div>
       </div>
       `,
     });