Merge pull request #5967 from HabitRPG/sabrecat/content-201509

September subscriber items and Fall Festival avatar customizations

common/dist/sprites/spritesmith-largeSprites-0.css

@@ -1,6 +1,6 @@
 .2014_Fall_HealerPROMO2 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -640px -843px;
+  background-position: -564px -843px;
   width: 90px;
   height: 90px;
 }
@@ -18,7 +18,7 @@
 }
 .2014_Fall_Warrior_PROMO {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -367px -843px;
+  background-position: -473px -843px;
   width: 90px;
   height: 90px;
 }
@@ -42,7 +42,7 @@
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -94px -843px;
+  background-position: -837px -843px;
   width: 90px;
   height: 90px;
 }
@@ -54,7 +54,7 @@
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -882px -641px;
+  background-position: -882px -550px;
   width: 217px;
   height: 90px;
 }
@@ -66,7 +66,7 @@
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -276px -843px;
+  background-position: -291px -843px;
   width: 90px;
   height: 90px;
 }
@@ -76,6 +76,18 @@
   width: 175px;
   height: 175px;
 }
+.promo_haunted_hair {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -1023px -402px;
+  width: 100px;
+  height: 137px;
+}
+.customize-option. {
+  background-image: url();
+  background-position:  ;
+  width: ;
+  height: ;
+}
 .promo_item_notif {
   background-image: url(spritesmith-largeSprites-0.png);
   background-position: -882px 0px;
@@ -84,7 +96,7 @@
 }
 .promo_mystery_201405 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -822px -843px;
+  background-position: -200px -843px;
   width: 90px;
   height: 90px;
 }
@@ -96,7 +108,7 @@
 }
 .promo_mystery_201407 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -934px;
+  background-position: -195px -949px;
   width: 42px;
   height: 62px;
 }
@@ -108,7 +120,7 @@
 }
 .promo_mystery_201409 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -549px -843px;
+  background-position: -746px -843px;
   width: 90px;
   height: 90px;
 }
@@ -120,13 +132,13 @@
 }
 .promo_mystery_201411 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -731px -843px;
+  background-position: -928px -843px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1065px -843px;
+  background-position: -152px -949px;
   width: 42px;
   height: 66px;
 }
@@ -138,25 +150,25 @@
 }
 .promo_mystery_201502 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -185px -843px;
+  background-position: -382px -843px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -913px -843px;
+  background-position: 0px -949px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1004px -843px;
+  background-position: -91px -949px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -458px -843px;
+  background-position: -655px -843px;
   width: 90px;
   height: 90px;
 }
@@ -174,19 +186,25 @@
 }
 .promo_mystery_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -843px;
+  background-position: -106px -843px;
   width: 93px;
   height: 90px;
 }
+.promo_mystery_201509 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -1019px -843px;
+  width: 90px;
+  height: 90px;
+}
 .promo_mystery_3014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -882px -550px;
+  background-position: -882px -641px;
   width: 217px;
   height: 90px;
 }
 .promo_orca {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1023px -402px;
+  background-position: 0px -843px;
   width: 105px;
   height: 105px;
 }
@@ -198,7 +216,7 @@
 }
 .promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -331px -668px;
+  background-position: 0px -668px;
   width: 330px;
   height: 83px;
 }
@@ -222,7 +240,7 @@
 }
 .promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -668px;
+  background-position: -331px -668px;
   width: 330px;
   height: 83px;
 }

common/locales/en/gear.json

@@ -336,6 +336,8 @@
   "armorMystery201506Notes": "Snorkel through a coral reef in this brightly-colored swim suit! Confers no benefit. June 2015 Subscriber Item.",
   "armorMystery201508Text": "Cheetah Costume",
   "armorMystery201508Notes": "Run fast as a flash in the fluffy Cheetah Costume! Confers no benefit. August 2015 Subscriber Item.",
+  "armorMystery201509Text": "Werewolf Costume",
+  "armorMystery201509Notes": "This IS a costume, right? Confers no benefit. September 2015 Subscriber Item.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
 
@@ -509,6 +511,8 @@
   "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.",
   "headMystery201508Text": "Cheetah Hat",
   "headMystery201508Notes": "This cozy cheetah hat is very fuzzy! Confers no benefit. August 2015 Subscriber Item.",
+  "headMystery201509Text": "Werewolf Mask",
+  "headMystery201509Notes": "This IS a mask, right? Confers no benefit. September 2015 Subscriber Item.",
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
   "headMystery301405Text": "Basic Top Hat",

common/script/content/index.coffee

@@ -49,6 +49,7 @@ api.mystery =
   201506: {start:'2015-06-25',end:'2015-07-02', text:'Neon Snorkeler Set'}
   201507: {start:'2015-07-24',end:'2015-08-02', text:'Rad Surfer Set'}
   201508: {start:'2015-08-23',end:'2015-09-02', text:'Cheetah Costume Set'}
+  201509: {start:'2015-09-24',end:'2015-10-02', text:'Werewolf Set'}
   301404: {start:'3014-03-24',end:'3014-04-02', text:'Steampunk Standard Set'}
   301405: {start:'3014-04-24',end:'3014-05-02', text:'Steampunk Accessories Set'}
   wondercon: {start:'2014-03-24',end:'2014-04-01'} # not really, but the mechanic works
@@ -258,7 +259,8 @@ gear =
       201503: text: t('armorMystery201503Text'), notes: t('armorMystery201503Notes'), mystery:'201503', value: 0
       201504: text: t('armorMystery201504Text'), notes: t('armorMystery201504Notes'), mystery:'201504', value: 0
       201506: text: t('armorMystery201506Text'), notes: t('armorMystery201506Notes'), mystery:'201506', value: 0
-      201508: text: t('armorMystery201508Text'), notes: t('armorMystery201508Notes'), mystery:'201508', value: 0, int: 0
+      201508: text: t('armorMystery201508Text'), notes: t('armorMystery201508Notes'), mystery:'201508', value: 0
+      201509: text: t('armorMystery201509Text'), notes: t('armorMystery201509Notes'), mystery:'201509', value: 0
       301404: text: t('armorMystery301404Text'), notes: t('armorMystery301404Notes'), mystery:'301404', value: 0
     armoire:
       lunarArmor: text: t('armorArmoireLunarArmorText'), notes: t('armorArmoireLunarArmorNotes', {str: 7, int: 7}), value: 100, str: 7, int: 7, set: 'soothing', canOwn: ((u)-> u.items.gear.owned.armor_armoire_lunarArmor?)
@@ -355,7 +357,8 @@ gear =
       201412: text: t('headMystery201412Text'), notes: t('headMystery201412Notes'), mystery:'201412', value: 0
       201501: text: t('headMystery201501Text'), notes: t('headMystery201501Notes'), mystery:'201501', value: 0
       201505: text: t('headMystery201505Text'), notes: t('headMystery201505Notes'), mystery:'201505', value: 0
-      201508: text: t('headMystery201508Text'), notes: t('headMystery201508Notes'), mystery:'201508', value: 0, int: 0
+      201508: text: t('headMystery201508Text'), notes: t('headMystery201508Notes'), mystery:'201508', value: 0
+      201509: text: t('headMystery201509Text'), notes: t('headMystery201509Notes'), mystery:'201509', value: 0
       301404: text: t('headMystery301404Text'), notes: t('headMystery301404Notes'), mystery:'301404', value: 0
       301405: text: t('headMystery301405Text'), notes: t('headMystery301405Notes'), mystery:'301405', value: 0
     armoire:

migrations/mystery_items.js

@@ -2,7 +2,7 @@ var _id = '';
 var update = {
   $addToSet: {
     'purchased.plan.mysteryItems':{
-      $each:['head_mystery_201508','armor_mystery_201508']
+      $each:['head_mystery_201509','armor_mystery_201509']
     }
   }
 };

website/views/options/profile.jade

@@ -84,7 +84,7 @@ mixin customizeProfile(mobile)
                 button(type='button', ng-if='user.purchased.hair.color.#{color}', class='customize-option hair hair_bangs_1_#{color}', ng-click='unlock("hair.color.#{color}")', ng-class='{selectableInventory: user.preferences.hair.color == "#{color}"}')
           +buyPref('hair.color', ['rainbow','yellow','green','purple','blue','TRUred'], 'rainbowColors')
           +buyPref('hair.color', ['pblue2','pgreen2','porange2','ppink2','ppurple2','pyellow2'], 'shimmerColors', 'disabled')
-          +buyPref('hair.color', ['candycorn','ghostwhite','halloween','midnight','pumpkin','zombie'], 'hauntedColors', 'disabled')
+          +buyPref('hair.color', ['candycorn','ghostwhite','halloween','midnight','pumpkin','zombie'], 'hauntedColors')
           +buyPref('hair.color', ['aurora','festive','hollygreen','peppermint','snowy','winterstar'], 'winteryColors', 'disabled')
 
           li.customize-menu
@@ -152,7 +152,7 @@ mixin customizeProfile(mobile)
           // Seasonal event skins. Note that Spooky Skins are a legacy set and should always be disabled for purchase
           +buyPref('skin', ['pastelPink','pastelOrange','pastelYellow','pastelGreen','pastelBlue','pastelPurple','pastelRainbowChevron','pastelRainbowDiagonal'], 'pastelSkins', 'disabled')
           +buyPref('skin', ['monster','pumpkin','skeleton','zombie','ghost','shadow'], 'spookySkins', 'disabled')
-          +buyPref('skin', ['candycorn','ogre','pumpkin2','reptile','shadow2','skeleton2','transparent','zombie2'], 'supernaturalSkins', 'disabled')
+          +buyPref('skin', ['candycorn','ogre','pumpkin2','reptile','shadow2','skeleton2','transparent','zombie2'], 'supernaturalSkins')
           +buyPref('skin', ['clownfish','deepocean','merblue','mergold','mergreen','merruby','shark','tropicalwater'], 'splashySkins', 'disabled')
 
 

website/views/shared/new-stuff.jade

@@ -1,5 +1,28 @@
-h2 9/21/2015 - FALL FESTIVAL! LIMITED-EDITION OUTFITS, SEASONAL SHOP, CANDY FOOD DROPS, AND NPC DRESS-UP
+h2 9/24/2015 - SEPTEMBER SUBSCRIBER ITEMS REVEALED; FALL FESTIVAL HAIR AND SKIN COLORS AVAILABLE
   hr
+  tr
+    td
+      h3 September Subscriber Items Revealed
+      .promo_mystery_201509.pull-right
+      p The September Subscriber Item has been revealed: the Werewolf Armor Set! All September subscribers will receive the Werewolf Mask and the Werewolf Costume. You still have six days to <a href='/#/options/settings/subscription'>subscribe</a> and receive the item set! Thank you so much for your support - we really do rely on you to keep Habitica free to use and running smoothly.
+      p.small.muted by Lemoness
+  tr
+    td
+      h3 Haunted Hair Colors and Supernatural Skin Set
+      .promo_haunted_hair.pull-right
+      p The Seasonal Edition Haunted Hair Colors are now available for purchase in <a href='/#/options/profile/avatar'>the avatar customizations page</a>! Now you can dye your avatar's hair Pumpkin, Midnight, Candy Corn, Ghost White, Zombie, or Halloween. Get them before October 31st!
+      br
+      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.
+      br
+      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!
+      p.small.muted by Lemoness, mariahm, and crystal phoenix
+
+if menuItem !== 'oldNews'
+  hr
+  a(href='/static/old-news', target='_blank') Read older news
+
+mixin oldNews
+  h2 9/21/2015 - FALL FESTIVAL! LIMITED-EDITION OUTFITS, SEASONAL SHOP, CANDY FOOD DROPS, AND NPC DRESS-UP
     tr
       td
         h3 Fall Festival Begins
@@ -28,14 +51,7 @@ h2 9/21/2015 - FALL FESTIVAL! LIMITED-EDITION OUTFITS, SEASONAL SHOP, CANDY FOOD
         h3 NPC Dress Up
         p The NPCs have decided to blend in with the locals of the Flourishing Fields by dressing up for the Fall Festival! Browse through the site to admire their new costumes.
         p.small.muted by Lemoness
-
-if menuItem !== 'oldNews'
-  hr
-  a(href='/static/old-news', target='_blank') Read older news
-
-mixin oldNews
   h2 9/16/2015 - MAMMOTHS AND MANTIS SHRIMPS IN TIME TRAVELER SHOP! PLUS, FALL FESTIVAL PLOT-LINE CONTINUES
-    hr
     tr
       td
         .Pet-MantisShrimp-Base.pull-right