Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.128.1",
+  "version": "4.128.2",
   "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.128.1",
+  "version": "4.128.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.7.7",

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

@@ -1,78 +1,60 @@
-.promo_achievement_white {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -862px -233px;
-  width: 204px;
-  height: 102px;
-}
 .promo_armoire_backgrounds_201912 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -475px;
+  background-position: 0px -175px;
   width: 423px;
   height: 147px;
 }
 .promo_g1g1_2019 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -469px -327px;
+  background-position: 0px -471px;
   width: 357px;
   height: 144px;
 }
-.promo_mystery_201912 {
+.promo_mystery_202001 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -623px;
+  background-position: -241px -616px;
-  width: 282px;
+  width: 279px;
   height: 147px;
 }
 .promo_snowballs {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -441px 0px;
+  background-position: 0px 0px;
   width: 420px;
   height: 174px;
 }
 .promo_take_this {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -862px -336px;
+  background-position: -358px -471px;
   width: 96px;
   height: 69px;
 }
 .promo_winter_potions_2020 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -475px;
+  background-position: -424px -175px;
   width: 423px;
   height: 147px;
 }
 .promo_winter_quests_bundle {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -623px;
+  background-position: 0px -323px;
   width: 423px;
   height: 147px;
 }
 .promo_winter_wonderland_2019 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -441px -175px;
+  background-position: -424px -323px;
   width: 402px;
   height: 147px;
 }
 .promo_winter_wonderland_2020 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -327px;
+  background-position: -421px 0px;
   width: 468px;
   height: 147px;
 }
-.scene_studying_hard {
+.scene_list {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -862px 0px;
+  background-position: 0px -616px;
-  width: 220px;
-  height: 232px;
-}
-.scene_tavern {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px 0px;
-  width: 440px;
-  height: 326px;
-}
-.scene_todos {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -771px;
   width: 240px;
   height: 195px;
 }

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

@@ -5,7 +5,7 @@ import moment from 'moment';
 // path: 'premiumHatchingPotions.Rainbow',
 const featuredItems = {
   market () {
-    if (moment().isBetween('2019-12-19', '2020-02-02')) {
+    if (moment().isBetween('2019-12-19', '2020-01-02')) {
       return [
         {
           type: 'card',
@@ -25,6 +25,26 @@ const featuredItems = {
         },
       ];
     }
+    if (moment().isBetween('2019-12-19', '2020-02-02')) {
+      return [
+        {
+          type: 'armoire',
+          path: 'armoire',
+        },
+        {
+          type: 'premiumHatchingPotion',
+          path: 'premiumHatchingPotions.Aurora',
+        },
+        {
+          type: 'premiumHatchingPotion',
+          path: 'premiumHatchingPotions.Holly',
+        },
+        {
+          type: 'premiumHatchingPotion',
+          path: 'premiumHatchingPotions.StarryNight',
+        },
+      ];
+    }
     return [
       {
         type: 'armoire',

website/server/controllers/api-v3/news.js

@@ -4,7 +4,7 @@ const api = {};
 
 // @TODO export this const, cannot export it from here because only routes are exported from
 // controllers
-const LAST_ANNOUNCEMENT_TITLE = 'DECEMBER LAST CHANCE, SNOWBALLS, NEW YEAR’S RESOLUTION BLOG POST, AND NEW YEAR’S HAT AND CARDS!';
+const LAST_ANNOUNCEMENT_TITLE = 'JANUARY SUBSCRIBER ITEMS AND OFFICIAL HABITICA CHALLENGES!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -31,54 +31,69 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>12/31/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>1/1/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="npc_justin center-block"></div>
+        <div class="promo_mystery_202001 center-block"></div>
-        <h3>Party Hats</h3>
+        <h3>January Subscriber Items Revealed!</h3>
         <p>
-          In honor of the new year, some free Party Hats are available in your Rewards! Each year
+          The January Subscriber Items have been revealed: the Fabled Fox Item Set! You'll receive
-          you celebrate New Year's with Habitica, you unlock a new hat. Enjoy, and stay tuned for
+          this set if you <a href='/user/settings/subscription'>subscribe to Habitica</a> by
-          the matching robes in late January during our annual Habitica Birthday Bash!
+          January 31. If you're already an active subscriber, reload the site and then head to
+          Inventory > Items to claim your gear!
         </p>
-        <div class="small mb-3">by Lemoness and SabreCat</div>
-        <div class="inventory_special_nye center-block"></div>
-        <h3>New Year's Cards</h3>
         <p>
-          Until January 1st only, the <a href='/shops/market'>Market</a> is stocking New Year's
+          Subscribers also receive the ability to buy Gems with Gold and other awesome perks! Plus,
-          Cards! Now you can send cards to your friends (and yourself) to wish them a Happy Habit
+          our Gift-One-Get-One promotion is running now, so it's the perfect time to check it out.
-          New Year. All senders and recipients will receive the Auld Acquaintance badge!
+          Gift-One-Get-One runs until January 6.
-        </p>
-        <div class="small mb-3">by Lemoness and SabreCat</div>
-        <h3>Blog Post: Jumpstart your 2020 Resolution with Habitica!</h3>
-        <p>
-          Do you have a special resolution or goal for the coming year? Check out a new post on the
-          <a href='https://habitica.wordpress.com/2019/12/26/jump-starting-your-2020-new-years-
-resolution-with-habitica/' target='_blank'>Habitica Blog</a> with our best tips and resources to
-          help you make and keep your 2020 resolution!
         </p>
+        <p>Thank you very much for your support -- it means a lot to us.</p>
         <div class="small mb-3">by Beffymaroo</div>
-        <div class="promo_snowballs center-block"></div>
+        <div class="scene_list center-block"></div>
-        <h3>Snowballs!</h3>
+        <h3>January 2020 Resolution Success Challenge and Take This Challenge</h3>
         <p>
-          The <a href='/shops/seasonal'>Seasonal Shop</a> is also stocking Snowballs for Gold!
+          The Habitica team has launched a special official Challenge series hosted in the <a
-          Throw them at your friends to have an exciting effect. If you get hit with a snowball,
+          href='/groups/guild/6e6a8bd3-9f5f-4351-9188-9f11fcd80a99' target='_blank'>Official New
-          you earn the Annoying Friends badge. The results of being hit with a Snowball will last
+          Year's Resolution Guild</a>. These Challenges are designed to help you build and maintain
-          until the end of your day, but you can also reverse them early by buying Salt from the
+          goals that are destined for success and then stick with them as 2020 progresses.
-          Rewards column. Snowballs are available until January 31st.
         </p>
-        <div class="small mb-3">by Shaner and Lemoness</div>
-        <div class="promo_mystery_201912 center-block"></div>
-        <h3>Last Chance for Polar Pixie Set</h3>
         <p>
-          Reminder: the 31st is the final day to <a href='/user/settings/subscription'>
+          Check out the first New Year's Resolution Challenge of the year to start your path to
-          subscribe</a> and receive the Polar Pixie item set! Subscribers also get a cute Jackalope
+          resolution success! In <a href='/challenges/463efbbf-8d98-413d-9bdc-708ab336414e'>Begin
-          pet, and the ability to buy Gems with Gold. The longer your subscription, the more Gems
+          Your Quest</a>, we're focusing on choosing realistic and achievable resolutions! One
-          you can get!
+          grand-prize winner will receive their choice of a one-month gift subscription to Habitica
+          or 25 Gems when it closes on February 3rd. Four lucky runners-up will get a 15 Gem prize.
         </p>
-        <p>Thanks so much for your support! You help keep Habitica running.</p>
+        <p>
-        <div class="small mb-3">by Beffymaroo</div>
+          Congratulations to the winners of December's Challenge, @AndoJun, @SilverSquirrel,
+          @CathB, @IntegrationAsh, and @DerRue!
+        </p>
+        <div class="promo_take_this center-block"></div>
+        <p>
+          The next Take This Challenge has also launched, <a
+          href='/challenges/8a4beff7-ce41-48de-b963-7194f85b656e'>Hero's Triumph</a>, with a focus
+          on volunteering. 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, "Test Thy Courage!":
+          grand prize winner @r-flan2020, and runners-up @SPLOOean, @Bobette37, @WizardGnome,
+          @pearlygeek, and @drilcipher! 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>
       `,
     });