Merge branch 'develop' into api-v3

This commit is contained in:
Blade Barringer
2015-12-13 16:39:59 -06:00
502 changed files with 5583 additions and 3160 deletions
+8
View File
@@ -1030,6 +1030,14 @@ api.premiumHatchingPotions = {
canBuy: (function() {
return false;
})
},
Peppermint: {
value: 2,
text: t('hatchingPotionPeppermint'),
limited: true,
canBuy: (function() {
return true;
})
}
};
+1
View File
@@ -2340,6 +2340,7 @@ api.wrap = function(user, main) {
if (analytics != null) {
analytics.track('acquire item', analyticsData);
}
if (!user._tmp) user._tmp = {}
return user._tmp.drop = {
type: 'Quest',
key: k