Content 2017/10/10 (#9177)

* feat(content): bundle, customizations

* chore(sprites): update

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

@@ -1,24 +1,18 @@
-.promo_armoire_backgrounds_201710 {
+.promo_bundle_witchyFamiliars {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: -142px 0px;
   width: 141px;
-  height: 438px;
+  height: 441px;
 }
-.promo_farm_friends {
+.promo_fall_customizations {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: 0px 0px;
   width: 141px;
-  height: 441px;
+  height: 588px;
 }
-.promo_mystery_201709 {
+.scene_raking_leaves {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: -284px 0px;
-  width: 114px;
-  height: 90px;
-}
-.promo_takeThis_gear {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -284px -91px;
-  width: 114px;
-  height: 87px;
+  width: 246px;
+  height: 198px;
 }

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

@@ -1,24 +1,18 @@
-.promo_armoire_backgrounds_201710 {
+.promo_bundle_witchyFamiliars {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: -142px 0px;
   width: 141px;
-  height: 438px;
+  height: 441px;
 }
-.promo_farm_friends {
+.promo_fall_customizations {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: 0px 0px;
   width: 141px;
-  height: 441px;
+  height: 588px;
 }
-.promo_mystery_201709 {
+.scene_raking_leaves {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: -284px 0px;
-  width: 114px;
-  height: 90px;
-}
-.promo_takeThis_gear {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -284px -91px;
-  width: 114px;
-  height: 87px;
+  width: 246px;
+  height: 198px;
 }

website/client/components/creatorIntro.vue

@@ -71,7 +71,6 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
             .skin.sprite.customize-option(:class="`skin_${option}`", @click='set({"preferences.skin": option})')
       .row(v-if='editing && set.key !== "undefined"', v-for='set in seasonalSkins')
         .col-12.customize-options
-          //h3(v-if='!hideSet(set)') {{$t(set.key)}}
           .option(v-for='option in set.options',
             :class='{active: option.active, locked: option.locked, hide: option.hide}')
             .skin.sprite.customize-option(:class="`skin_${option.key}`", @click='option.click')
@@ -98,25 +97,13 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
           .option(v-for='option in ["white", "brown", "blond", "red", "black"]',
             :class='{active: user.preferences.hair.color === option}')
             .color-bangs.sprite.customize-option(:class="`hair_bangs_1_${option}`", @click='set({"preferences.hair.color": option})')
-        //.row(v-if='editing')
-          .col-12.customize-options(v-if='editing')
-            .option(v-for='option in premiumHairColors',
-              :class='{active: option.active === option, locked: option.locked}')
-              .color-bangs.sprite.customize-option(:class="`hair_bangs_1_${option.key}`", @click='option.click')
-              .gem-lock(v-if='option.locked')
-                .svg-icon.gem(v-html='icons.gem')
-                span 2
-          .col-12.text-center
-            button.btn.btn-secondary.purchase-all(v-if='!userOwnsSet("hair", premiumHairColorKeys, "color")', @click='unlock(`hair.color.${premiumHairColorKeys.join(",hair.color.")}`)') {{ $t('purchaseAll') }}
-        .row(v-if='editing && set.key !== "undefined"', v-for='set in seasonalHairColors')
-          .col-12.customize-options
-            //h3(v-if='!hideSet(set)') {{set.text}}
-            .option(v-for='option in set.options',
-              :class='{active: option.active, locked: option.locked, hide: option.hide}')
-              .skin.sprite.customize-option(:class="`hair_bangs_1_${option.key}`", @click='option.click')
-              .gem-lock(v-if='option.locked')
-                .svg-icon.gem(v-html='icons.gem')
-                span 2
+        .col-12.customize-options(v-if='editing && set.key !== "undefined"', v-for='set in seasonalHairColors')
+          .option(v-for='option in set.options',
+            :class='{active: option.active, locked: option.locked, hide: option.hide}')
+            .skin.sprite.customize-option(:class="`hair_bangs_1_${option.key}`", @click='option.click')
+            .gem-lock(v-if='option.locked')
+              .svg-icon.gem(v-html='icons.gem')
+              span 2
           .col-12.text-center
             button.btn.btn-secondary.purchase-all(v-if='!hideSet(set) && !userOwnsSet("hair", set.keys, "color")', @click='unlock(`hair.color.${set.keys.join(",hair.color.")}`)') {{ $t('purchaseAll') }}
       #style.row(v-if='activeSubPage === "style"')

website/client/components/static/newStuff.vue

@@ -4,58 +4,32 @@
       .align-self-center.right-margin(:class='baileyClass')
       .media-body
         h1.align-self-center(v-markdown='$t("newStuff")')
-    h2 10/5/2017 - OCTOBER BACKGROUNDS AND ARMOIRE ITEMS, REDESIGN FIXES AND FEEDBACK, TAKE THIS CHALLENGE, LAST CHANCE FOR SORCERY STUDENT SET AND FARM FRIENDS BUNDLE
+    h2 10/10/2017 - SUPERNATURAL SKINS, HAUNTED HAIR COLORS, WITCHY FAMILIARS QUEST BUNDLE, AND GOALS WIKI
     hr
     .media
-      .promo_armoire_backgrounds_201710.right-margin
+      .promo_fall_customizations.right-margin
       .media-body
-        h3 October Backgrounds and Armoire Items!
-        p We’ve added three new backgrounds to the avatar shop! Now your avatar can tiptoe through the Tar Pits, sneak down the hall of a Spooky Hotel, and bask in the glow of Magical Candles.
-        p Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Candlemaker Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
-        .small by jordanzimmerman, nekoatsumelarper, vampitch, reesa3, Chimera Liani, and mewrose
-        h3 Bug Fixes Keep Coming!
-        p Hello Habiticans! <3 We’ve released another batch of bug fixes! Thank you all again for your reports:
-        ul
-          li We've fixed the issue preventing checklists from being collapsible!
-          li We fixed the bug where some users who reached 0 health would get their health bar stuck there without refiling.
-          li You can now upgrade Guilds into Group Plans using Stripe!
-          li We fixed issues with the Bailey announcement refusing to scroll if it coincided with multiple pop-ups.
-    ul
-      li We fixed some bugs preventing users from subscribing with Amazon.
-      li We've prevented you from opening someone's profile if their user avatar wasn't fully loaded (resulting in the wrong profile being displayed).
-      li All Quick Inventory bars now remember whether or not you minimized them, and remain in that state even when you navigate away or refresh.
-      li We prevented the filter menu from accidentally closing if you're in edit mode.
-      li Pop-ups no longer interrupt the Record Yesterday's Activity modal.
-      li The loading bar is back when you take an action on the site!
-      li Now when you buy anything in one of the shops, the confirmation popup doesn't return for the rest of your session.
-      li The Group Billing tab has returned to Group Plans!
-      li Users with many To-dos are able to check off the final To-do in their list again.
-      li We fixed the bugs where the Enchanted Armoire sometimes wouldn't correctly report what you had received.
-      li The Enchanted Armoire now tells you how much experience you received.
-      li If you already own the Bat-tle Rogue set, Spooky Sparkles are now the featured item in the Seasonal Shop.
-      li Opaque potions and other transformation item cures are now available in the Rewards column again!
-      li The Enchanted Armoire and Health Potions are now purchased with a single click, not needing a popup.
-      li Brutal Smash and other task-targeting skills can no longer accidentally check off tasks.
-      li Now if you make your screen very small, it does not prevent you from accessing all the navigation items.
-      li We fixed the issue with the limited identifier being cut off on the Rewards column when an item was located in the top row.
-      li We've fixed the bug preventing the number of notifications from displaying!
-      li Transformation items now take effect immediately, without having to refresh the page.
-      li You can now use emoji and other Markdown in Challenge titles again.
-      li Equipment items that don't belong to any specific class can now be found in the Market under Equipment > Class > None.
-    p(v-markdown='"Refresh the page to see these fixes! If you\'re still encountering these issues after a refresh, head to the [Report a Bug Guild](/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) and we will investigate. Thanks for being part of Habitica!"')
-    h3 Redesign Feedback Form Available
-    p(v-markdown='"Now that the new Habitica redesign has been out for a week and we\'ve had some time to fix some of the bugs, we wanted to open up a channel for your feedback. Please note that some pending features (like the ability to add tasks above each column, the sync button, push to top/bottom, and the ability to batch-add tasks) are still being built, and our team is still working hard to fix bugs. To see if your concerns are already being addressed, be sure to check out the [Redesign FAQ](http://habitica.wikia.com/wiki/Habitica_Redesign_FAQ) and the [Known Bugs List](http://habitica.wikia.com/wiki/Habitica_Redesign:_Known_Bugs)!"')
-    p(v-markdown='"Although originally we planned to collect feedback via Trello, we heard some concerns from the community that this would be difficult because it would require people to sign up for additional accounts. For that reason, we\'ve decided to collect feedback via [a Google form](https://docs.google.com/forms/d/e/1FAIpQLScpeCeoTbmNPotBvEWtAFeVlD6g83KEN_YlwD_GHB4yHJbZww/viewform). We hope that this makes it easier to tell us what you think! We\'re eager to get your input so that we can work to make Habitica the best that it can be."')
-    p We are a very small team, and for many of us, Habitica is a labor of love. Thank you all very much for your patience and for your support during this time of transition -- it means the world to us.
-    .media
-      .promo_takeThis_gear.right-margin
-      .media-body
-        h3 New Take This Challenge
-        p(v-markdown='"The next Take This Challenge has launched, [Multiplayer Co-Op Exercise!](/challenges/e577f6bd-59af-4f89-b011-44767527ee92), with a focus on working out with a partner. Be sure to check it out to earn additional pieces of the Take This armor set!"')
-    p(v-markdown='"[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(v-markdown='"Congratulations to the winners of the last Take This Challenge, “Hero\'s Triumph!”: grand prize winner David Rule, and runners-up José Barata Gonçalves, Ar_tem, Ziggy, schooler, and Ayano. 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) if they hadn\'t completed the set already. It is located in the [Market](/shops/market) under Class \> None. Enjoy!"')
-    .small by Doctor B, the Take This team, Lemoness, and SabreCat
+        h3 Supernatural Skins and Haunted Hair Colors
+        p The Seasonal Edition Haunted Hair Colors are now available for purchase in the avatar customizations shop! Now you can dye your avatar's hair Pumpkin, Midnight, Candy Corn, Ghost White, Zombie, or Halloween. Get them before October 31st!
+        .media
+          .media-body
+            p The Supernatural Skin Set is also available until October 31st! Now your avatar can become an Ogre, Skeleton, Pumpkin, Candy Corn, Reptile, or Dread Shade.
+            p Seasonal Edition items recur unchanged every year, but they are only available to purchase during a short period of time. Get them now, or you'll have to wait until next year!
+            .small by Lemoness, mariahm, and crystal phoenix
+            h3 Witchy Familiars Quest Bundle
+            p If you are looking to add some pets to your Habitica stable in to match your Fall Festival gear, you're in luck! From now until October 31, you can purchase 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> today!
+            .small by Lemoness and SabreCat
+            .small Art by Pandah, UncommonCriminal, Arcosine, starsystemic, RosemonkeyCT, Jon Arjinborn, and Breadstrings
+            .small Writing by Token, Arcosine, and Fluitare
+          .promo_bundle_witchyFamiliars.left-margin
     br
+    p If rats and/or spiders are something you'd prefer not to see in Habitica due to a phobia, check out the <a href='http://habitica.wikia.com/wiki/Phobia_Protection_Extension' target='_blank'>Phobia Protection Extension</a> which will hide any pets, mounts, backgrounds, quest bosses, or equipment featuring rats and/or spiders (as well as snakes, bees, zombies, skeletons, or any combination thereof). We hope that it helps make everyone's Habitica experience fun!
+    .media
+      .scene_raking_leaves.right-margin
+      .media-body
+        h3 Blog Post: Dealing with Variable Goals
+        p(v-markdown='"This month\'s [featured Wiki article](https://habitica.wordpress.com/2017/10/04/dealing-with-variable-goals/) is about Dealing with Variable Goals! We hope that it will help you as you add tasks with irregular deadlines to your lists. Be sure to check it out, and let us know what you think by reaching out on [Twitter](https://twitter.com/habitica), [Tumblr](http://blog.habitrpg.com/), and [Facebook](https://www.facebook.com/Habitica/)."')
+        .small by Beffymaroo and the Wiki Wizards
 </template>
 
 <style lang='scss' scoped>
@@ -75,6 +49,10 @@
   .small {
     margin-bottom: 1em;
   }
+
+  .small ~ .small {
+    margin-bottom: 0;
+  }
 </style>
 
 <script>

website/common/locales/en/questsContent.json

@@ -586,5 +586,8 @@
   "questHippoUnlockText": "Unlocks purchasable Hippo eggs in the Market",
 
   "farmFriendsText": "Farm Friends Quest Bundle",
-  "farmFriendsNotes": "Contains 'The Mootant Cow', 'Ride the Night-Mare', and 'The Thunder Ram'. Available until September 30."
+  "farmFriendsNotes": "Contains 'The Mootant Cow', 'Ride the Night-Mare', and 'The Thunder Ram'. Available until September 30.",
+
+  "witchyFamiliarsText": "Witchy Familiars Quest Bundle",
+  "witchyFamiliarsNotes": "Contains 'The Rat King', 'The Icy Arachnid', and 'Swamp of the Clutter Frog'. Available until October 31."
 }

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

@@ -11,13 +11,13 @@ module.exports = prefill({
   pastelHairColors: {setPrice: 5, availableUntil: '2016-01-01'},
   rainbowHairColors: {setPrice: 5, text: t('rainbowColors')},
   shimmerHairColors: {setPrice: 5, availableUntil: '2017-05-02', text: t('shimmerColors')},
-  hauntedHairColors: {setPrice: 5, availableUntil: '2016-11-01', text: t('hauntedColors')},
+  hauntedHairColors: {setPrice: 5, availableUntil: '2017-11-02', text: t('hauntedColors')},
   winteryHairColors: {setPrice: 5, availableFrom: '2015-12-18', availableUntil: '2016-02-02', text: t('winteryColors')},
   rainbowSkins: {setPrice: 5, text: t('rainbowSkins')},
   animalSkins: {setPrice: 5, text: t('animalSkins')},
   pastelSkins: {setPrice: 5, availableUntil: '2017-05-02', text: t('pastelSkins')},
   spookySkins: {setPrice: 5, availableUntil: '2016-01-01', text: t('spookySkins')},
-  supernaturalSkins: {setPrice: 5, availableUntil: '2016-11-01', text: t('supernaturalSkins')},
+  supernaturalSkins: {setPrice: 5, availableUntil: '2017-11-02', text: t('supernaturalSkins')},
   splashySkins: {setPrice: 5, availableUntil: '2017-08-02', text: t('splashySkins')},
   winterySkins: {setPrice: 5, availableFrom: '2015-12-18', availableUntil: '2016-02-02', text: t('winterySkins')},
 });

website/common/script/content/index.js

@@ -107,6 +107,21 @@ api.bundles = {
     type: 'quests',
     value: 7,
   },
+  witchyFamiliars: {
+    key: 'witchyFamiliars',
+    text: t('witchyFamiliarsText'),
+    notes: t('witchyFamiliarsNotes'),
+    bundleKeys: [
+      'rat',
+      'spider',
+      'frog',
+    ],
+    canBuy () {
+      return moment().isBetween('2017-10-10', '2017-11-02');
+    },
+    type: 'quests',
+    value: 7,
+  },
 };
 
 /*