Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.98.1",
+  "version": "4.99.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.98.1",
+  "version": "4.99.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@google-cloud/trace-agent": "^3.6.0",

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

@@ -1,4 +1,4 @@
-.promo_armoire_backgrounds_201905 {
+.promo_armoire_backgrounds_201906 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px -361px;
   width: 423px;

website/common/locales/en/backgrounds.json

@@ -497,5 +497,13 @@
   "backgroundParkWithStatueText": "Park with Statue",
   "backgroundParkWithStatueNotes": "Follow a flower-lined path through a Park with a Statue.",
   "backgroundRainbowMeadowText": "Rainbow Meadow",
-  "backgroundRainbowMeadowNotes": "Find the pot of gold where a Rainbow ends in a Meadow."
+  "backgroundRainbowMeadowNotes": "Find the pot of gold where a Rainbow ends in a Meadow.",
+
+  "backgrounds062019": "SET 61: Released June 2019",
+  "backgroundSchoolOfFishText": "School of Fish",
+  "backgroundSchoolOfFishNotes": "Swim among a School of Fish.",
+  "backgroundSeasideCliffsText": "Seaside Cliffs",
+  "backgroundSeasideCliffsNotes": "Stand on a beach with the beauty of Seaside Cliffs above.",
+  "backgroundUnderwaterVentsText": "Underwater Vents",
+  "backgroundUnderwaterVentsNotes": "Take a deep dive down, down to the Underwater Vents."
 }

website/common/locales/en/gear.json

@@ -424,6 +424,8 @@
   "weaponArmoireSlingshotNotes": "Take aim at your red Dailies! Increases Strength by <%= str %>. Enchanted Armoire: Independent Item.",
   "weaponArmoireNephriteBowText": "Nephrite Bow",
   "weaponArmoireNephriteBowNotes": "This bow shoots special jade-tipped arrows that will take down even your most stubborn bad habits! Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Nephrite Archer Set (Item 1 of 3).",
+  "weaponArmoireBambooCaneText": "Bamboo Cane",
+  "weaponArmoireBambooCaneNotes": "Perfect for assisting you in a stroll, or for dancing the Charleston. Increases Intelligence, Perception, and Constitution by <%= attrs %> each. Enchanted Armoire: Boating Set (Item 3 of 3).",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -916,6 +918,8 @@
   "armorArmoireVernalVestmentNotes": "This silky garment is perfect for enjoying mild spring weather in style. Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Vernal Vestments Set (Item 2 of 3).",
   "armorArmoireNephriteArmorText": "Nephrite Armor",
   "armorArmoireNephriteArmorNotes": "Made from strong steel rings and decorated with jade, this armor will protect you from procrastination! Increases Strength by <%= str %> and Perception by <%= per %>. Enchanted Armoire: Nephrite Archer Set (Item 3 of 3).",
+  "armorArmoireBoatingJacketText": "Boating Jacket",
+  "armorArmoireBoatingJacketNotes": "Whether you're on a swanky yacht or in a jalopy, you'll be the cat's meow in this jacket and tie. Increases Strength, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Boating Set (Item 1 of 3).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -1422,6 +1426,8 @@
   "headArmoireTricornHatNotes": "Become a revolutionary jokester! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
   "headArmoireNephriteHelmText": "Nephrite Helm",
   "headArmoireNephriteHelmNotes": "The carved jade plume atop this helm is enchanted to enhance your aim. Increases Perception by <%= per %> and Intelligence by <%= int %>. Enchanted Armoire: Nephrite Archer Set (Item 2 of 3).",
+  "headArmoireBoaterHatText": "Boater Hat",
+  "headArmoireBoaterHatNotes": "This straw chapeau is the bee's knees! Increases Strength, Constitution, and Perception by <%= attrs %> each. Enchanted Armoire: Boating Set (Item 2 of 3).",
 
   "offhand": "off-hand item",
   "offhandCapitalized": "Off-Hand Item",

website/common/script/content/appearance/backgrounds.js

@@ -843,6 +843,20 @@ let backgrounds = {
       notes: t('backgroundRainbowMeadowNotes'),
     },
   },
+  backgrounds062019: {
+    school_of_fish: {
+      text: t('backgroundSchoolOfFishText'),
+      notes: t('backgroundSchoolOfFishNotes'),
+    },
+    seaside_cliffs: {
+      text: t('backgroundSeasideCliffsText'),
+      notes: t('backgroundSeasideCliffsNotes'),
+    },
+    underwater_vents: {
+      text: t('backgroundUnderwaterVentsText'),
+      notes: t('backgroundUnderwaterVentsNotes'),
+    },
+  },
   incentiveBackgrounds: {
     violet: {
       text: t('backgroundVioletText'),

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

@@ -462,6 +462,16 @@ let armor = {
     set: 'nephrite',
     canOwn: ownsItem('armor_armoire_nephriteArmor'),
   },
+  boatingJacket: {
+    text: t('armorArmoireBoatingJacketText'),
+    notes: t('armorArmoireBoatingJacketNotes', { attrs: 6 }),
+    value: 100,
+    int: 6,
+    per: 6,
+    str: 6,
+    set: 'boating',
+    canOwn: ownsItem('armor_armoire_boatingJacket'),
+  },
 };
 
 let body = {
@@ -949,6 +959,16 @@ let head = {
     set: 'nephrite',
     canOwn: ownsItem('head_armoire_nephriteHelm'),
   },
+  boaterHat: {
+    text: t('headArmoireBoaterHatText'),
+    notes: t('headArmoireBoaterHatNotes', { attrs: 6 }),
+    value: 100,
+    str: 6,
+    con: 6,
+    per: 6,
+    set: 'boating',
+    canOwn: ownsItem('head_armoire_boaterHat'),
+  },
 };
 
 let shield = {
@@ -1602,6 +1622,16 @@ let weapon = {
     twoHanded: true,
     canOwn: ownsItem('weapon_armoire_nephriteBow'),
   },
+  bambooCane: {
+    text: t('weaponArmoireBambooCaneText'),
+    notes: t('weaponArmoireBambooCaneNotes', { attrs: 6 }),
+    value: 100,
+    int: 6,
+    per: 6,
+    con: 6,
+    set: 'boating',
+    canOwn: ownsItem('weapon_armoire_bambooCane'),
+  },
 };
 
 let armoireSet = {

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 = 'JUNE 2019 RESOLUTION SUCCESS CHALLENGE AND NEW TAKE THIS CHALLENGE';
+const LAST_ANNOUNCEMENT_TITLE = 'JUNE BACKGROUNDS AND ARMOIRE ITEMS!';
 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>6/3/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>6/4/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="scene_hiking center-block"></div>
-        <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.</p>
-        <p>For this month's Challenge, <a href='/challenges/7d413b28-24ce-4806-8755-2aa0cd6b3c57'>Mark Your Journey</a>, we're reflecting on your achievements since January and looking ahead to the rest of the year! It has a 15 Gem prize, which will be awarded to five lucky winners on July 1st.</p>
-        <p>Congratulations to the winners of May's Challenge, @CamelliaLynne, @wespe, @bdwilson, @skyflower, and @Mawri!</p>
-        <p>The next Take This Challenge has also launched, "<a href='/challenges/2a8c41ec-4a6b-490b-94e2-bdeddce1446d'>You've Got a Friend in Me!</a>", with a focus on expressing gratitude to people who improve our lives. Be sure to check it out to earn additional pieces of the Take This armor set!</p>
-        <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>
-        <p>Congratulations to the winners of the last Take This Challenge, "Organize Your Inventory!": grand prize winner t3h5rC, and runners-up avogad-ro, DrearyDear, BlueSky, Riou, and Keeva! 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>
-        <div class="small mb-3">by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat</div>
-        <div class="promo_take_this center-block"></div>
+        <div class="promo_armoire_backgrounds_201906 center-block"></div>
+        <p>We’ve added three new backgrounds to the Background Shop! Now your avatar can take a deep dive to Underwater Vents, swim with a School of Fish, and enjoy the beauty of Seaside Cliffs. Check them out under User Icon > Backgrounds!</p>
+        <p>Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the Boating Outfit. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)</p>
+        <div class="small mb-3">by Tyche Alba, The Mushroom King, Manostion, FolleMente, Katy133, Chimera Liani, and SabreCat</div>
       </div>
       `,
     });