feat(content): Backgrounds and Armoire 2017-11

End Habitoween and Fall Festival

migrations/takeThis.js

@@ -65,19 +65,29 @@ function updateUser (user) {
     set = {'migration':migrationName};
   } else if (typeof user.items.gear.owned.body_special_takeThis !== 'undefined') {
     set = {'migration':migrationName, 'items.gear.owned.back_special_takeThis':false};
+    var push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.back_special_takeThis', '_id': monk.id()}};
   } else if (typeof user.items.gear.owned.head_special_takeThis !== 'undefined') {
     set = {'migration':migrationName, 'items.gear.owned.body_special_takeThis':false};
+    var push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.body_special_takeThis', '_id': monk.id()}};
   } else if (typeof user.items.gear.owned.armor_special_takeThis !== 'undefined') {
     set = {'migration':migrationName, 'items.gear.owned.head_special_takeThis':false};
+    var push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.head_special_takeThis', '_id': monk.id()}};
   } else if (typeof user.items.gear.owned.weapon_special_takeThis !== 'undefined') {
     set = {'migration':migrationName, 'items.gear.owned.armor_special_takeThis':false};
+    var push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_takeThis', '_id': monk.id()}};
   } else if (typeof user.items.gear.owned.shield_special_takeThis !== 'undefined') {
     set = {'migration':migrationName, 'items.gear.owned.weapon_special_takeThis':false};
+    var push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.weapon_special_takeThis', '_id': monk.id()}};
   } else {
     set = {'migration':migrationName, 'items.gear.owned.shield_special_takeThis':false};
+    var push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.shield_special_takeThis', '_id': monk.id()}};
   }
 
+  if (push) {
+    dbUsers.update({_id: user._id}, {$set: set, $push: push});
+  } else {
     dbUsers.update({_id: user._id}, {$set: set});
+  }
 
   if (count % progressCount == 0) console.warn(count + ' ' + user._id);
   if (user._id == authorUuid) console.warn(authorName + ' processed');

website/client/assets/scss/variables.scss

@@ -2,8 +2,8 @@
 // possible values are: normal, fall, habitoween
 // 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/components/shops/seasonal/index.vue

@@ -57,7 +57,7 @@
                 @click="itemSelected(item)"
               )
 
-      h1.mb-0.page-header(v-once) {{ $t('seasonalShop') }}
+      h1.mb-0.page-header(v-once, v-if='seasonal.opened') {{ $t('seasonalShop') }}
 
       .clearfix(v-if="seasonal.opened")
         h2.float-left

website/client/components/static/newStuff.vue

@@ -4,25 +4,36 @@
       .align-self-center.right-margin(:class='baileyClass')
       .media-body
         h1.align-self-center(v-markdown='$t("newStuff")')
-    h2 10/30/2017 - HAPPY HABITOWEEN!
+    h2 11/2/2017 - BATCH ADD, PUSH TO TOP/BOTTOM, AND COUNTERS FOR TASKS; NEW BACKGROUNDS AND ARMOIRE ITEMS; NEW TAKE THIS CHALLENGE
     hr
     .media
       .media-body
-        h3 It's Habitoween!
-        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....
-        h3 Jack O' Lantern Pets and Mounts!
-        p(v-markdown='"The Flourishing Fields are full of cute carved pumpkins - and it looks like one has [followed you home](/inventory/stable)!"')
-        p Each Habitoween, you'll get a new and exciting Jack o'Lantern variety! What kind of Jack o' Lantern? It all depends on how many Habitoweens you've celebrated with us. Happy Fall Festival!
-        .small by Lemoness
-        h3 Candy for Everyone!
-        p(v-markdown='"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 [Stable](/inventory/stable)! Enjoy."')
-        .small by SabreCat and Lemoness
-      .promo_jackolanterns.left-margin
-    h3 Last Chance for Fall Festival Items and Imperious Imp Set
-    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 Spooky and Ghost Hatching Potions. Grab them all while you still can!
-    p(v-markdown='"Plus, today is the final day to [subscribe](/user/settings/subscription) and receive the Imperious Imp Item Set!"')
-    p Thanks so much for your supporting the site -- you're helping us keep Habitica alive. Happy Habitoween!
-    .small by Lemoness
+        h3 Task Features: Batch Add, Push to Top, Push to Bottom, and List Counters
+        p There are some new features on the website task page!
+        p Want to add multiple tasks at a time? Now you can type more than one task in the quick-add sections above the tasks and add them all at once! Just separate them by Shift-Enter, and then when you click Enter, they'll all be added at the same time.
+      .promo_batch_tasks
+    .media
+      .media-body
+        p Plus, now when hovering over a task, three dots appear in the corner. Click them for a quick-dropdown menu that includes a faster way to delete tasks and the ability to instantly push a task to the top or bottom of the list!
+        p Finally, the website now has our popular task counters from mobile, which tell you how many actionable Dailies + To-Dos you're currently viewing! Want to see how many Scheduled To-Dos are on your plate, or how many "Morning" Dailies you have in that filter? The purple number at the top of the column will tell you!
+        p We hope that you enjoy these updates!
+        .small by paglias and Apollo
+      .promo_push_top_bottom
+    .media
+      .promo_armoire_backgrounds_201711.right-margin
+      .media-body
+        h3 November Backgrounds and Armoire Items!
+        p We’ve added three new backgrounds! Now your avatar can spin thread in a Fiber Arts Room, stroll by the Midnight Castle, and fly through a Tornado! Find them in User Icon > Backgrounds!
+        p Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Weaver Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+        .small by AnnDeLune, Katy133, Chum Bucket, Vampitch, and RandomGryffindor
+        .media
+          .media-body
+            h3 New Take This Challenge!
+            p The next Take This Challenge has launched, [NAME] (LINK), with a focus on [subject]. Be sure to check it out to earn additional pieces of the Take This armor set!
+          .promo_take_this
+        p [Take This] (http://www.takethis.org/) 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 Congratulations to the winners of the last Take This Challenge, [NAME]": grand prize winner [NAME], and runners-up [Names]. Plus, all participants in that Challenge have received a piece of the [Take This item set] (http://habitica.wikia.com/wiki/Event_Item_Sequences#Take_This_Armor_Set). It is located in your Rewards column. Enjoy!
+    .small by Doctor B, the Take This team, Lemoness, and SabreCat
     br
 </template>
 

website/common/locales/en/backgrounds.json

@@ -345,5 +345,13 @@
   "backgroundSpookyHotelText": "Spooky Hotel",
   "backgroundSpookyHotelNotes": "Sneak down the hall of a Spooky Hotel.",
   "backgroundTarPitsText": "Tar Pits",
-  "backgroundTarPitsNotes": "Tiptoe through the Tar Pits."
+  "backgroundTarPitsNotes": "Tiptoe through the Tar Pits.",
+
+  "backgrounds112017": "SET 42: Released November 2017",
+  "backgroundFiberArtsRoomText": "Fiber Arts Room",
+  "backgroundFiberArtsRoomNotes": "Spin thread in a Fiber Arts Room.",
+  "backgroundMidnightCastleText": "Midnight Castle",
+  "backgroundMidnightCastleNotes": "Stroll by the Midnight Castle.",
+  "backgroundTornadoText": "Tornado",
+  "backgroundTornadoNotes": "Fly through a Tornado."
 }

website/common/locales/en/gear.json

@@ -334,6 +334,8 @@
   "weaponArmoireBattleAxeNotes": "This fine iron axe is well-suited to battling your fiercest foes or your most difficult tasks. Increases Intelligence by <%= int %> and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
   "weaponArmoireHoofClippersText": "Hoof Clippers",
   "weaponArmoireHoofClippersNotes": "Trim the hooves of your hard-working mounts to help them stay healthy as they carry you to adventure! Increases Strength, Intelligence, and Constitution by <%= attrs %> each. Enchanted Armoire: Farrier Set (Item 1 of 3).",
+  "weaponArmoireWeaversCombText": "Weaver's Comb",
+  "weaponArmoireWeaversCombNotes": "Use this comb to pack your weft threads together to make a tightly woven fabric. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Weaver Set (Item 2 of 3).",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -706,6 +708,8 @@
   "armorArmoireFarrierOutfitNotes": "These sturdy work clothes can stand up to the messiest Stable. Increases Intelligence, Constitution, and Perception by <%= attrs %> each. Enchanted Armoire: Farrier Set (Item 2 of 3).",
   "armorArmoireCandlestickMakerOutfitText": "Candlestick Maker Outfit",
   "armorArmoireCandlestickMakerOutfitNotes": "This sturdy set of clothes will protect you from hot wax spills as you ply your craft! Increases Constitution by <%= con %>. Enchanted Armoire: Candlestick Maker Set (Item 1 of 3).",
+  "armorArmoireWovenRobesText": "Woven Robes",
+  "armorArmoireWovenRobesNotes": "Display your weaving work proudly by wearing this colorful robe! Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Weaver Set (Item 1 of 3).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -1303,6 +1307,8 @@
   "shieldArmoireHorseshoeNotes": "Help protect the feet of your hooved mounts with this iron shoe. Increases Constitution, Perception, and Strength by <%= attrs %> each. Enchanted Armoire: Farrier Set (Item 3 of 3)",
   "shieldArmoireHandmadeCandlestickText": "Handmade Candlestick",
   "shieldArmoireHandmadeCandlestickNotes": "Your fine wax wares provide light and warmth to grateful Habiticans! Increases Strength by <%= str %>. Enchanted Armoire: Candlestick Maker Set (Item 3 of 3).",
+  "shieldArmoireWeaversShuttleText": "Weaver's Shuttle",
+  "shieldArmoireWeaversShuttleNotes": "This tool passes your weft thread through the warp to make cloth! Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Weaver Set (Item 3 of 3).",
 
   "back": "Back Accessory",
   "backCapitalized": "Back Accessory",

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

@@ -577,6 +577,20 @@ let backgrounds = {
       notes: t('backgroundTarPitsNotes'),
     },
   },
+  backgrounds112017: {
+    fiber_arts_room: {
+      text: t('backgroundFiberArtsRoomText'),
+      notes: t('backgroundFiberArtsRoomNotes'),
+    },
+    midnight_castle: {
+      text: t('backgroundMidnightCastleText'),
+      notes: t('backgroundMidnightCastleNotes'),
+    },
+    tornado: {
+      text: t('backgroundTornadoText'),
+      notes: t('backgroundTornadoNotes'),
+    },
+  },
   incentiveBackgrounds: {
     violet: {
       text: t('backgroundVioletText'),

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

@@ -297,6 +297,15 @@ let armor = {
     set: 'candlestickMaker',
     canOwn: ownsItem('armor_armoire_candlestickMakerOutfit'),
   },
+  wovenRobes: {
+    text: t('armorArmoireWovenRobesText'),
+    notes: t('armorArmoireWovenRobesNotes', { con: 8, int: 9 }),
+    value: 100,
+    con: 8,
+    int: 9,
+    set: 'weaver',
+    canOwn: ownsItem('armor_armoire_wovenRobes'),
+  },
 };
 
 let eyewear = {
@@ -791,6 +800,15 @@ let shield = {
     set: 'candlestickMaker',
     canOwn: ownsItem('shield_armoire_handmadeCandlestick'),
   },
+  weaversShuttle: {
+    text: t('shieldArmoireWeaversShuttleText'),
+    notes: t('shieldArmoireWeaversShuttleNotes', { int: 8, per: 9 }),
+    value: 100,
+    per: 9,
+    int: 8,
+    set: 'weaver',
+    canOwn: ownsItem('shield_armoire_weaversShuttle'),
+  },
 };
 
 let headAccessory = {
@@ -1037,6 +1055,15 @@ let weapon = {
     set: 'farrier',
     canOwn: ownsItem('weapon_armoire_hoofClippers'),
   },
+  weaversComb: {
+    text: t('weaponArmoireWeaversCombText'),
+    notes: t('weaponArmoireWeaversCombNotes', { per: 8, str: 9 }),
+    value: 100,
+    per: 8,
+    str: 9,
+    set: 'weaver',
+    canOwn: ownsItem('weapon_armoire_weaversComb'),
+  },
 };
 
 let armoireSet = {

website/common/script/content/index.js

@@ -251,10 +251,10 @@ api.specialMounts = stable.specialMounts;
 api.mountInfo = stable.mountInfo;
 
 // For seasonal events, change these booleans:
-let canBuyNormalFood = false;
-let canDropNormalFood = false;
-let canBuyCandyFood = true;
-let canDropCandyFood = true;
+let canBuyNormalFood = true;
+let canDropNormalFood = true;
+let canBuyCandyFood = false;
+let canDropCandyFood = false;
 let canBuyCakeFood = false;
 let canDropCakeFood = false;
 

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

@@ -1,28 +1,19 @@
-import { SEASONAL_SETS} from '../content/constants';
+// import { SEASONAL_SETS } from '../content/constants';
 
 module.exports = {
-  // opened: false,
-  opened: true,
+  opened: false,
 
-  // used for the seasonalShop.notes
-  // currentSeason: 'Closed',
-  currentSeason: 'Fall',
+  currentSeason: 'Closed',
 
   dateRange: { start: '2017-09-21', end: '2017-10-31' },
 
   availableSets: [
-    ...SEASONAL_SETS.fall,
   ],
 
   pinnedSets: {
-    warrior: 'fall2017HabitoweenSet',
-    wizard: 'fall2017MasqueradeSet',
-    rogue: 'fall2017TrickOrTreatSet',
-    healer: 'fall2017HauntedHouseSet',
   },
 
   availableSpells: [
-    'spookySparkles',
   ],
 
   availableQuests: [

website/server/models/user/hooks.js

@@ -137,8 +137,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';
 
   if (user.registeredThrough === 'habitica-web') {
     taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag'];