Merge pull request #51 from therufs/master

re-tweak potion ratios

.gitignore

@@ -1,2 +1,4 @@
 node_modules
-.idea
+.idea
+.swo
+.swp

dist/habitrpg-shared.js

@@ -8945,7 +8945,7 @@ var global=self;/**
         drop.type = 'Egg';
         drop.dialog = "You've found a " + drop.text + " Egg! " + drop.notes;
       } else {
-        acceptableDrops = rarity < .03 ? ['Golden'] : rarity < .06 ? ['Zombie', 'CottonCandyPink', 'CottonCandyBlue'] : rarity < .09 ? ['Red', 'Shade', 'Skeleton'] : ['Base', 'White', 'Desert'];
+        acceptableDrops = rarity < .03 ? ['Golden'] : rarity < .09 ? ['Zombie', 'CottonCandyPink', 'CottonCandyBlue'] : rarity < .18 ? ['Red', 'Shade', 'Skeleton'] : ['Base', 'White', 'Desert'];
         drop = helpers.randomVal(_.pick(hatchingPotions, (function(v, k) {
           return __indexOf.call(acceptableDrops, k) >= 0;
         })));
@@ -10595,4 +10595,4 @@ try {
 
 
 },{"lodash":2}]},{},[6])
-;
+;

script/algos.coffee

@@ -154,9 +154,9 @@ randomDrop = (user, delta, priority, streak = 0, options={}) ->
         # Very Rare: 10% (of 30%)
         if rarity < .03 then ['Golden']
         # Rare: 20% (of 30%)
-        else if rarity < .06 then ['Zombie', 'CottonCandyPink', 'CottonCandyBlue']
+        else if rarity < .09 then ['Zombie', 'CottonCandyPink', 'CottonCandyBlue']
         # Uncommon: 30% (of 30%)
-        else if rarity < .09 then ['Red', 'Shade', 'Skeleton']
+        else if rarity < .18 then ['Red', 'Shade', 'Skeleton']
         # Common: 40% (of 30%)
         else ['Base', 'White', 'Desert']