Merge branch 'release' into develop

migrations/users/mystery-items.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
-const MIGRATION_NAME = 'mystery_items_201904';
-const MYSTERY_ITEMS = ['armor_mystery_201904', 'head_mystery_201904'];
+const MIGRATION_NAME = 'mystery_items_201905';
+const MYSTERY_ITEMS = ['headAccessory_mystery_201905', 'back_mystery_201905'];
 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.96.1",
+  "version": "4.97.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.96.1",
+  "version": "4.97.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@google-cloud/trace-agent": "^3.6.0",

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

@@ -22,7 +22,7 @@
   width: 423px;
   height: 147px;
 }
-.promo_mystery_201904 {
+.promo_mystery_201905 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: -860px -223px;
   width: 282px;

website/common/locales/en/gear.json

@@ -1738,6 +1738,8 @@
   "backMystery201812Notes": "Your luxurious tail shimmers like an icicle, bobbing happily as you pad softly over the snowdrifts. Confers no benefit. December 2018 Subscriber Item.",
   "backMystery201805Text": "Phenomenal Peacock Tail",
   "backMystery201805Notes": "This gorgeous feathery tail is perfect for a strut down a lovely garden path! Confers no benefit. May 2018 Subscriber Item.",
+  "backMystery201905Text": "Dazzling Dragon Wings",
+  "backMystery201905Notes": "Fly to untold realms with these iridescent wings. Confers no benefit. May 2019 Subscriber Item.",
 
   "backSpecialWonderconRedText": "Mighty Cape",
   "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",
@@ -1906,6 +1908,8 @@
   "headAccessoryMystery201804Notes": "These fuzzy sound-catchers will ensure you never miss the rustle of a leaf or the sound of an acorn falling! Confers no benefit. April 2018 Subscriber Item.",
   "headAccessoryMystery201812Text": "Arctic Fox Ears",
   "headAccessoryMystery201812Notes": "You hear the subtle sound of snowflakes falling upon the landscape. Confers no benefit. December 2018 Subscriber Item.",
+  "headAccessoryMystery201905Text": "Dazzling Dragon Horns",
+  "headAccessoryMystery201905Notes": "These horns are as sharp as they are shimmery. Confers no benefit. May 2019 Subscriber Item.",
   "headAccessoryMystery301405Text": "Headwear Goggles",
   "headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",
 

website/common/locales/en/subscriber.json

@@ -158,6 +158,7 @@
     "mysterySet201902": "Cryptic Crush Set",
     "mysterySet201903": "Egg-squisite Set",
     "mysterySet201904": "Opulent Opal Set",
+    "mysterySet201905": "Dazzling Dragon Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

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

@@ -358,6 +358,12 @@ let back = {
     mystery: '201812',
     value: 0,
   },
+  201905: {
+    text: t('backMystery201905Text'),
+    notes: t('backMystery201905Notes'),
+    mystery: '201905',
+    value: 0,
+  },
 };
 
 let body = {
@@ -772,6 +778,12 @@ let headAccessory = {
     mystery: '201812',
     value: 0,
   },
+  201905: {
+    text: t('headAccessoryMystery201905Text'),
+    notes: t('headAccessoryMystery201905Notes'),
+    mystery: '201905',
+    value: 0,
+  },
   301405: {
     text: t('headAccessoryMystery301405Text'),
     notes: t('headAccessoryMystery301405Notes'),

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

@@ -185,8 +185,10 @@ let premium = {
     value: 2,
     text: t('hatchingPotionBronze'),
     limited: true,
-    _season: 'March',
     canBuy: hasQuestAchievementFunction('bronze'),
+    _addlNotes () {
+      return '';
+    },
   },
 };
 

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

@@ -254,6 +254,10 @@ let mysterySets = {
     start: '2019-04-25',
     end: '2019-05-02',
   },
+  201905: {
+    start: '2019-05-28',
+    end: '2019-06-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 = 'BLOG POSTS: WIKI AND USE CASE SPOTLIGHTS!';
+const LAST_ANNOUNCEMENT_TITLE = 'MAY SUBSCRIBER ITEMS REVEALED!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -30,19 +30,14 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>5/23/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>5/28/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="scene_rewards center-block"></div>
-        <h3>Blog Post: Enchanted Armoire</h3>
-        <p>This month's <a href='https://habitica.wordpress.com/2019/05/22/enchanted-armoire/' target='_blank'>featured Wiki article</a> is about the Enchanted Armoire! We hope that it will help you as you reward yourself for your accomplishments. 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_gold center-block"></div>
-        <h3>Use Case Spotlight: Invigorating the Endgame</h3>
-        <p>This month's <a href='https://habitica.wordpress.com/2019/05/23/use-case-spotlight-keeping-things-interesting-in-endgame/' target='_blank'>Use Case Spotlight</a> is about Keeping Things Interesting in Habitica's "Endgame"! 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 longtime Habiticans looking to keep things fresh.</p>
-        <p>Plus, we're collecting user submissions for the next spotlight! We want to hear your best tricks and strategies for playing the Warrior class to its full advantage. We’ll be featuring player-submitted tips 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_201905 center-block"></div>
+        <p>The May Subscriber Item has been revealed: the Dazzling Dragon Item Set! You only have until May 31 to receive the item set <a href='/user/settings/subscription'>when you 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>
       `,
     });