Merge branch 'release' into develop

gulp/gulp-sprites.js

@@ -161,4 +161,4 @@ gulp.task('sprites:checkCompiledDimensions', gulp.series('sprites:main', 'sprite
   done();
 }));
 
-gulp.task('sprites:compile', gulp.series('sprites:clean', 'sprites:main', 'sprites:largeSprites', 'sprites:checkCompiledDimensions', done => done()));
+gulp.task('sprites:compile', gulp.series('sprites:clean', 'sprites:checkCompiledDimensions', done => done()));

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.140.13",
+  "version": "4.140.14",
   "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.140.13",
+  "version": "4.140.14",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.9.6",

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

@@ -1,102 +1,24 @@
-.promo_april_fools_2020 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -445px -184px;
-  width: 423px;
-  height: 147px;
-}
 .promo_armoire_backgrounds_202004 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -433px -337px;
+  background-position: -313px 0px;
   width: 423px;
   height: 147px;
 }
-.promo_egg_quest {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -648px;
-  width: 354px;
-  height: 147px;
-}
-.promo_mystery_202004 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -796px;
-  width: 282px;
-  height: 147px;
-}
 .promo_mystery_202005 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -283px -796px;
+  background-position: 0px -223px;
   width: 282px;
   height: 147px;
 }
-.promo_pastel_skin_hair {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -355px -648px;
-  width: 354px;
-  height: 147px;
-}
-.customize-option.promo_pastel_skin_hair {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -380px -663px;
-  width: 60px;
-  height: 60px;
-}
-.promo_seasonal_shop_spring {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -875px -524px;
-  width: 162px;
-  height: 138px;
-}
-.promo_shiny_seeds {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -500px;
-  width: 360px;
-  height: 147px;
-}
-.promo_spring_2019 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -337px;
-  width: 432px;
-  height: 162px;
-}
-.promo_spring_2020 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -445px 0px;
-  width: 429px;
-  height: 183px;
-}
-.promo_spring_potions_2020 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -500px;
-  width: 423px;
-  height: 147px;
-}
 .promo_take_this {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -875px -663px;
+  background-position: -313px -148px;
   width: 96px;
   height: 69px;
 }
-.scene_citrusella {
+.scene_casting_spells {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -875px -196px;
-  width: 152px;
-  height: 176px;
-}
-.scene_hat_guild {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px 0px;
-  width: 444px;
+  width: 312px;
-  height: 336px;
+  height: 222px;
-}
-.scene_meditation {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -875px -373px;
-  width: 150px;
-  height: 150px;
-}
-.scene_tasks {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -875px 0px;
-  width: 240px;
-  height: 195px;
 }

website/client/src/assets/css/sprites/spritesmith-main-13.css

@@ -4,21 +4,15 @@
   width: 221px;
   height: 39px;
 }
-.quest_dilatoryDistress3 {
+.quest_dolphin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
   background-position: -220px 0px;
   width: 219px;
   height: 219px;
 }
-.quest_dolphin {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px 0px;
-  width: 219px;
-  height: 219px;
-}
 .quest_dustbunnies {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -232px;
+  background-position: -440px 0px;
   width: 219px;
   height: 219px;
 }
@@ -36,19 +30,19 @@
 }
 .quest_evilsanta2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -232px;
+  background-position: 0px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_falcon {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -232px;
+  background-position: -220px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_ferret {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px 0px;
+  background-position: -440px -232px;
   width: 219px;
   height: 219px;
 }
@@ -60,13 +54,13 @@
 }
 .quest_ghost_stag {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -220px;
+  background-position: -660px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -452px;
+  background-position: -660px -220px;
   width: 219px;
   height: 219px;
 }
@@ -90,13 +84,13 @@
 }
 .quest_guineapig {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -452px;
+  background-position: 0px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_harpy {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -452px;
+  background-position: -220px -452px;
   width: 219px;
   height: 219px;
 }
@@ -108,19 +102,19 @@
 }
 .quest_hippo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -452px;
+  background-position: -440px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_horse {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px 0px;
+  background-position: -660px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_kangaroo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -220px;
+  background-position: -880px 0px;
   width: 219px;
   height: 219px;
 }
@@ -132,19 +126,19 @@
 }
 .quest_lostMasterclasser1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -440px;
+  background-position: -880px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -672px;
+  background-position: -880px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -672px;
+  background-position: 0px -672px;
   width: 219px;
   height: 219px;
 }
@@ -156,19 +150,19 @@
 }
 .quest_mayhemMistiflying2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -672px;
+  background-position: -220px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -672px;
+  background-position: -440px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_monkey {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -672px;
+  background-position: -660px -672px;
   width: 219px;
   height: 219px;
 }
@@ -180,31 +174,31 @@
 }
 .quest_moon2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px 0px;
+  background-position: -880px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -220px;
+  background-position: -1100px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -440px;
+  background-position: -1100px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -660px;
+  background-position: -1100px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -892px;
+  background-position: -1100px -660px;
   width: 219px;
   height: 219px;
 }
@@ -222,7 +216,7 @@
 }
 .quest_owl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -892px;
+  background-position: 0px -892px;
   width: 219px;
   height: 219px;
 }
@@ -240,19 +234,19 @@
 }
 .quest_pterodactyl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -892px;
+  background-position: -220px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_rat {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -892px;
+  background-position: -440px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_robot {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -892px;
+  background-position: -660px -892px;
   width: 219px;
   height: 219px;
 }
@@ -270,43 +264,43 @@
 }
 .quest_ruby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -892px;
+  background-position: -880px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_sabretooth {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px 0px;
+  background-position: -1100px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_seaserpent {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -220px;
+  background-position: -1320px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_sheep {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -440px;
+  background-position: -1320px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_silver {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -660px;
+  background-position: -1320px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_slime {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -880px;
+  background-position: -1320px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_sloth {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1112px;
+  background-position: -1320px -880px;
   width: 219px;
   height: 219px;
 }
@@ -330,7 +324,7 @@
 }
 .quest_squirrel {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -1112px;
+  background-position: 0px -1112px;
   width: 219px;
   height: 219px;
 }
@@ -342,13 +336,13 @@
 }
 .quest_stoikalmCalamity2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -1112px;
+  background-position: -220px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_stoikalmCalamity3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -1112px;
+  background-position: -440px -1112px;
   width: 219px;
   height: 219px;
 }
@@ -366,7 +360,7 @@
 }
 .quest_taskwoodsTerror3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -1112px;
+  background-position: -660px -1112px;
   width: 219px;
   height: 219px;
 }
@@ -389,6 +383,12 @@
   height: 177px;
 }
 .quest_triceratops {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -880px -1112px;
+  width: 219px;
+  height: 219px;
+}
+.quest_turtle {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
   background-position: -1100px -1112px;
   width: 219px;

website/client/src/assets/scss/variables.scss

@@ -1,12 +1,12 @@
 // this variables are used to determine which shop npc/backgrounds should be loaded
-// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer
+// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, normal, summer
 // more to be added on future seasons
 
-$npc_market_flavor: 'spring';
+$npc_market_flavor: 'normal';
-$npc_quests_flavor: 'spring';
+$npc_quests_flavor: 'normal';
-$npc_seasonal_flavor: 'spring';
+$npc_seasonal_flavor: 'normal';
-$npc_timetravelers_flavor: 'spring';
+$npc_timetravelers_flavor: 'normal';
-$npc_tavern_flavor: 'spring';
+$npc_tavern_flavor: 'normal';
 
 $restingToolbarHeight: 40px;
 $menuToolbarHeight: 56px;

website/client/src/components/achievements/chooseClass.vue

@@ -225,30 +225,30 @@ export default {
     classGear (heroClass) {
       if (heroClass === 'rogue') {
         return {
-          armor: 'armor_special_spring2020Rogue',
+          armor: 'armor_rogue_5',
-          head: 'head_special_spring2020Rogue',
+          head: 'head_rogue_5',
-          shield: 'shield_special_spring2020Rogue',
+          shield: 'shield_rogue_6',
-          weapon: 'weapon_special_spring2020Rogue',
+          weapon: 'weapon_rogue_6',
         };
       } if (heroClass === 'wizard') {
         return {
-          armor: 'armor_special_spring2020Mage',
+          armor: 'armor_wizard_5',
-          head: 'head_special_spring2020Mage',
+          head: 'head_wizard_5',
-          weapon: 'weapon_special_spring2020Mage',
+          weapon: 'weapon_wizard_6',
         };
       } if (heroClass === 'healer') {
         return {
-          armor: 'armor_special_spring2020Healer',
+          armor: 'armor_healer_5',
-          head: 'head_special_spring2020Healer',
+          head: 'head_healer_5',
-          shield: 'shield_special_spring2020Healer',
+          shield: 'shield_healer_5',
-          weapon: 'weapon_special_spring2020Healer',
+          weapon: 'weapon_healer_6',
         };
       }
       return {
-        armor: 'armor_special_spring2020Warrior',
+        armor: 'armor_warrior_5',
-        head: 'head_special_spring2020Warrior',
+        head: 'head_warrior_5',
-        shield: 'shield_special_spring2020Warrior',
+        shield: 'shield_warrior_5',
-        weapon: 'weapon_special_spring2020Warrior',
+        weapon: 'weapon_warrior_6',
       };
     },
     selectionBox (selectedClass, heroClass) {

website/common/script/content/quests.js

@@ -515,7 +515,7 @@ const quests = {
     value: 1,
     category: 'pet',
     canBuy () {
-      return true;
+      return false;
     },
     collect: {
       plainEgg: {

website/common/script/libs/shops-seasonal.config.js

@@ -1,30 +1,23 @@
-import { SEASONAL_SETS } from '../content/constants';
+// import { SEASONAL_SETS } from '../content/constants';
 
 export default {
-  opened: true,
+  opened: false,
 
-  currentSeason: 'Spring',
+  currentSeason: 'Closed',
 
-  dateRange: { start: '2020-03-19', end: '2020-04-30' },
+  dateRange: { start: '2019-09-24', end: '2019-10-31' },
 
   availableSets: [
-    ...SEASONAL_SETS.spring,
   ],
 
   pinnedSets: {
-    healer: 'spring2020IrisHealerSet',
-    rogue: 'spring2020LapisLazuliRogueSet',
-    warrior: 'spring2020BeetleWarriorSet',
-    wizard: 'spring2020PuddleMageSet',
   },
 
   availableSpells: [
-    'shinySeed',
   ],
 
   availableQuests: [
-    'egg',
   ],
 
-  featuredSet: 'spring2020PuddleMageSet',
+  featuredSet: 'fall2018AlterEgoSet',
 };

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 = 'LAST CHANCE FOR APRIL AND SPRING FLING GOODIES!';
+const LAST_ANNOUNCEMENT_TITLE = 'MAY SUBSCRIBER ITEMS AND OFFICIAL HABITICA CHALLENGES!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -31,73 +31,65 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>4/30/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>5/4/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_spring_2020 center-block"></div>
+        <div class="promo_mystery_202005 center-block"></div>
-        <h3>Last Chance for Spring Fling Outfits, Spring Customizations, Spring Magic Hatching Potions, and Shiny Seeds</h3>
+        <h3>May Subscriber Items Revealed!</h3>
         <p>
-          Spring Fling is coming to a close in Habitica. It's the last day to snag this year's
+          The May Subscriber Item Set has been revealed: the Wondrous Wyvern Item Set! <a
-          limited edition outfits from your Rewards column. Depending on your class, you can be a
+          href='/user/settings/subscription'>Subscribe to Habitica</a> by May 31 to receive this
-          Puddle Mage, Rhinoceros Beetle Warrior, Lapiz Lazuli Rogue, or Iris Healer! Don't miss
+          exciting set! If you're already an active subscriber, reload the site and then head to
-          these awesome gear sets, available to purchase with Gold for now!
+          Inventory > Items to claim your gear!
         </p>
-        <div class="small mb-3">by Vikte, gawrone, jjgame83, Shine Caramia, and SabreCat</div>
-        <div class="promo_spring_2019 center-block"></div>
         <p>
-          The <a href='/shops/seasonal'>Seasonal Shop</a> will also be closing when the Gala ends.
+          Subscribers also receive the ability to buy Gems with Gold -- the longer you subscribe,
-          The Seasonal Sorceress is stocking the seasonal edition versions of previous spring
+          the more Gems you can buy per month! There are other perks as well, such as longer
-          outfits, now available for Gems instead of Gold, the seasonal Egg Quest, and Shiny Seeds.
+          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 Eslyn, Aspiring Advocate, OuttaMyMind, Lt. Cabel, Vikte, Lalaitha, DialFForFunky,
-          Gerald the Pixel, Scarvia, Awesome kitty, usnbfs, Balduranne, PainterProphet,
-          Beffymaroo, SabreCat and Lemoness
-        </div>
-        <div class="promo_spring_potions_2020 center-block"></div>
-        <p>
-          It's also the final day to <a href='/shops/market'>buy the Birch Bark, Celestial, and
-          Shimmer Magic Hatching Potions!</a> If they come back, it won't be until next year at the
-          earliest, so don't delay!
-        </p>
-        <div class="small mb-3">
-          by Teto Forever, tricksy.fox, Bonogo, Mara, ravenlune, Ricardo,  and SabreCat
-        </div>
-        <div class="promo_pastel_skin_hair center-block"></div>
-        <p>
-          Don't miss the Pastel Skins and Shimmer Hair colors! They're also available in User >
-          Customize Avatar until the Gala ends. But once you purchase them, you can use them
-          year-round!
-        </p>
-        <div class="small mb-3">by Lemoness and McCoyly</div>
-        <div class="promo_mystery_202004 center-block"></div>
-        <h3>Last Chance for Majestic Monarch Set</h3>
-        <p>
-          Reminder: this is the final day to <a href='/user/settings/subscription'>subscribe</a>
-          and receive the Majestic Monarch Set! Subscribing also lets you buy Gems with Gold. The
-          longer your subscription, the more Gems you can get!
-        </p>
-        <p>Thanks so much for your support! You help keep Habitica running.</p>
         <div class="small mb-3">by Beffymaroo</div>
-        <div class="promo_april_fools_2020 center-block"></div>
+        <div class="scene_casting_spells center-block"></div>
-        <h3>Last Chance for Confection Hatching Potion Quest and Garden Potions</h3>
+        <h3>May 2020 Resolution Success Challenge and Take This Challenge</h3>
         <p>
-          Have you had your eye on the sweet new Confection Hatching Potion Pets from this year's
+          The Habitica team has launched a special official Challenge series hosted in the <a
-          April Fool's festivities? Be sure to get the special Waffling with the Fool Quest from
+          href='/groups/guild/6e6a8bd3-9f5f-4351-9188-9f11fcd80a99'>Official New Year's Resolution
-          the <a href='/shops/quests'>Quest Shop</a>! After today, it will not be available again
+          Guild</a>. These Challenges are designed to help you build and maintain goals that are
-          for at least one year.
+          destined for success and then stick with them as the year progresses. For this month's
+          Challenge, <a href='/challenges/7b0f5ff4-6022-462a-af6b-b153aea2517e'>Review Your Combat
+          Tactics</a>, we're focusing on refining your strategy to help you stay motivated and keep
+          moving forward as we're almost halfway through the year! It has a 15 Gem prize, which
+          will be awarded to five lucky winners on June 1st.
         </p>
         <p>
-          Garden Potions, which hatch the fruit and veggie pets from our 2019 April Fool's prank,
+          Congratulations to the winners of April's Challenge: @Auralov, @organized_aspie,
-          will also disappear from the <a href='/shops/market'>Market</a> after today. Be sure to
+          @yasaminnb, @noblegeas and @Nodel!
-          stock up if you haven't already!
         </p>
         <p>
-          Note that Confection Pets and Garden Pets do not have mount forms, so plan your purchases
+          The next Take This Challenge has also launched, "<a
-          accordingly!
+          href='/challenges/e6d862f8-5b96-4465-8e2f-18ee79592b4a'>Don't Be a Completionist!</a>",
+          with a focus on prioritization. Be sure to check it out to earn additional pieces of the
+          Take This armor set!
         </p>
-        <div class="small mb-3">by Beffymaroo, Piyo, SabreCat, and Viirus</div>
+        <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, "This One Goes to 11!":
+          grand prize winner @Daphne36, and runners-up @aggripa, @Lily_of_the_valley,
+          @Mockingjayabi, @Cirth, and @KatieIrene! 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>
       `,
     });