Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03

Gruntfile.js

@@ -13,7 +13,7 @@ module.exports = function(grunt) {
 //    totalDims.width += dims.width;
 //    totalDims.height += dims.height;
 //  })
-  var COUNT = 6;//Math.ceil( (totalDims.width * totalDims.height) / (1024*1024*3) );
+  var COUNT = 7;//Math.ceil( (totalDims.width * totalDims.height) / (1024*1024*3) );
   //console.log({totalDims:totalDims,COUNT:COUNT});
 
   var sprite = {};

common/dist/scripts/habitrpg-shared.js

@@ -2901,6 +2901,8 @@ api.spells = {
       cast: function(user, target) {
         var _base;
         target.stats.buffs.snowball = true;
+        target.stats.buffs.spookDust = false;
+        target.stats.buffs.shinySeed = false;
         if ((_base = target.achievements).snowball == null) {
           _base.snowball = 0;
         }
@@ -2928,7 +2930,9 @@ api.spells = {
       notes: t('spellSpecialSpookDustNotes'),
       cast: function(user, target) {
         var _base;
+        target.stats.buffs.snowball = false;
         target.stats.buffs.spookDust = true;
+        target.stats.buffs.shinySeed = false;
         if ((_base = target.achievements).spookDust == null) {
           _base.spookDust = 0;
         }
@@ -2948,6 +2952,36 @@ api.spells = {
         return user.stats.gp -= 5;
       }
     },
+    shinySeed: {
+      text: t('spellSpecialShinySeedText'),
+      mana: 0,
+      value: 15,
+      target: 'user',
+      notes: t('spellSpecialShinySeedNotes'),
+      cast: function(user, target) {
+        var _base;
+        target.stats.buffs.snowball = false;
+        target.stats.buffs.spookDust = false;
+        target.stats.buffs.shinySeed = true;
+        if ((_base = target.achievements).shinySeed == null) {
+          _base.shinySeed = 0;
+        }
+        target.achievements.shinySeed++;
+        return user.items.special.shinySeed--;
+      }
+    },
+    petalFreePotion: {
+      text: t('spellSpecialPetalFreePotionText'),
+      mana: 0,
+      value: 5,
+      immediateUse: true,
+      target: 'self',
+      notes: t('spellSpecialPetalFreePotionNotes'),
+      cast: function(user, target) {
+        user.stats.buffs.shinySeed = false;
+        return user.stats.gp -= 5;
+      }
+    },
     nye: {
       text: t('nyeCard'),
       mana: 0,