Merge branch 'develop' into api-v3

.github/ISSUE_TEMPLATE.md

@@ -1,10 +1,10 @@
-[//]: # (Before logging this issue, look through common problems at https://github.com/HabitRPG/habitrpg/issue If you find your issue there, read at least the first post to see if there is a workaround for you.)
+[//]: # (Before logging this issue, look through common problems at https://github.com/HabitRPG/habitrpg/issue If you find your issue there, read at least the first post to see if there is a workaround for you)
 
-[//]: # (Github is primarilly used for reporting bugs. If you have a feature request, use "Help > Request a Feature" so that the feature request can be vetted by the larger Habitica community.)
+[//]: # (Github is primarily used for reporting bugs. If you have a feature request, use "Help > Request a Feature" so that the feature request can be vetted by the larger Habitica community)
 
 [//]: # (To report a bug in one of the mobile apps, please report it in the correct repository. Android: https://github.com/HabitRPG/habitrpg-android, iOS: https://github.com/HabitRPG/habitrpg-ios)
 
-[//]: # (For more guidelines see https://github.com/HabitRPG/habitrpg/issues/2760 for more info)
+[//]: # (For more guidelines see https://github.com/HabitRPG/habitrpg/issues/2760)
 
 [//]: # (Fill out relevant information - UUID is found in Settings -> API)
 General Info
@@ -18,5 +18,5 @@ General Info
 
 
 #### Console Errors
-[//]: # (Include any javscript console errors here)
+[//]: # (Include any JavaScript console errors here.)
 

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

@@ -1,30 +1,30 @@
 .2014_Fall_HealerPROMO2 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -825px -423px;
+  background-position: -1005px -809px;
   width: 90px;
   height: 90px;
 }
 .2014_Fall_Mage_PROMO9 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1466px -1139px;
+  background-position: -954px -660px;
   width: 120px;
   height: 90px;
 }
 .2014_Fall_RoguePROMO3 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1096px -851px;
+  background-position: -843px -408px;
   width: 105px;
   height: 90px;
 }
 .2014_Fall_Warrior_PROMO {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -669px -1157px;
+  background-position: -1033px -1157px;
   width: 90px;
   height: 90px;
 }
 .promo_android {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1096px -508px;
+  background-position: -1096px -332px;
   width: 175px;
   height: 175px;
 }
@@ -54,7 +54,7 @@
 }
 .promo_backtoschool {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1343px -251px;
+  background-position: -1343px -553px;
   width: 150px;
   height: 150px;
 }
@@ -66,7 +66,7 @@
 }
 .promo_chairs_glasses {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -954px -569px;
+  background-position: 0px -1248px;
   width: 51px;
   height: 210px;
 }
@@ -84,7 +84,7 @@
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -332px;
+  background-position: -770px -525px;
   width: 90px;
   height: 90px;
 }
@@ -102,31 +102,31 @@
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1343px -789px;
+  background-position: -1343px -1000px;
   width: 217px;
   height: 90px;
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1343px -972px;
+  background-position: -1096px -776px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -825px -332px;
+  background-position: -808px -706px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1343px -1139px;
+  background-position: -954px -569px;
   width: 122px;
   height: 90px;
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -861px -525px;
+  background-position: -760px -1157px;
   width: 90px;
   height: 90px;
 }
@@ -138,7 +138,7 @@
 }
 .promo_habitica {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1096px -332px;
+  background-position: -1096px -508px;
   width: 175px;
   height: 175px;
 }
@@ -150,7 +150,7 @@
 }
 .promo_haunted_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1484px -402px;
+  background-position: -1484px -704px;
   width: 100px;
   height: 137px;
 }
@@ -162,7 +162,7 @@
 }
 .promo_mystery_201405 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -760px -1157px;
+  background-position: -52px -1248px;
   width: 90px;
   height: 90px;
 }
@@ -174,73 +174,73 @@
 }
 .promo_mystery_201407 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1243px -684px;
+  background-position: -881px -241px;
   width: 42px;
   height: 62px;
 }
 .promo_mystery_201408 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1272px -332px;
+  background-position: -1272px -414px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -770px -525px;
+  background-position: -578px -1157px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1496px -1063px;
+  background-position: -1249px -867px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1005px -809px;
+  background-position: -942px -1157px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1272px -578px;
+  background-position: -1277px -776px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1542px -880px;
+  background-position: -1272px -578px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1033px -1157px;
+  background-position: -143px -1248px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1124px -1157px;
+  background-position: -234px -1248px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1272px -404px;
+  background-position: -1272px -508px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -423px;
+  background-position: -861px -525px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1272px -508px;
+  background-position: -1295px -684px;
   width: 42px;
   height: 69px;
 }
@@ -252,121 +252,121 @@
 }
 .promo_mystery_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -828px -241px;
+  background-position: -1494px -553px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -808px -706px;
+  background-position: -669px -1157px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -241px;
+  background-position: -855px -317px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -578px -1157px;
+  background-position: -851px -1157px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201512 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1524px -972px;
+  background-position: -1272px -332px;
   width: 60px;
   height: 81px;
 }
 .promo_mystery_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1096px -760px;
+  background-position: -734px -317px;
   width: 120px;
   height: 90px;
 }
 .promo_mystery_201602 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -851px -1157px;
+  background-position: -1124px -1157px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201603 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -942px -1157px;
+  background-position: -1215px -1157px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201604 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1202px -851px;
+  background-position: -1494px -402px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_3014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1343px -698px;
+  background-position: -1343px -1091px;
   width: 217px;
   height: 90px;
 }
 .promo_orca {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1484px -550px;
+  background-position: -1484px -852px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px -442px;
+  background-position: -1343px -1182px;
   width: 115px;
   height: 47px;
 }
 .promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -648px -957px;
+  background-position: -979px -957px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -673px -972px;
+  background-position: -1004px -972px;
   width: 60px;
   height: 60px;
 }
 .promo_peppermint_flame {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1343px -550px;
+  background-position: -1343px -704px;
   width: 140px;
   height: 147px;
 }
 .promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1343px -402px;
+  background-position: -1343px -852px;
   width: 140px;
   height: 147px;
 }
 .customize-option.promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1368px -417px;
+  background-position: -1368px -867px;
   width: 60px;
   height: 60px;
 }
 .promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -979px -957px;
+  background-position: -648px -957px;
   width: 330px;
   height: 83px;
 }
 .promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1343px -880px;
+  background-position: -1096px -684px;
   width: 198px;
   height: 91px;
 }
 .customize-option.promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1368px -895px;
+  background-position: -1121px -699px;
   width: 60px;
   height: 60px;
 }
@@ -378,13 +378,13 @@
 }
 .promo_springclasses2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1157px;
+  background-position: -289px -1157px;
   width: 288px;
   height: 90px;
 }
 .promo_springclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -289px -1157px;
+  background-position: 0px -1157px;
   width: 288px;
   height: 90px;
 }
@@ -408,7 +408,7 @@
 }
 .promo_veteran_pets {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1096px -684px;
+  background-position: -734px -241px;
   width: 146px;
   height: 75px;
 }
@@ -426,7 +426,7 @@
 }
 .promo_winteryhair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1343px -1063px;
+  background-position: -1096px -867px;
   width: 152px;
   height: 75px;
 }
@@ -438,7 +438,7 @@
 }
 .npc_viirus {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1217px -760px;
+  background-position: -734px -408px;
   width: 108px;
   height: 90px;
 }
@@ -448,6 +448,18 @@
   width: 451px;
   height: 219px;
 }
+.scene_coding {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -1343px -251px;
+  width: 150px;
+  height: 150px;
+}
+.scene_phone_peek {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -1343px -402px;
+  width: 150px;
+  height: 150px;
+}
 .welcome_basic_avatars {
   background-image: url(spritesmith-largeSprites-0.png);
   background-position: -1096px 0px;

common/locales/en/content.json

@@ -163,6 +163,10 @@
   "questEggFalconMountText": "Falcon",
   "questEggFalconAdjective": "a swift",
 
+  "questEggTreelingText": "Treeling",
+  "questEggTreelingMountText": "Treeling",
+  "questEggTreelingAdjective": "a leafy",
+
   "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
 
   "hatchingPotionBase": "Base",

common/locales/en/front.json

@@ -182,6 +182,7 @@
     "zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
     "reportAccountProblems": "Report Account Problems",
     "reportCommunityIssues": "Report Community Issues",
+    "subscriptionPaymentIssues": "Subscription and Payment Issues",
     "generalQuestionsSite": "General Questions about the Site",
     "businessInquiries": "Business Inquiries",
     "merchandiseInquiries": "Merchandise Inquiries",

common/locales/en/questsContent.json

@@ -365,5 +365,12 @@
   "questFalconCompletion": "Having finally triumphed over the Birds of Preycrastination, you settle down to enjoy the view and your well-earned rest.<br><br>\"Wow!\" says @Trogdorina. \"You won!\"<br><br>@Squish adds, \"Here, take these eggs I found as a reward.\"",
   "questFalconBoss": "Birds of Preycrastination",
   "questFalconDropFalconEgg": "Falcon (Egg)",
-  "questFalconUnlockText": "Unlocks purchasable Falcon eggs in the Market"
+  "questFalconUnlockText": "Unlocks purchasable Falcon eggs in the Market",
+
+  "questTreelingText": "The Tangle Tree",
+  "questTreelingNotes": "It's the annual Garden Competition, and everyone is talking about the mysterious project which @aurakami has promised to unveil. You join the crowd on the day of the big announcement, and marvel at the introduction of a moving tree. @fuzzytrees explains that the tree will help with garden maintenance, showing how it can mow the lawn, trim the hedge and prune the roses all at the same time – until the tree suddenly goes wild, turning its secateurs on its creator! The crowd panics as everyone tries to flee, but you aren't afraid – you leap forward, ready to do battle.",
+  "questTreelingCompletion": "You dust yourself off as the last few leaves drift to the floor. In spite of the upset, the Garden Competition is now safe – although the tree you just reduced to a heap of wood chips won't be winning any prizes! \"Still a few kinks to work out there,\" @PainterProphet says. \"Perhaps someone else would do a better job of training the saplings. Do you fancy a go?\"",
+  "questTreelingBoss": "Tangle Tree",
+  "questTreelingDropTreelingEgg": "Treeling (Egg)",
+  "questTreelingUnlockText": "Unlocks purchasable Treeling eggs in the Market"
 }

common/script/content/index.js

@@ -387,6 +387,13 @@ api.questEggs = {
       return u.achievements.quests && (u.achievements.quests.falcon != null) > 0;
     }),
   },
+  Treeling: {
+    text: t('questEggTreelingText'),
+    adjective: t('questEggTreelingAdjective'),
+    canBuy: (function(u) {
+      return u.achievements.quests && (u.achievements.quests.treeling != null) > 0;
+    }),
+  },
 };
 
 _.each(api.questEggs, function(egg, key) {
@@ -2664,6 +2671,38 @@ api.quests = {
       unlock: t('questFalconUnlockText'),
     },
   },
+  treeling: {
+    text: t('questTreelingText'),
+    notes: t('questTreelingNotes'),
+    completion: t('questTreelingCompletion'),
+    value: 4,
+    category: 'pet',
+    boss: {
+      name: t('questTreelingBoss'),
+      hp: 600,
+      str: 1.5,
+    },
+    drop: {
+      items: [
+        {
+          type: 'eggs',
+          key: 'Treeling',
+          text: t('questTreelingDropTreelingEgg'),
+        }, {
+          type: 'eggs',
+          key: 'Treeling',
+          text: t('questTreelingDropTreelingEgg'),
+        }, {
+          type: 'eggs',
+          key: 'Treeling',
+          text: t('questTreelingDropTreelingEgg'),
+        }
+      ],
+      gp: 43,
+      exp: 350,
+      unlock: t('questTreelingUnlockText'),
+    },
+  },
 };
 
 _.each(api.quests, function(v, key) {

website/views/shared/new-stuff.jade

@@ -1,22 +1,50 @@
-h2 5/11/2016 - NEW AVATAR CUSTOMIZATIONS AND CHALLENGE SPOTLIGHT SUBMISSIONS
+h2 5/17/2016 - TREELING PET QUEST AND CHALLENGE SPOTLIGHT!
   hr
   tr
     td
-      .promo_chairs_glasses.pull-right
-      h3 Glasses and New Wheelchair Colors for Avatars
-      p We have two new sets of free <a href='/#/options/profile/avatar'>avatar customizations</a> available: glasses, and additional wheelchair colors! We hope that Habiticans who wear glasses and/or use wheelchairs will enjoy these options.
-      p.small.muted by Breadstrings and Balduranne
+      .Pet-Treeling-Base.pull-right
+      h3 New Pet Quest: The Tangle Tree (Treelings)
+      p We've released a new <a href='/#/options/inventory/quests'>Pet Quest</a>: The Tangle Tree! The Garden Competition has been disrupted by a terrible multi-tasking tree. Can you defeat this wooden warrior? If so, you'll earn some treeling eggs!
+      p.small.muted by Lemoness and SabreCat
+      p.small.muted Art by fuzzytrees, PainterProphet, and aurakami
+      p.small.muted Writing by Flutter Bee
   tr
     td
-      h3 Challenge Spotlight Submissions
-      p Do you have a broadly-applicable Challenge that you would like to promote to all of Habitica? Now you can submit Challenges to be featured on our official blog! To qualify, the Challenge must have a fixed end date and a Gem prize of any amount. To submit a Challenge for consideration, just <a href='https://docs.google.com/forms/d/1Wb0TJaZrMA3URdANqoNjnhi_EfFTwfZ0WwteB8IU5E8/viewform' target='_blank'>fill out this form.</a>
+      h3 Challenge Spotlight
+      p There's a new <a href='https://habitica.wordpress.com/2016/05/17/simplify-your-digital-life-may-challenge-spotlight/' target='_blank'>Challenge Spotlight</a> on our blog! Check it out for some great Challenges that can help you simplify your digital life.
+      br
+      p Have you made a Challenge that you think deserves to be in the spotlight? <a href='https://docs.google.com/forms/d/1Wb0TJaZrMA3URdANqoNjnhi_EfFTwfZ0WwteB8IU5E8/viewform' target='_blank'>Submit it to be featured on our blog!</a> Any Challenge with a Gem prize and a concrete end date is eligible. And feel free to tell us what you think about this month's spotlight in the comments, or on <a href='https://twitter.com/habitica' target='_blank'>Twitter</a>, <a href='https://www.facebook.com/Habitica' target='_blank'>Facebook</a>, or <a href='http://habitica.tumblr.com/' target='_blank'>Tumblr</a>. Enjoy!
       p.small.muted by redphoenix
+      p.small.muted Challenges by ArynChris, Janelle Rowe, and BeanieB
 
 if menuItem !== 'oldNews'
   hr
   a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h2 5/14/2016 - IMPORTANT ANDROID UPDATE AND HABITICA ON SOCIAL MEDIA
+    tr
+      td
+        .scene_phone_peek.pull-right
+        h3 Android Update
+        p We've released <a href='https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica' target='_blank'>a new Android update</a> which includes the ability to choose a class at level 10! We've also fixed a bunch of bugs, and enabled social media sharing. Want to show off your new pet or fancy avatar to your friends? Now you can!
+    tr
+      td
+        .scene_coding.pull-right
+        h3 Habitica on Social Media
+        p Speaking of social media.... you should come follow Habitica on <a href='https://twitter.com/habitica' target='_blank'>Twitter</a>, <a href='https://www.facebook.com/Habitica' target='_blank'>Facebook</a>, and <a href='http://habitica.tumblr.com/' target='_blank'>Tumblr</a>! We post important announcements and weekly updates, and we even share fun things like Habitica <a href='http://blog.habitrpg.com/tagged/fanart' target='_blank'>fanart</a> and <a href='http://blog.habitrpg.com/tagged/cosplay' target='_blank'>cosplay</a> on our blog. Come chat with us!
+  h2 5/11/2016 - NEW AVATAR CUSTOMIZATIONS AND CHALLENGE SPOTLIGHT SUBMISSIONS
+    tr
+      td
+        .promo_chairs_glasses.pull-right
+        h3 Glasses and New Wheelchair Colors for Avatars
+        p We have two new sets of free <a href='/#/options/profile/avatar'>avatar customizations</a> available: glasses, and additional wheelchair colors! We hope that Habiticans who wear glasses and/or use wheelchairs will enjoy these options.
+        p.small.muted by Breadstrings and Balduranne
+    tr
+      td
+        h3 Challenge Spotlight Submissions
+        p Do you have a broadly-applicable Challenge that you would like to promote to all of Habitica? Now you can submit Challenges to be featured on our official blog! To qualify, the Challenge must have a fixed end date and a Gem prize of any amount. To submit a Challenge for consideration, just <a href='https://docs.google.com/forms/d/1Wb0TJaZrMA3URdANqoNjnhi_EfFTwfZ0WwteB8IU5E8/viewform' target='_blank'>fill out this form.</a>
+        p.small.muted by redphoenix
   h2 5/3/2016 - iOS UPDATE, MAY BACKGROUNDS, AND MAY ARMOIRE ITEMS
     tr
       td

website/views/static/contact.jade

@@ -25,6 +25,10 @@ block content
         | : 
         a(href='mailto:leslie@habitica.com') leslie@habitica.com
         br
+        =env.t('subscriptionPaymentIssues')
+        | : 
+        a(href='mailto:admin@habitica.com') admin@habitica.com
+        br
         =env.t('generalQuestionsSite')
         | : 
         a(target='_blank', href='http://habitica.wikia.com/wiki/The_Keep:The_Newbies_Guild') Newbies Guild