Merge branch 'develop' into split-shared

.nvmrc

@@ -1 +1 @@
-0.10.40
+4.3.1

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '0.10'
+  - '4.3.1'
 before_install:
   - "npm install -g npm@2"
   - "npm install -g gulp"

common/dist/sprites/spritesmith-main-12.css

@@ -0,0 +1,144 @@
+.Pet-Wolf-CottonCandyBlue {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -82px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyPink {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Desert {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Golden {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url(spritesmith-main-12.png);
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url(spritesmith-main-12.png);
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url(spritesmith-main-12.png);
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet_HatchingPotion_Base {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -294px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_CottonCandyBlue {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -328px -52px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_CottonCandyPink {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -328px -104px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Desert {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -328px -156px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Golden {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -328px -208px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Peppermint {
+  background-image: url(spritesmith-main-12.png);
+  background-position: 0px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Red {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -49px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Shade {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -98px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Skeleton {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -147px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Spooky {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -196px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_White {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -245px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Zombie {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -328px 0px;
+  width: 48px;
+  height: 51px;
+}

common/dist/sprites/spritesmith-main-5.css

@@ -120,31 +120,31 @@
 }
 .shop_body_special_wondercon_black {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -144px;
+  background-position: -697px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_body_special_wondercon_gold {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1066px -1680px;
+  background-position: -1107px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_body_special_wondercon_red {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1025px -1680px;
+  background-position: -1066px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_eyewear_special_wondercon_black {
   background-image: url(spritesmith-main-5.png);
-  background-position: -984px -1680px;
+  background-position: -1025px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_eyewear_special_wondercon_red {
   background-image: url(spritesmith-main-5.png);
-  background-position: -943px -1680px;
+  background-position: -984px -1680px;
   width: 40px;
   height: 40px;
 }
@@ -294,145 +294,145 @@
 }
 .shop_head_healer_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -902px -1680px;
+  background-position: -943px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_healer_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -861px -1680px;
+  background-position: -902px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_healer_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -820px -1680px;
+  background-position: -861px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_healer_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -779px -1680px;
+  background-position: -820px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_healer_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -738px -1680px;
+  background-position: -779px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_rogue_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -697px -1680px;
+  background-position: -738px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_rogue_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -615px -1680px;
+  background-position: -656px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_rogue_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -574px -1680px;
+  background-position: -615px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_rogue_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -533px -1680px;
+  background-position: -574px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_rogue_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -492px -1680px;
+  background-position: -533px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -451px -1680px;
+  background-position: -492px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -369px -1680px;
+  background-position: -410px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -328px -1680px;
+  background-position: -369px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fireCoralCirclet {
   background-image: url(spritesmith-main-5.png);
-  background-position: -287px -1680px;
+  background-position: -328px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -164px -1680px;
+  background-position: -205px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -123px -1680px;
+  background-position: -164px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -82px -1680px;
+  background-position: -123px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -41px -1680px;
+  background-position: -82px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -1680px;
+  background-position: -41px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_wizard_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1380px -1253px;
+  background-position: 0px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_head_wizard_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1380px -1212px;
+  background-position: -1380px -1253px;
   width: 40px;
   height: 40px;
 }
 .shop_head_wizard_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1233px -1113px;
+  background-position: -1380px -1212px;
   width: 40px;
   height: 40px;
 }
 .shop_head_wizard_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -431px;
+  background-position: -1700px -442px;
   width: 40px;
   height: 40px;
 }
 .shop_head_wizard_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -390px;
+  background-position: -1700px -401px;
   width: 40px;
   height: 40px;
 }
@@ -534,37 +534,37 @@
 }
 .shop_headAccessory_special_bearEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -349px;
+  background-position: -1700px -360px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_cactusEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -308px;
+  background-position: -1700px -319px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_foxEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -267px;
+  background-position: -1700px -278px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_lionEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -226px;
+  background-position: -1700px -237px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_pandaEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1107px -1680px;
+  background-position: -1148px -1680px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_pigEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -656px -1680px;
+  background-position: -451px -1680px;
   width: 40px;
   height: 40px;
 }
@@ -714,103 +714,103 @@
 }
 .shop_shield_healer_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1087px;
+  background-position: -1700px -1098px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_healer_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1046px;
+  background-position: -1700px -1057px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_healer_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1005px;
+  background-position: -1700px -1016px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -964px;
+  background-position: -1700px -975px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -923px;
+  background-position: -1700px -934px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -882px;
+  background-position: -1700px -893px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -841px;
+  background-position: -1700px -852px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -800px;
+  background-position: -1700px -811px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -759px;
+  background-position: -1700px -770px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -718px;
+  background-position: -1700px -729px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -677px;
+  background-position: -1700px -688px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -636px;
+  background-position: -1700px -647px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_goldenknight {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -595px;
+  background-position: -1700px -606px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_moonpearlShield {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -554px;
+  background-position: -1700px -565px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_warrior_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -513px;
+  background-position: -1700px -524px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_warrior_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -472px;
+  background-position: -1700px -483px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_warrior_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -410px -1680px;
+  background-position: -287px -1680px;
   width: 40px;
   height: 40px;
 }
@@ -930,85 +930,85 @@
 }
 .shop_weapon_special_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1128px;
+  background-position: -1700px -1139px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_critical {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -185px;
+  background-position: -1700px -196px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_tridentOfCrashingTides {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1169px;
+  background-position: -1700px -1180px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1210px;
+  background-position: -1700px -1221px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1251px;
+  background-position: -1700px -1262px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1292px;
+  background-position: -1700px -1303px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1333px;
+  background-position: -1700px -1344px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1374px;
+  background-position: -1700px -1385px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1415px;
+  background-position: -1700px -1426px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1456px;
+  background-position: -1700px -1467px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_wizard_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1497px;
+  background-position: -1700px -1508px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_wizard_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1538px;
+  background-position: -1700px -1549px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_wizard_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1579px;
+  background-position: -1700px -1590px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_wizard_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1620px;
+  background-position: -1700px -1631px;
   width: 40px;
   height: 40px;
 }
@@ -1230,13 +1230,13 @@
 }
 .Pet_Currency_Gem {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -104px;
+  background-position: -1700px -156px;
   width: 45px;
   height: 39px;
 }
 .Pet_Currency_Gem1x {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1661px;
+  background-position: -1670px -364px;
   width: 15px;
   height: 13px;
 }
@@ -1500,7 +1500,7 @@
 }
 .zzz {
   background-image: url(spritesmith-main-5.png);
-  background-position: -205px -1680px;
+  background-position: -1233px -1113px;
   width: 40px;
   height: 40px;
 }
@@ -1656,7 +1656,7 @@
 }
 .inventory_quest_scroll_dilatoryDistress3_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -52px;
+  background-position: -1700px -104px;
   width: 48px;
   height: 51px;
 }
@@ -1858,78 +1858,84 @@
   width: 48px;
   height: 51px;
 }
-.inventory_quest_scroll_snake {
+.inventory_quest_scroll_snail {
   background-image: url(spritesmith-main-5.png);
   background-position: -1078px -1628px;
   width: 48px;
   height: 51px;
 }
-.inventory_quest_scroll_spider {
+.inventory_quest_scroll_snake {
   background-image: url(spritesmith-main-5.png);
   background-position: -1127px -1628px;
   width: 48px;
   height: 51px;
 }
-.inventory_quest_scroll_trex {
-  background-image: url(spritesmith-main-5.png);
-  background-position: -1225px -1628px;
-  width: 48px;
-  height: 51px;
-}
-.inventory_quest_scroll_trex_undead {
+.inventory_quest_scroll_spider {
   background-image: url(spritesmith-main-5.png);
   background-position: -1176px -1628px;
   width: 48px;
   height: 51px;
 }
-.inventory_quest_scroll_unicorn {
+.inventory_quest_scroll_trex {
   background-image: url(spritesmith-main-5.png);
   background-position: -1274px -1628px;
   width: 48px;
   height: 51px;
 }
-.inventory_quest_scroll_vice1 {
+.inventory_quest_scroll_trex_undead {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1372px -1628px;
+  background-position: -1225px -1628px;
   width: 48px;
   height: 51px;
 }
-.inventory_quest_scroll_vice1_locked {
+.inventory_quest_scroll_unicorn {
   background-image: url(spritesmith-main-5.png);
   background-position: -1323px -1628px;
   width: 48px;
   height: 51px;
 }
-.inventory_quest_scroll_vice2 {
-  background-image: url(spritesmith-main-5.png);
-  background-position: -1470px -1628px;
-  width: 48px;
-  height: 51px;
-}
-.inventory_quest_scroll_vice2_locked {
+.inventory_quest_scroll_vice1 {
   background-image: url(spritesmith-main-5.png);
   background-position: -1421px -1628px;
   width: 48px;
   height: 51px;
 }
-.inventory_quest_scroll_vice3 {
+.inventory_quest_scroll_vice1_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1568px -1628px;
+  background-position: -1372px -1628px;
   width: 48px;
   height: 51px;
 }
-.inventory_quest_scroll_vice3_locked {
+.inventory_quest_scroll_vice2 {
   background-image: url(spritesmith-main-5.png);
   background-position: -1519px -1628px;
   width: 48px;
   height: 51px;
 }
-.inventory_quest_scroll_whale {
+.inventory_quest_scroll_vice2_locked {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1470px -1628px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_vice3 {
   background-image: url(spritesmith-main-5.png);
   background-position: -1617px -1628px;
   width: 48px;
   height: 51px;
 }
+.inventory_quest_scroll_vice3_locked {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1568px -1628px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_whale {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1700px 0px;
+  width: 48px;
+  height: 51px;
+}
 .quest_atom1 {
   background-image: url(spritesmith-main-5.png);
   background-position: -679px -886px;
@@ -1986,7 +1992,7 @@
 }
 .quest_dilatoryDistress1_fireCoral {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px 0px;
+  background-position: -1700px -52px;
   width: 48px;
   height: 51px;
 }

common/locales/en/content.json

@@ -49,7 +49,7 @@
 
   "dropEggBearCubText": "Bear Cub",
   "dropEggBearCubMountText": "Bear",
-  "dropEggBearCubAdjective": "a cuddly",
+  "dropEggBearCubAdjective": "a brave",
 
   "questEggGryphonText": "Gryphon",
   "questEggGryphonMountText": "Gryphon",
@@ -69,7 +69,7 @@
 
   "questEggRatText": "Rat",
   "questEggRatMountText": "Rat",
-  "questEggRatAdjective": "a dirty",
+  "questEggRatAdjective": "a sociable",
 
   "questEggOctopusText": "Octopus",
   "questEggOctopusMountText": "Octopus",
@@ -155,6 +155,10 @@
   "questEggMonkeyMountText": "Monkey",
   "questEggMonkeyAdjective": "a mischievous",
 
+  "questEggSnailText": "Snail",
+  "questEggSnailMountText": "Snail",
+  "questEggSnailAdjective": "a slow but steady",
+
   "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
 
   "hatchingPotionBase": "Base",

common/locales/en/questsContent.json

@@ -339,5 +339,12 @@
   "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
   "questMonkeyBoss": "Monstrous Mandrill",
   "questMonkeyDropMonkeyEgg": "Monkey (Egg)",
-  "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+  "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+
+  "questSnailText": "The Snail of Drudgery Sludge",
+  "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+  "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+  "questSnailBoss": "Snail of Drudgery Sludge",
+  "questSnailDropSnailEgg": "Snail (Egg)",
+  "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }

common/script/content/faq.js

@@ -2,7 +2,13 @@ import t from './translation';
 
 const NUMBER_OF_QUESTIONS = 12;
 
-export const questions = [];
+let faq = {
+  questions: [],
+  stillNeedHelp: {
+    ios: t('iosFaqStillNeedHelp'),
+    web: t('webFaqStillNeedHelp'),
+  },
+};
 
 for (let i = 0; i <= NUMBER_OF_QUESTIONS; i++) {
   let question = {
@@ -11,10 +17,7 @@ for (let i = 0; i <= NUMBER_OF_QUESTIONS; i++) {
     web: t(`webFaqAnswer${i}`),
   };
 
-  questions.push(question);
+  faq.questions.push(question);
 }
 
-export const stillNeedHelp = {
-  ios: t('iosFaqStillNeedHelp'),
-  web: t('webFaqStillNeedHelp'),
-};
+module.exports = faq;

common/script/content/index.js

@@ -373,6 +373,13 @@ api.questEggs = {
       return u.achievements.quests && (u.achievements.quests.monkey != null) > 0;
     })
   },
+  Snail: {
+    text: t('questEggSnailText'),
+    adjective: t('questEggSnailAdjective'),
+    canBuy: (function(u) {
+      return u.achievements.quests && (u.achievements.quests.snail != null) > 0;
+    })
+  },
 };
 
 _.each(api.questEggs, function(egg, key) {
@@ -2488,6 +2495,38 @@ api.quests = {
       unlock: t('questMonkeyUnlockText')
     }
   },
+  snail: {
+    text: t('questSnailText'),
+    notes: t('questSnailNotes'),
+    completion: t('questSnailCompletion'),
+    value: 4,
+    category: 'pet',
+    boss: {
+      name: t('questSnailBoss'),
+      hp: 500,
+      str: 1.5
+    },
+    drop: {
+      items: [
+        {
+          type: 'eggs',
+          key: 'Snail',
+          text: t('questSnailDropSnailEgg')
+        }, {
+          type: 'eggs',
+          key: 'Snail',
+          text: t('questSnailDropSnailEgg')
+        }, {
+          type: 'eggs',
+          key: 'Snail',
+          text: t('questSnailDropSnailEgg')
+        }
+      ],
+      gp: 37,
+      exp: 275,
+      unlock: t('questSnailUnlockText')
+    }
+  },
 };
 
 _.each(api.quests, function(v, key) {

common/script/index.js

@@ -131,6 +131,7 @@ api.wrap = function(user, main) {
   user._wrapped = true;
   if (main) {
     user.ops = {
+<<<<<<< HEAD
       update: _.partial(importedOps.update, user),
       sleep: _.partial(importedOps.sleep, user),
       revive: _.partial(importedOps.revive, user),

common/script/ops/updateTask.js

@@ -9,10 +9,13 @@ module.exports = function(user, req, cb) {
       message: i18n.t('messageTaskNotFound', req.language)
     }) : void 0;
   }
-  _.merge(task, _.omit(req.body, ['checklist', 'id', 'type']));
+  _.merge(task, _.omit(req.body, ['checklist', 'reminders', 'id', 'type']));
   if (req.body.checklist) {
     task.checklist = req.body.checklist;
   }
+  if (req.body.reminders) {
+    task.reminders = req.body.reminders;
+  }
   if (typeof task.markModified === "function") {
     task.markModified('tags');
   }

package.json

@@ -85,7 +85,7 @@
   },
   "private": true,
   "engines": {
-    "node": "^0.10.40",
+    "node": "^4.3.1",
     "npm": "^2.14.9"
   },
   "scripts": {

test/api/v2/user/PUT-user.test.js

@@ -175,4 +175,27 @@ describe('PUT /user', () => {
       });
     });
   });
+
+  context('Improvement Categories', () => {
+    it('sets valid categories', async () => {
+      await user.put('/user', {
+        'preferences.improvementCategories': ['work', 'school'],
+      });
+
+      await user.sync();
+
+      expect(user.preferences.improvementCategories).to.eql(['work', 'school']);
+    });
+
+    it('discards invalid categories', async () => {
+      await expect(user.put('/user', {
+        'preferences.improvementCategories': ['work', 'procrastination', 'school'],
+      })).to.eventually.be.rejected.and.eql({
+        code: 400,
+        text: [
+          'Validator failed for path `preferences.improvementCategories` with value `work,procrastination,school`',
+        ],
+      });
+    });
+  });
 });

website/public/js/controllers/chatCtrl.js

@@ -39,7 +39,7 @@ habitrpg.controller('ChatCtrl', ['$scope', 'Groups', 'Chat', 'User', '$http', 'A
           Analytics.updateUser({'partyID':group.id,'partySize':group.memberCount});
         }
         if (group.privacy == 'public'){
-          Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'group chat','groupType':group.type,'privacy':group.privacy,'groupName':group.name,'message':message});
+          Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'group chat','groupType':group.type,'privacy':group.privacy,'groupName':group.name});
         } else {
           Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'group chat','groupType':group.type,'privacy':group.privacy});
         }

website/src/controllers/api-v2/user.js

@@ -355,7 +355,15 @@ api.update = (req, res, next) => {
 
   user.save((err) => {
     if (!_.isEmpty(errors)) return res.json(401, {err: errors});
-    if (err) return next(err);
+    if (err) {
+      if (err.name == 'ValidationError') {
+        let errorMessages = _.map(_.values(err.errors), (error) => {
+          return error.message;
+        });
+        return res.json(400, {err: errorMessages});
+      }
+      return next(err);
+    }
 
     res.json(200, user);
     user = errors = null;

website/src/middlewares/apiThrottle.js

@@ -4,7 +4,9 @@ var limiter = require('connect-ratelimit');
 var IS_PROD = nconf.get('NODE_ENV') === 'production';
 
 module.exports = function(app) {
-  if (!IS_PROD) return;
+  // TODO review later
+  // disable the rate limiter middleware
+  if (/*!IS_PROD || */true) return;
   app.use(limiter({
     end:false,
     categories:{
@@ -19,4 +21,4 @@ module.exports = function(app) {
     if (res.ratelimit.exceeded) return res.json(429,{err:'Rate limit exceeded'});
     next();
   });
-};
+};

website/src/models/task.js

@@ -28,7 +28,12 @@ var TaskSchema = {
     broken: String, // CHALLENGE_DELETED, TASK_DELETED, UNSUBSCRIBED, CHALLENGE_CLOSED
     winner: String // user.profile.name
     // group: {type: 'Strign', ref: 'Group'} // if we restore this, rename `id` above to `challenge`
-  }
+  },
+  reminders: [{
+    id: {type:String,'default':shared.uuid},
+    startDate: Date,
+    time: Date
+  }]
 };
 
 var HabitSchema = new Schema(

website/src/models/user.js

@@ -390,7 +390,14 @@ var UserSchema = new Schema({
       hatchPet: {type: Boolean, 'default': false},
       raisePet: {type: Boolean, 'default': false},
       streak: {type: Boolean, 'default': false}
-    }
+    },
+    improvementCategories: {
+      type: Array,
+      validate: (categories) => {
+        const validCategories = ['work', 'exercise', 'healthWellness', 'school', 'teams', 'chores', 'creativity'];
+        let isValidCategory = categories.every(category => validCategories.indexOf(category) !== -1);
+        return isValidCategory;
+    }}
   },
   profile: {
     blurb: String,

website/views/options/social/tavern.jade

@@ -83,7 +83,7 @@
                 a.label.label-contributor-1(ng-click='toggleUserTier($event)')=env.t('tier') + ' 1 (' + env.t('friend') + ')'
                 div
                   p
-                    span.achievement.achievement-firefox
+                    span.achievement.achievement-boot
                     !=env.t('friendFirst')
             tr
               td

website/views/shared/new-stuff.jade

@@ -1,37 +1,59 @@
-h2 3/1/2016 - MARCH BACKGROUNDS AND ARMOIRE ITEMS REVEALED! PLUS, WEB DESIGNER NEEDED AND MARCH MYSTERY BOX
+h2 3/9/2016 - SNAIL PET QUEST AND MOBILE CHALLENGE WINNERS. PLUS, SPRING PLOT-LINE BEGINS!
   hr
   tr
     td
-      .promo_backgrounds_armoire_201603.pull-right
-      h3 March Backgrounds
-      p There are three new avatar backgrounds in the <a href='/#/options/profile/backgrounds'>Background Shop!</a> Now your avatar can venture into a Rainforest, find precious metals in a Deep Mine, or cast spells in a Circle of Stones.
-      p.small.muted by James Danger, sungabraverday, and UncommonCriminal
-  tr
-    td
-      h3 March Armoire Items Revealed
-      p There is new equipment in Enchanted Armoire, a 100 GP Reward in the Rewards Column which unlocks after you've attained Ultimate Gear!
-      br
-      p Click on the Enchanted Armoire for a random chance at special Equipment, including the Miner Set and the Mystic Lamp! It may also give you random XP or food items. We'll be adding new equipment to it during the first week of each month, but even when you've exhausted the current supply, you can keep clicking for a chance at food and XP.
-      br
-      p Now go spend all that accumulated Gold! May the Random Number Generator smile upon you...
+      span.Mount_Body_Snail-Base.pull-right
+        span.Mount_Head_Snail-Base.pull-right(style='margin:0')
+      h3 Snail Pet Quest
+      p We've released a new Pet Quest: <a href='/#/options/inventory/quests'>The Snail of Drudgery Sludge</a>! Habiticans everywhere are bogged down by unimportant tasks. Can you wash away the slime? If so, you'll earn some Snail Eggs!
       p.small.muted by Lemoness and SabreCat
-      p.small.muted Art by Balduranne
+      p.small.muted Art by Overomega, Pffernusse, and Misceo
+      p.small.muted Writing by Maz Wendling
   tr
     td
-      .inventory_present_03.pull-right
-      h3 March Mystery Box
-      p Ooh... What could it be? All Habiticans who are subscribed during the month of March will receive the March Mystery Item Set! It will be revealed on the 23rd, so keep your eyes peeled. Thanks for supporting the site <3
+      h3 Mobile Challenge Winners
+      p Congratulations to the winners of the Mobile App Challenges: J, Janče Skalkova, studentSeekingDiscipline, Felipe Marinelli Affonso, compl, Yuri Augusto, Ewe Pacheco, Narmence, Ryan_carter, and candieb! Thanks to everyone who participated. We hope that you're enjoying the apps!
       p.small.muted by Lemoness
   tr
     td
-      h3 Web UI Designer Needed
-      p We’re looking for UI designers with experience in UX! Do you like user-centered approaches? Are you familiar with web patterns and assets? If that sounds like you, and you’re interested in contributing to Habitica, please email <a href='mailto:vicky@habitica.com' target='_blank'>vicky@habitica.com</a>. We look forward to questing with you!
+      h3 Spring Plot-line Begins
+      p A large crowd has gathered in Productivity Plaza, just outside of the Tavern. Curious, you press forward and see people peering through a telescope, which is pointed at a strange, sparkling cloud on the horizon.
+      br
+      p Unfortunately, it turns out that the line to look through the telescope is about an hour long! Who has that kind of time when there are tasks to conquer? Oh well. Whatever it is, you’ll probably hear all about it soon...
+      p.small.muted by Lemoness
 
 if menuItem !== 'oldNews'
   hr
   a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h2 3/1/2016 - MARCH BACKGROUNDS AND ARMOIRE ITEMS REVEALED! PLUS, WEB DESIGNER NEEDED AND MARCH MYSTERY BOX
+    tr
+      td
+        .promo_backgrounds_armoire_201603.pull-right
+        h3 March Backgrounds
+        p There are three new avatar backgrounds in the <a href='/#/options/profile/backgrounds'>Background Shop!</a> Now your avatar can venture into a Rainforest, find precious metals in a Deep Mine, or cast spells in a Circle of Stones.
+        p.small.muted by James Danger, sungabraverday, and UncommonCriminal
+    tr
+      td
+        h3 March Armoire Items Revealed
+        p There is new equipment in Enchanted Armoire, a 100 GP Reward in the Rewards Column which unlocks after you've attained Ultimate Gear!
+        br
+        p Click on the Enchanted Armoire for a random chance at special Equipment, including the Miner Set and the Mystic Lamp! It may also give you random XP or food items. We'll be adding new equipment to it during the first week of each month, but even when you've exhausted the current supply, you can keep clicking for a chance at food and XP.
+        br
+        p Now go spend all that accumulated Gold! May the Random Number Generator smile upon you...
+        p.small.muted by Lemoness and SabreCat
+        p.small.muted Art by Balduranne
+    tr
+      td
+        .inventory_present_03.pull-right
+        h3 March Mystery Box
+        p Ooh... What could it be? All Habiticans who are subscribed during the month of March will receive the March Mystery Item Set! It will be revealed on the 23rd, so keep your eyes peeled. Thanks for supporting the site <3
+        p.small.muted by Lemoness
+    tr
+      td
+        h3 Web UI Designer Needed
+        p We’re looking for UI designers with experience in UX! Do you like user-centered approaches? Are you familiar with web patterns and assets? If that sounds like you, and you’re interested in contributing to Habitica, please email <a href='mailto:vicky@habitica.com' target='_blank'>vicky@habitica.com</a>. We look forward to questing with you!
   h2 2/24/2016 - PHOENIXES IN THE TIME TRAVEL STABLE! FEBRUARY MYSTERY SET!
     tr
       td