Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.119.1",
+  "version": "4.119.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.119.1",
+  "version": "4.119.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.6.4",

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

@@ -1,108 +1,30 @@
 .promo_armoire_backgrounds_201910 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -576px;
+  background-position: -477px 0px;
   width: 423px;
   height: 147px;
 }
 .promo_costume_achievement {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -737px -387px;
+  background-position: 0px -365px;
   width: 144px;
   height: 156px;
 }
-.promo_desert_pet_achievements {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -205px -872px;
-  width: 204px;
-  height: 102px;
-}
-.promo_fall_festival_2018 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -395px;
-  width: 372px;
-  height: 180px;
-}
-.promo_fall_festival_2019 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -376px 0px;
-  width: 360px;
-  height: 189px;
-}
-.promo_fall_skins {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -187px;
-  width: 336px;
-  height: 207px;
-}
-.customize-option.promo_fall_skins {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -25px -202px;
-  width: 60px;
-  height: 60px;
-}
-.promo_habitoween_2019 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -373px -395px;
-  width: 279px;
-  height: 147px;
-}
 .promo_mystery_201910 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -376px -190px;
+  background-position: -477px -148px;
   width: 282px;
   height: 147px;
 }
-.promo_seasonal_shop_fall {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -994px 0px;
-  width: 162px;
-  height: 138px;
-}
-.promo_shadow_spooky_potions {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -724px;
-  width: 423px;
-  height: 147px;
-}
-.promo_spooky_sparkles {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -576px;
-  width: 423px;
-  height: 147px;
-}
 .promo_take_this {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -994px -139px;
+  background-position: -760px -148px;
   width: 96px;
   height: 69px;
 }
-.promo_witchy_familiars {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -724px;
-  width: 423px;
-  height: 147px;
-}
-.promo_zombie_achievements {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -872px;
-  width: 204px;
-  height: 102px;
-}
-.scene_arts_crafts {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -737px 0px;
-  width: 256px;
-  height: 256px;
-}
-.scene_quest_shop {
+.scene_seaserpent {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px 0px;
-  width: 375px;
-  height: 186px;
-}
-.scene_strength {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -737px -257px;
-  width: 192px;
-  height: 129px;
+  width: 476px;
+  height: 364px;
 }

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

@@ -49,7 +49,7 @@
 .npc_bailey {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
   background-position: -1963px -836px;
-  width: 54px;
+  width: 60px;
   height: 72px;
 }
 .npc_justin {

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

@@ -2,8 +2,8 @@
 // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer
 // more to be added on future seasons
 
-$npc_market_flavor: 'habitoween';
-$npc_quests_flavor: 'habitoween';
-$npc_seasonal_flavor: 'habitoween';
-$npc_timetravelers_flavor: 'fall';
-$npc_tavern_flavor: 'habitoween';
+$npc_market_flavor: 'normal';
+$npc_quests_flavor: 'normal';
+$npc_seasonal_flavor: 'normal';
+$npc_timetravelers_flavor: 'normal';
+$npc_tavern_flavor: 'normal';

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

@@ -225,32 +225,30 @@ export default {
     classGear (heroClass) {
       if (heroClass === 'rogue') {
         return {
-          armor: 'armor_special_fall2019Rogue',
-          eyewear: 'eyewear_special_fall2019Rogue',
-          head: 'head_special_fall2019Rogue',
-          shield: 'shield_special_fall2019Rogue',
-          weapon: 'weapon_special_fall2019Rogue',
+          armor: 'armor_rogue_5',
+          head: 'head_rogue_5',
+          shield: 'shield_rogue_6',
+          weapon: 'weapon_rogue_6',
         };
       } if (heroClass === 'wizard') {
         return {
-          armor: 'armor_special_fall2019Mage',
-          head: 'head_special_fall2019Mage',
-          weapon: 'weapon_special_fall2019Mage',
+          armor: 'armor_wizard_5',
+          head: 'head_wizard_5',
+          weapon: 'weapon_wizard_6',
         };
       } if (heroClass === 'healer') {
         return {
-          armor: 'armor_special_fall2019Healer',
-          eyewear: 'eyewear_special_fall2019Healer',
-          head: 'head_special_fall2019Healer',
-          shield: 'shield_special_fall2019Healer',
-          weapon: 'weapon_special_fall2019Healer',
+          armor: 'armor_healer_5',
+          head: 'head_healer_5',
+          shield: 'shield_healer_5',
+          weapon: 'weapon_healer_6',
         };
       }
       return {
-        armor: 'armor_special_fall2019Warrior',
-        head: 'head_special_fall2019Warrior',
-        shield: 'shield_special_fall2019Warrior',
-        weapon: 'weapon_special_fall2019Warrior',
+        armor: 'armor_warrior_5',
+        head: 'head_warrior_5',
+        shield: 'shield_warrior_5',
+        weapon: 'weapon_warrior_6',
       };
     },
     selectionBox (selectedClass, heroClass) {

website/common/locales/en/character.json

@@ -104,7 +104,7 @@
   "allocatePerPop": "Add a Point to Perception",
   "allocateInt": "Points allocated to Intelligence:",
   "allocateIntPop": "Add a Point to Intelligence",
-  "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Stat Points. You can continue leveling up, or start a new adventure at level 1 by using the <a href='http://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a>, now available for free in the Market.",
+  "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Stat Points. You can continue leveling up, or start a new adventure at level 1 by using the <a href='http://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a>!",
   "stats": "Stats",
   "achievs": "Achievements",
   "strength": "Strength",

website/common/script/content/gear/sets/special/index.js

@@ -8,7 +8,7 @@ import * as takeThisGear from './special-takeThis';
 import * as wonderconGear from './special-wondercon';
 import t from '../../../translation';
 
-const CURRENT_SEASON = 'fall';
+const CURRENT_SEASON = '_NONE_';
 
 const armor = {
   0: backerGear.armorSpecial0,

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

@@ -8,22 +8,22 @@ const featuredItems = {
       path: 'armoire',
     },
     {
-      type: 'premiumHatchingPotion',
-      path: 'premiumHatchingPotions.Glow',
+      type: 'eggs',
+      path: 'eggs.PandaCub',
     },
     {
-      type: 'premiumHatchingPotion',
-      path: 'premiumHatchingPotions.Spooky',
+      type: 'hatchingPotions',
+      path: 'hatchingPotions.Shade',
     },
     {
-      type: 'premiumHatchingPotion',
-      path: 'premiumHatchingPotions.Shadow',
+      type: 'food',
+      path: 'food.Potatoe',
     },
   ],
   quests: [
     {
-      type: 'bundles',
-      path: 'bundles.witchyFamiliars',
+      type: 'quests',
+      path: 'quests.sloth',
     },
     {
       type: 'quests',

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

@@ -1,25 +1,19 @@
-import { SEASONAL_SETS } from '../content/constants';
+// import { SEASONAL_SETS } from '../content/constants';
 
 export default {
-  opened: true,
+  opened: false,
 
-  currentSeason: 'Fall',
+  currentSeason: 'Closed',
 
   dateRange: { start: '2019-09-24', end: '2019-10-31' },
 
   availableSets: [
-    ...SEASONAL_SETS.fall,
   ],
 
   pinnedSets: {
-    wizard: 'fall2019CyclopsSet',
-    warrior: 'fall2019RavenSet',
-    rogue: 'fall2019OperaticSpecterSet',
-    healer: 'fall2019LichSet',
   },
 
   availableSpells: [
-    'spookySparkles',
   ],
 
   availableQuests: [

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 = 'HABITOWEEN! AND LAST CHANCE FOR OCTOBER AND FALL FESTIVAL ITEMS';
+const LAST_ANNOUNCEMENT_TITLE = 'NEW OFFICIAL HABITICA CHALLENGES! RESOLUTION SUCCESS AND TAKE THIS';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -31,49 +31,39 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>10/31/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>11/1/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <h3>Happy Habitoween!</h3>
-        <p>It's the last day of the Fall Festival, and all the NPCs are looking monstrous. Plus,
-        we have lots of fun things in store...</p>
-        <div class="promo_habitoween_2019 center-block"></div>
-        <h3>Jack O' Lantern Pets and Mounts!</h3>
-        <p>The Flourishing Fields are full of cute carved pumpkins - and it looks like
-        <a href='/inventory/stable'>one has followed you home</a>! What kind of pumpkin? It all
-        depends on how many Habitoweens you've celebrated with us. Each Habitoween, you'll get a
-        new and exciting pumpkin variety!</p>
-        <div class="small mb-3">by Lemoness and Beffymaroo</div>
-        <h3>Candy for Everyone!</h3>
-        <p>It's a feast for your pets and mounts! In honor of the end of the Fall Festival, we've
-        given everyone an assortment of candy. You can feed it to your pets in the
-        <a href='/inventory/stable'>Stable</a>! Enjoy.</p>
-        <div class="small mb-3">by SabreCat and Lemoness</div>
-        <div class="promo_fall_festival_2019 center-block"></div>
-        <h3>Last Chance for Fall Festival Items, Witchy Familiars Pet Quest Bundle, and Cryptic
-        Flame Set</h3>
-        <p>This is your last chance to get all Fall Festival items before they vanish at the end
-        of October 31st! This includes Limited-Edition Outfits, Seasonal Shop purchases, Seasonal
-        Edition Skins and Hair Colors, and yes, even Glow-in-the-Dark, Spooky, and Shadow Hatching
-        Potions. Grab them all while you still can!</p>
-        <div class="small mb-3">by gawrone, jjgame83, AnnDeLune, ʂʈєƒąʃųƥągųʂ, Katy133, Lilith of
-        Alfheim, Definitely not a villain, ShoGirlGeek. cataclysms, maxpendragon, Vikte, mariahm,
-        crystalphoenix, AaronTheTwin, tricksy.fox, QuartzFox, Lemoness, Beffymaroo and
-        SabreCat</div>
-        <p>It's also the last day to get the Witchy Familiars Pet Quest Bundle and receive the
-        Rat, Spider, and Frog quests, all for only 7 Gems! That's a discount of 5 Gems from the
-        price of purchasing them separately. Check it out in the <a href='/shops/quests'>Quest
-        Shop</a> before it crawls away!</p>
-        <div class="small">by Lemoness and SabreCat</div>
-        <div class="small">Art by Pandah, UncommonCriminal, Arcosine, starsystemic, RosemonkeyCT,
-        Jon Arjinborn, and Breadstrings</div>
-        <div class="small mb-3">Writing by Token, Arcosine, and Fluitare</div>
-        <p>Plus, today is the final day to <a href='/user/settings/subscription'>subscribe</a> and
-        receive the Cryptic Flame set along with other rad subscriber perks!</p>
-        <p>Thanks so much for your supporting the site -- you're helping us keep Habitica alive.
-        Happy Habitoween!</p>
-        <div class="small mb-3">by Beffymaroo</div>
+        <div class="scene_seaserpent 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. For this month's Challenge, <a
+          href='/challenges/810ba103-bc72-4ba0-810f-fc45703edc5e'>Here Be Dragons</a>, we're
+          focusing on obstacles that arise as you reach the end of the year! It has a 15 Gem
+          prize, which will be awarded to five lucky winners on December 2nd.</p>
+        <p>Congratulations to the winners of October's Challenge, @boxofdelights, @aethelflaeda,
+          @pygy, @threethreethree, and @ScarlettJill!</p>
+        <div class="promo_take_this center-block"></div>
+        <p>The next Take This Challenge has also launched,
+          "<a href='/challenges/661e1352-1ed2-44d3-8175-ec8413293391'>Cast of Characters</a>",
+          with a focus on processing our feelings by turning them into characters in a game or
+          story. 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, "Check Your HP!": grand
+          prize winner @shadowdancer16, and runners-up @kuumathebronze, Ras Algathier, @OldMan76,
+          @JuanaTango, and @Khontis! 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>
       `,
     });

website/server/models/user/hooks.js

@@ -129,9 +129,6 @@ function _setUpNewUser (user) {
   user.items.quests.dustbunnies = 1;
   user.purchased.background.violet = true;
   user.preferences.background = 'violet';
-  user.items.pets['JackOLantern-Base'] = 5;
-  user.items.currentPet = 'JackOLantern-Base';
-  user.migration = '20191031_habitoween_ladder';
 
   user.markModified('items');