Merge branch 'develop' into release

website/common/script/content/shop-featuredItems.js

@@ -1,3 +1,6 @@
+// Magic Hatching Potions are configured like this:
+// type: 'premiumHatchingPotion',  // note no "s" at the end
+// path: 'premiumHatchingPotions.Rainbow',
 const featuredItems = {
   market: [
     {
@@ -5,12 +8,12 @@ const featuredItems = {
       path: 'armoire',
     },
     {
-      type: 'hatchingPotions',
-      path: 'hatchingPotions.Shimmer',
+      type: 'premiumHatchingPotion',
+      path: 'premiumHatchingPotions.Shimmer',
     },
     {
-      type: 'hatchingPotions',
-      path: 'hatchingPotions.Rainbow',
+      type: 'premiumHatchingPotion',
+      path: 'premiumHatchingPotions.Rainbow',
     },
     {
       type: 'card',

website/common/script/content/spells.js

@@ -62,7 +62,7 @@ spells.wizard = {
     cast (user, target) {
       each(target, (member) => {
         let bonus = statsComputed(user).int;
-        if (user._id !== member._id) {
+        if (user._id !== member._id && member.stats.class !== 'wizard') {
           member.stats.mp += Math.ceil(diminishingReturns(bonus, 25, 125));
         }
       });