Merge branch 'develop' into sabrecat/party-page

common/dist/sprites/spritesmith0.css

@@ -4074,479 +4074,491 @@
 }
 .hair_base_10_frost {
   background-image: url(spritesmith0.png);
-  background-position: -1365px -1434px;
+  background-position: -91px -1889px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_frost {
   background-image: url(spritesmith0.png);
-  background-position: -1390px -1449px;
+  background-position: -116px -1904px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ghostwhite {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -455px;
+  background-position: -1365px -1434px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ghostwhite {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -470px;
+  background-position: -1390px -1449px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_green {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -364px;
+  background-position: -1132px -455px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_green {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -379px;
+  background-position: -1157px -470px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_halloween {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -273px;
+  background-position: -1132px -364px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_halloween {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -288px;
+  background-position: -1157px -379px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_holly {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -182px;
+  background-position: -1132px -273px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_holly {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -197px;
+  background-position: -1157px -288px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_hollygreen {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -91px;
+  background-position: -1132px -182px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_hollygreen {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -106px;
+  background-position: -1157px -197px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_midnight {
   background-image: url(spritesmith0.png);
-  background-position: -1132px 0px;
+  background-position: -1132px -91px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_midnight {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -15px;
+  background-position: -1157px -106px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pblue {
   background-image: url(spritesmith0.png);
-  background-position: -1001px -979px;
+  background-position: -1132px 0px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pblue {
   background-image: url(spritesmith0.png);
-  background-position: -1026px -994px;
+  background-position: -1157px -15px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pblue2 {
   background-image: url(spritesmith0.png);
-  background-position: -910px -979px;
+  background-position: -1001px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pblue2 {
   background-image: url(spritesmith0.png);
-  background-position: -935px -994px;
+  background-position: -1026px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_peppermint {
   background-image: url(spritesmith0.png);
-  background-position: -819px -979px;
+  background-position: -910px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_peppermint {
   background-image: url(spritesmith0.png);
-  background-position: -844px -994px;
+  background-position: -935px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pgreen {
   background-image: url(spritesmith0.png);
-  background-position: -728px -979px;
+  background-position: -819px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pgreen {
   background-image: url(spritesmith0.png);
-  background-position: -753px -994px;
+  background-position: -844px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pgreen2 {
   background-image: url(spritesmith0.png);
-  background-position: -637px -979px;
+  background-position: -728px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pgreen2 {
   background-image: url(spritesmith0.png);
-  background-position: -662px -994px;
+  background-position: -753px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_porange {
   background-image: url(spritesmith0.png);
-  background-position: -546px -979px;
+  background-position: -637px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_porange {
   background-image: url(spritesmith0.png);
-  background-position: -571px -994px;
+  background-position: -662px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_porange2 {
   background-image: url(spritesmith0.png);
-  background-position: -455px -979px;
+  background-position: -546px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_porange2 {
   background-image: url(spritesmith0.png);
-  background-position: -480px -994px;
+  background-position: -571px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppink {
   background-image: url(spritesmith0.png);
-  background-position: -364px -979px;
+  background-position: -455px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppink {
   background-image: url(spritesmith0.png);
-  background-position: -389px -994px;
+  background-position: -480px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppink2 {
   background-image: url(spritesmith0.png);
-  background-position: -273px -979px;
+  background-position: -364px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppink2 {
   background-image: url(spritesmith0.png);
-  background-position: -298px -994px;
+  background-position: -389px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppurple {
   background-image: url(spritesmith0.png);
-  background-position: -182px -979px;
+  background-position: -273px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppurple {
   background-image: url(spritesmith0.png);
-  background-position: -207px -994px;
+  background-position: -298px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppurple2 {
   background-image: url(spritesmith0.png);
-  background-position: -91px -979px;
+  background-position: -182px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppurple2 {
   background-image: url(spritesmith0.png);
-  background-position: -116px -994px;
+  background-position: -207px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pumpkin {
   background-image: url(spritesmith0.png);
-  background-position: 0px -979px;
+  background-position: -91px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pumpkin {
   background-image: url(spritesmith0.png);
-  background-position: -25px -994px;
+  background-position: -116px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_purple {
   background-image: url(spritesmith0.png);
-  background-position: -1001px -888px;
+  background-position: 0px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_purple {
   background-image: url(spritesmith0.png);
-  background-position: -1026px -903px;
+  background-position: -25px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pyellow {
   background-image: url(spritesmith0.png);
-  background-position: -910px -888px;
+  background-position: -1001px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pyellow {
   background-image: url(spritesmith0.png);
-  background-position: -935px -903px;
+  background-position: -1026px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pyellow2 {
   background-image: url(spritesmith0.png);
-  background-position: -819px -888px;
+  background-position: -910px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pyellow2 {
   background-image: url(spritesmith0.png);
-  background-position: -844px -903px;
+  background-position: -935px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_rainbow {
   background-image: url(spritesmith0.png);
-  background-position: -728px -888px;
+  background-position: -819px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_rainbow {
   background-image: url(spritesmith0.png);
-  background-position: -753px -903px;
+  background-position: -844px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_red {
   background-image: url(spritesmith0.png);
-  background-position: -637px -888px;
+  background-position: -728px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_red {
   background-image: url(spritesmith0.png);
-  background-position: -662px -903px;
+  background-position: -753px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_snowy {
   background-image: url(spritesmith0.png);
-  background-position: -546px -888px;
+  background-position: -637px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_snowy {
   background-image: url(spritesmith0.png);
-  background-position: -571px -903px;
+  background-position: -662px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_white {
   background-image: url(spritesmith0.png);
-  background-position: -455px -888px;
+  background-position: -546px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_white {
   background-image: url(spritesmith0.png);
-  background-position: -480px -903px;
+  background-position: -571px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_winternight {
   background-image: url(spritesmith0.png);
-  background-position: -364px -888px;
+  background-position: -455px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_winternight {
   background-image: url(spritesmith0.png);
-  background-position: -389px -903px;
+  background-position: -480px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_winterstar {
   background-image: url(spritesmith0.png);
-  background-position: -273px -888px;
+  background-position: -364px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_winterstar {
   background-image: url(spritesmith0.png);
-  background-position: -298px -903px;
+  background-position: -389px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_yellow {
   background-image: url(spritesmith0.png);
-  background-position: -182px -888px;
+  background-position: -273px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_yellow {
   background-image: url(spritesmith0.png);
-  background-position: -207px -903px;
+  background-position: -298px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_zombie {
   background-image: url(spritesmith0.png);
-  background-position: -91px -888px;
+  background-position: -182px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_zombie {
   background-image: url(spritesmith0.png);
-  background-position: -116px -903px;
+  background-position: -207px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_TRUred {
   background-image: url(spritesmith0.png);
-  background-position: 0px -888px;
+  background-position: -91px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_TRUred {
   background-image: url(spritesmith0.png);
-  background-position: -25px -903px;
+  background-position: -116px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_aurora {
   background-image: url(spritesmith0.png);
-  background-position: -990px -717px;
+  background-position: 0px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_aurora {
   background-image: url(spritesmith0.png);
-  background-position: -1015px -732px;
+  background-position: -25px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_black {
   background-image: url(spritesmith0.png);
-  background-position: -990px -626px;
+  background-position: -990px -717px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_black {
   background-image: url(spritesmith0.png);
-  background-position: -1015px -641px;
+  background-position: -1015px -732px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_blond {
   background-image: url(spritesmith0.png);
-  background-position: -990px -535px;
+  background-position: -990px -626px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_blond {
   background-image: url(spritesmith0.png);
-  background-position: -1015px -550px;
+  background-position: -1015px -641px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_blue {
   background-image: url(spritesmith0.png);
-  background-position: 0px -1070px;
+  background-position: -990px -535px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_blue {
   background-image: url(spritesmith0.png);
-  background-position: -25px -1085px;
+  background-position: -1015px -550px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_brown {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -910px;
+  background-position: 0px -1070px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_brown {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -925px;
+  background-position: -25px -1085px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_candycane {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -819px;
+  background-position: -1132px -910px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_candycane {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -834px;
+  background-position: -1157px -925px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_candycorn {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -728px;
+  background-position: -1132px -819px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_candycorn {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -743px;
+  background-position: -1157px -834px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_festive {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -637px;
+  background-position: -1132px -728px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_festive {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -652px;
+  background-position: -1157px -743px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_frost {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -546px;
+  background-position: -1132px -637px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_frost {
+  background-image: url(spritesmith0.png);
+  background-position: -1157px -652px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_11_ghostwhite {
+  background-image: url(spritesmith0.png);
+  background-position: -1132px -546px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_11_ghostwhite {
   background-image: url(spritesmith0.png);
   background-position: -1157px -561px;
   width: 60px;

common/locales/en/gear.json

@@ -314,6 +314,8 @@
   "armorMystery201504Notes": "You'll be productive as a busy bee in this fetching robe! Confers no benefit. April 2015 Subscriber Item.",
   "armorMystery201506Text": "Snorkel Suit",
   "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.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
 
@@ -474,6 +476,8 @@
   "headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.",
   "headMystery201505Text": "Green Knight Helm",
   "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.",
   "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/locales/en/limited.json

@@ -29,7 +29,7 @@
     "seasonalShopClosedText": "The Seasonal Shop is currently closed!! I don't know where the Seasonal Sorceress is now, but I bet she'll be back during the next <a href='http://habitica.wikia.com/wiki/Grand_Galas' target='_blank'>Grand Gala</a>!",
     "seasonalShopText": "Welcome to the Seasonal Shop!! We're stocking springtime <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Spring Fling event each year, but we're only open until April 30th, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
     "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
-    "seasonalShopRebirth": "If you've used the Orb of Rebirth, you can repurchase this equipment in the Rewards Column after you unlock the Item Shop. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.",
+    "seasonalShopRebirth": "If you've used the Orb of Rebirth, you can repurchase this equipment in the Rewards Column. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.",
     "candycaneSet": "Candy Cane (Mage)",
     "skiSet": "Ski-sassin (Rogue)",
     "snowflakeSet": "Snowflake (Healer)",

common/locales/en/rebirth.json

@@ -2,9 +2,9 @@
     "rebirthNew": "Rebirth: New Adventure Available!",
     "rebirthUnlock": "You've unlocked Rebirth! This special Market item allows you to begin a new game at level 1 while keeping your tasks, achievements, pets, and more. Use it to breathe new life into Habitica if you feel you've achieved it all, or to experience new features with the fresh eyes of a beginning character!",
     "rebirthBegin": "Rebirth: Begin a New Adventure",
-    "rebirthStartOver": "Rebirth starts your character over from Level 1, as if you had created a new account.",
+    "rebirthStartOver": "Rebirth starts your character over from Level 1.",
     "rebirthAdvList1": "You return to full Health.",
-    "rebirthAdvList2": "You have no Experience, Gold, or equipment.",
+    "rebirthAdvList2": "You have no Experience, Gold, or Equipment (with the exception of free items like Mystery items).",
     "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset.",
     "rebirthAdvList4": "You have the starting class of Warrior until you earn a new class.",
     "rebirthInherit": "Your new character inherits a few things from their predecessor:",

common/script/content.coffee

@@ -52,6 +52,7 @@ api.mystery =
   201505: {start:'2015-05-25',end:'2015-06-02', text:'Green Knight Set'}
   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'}
   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
@@ -86,14 +87,6 @@ gear =
       5: text: t('weaponWarrior5Text'), notes: t('weaponWarrior5Notes', {str: 15}), str: 15, value:90
       6: text: t('weaponWarrior6Text'), notes: t('weaponWarrior6Notes', {str: 18}), str: 18, value:120, last: true
     rogue:
-      #Not using bows at the moment, but they would be easy to add back in to an advanced Armory feature, as Quest drops, etc.
-      #0: twoHanded: true, text: "Practice Bow", notes:'Training weapon. Confers no benefit.', value:0
-      #1: twoHanded: true, text: "Short Bow", notes:'Simple bow best at close ranges. Increases STR by 2.', str: 2, value:20
-      #2: twoHanded: true, text: "Long Bow", notes:'Bow with a strong draw for extra distance. Increases STR by 5.', str: 5, value:50
-      #3: twoHanded: true, text: "Recurve Bow", notes:'Built with advanced techniques. Increases STR by 8.', str: 8, value:80
-      #4: twoHanded: true, text: "Icicle Bow", notes:'Fires arrows of piercing cold. Increases STR by 12.', str: 12, value:120
-      #5: twoHanded: true, text: "Meteor Bow", notes:'Rains flame upon your foes. Increases STR by 16.', str: 16, value:160
-      #6: twoHanded: true, text: "Golden Bow", notes:'As swift as sunlight and as sharp as lightning. Increases STR by 20.', str: 20, value:200, last: true
       0: text: t('weaponRogue0Text'), notes: t('weaponRogue0Notes'), str: 0, value: 0
       1: text: t('weaponRogue1Text'), notes: t('weaponRogue1Notes', {str: 2}), str: 2, value: 20
       2: text: t('weaponRogue2Text'), notes: t('weaponRogue2Notes', {str: 3}), str: 3, value: 35
@@ -258,6 +251,7 @@ 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
       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?)
@@ -348,6 +342,7 @@ 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
       301404: text: t('headMystery301404Text'), notes: t('headMystery301404Notes'), mystery:'301404', value: 0
       301405: text: t('headMystery301405Text'), notes: t('headMystery301405Notes'), mystery:'301405', value: 0
     armoire:

common/script/index.coffee

@@ -567,8 +567,8 @@ api.wrap = (user, main=true) ->
           gear[type].shield = 'shield_base_0'
         if user.items.currentPet then user.ops.equip({params:{type: 'pet', key: user.items.currentPet}})
         if user.items.currentMount then user.ops.equip({params:{type: 'mount', key: user.items.currentMount}})
-        # Strip owned gear down to the training sword, but preserve purchase history so user can re-purchase limited edition equipment
+        # Strip owned gear down to the training sword and free items (zero gold value), but preserve purchase history so user can re-purchase limited edition equipment
-        _.each gear.owned, (v, k) -> if gear.owned[k] then gear.owned[k] = false; true
+        _.each gear.owned, (v, k) -> if gear.owned[k] and content.gear.flat[k].value then gear.owned[k] = false; true
         gear.owned.weapon_warrior_0 = true
         user.markModified? 'items.gear.owned'
         user.preferences.costume = false
@@ -1178,7 +1178,7 @@ api.wrap = (user, main=true) ->
         item = content.gear.flat[item]
         user.items.gear.owned[item.key] = true
         user.markModified? 'purchased.plan.mysteryItems'
-        item.type = 'Mystery'
+        item.notificationType = 'Mystery' # needed for website/public/js/controllers/notificationCtrl.js line 59 approx.
         analyticsData = {
           uuid: user._id,
           itemKey: item,

migrations/mystery_items.js

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

test/common/algos.mocha.coffee

@@ -366,6 +366,30 @@ describe 'User', ->
       shared.content.gear.flat.head_special_nye.event.end = moment().add(5,'days')
       expect(shared.content.gear.flat.head_special_nye.canOwn(user)).to.be true
 
+  describe 'Rebirth', ->
+    user = undefined
+    it 'removes correct gear', ->
+      user = newUser()
+      user.stats.lvl = 100
+      user.items.gear.owned = {
+        "weapon_warrior_0": true,
+        "weapon_warrior_1": true,
+        "armor_warrior_1": false,
+        "armor_mystery_201402": true,
+        "back_mystery_201402": false,
+        "head_mystery_201402": true,
+        "weapon_armoire_basicCrossbow": true,
+        }
+      user.ops.rebirth()
+      expect(user.items.gear.owned).to.eql {
+        "weapon_warrior_0": true,
+        "weapon_warrior_1": false,
+        "armor_warrior_1": false,
+        "armor_mystery_201402": true,
+        "back_mystery_201402": false,
+        "head_mystery_201402": true,
+        "weapon_armoire_basicCrossbow": false,
+        }
 
   describe 'store', ->
     it 'recovers hp buying potions', ->

website/public/js/controllers/notificationCtrl.js

@@ -62,7 +62,10 @@ habitrpg.controller('NotificationCtrl',
       var text, notes, type;
       $rootScope.playSound('Item_Drop');
 
-      if (after.type !== 'gear' && after.type !== 'Quest' && after.type !== 'Mystery') {
+      // Note: For Mystery Item gear, after.type will be 'head', 'armor', etc
+      // so we use after.notificationType below.
+
+      if (after.type !== 'gear' && after.type !== 'Quest' && after.notificationType !== 'Mystery') {
         if (after.type === 'Food') {
           type = 'food';
         } else if (after.type === 'HatchingPotion') {
@@ -91,7 +94,7 @@ habitrpg.controller('NotificationCtrl',
       } else if (after.type === 'Quest') {
         $rootScope.selectedQuest = Content.quests[after.key];
         $rootScope.openModal('questDrop', {controller:'PartyCtrl'});
-      } else if (after.type === 'Mystery') {
+      } else if (after.notificationType === 'Mystery') {
         text = Content.gear.flat[after.key].text();
         Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after);
       } else {

website/views/shared/new-stuff.jade

@@ -1,37 +1,53 @@
-h5 8/19/2015 - CHEETAH PET QUEST, iPAD APP, and GRYPHON CONTEST WINNER!
+h5 8/27/2015 - OFFICIAL BACK TO SCHOOL ADVICE CHALLENGE
   hr
   tr
     td
-      .Pet-Cheetah-Base.pull-right
+      .promo_backtoschool.pull-right
-      h5 Cheetah Pet Quest
+      h5 Official Back to School Advice Challenge!
-      p A new pet quest is available in the <a href='/#/options/inventory/quests'>Quests Page</a>: Such a Cheetah! A Cheetah is speeding past incomplete tasks and burning them up before people can complete them. Can you put on the brakes? If so, you’ll be awarded with some cheetah eggs!
+      p We've launched another Official Challenge: the Back To School Advice Challenge! Use social media to tell us how you use Habitica to improve study habits, share stories of scholarly success with the app, or just give us your advice on using Habitica to be the best you can be.
-      p.small.muted by PainterProphet, tivaquinn, Unruly Hyena, Crawford, janetmango, Lemoness, and SabreCat
-  tr
-    td
-      h5 iOS Update and iPad App
-      p There’s a new iOS update! One of our awesome open-source contributors, Shadallark, has made our Habitica iOS app Universal so that it natively supports iPads. Enjoy all the new space for your tasks! We've also fixed several bugs, and excellent contributor kylefox has added a search bar.
       br
-      p If you like the direction that we’ve been taking the app, please consider leaving us a review. It means a lot to us :) Questions? Concerns? Don't hesitate to email <a href='mailto:mobile@habitica.com' target='_blank'>mobile@habitica.com</a> and we will happily help you!
+      p The contest ends on September 27th, and the 10 winners will each get 30 Gems! For the full rules, <a href='/#/options/groups/challenges/533cac3f-f431-424f-9eaa-4d509f015a75'>check out the challenge here</a>.
-      br
-      p This is an example of our fantastic open-source community at work - since our developers are spending all their time on the Android app, it would have been a long while before we could develop an iPad version if it weren’t for our excellent volunteers!
-      br
-      p Speaking of which, we are now accepting translations for the iOS app on Transifex <a href='https://www.transifex.com/habitrpg/habitica-ios/' target='_blank'>here</a>. If you speak another language, we’d love your help!
-      p.small.muted by Shalladark, kylefox, and viirus
-  tr
-    td
-      span.Mount_Body_Gryphon-RoyalPurple.pull-right
-          span.Mount_Head_Gryphon-RoyalPurple.pull-right(style='margin:0')
-      h5 Gryphon Contest Winner
-      p After sorting through over 1600 entries, we finally have a name for our Royal Purple Gryphon: MELIOR! "Melior" is Latin for "better," because Habitica is a place where everyone is striving to become better at their goals in their quest to improve their lives.
-      br
-      p The name "Melior" was submitted by awesome user NobleTheSecond, who has received their prize. Congratulations! A secondary prize has also been awarded to TangyDragonBBQ, who independently submitted a slightly different variant of that name. 
-      br
-      p Thank you so much to everyone who submitted names! They were very well-thought-out and very entertaining, and it was extremely difficult for the staff to make a decision. We hope you will join with us in welcoming Melior into the Habitica family!
 
 hr
 a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h5 8/24/2015 - AUGUST SUBSCRIBER ITEM SET: CHEETAH COSTUME!
+    tr
+      td
+        .promo_mystery_201508.pull-right
+        h5 August Subscriber Item Set: Cheetah Costume!
+        p The August Subscriber Items have been revealed: the Cheetah Costume Item Set! All August subscribers will receive the Cheetah Costume and the Cheetah Hat. 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
+  h5 8/19/2015 - CHEETAH PET QUEST, iPAD APP, and GRYPHON CONTEST WINNER!
+    tr
+      td
+        .Pet-Cheetah-Base.pull-right
+        h5 Cheetah Pet Quest
+        p A new pet quest is available in the <a href='/#/options/inventory/quests'>Quests Page</a>: Such a Cheetah! A Cheetah is speeding past incomplete tasks and burning them up before people can complete them. Can you put on the brakes? If so, you’ll be awarded with some cheetah eggs!
+        p.small.muted by PainterProphet, tivaquinn, Unruly Hyena, Crawford, janetmango, Lemoness, and SabreCat
+    tr
+      td
+        h5 iOS Update and iPad App
+        p There’s a new iOS update! One of our awesome open-source contributors, Shadallark, has made our Habitica iOS app Universal so that it natively supports iPads. Enjoy all the new space for your tasks! We've also fixed several bugs, and excellent contributor kylefox has added a search bar.
+        br
+        p If you like the direction that we’ve been taking the app, please consider leaving us a review. It means a lot to us :) Questions? Concerns? Don't hesitate to email <a href='mailto:mobile@habitica.com' target='_blank'>mobile@habitica.com</a> and we will happily help you!
+        br
+        p This is an example of our fantastic open-source community at work - since our developers are spending all their time on the Android app, it would have been a long while before we could develop an iPad version if it weren’t for our excellent volunteers!
+        br
+        p Speaking of which, we are now accepting translations for the iOS app on Transifex <a href='https://www.transifex.com/habitrpg/habitica-ios/' target='_blank'>here</a>. If you speak another language, we’d love your help!
+        p.small.muted by Shalladark, kylefox, and viirus
+    tr
+      td
+        span.Mount_Body_Gryphon-RoyalPurple.pull-right
+          span.Mount_Head_Gryphon-RoyalPurple.pull-right(style='margin:0')
+        h5 Gryphon Contest Winner
+        p After sorting through over 1600 entries, we finally have a name for our Royal Purple Gryphon: MELIOR! "Melior" is Latin for "better," because Habitica is a place where everyone is striving to become better at their goals in their quest to improve their lives.
+        br
+        p The name "Melior" was submitted by awesome user NobleTheSecond, who has received their prize. Congratulations! A secondary prize has also been awarded to TangyDragonBBQ, who independently submitted a slightly different variant of that name. 
+        br
+        p Thank you so much to everyone who submitted names! They were very well-thought-out and very entertaining, and it was extremely difficult for the staff to make a decision. We hope you will join with us in welcoming Melior into the Habitica family!
+
   h5 8/13/2015 - GOLD-PURCHASABLE CARDS
     tr
       td