Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.57.2",
+  "version": "4.57.3",
   "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.57.2",
+  "version": "4.57.3",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",

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

@@ -4,6 +4,12 @@
   width: 141px;
   height: 441px;
 }
+.promo_ember_potions {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -959px 0px;
+  width: 141px;
+  height: 441px;
+}
 .promo_ios {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: -441px 0px;
@@ -18,13 +24,13 @@
 }
 .promo_mystery_201807 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -817px -442px;
+  background-position: -959px -442px;
   width: 114px;
   height: 120px;
 }
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -817px -563px;
+  background-position: -959px -563px;
   width: 96px;
   height: 69px;
 }

website/common/locales/fr/content.json

@@ -175,7 +175,7 @@
     "questEggSeaSerpentAdjective": "étincelant",
     "questEggKangarooText": "Kangourou",
     "questEggKangarooMountText": "Kangourou",
-    "questEggKangarooAdjective": "a keen",
+    "questEggKangarooAdjective": "enthousiaste",
     "eggNotes": "Trouvez une potion d’éclosion à verser sur cet œuf et il en sortira <%= eggAdjective(locale) %> bébé <%= eggText(locale) %>.",
     "hatchingPotionBase": "de base",
     "hatchingPotionWhite": "des neiges",

website/common/locales/fr/questscontent.json

@@ -611,10 +611,10 @@
     "questSeaSerpentBoss": "Le puissant serpent de mer",
     "questSeaSerpentDropSeaSerpentEgg": "Serpent de mer (œuf)",
     "questSeaSerpentUnlockText": "Débloque les oeufs de serpents de mer dans la boutique",
-    "questKangarooText": "Kangaroo Catastrophe",
-    "questKangarooNotes": "Maybe you should have finished that last task… you know, the one you keep avoiding, even though it always comes back around? But @Mewrose and @LilithofAlfheim invited you and @stefalupagus to see a rare kangaroo troop hopping through the Sloensteadi Savannah; how could you say no?! As the troop comes into view, something hits you on the back of the head with a mighty <em>whack!</em><br><br>Shaking the stars from your vision, you pick up the responsible object--a dark red boomerang, with the very task you continually push back etched into its surface. A quick glance around confirms the rest of your party met a similar fate. One larger kangaroo looks at you with a smug grin, like she’s daring you to face her and that dreaded task once and for all!",
-    "questKangarooCompletion": "“NOW!” You signal your party to throw the boomerangs back at the kangaroo. The beast hops further away with each hit until she flees, leaving nothing more than a dark red cloud of dust, a few eggs, and some gold coins.<br><br>@Mewrose walks forward to where the kangaroo once stood. “Hey, where did the boomerangs go?”<br><br>“They probably dissolved into dust, making that dark red cloud, when we finished our respective tasks,” @stefalupagus speculates.<br><br>@LilithofAlfheim squints at the horizon. “Is that another kangaroo troop heading our way?”<br><br>You all break into a run back to Habit City. Better to face your difficult tasks than take another lump to the back of the head!",
-    "questKangarooBoss": "Catastrophic Kangaroo",
+    "questKangarooText": "Catastrophe kangourou",
+    "questKangarooNotes": "Vous auriez peut-être dû terminer cette dernière tâche.... vous savez, celle que vous évitez toujours, même si elle revient toujours ? Mais @Mewrose et @LilithofAlfheim vous invitent, vous et @stefalupagus, à voir un kangourou rare sauter à travers la savane Tanfépaï ; comment pourriez-vous dire non ?! Alors que la troupe entre en vue, quelque chose vous frappe à l'arrière de la tête d'un puissant <em>boum</em><br><br> ! Des étoiles devant les yeux, vous ramassez l'objet responsable - un boomerang rouge foncé, avec la tâche même que vous repoussez continuellement gravée sur sa surface. Un coup d'œil rapide confirme que le reste de votre groupe a connu le même sort. Une plus grande kangourou vous regarde avec un sourire suffisant, comme si elle vous mettait au défi de l'affronter, elle et cette tâche redoutée une fois pour toutes !",
+    "questKangarooCompletion": "\"MAINTENANT !\" Vous faites signe à votre groupe de lancer les boomerangs sur la kangourou. La bête saute plus loin à chaque coup jusqu'à ce qu'elle s'enfuit, ne laissant rien de plus qu'un nuage de poussière rouge foncé, quelques œufs et quelques pièces d'or.<br><br>@Mewrose marche jusqu'à l'endroit où la kangourou se tenait autrefois. \"Hé, où sont allés les boomerangs ?\"<br><br>\"Ils se sont probablement dissous dans la poussière, faisant ce nuage rouge foncé, quand nous avons terminé nos tâches respectives\", spécule @stefalupagus.<br><br>@LilithofAlfheim louche à l'horizon. \"Est-ce qu'une autre troupe de kangourou se dirige vers nous ?\"<br><br>Vous vous êtes tous introduits dans une course vers Habit City. Mieux vaut affronter vos tâches difficiles que de prendre une autre bosse à l'arrière de la tête !",
+    "questKangarooBoss": "Kangourou catastrophique",
     "questKangarooDropKangarooEgg": "Kangourou (Œuf) ",
     "questKangarooUnlockText": " Déverrouille l'achat d’œufs de kangourou au Marché "
 }

website/common/locales/ja/gear.json

@@ -568,8 +568,8 @@
     "armorSpecialFall2017MageNotes": "印象的で圧倒的なローブ無くして、何が仮面舞踏会の衣装と言えるのでしょう？　知能が<%= int %>上がります。2017年秋の限定装備。",
     "armorSpecialFall2017HealerText": "幽霊屋敷のよろい",
     "armorSpecialFall2017HealerNotes": "あなたの心は開いたドア、肩は屋根瓦です！　体質が<%= con %>上がります。2017年秋の限定装備。",
-    "armorSpecialWinter2018RogueText": "Reindeer Costume",
-    "armorSpecialWinter2018RogueNotes": "You look so cute and fuzzy, who could suspect you are after holiday loot? Increases Perception by <%= per %>. Limited Edition 2017-2018 Winter Gear.",
+    "armorSpecialWinter2018RogueText": "トナカイのコスチューム",
+    "armorSpecialWinter2018RogueNotes": "あなたは柔らかな毛で覆われてとっても可愛く見えますよ。祝祭明けの贈り物なんじゃないか？と誰かが思うくらいにね。知覚が <%= per %> 上がります。2017年-2018年冬の限定装備。",
     "armorSpecialWinter2018WarriorText": "Wrapping Paper Armor",
     "armorSpecialWinter2018WarriorNotes": "Don't let the papery feel of this armor fool you. It's nearly impossible to rip! Increases Constitution by <%= con %>. Limited Edition 2017-2018 Winter Gear.",
     "armorSpecialWinter2018MageText": "きらびやかなタキシード",
@@ -972,8 +972,8 @@
     "headSpecialFall2017HealerNotes": "このかぶとが持つ癒しの力を手に入れるため、不気味な霊魂や友好的なモンスターを招き入れましょう！　知能が<%= int %>上がります。2017年秋の限定装備。",
     "headSpecialNye2017Text": "しゃれたパーティハット",
     "headSpecialNye2017Notes": "しゃれたパーティハットをもらいました!　新年を告げる鐘を聞きながら、誇りをもってかぶりましょう!　効果なし。",
-    "headSpecialWinter2018RogueText": "Reindeer Helm",
-    "headSpecialWinter2018RogueNotes": "The perfect holiday disguise, with a built-in headlight! Increases Perception by <%= per %>. Limited Edition 2017-2018 Winter Gear.",
+    "headSpecialWinter2018RogueText": "トナカイのかぶと",
+    "headSpecialWinter2018RogueNotes": "ヘッドライトが内蔵された、パーフェクトな祝祭の仮装です！知覚が <%= per %> 上がります。2017年-2018年冬の限定装備。",
     "headSpecialWinter2018WarriorText": "Giftbox Helm",
     "headSpecialWinter2018WarriorNotes": "This jaunty box top and bow are not only festive, but quite sturdy. Increases Strength by <%= str %>. Limited Edition 2017-2018 Winter Gear.",
     "headSpecialWinter2018MageText": "Sparkly Top Hat",

website/common/locales/nl/groups.json

@@ -3,7 +3,7 @@
     "tavernChat": "Herbergchat",
     "innCheckOut": "Uitchecken bij de herberg",
     "innCheckIn": "Rust uit in de herberg",
-    "innText": "You're resting in the Inn! While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day. Be warned: If you are participating in a Boss Quest, the Boss will still damage you for your Party mates' missed Dailies unless they are also in the Inn! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
+    "innText": "Je bent aan het rusten in de herberg! Tijdens je verblijf zullen je dagelijkse taken je geen schade doen op het einde van de dag, maar ze zullen wel elke dag herladen. Opgelet: Als je in een Baas queeste deelneemt, zal de baas je nog steeds schade aanrichten voor de gemiste dagelijkse taken van je gezelschap leden tenzij ze ook in de herberg zijn! Je eigen schade aan de baas (of gecollecteerde items) zullen ook niet toegepast worden tot je je terug uit checkt.",
     "innTextBroken": "You're resting in the Inn, I guess... While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day...  If you are participating in a Boss Quest, the Boss will still damage you for your Party mates' missed Dailies... unless they are also in the Inn... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn... so tired...",
     "innCheckOutBanner": "Je bent momenteel in de Herberg. Je dagelijkse taken zullen je niet verwonden en je zal geen vooruitgang maken in Queesten",
     "resumeDamage": "Resume Damage",

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 = '_NONE_';
+const CURRENT_SEASON = 'August';
 
 let drops = {
   Base: {

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

@@ -8,12 +8,12 @@ const featuredItems = {
       path: 'armoire',
     },
     {
-      type: 'food',
-      path: 'food.Saddle',
+      type: 'premiumHatchingPotion',
+      path: 'premiumHatchingPotions.Ember',
     },
     {
-      type: 'food',
-      path: 'food.Fish',
+      type: 'eggs',
+      path: 'eggs.Dragon',
     },
     {
       type: 'card',
@@ -31,7 +31,7 @@ const featuredItems = {
     },
     {
       type: 'quests',
-      path: 'quests.whale',
+      path: 'quests.kangaroo',
     },
   ],
   seasonal: '',

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 = 'NEW PET QUEST: KANGAROOS! PLUS SPOTLIGHT ON HABITICA COMMUNITY INVOLVEMENT';
+const LAST_ANNOUNCEMENT_TITLE = 'EMBER HATCHING POTIONS RETURN!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -26,32 +26,22 @@ api.getNews = {
     res.status(200).send({
       html: `
       <div class="bailey">
+        <div class="media align-items-center">
+          <div class="media-body">
             <div class="media align-items-center">
               <div class="mr-3 ${baileyClass}"></div>
               <div class="media-body">
                 <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>8/16/2018 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+                <h2>8/21/2018 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
               </div>
             </div>
             <hr/>
-        <div class="media align-items-center">
-          <div class="media-body">
-            <h3>New Pet Quest: Kangaroo Catastrophe!</h3>
-            <p>Ever feel like you've dodged a dreaded task, but it just comes back around to brain you like a whirling boomerang? Get the latest pet quest, "Kangaroo Catastrophe," from the <a href='/shops/quests' target='_blank'>Quest Shop</a> and earn some keen kangaroo pets by completing those real-life tasks!</p>
-            <div class="small">Art by stefalupagus, mewrose, LilithofAlfheim, ChrisSpatzerl, Willow the Witty, tricksy.fox, and Beffymaroo</div>
-            <div class="small mb-3">Writing by summra and SabreCat</div>
+            <p>They're back! Between now and September 21, you can buy Ember Hatching Potions from <a href='/shops/market' target='_blank'>the Market</a> and use them to hatch any standard pet egg. (Magic Hatching Potions do not work on Quest Pet eggs.) Ember 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 Ember Hatching Potions are available again, so be sure to get them now!</p>
+            <div class="small mb-3">by Balduranne and SabreCat</div>
           </div>
-          <div class="promo_kangaroo ml-3 mb-3"></div>
+          <div class="promo_ember_potions ml-3 mb-3"></div>
         </div>
-        <div class="media align-items-center">
-          <div class="scene_tavern mr-3"></div>
-          <div class="media-body">
-            <h3>Use Case Spotlight and Guild Spotlight on Getting Involved with Habitica's Community</h3>
-            <p>We've got new posts on the blog all about ways to get involved with Habitica's community! First, there's a <a href='https://habitica.wordpress.com/2018/08/16/getting-involved-in-habitica-guilds-for-contributing/' target='_blank'>Guild Spotlight</a> that highlights the Guilds that can help you earn a place as an esteemed Habitica contributor. We've also posted a <a href='https://habitica.wordpress.com/2018/08/16/use-case-spotlight-get-involved-in-the-habitica-community/' target='_blank'>Use Case Spotlight</a> featuring a number of great suggestions for other ways to get involved with contributing or simply getting social on the site and apps! These suggestions were submitted by Habiticans in the <a href='/groups/guild/1d3a10bf-60aa-4806-a38b-82d1084a59e6' target='_blank'>Use Case Spotlights Guild</a>.</p>
-          </div>
-        </div>
-        <p>Plus, we're collecting user submissions for the next Use Case Spotlight! How do you use Habitica as you learn practical and hands-on skills? 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>
       `,
     });