Merge pull request #40 from therufs/fix-rarity

Fix drop ratios
This commit is contained in:
Tyler Renelle 2013-11-14 20:37:02 -08:00
commit ecd7a32974
2 changed files with 9 additions and 9 deletions

View file

@ -8336,7 +8336,7 @@ if(typeof module != 'undefined' && module.exports){
drop.type = 'Egg';
drop.dialog = "You've found a " + drop.text + " Egg! " + drop.notes;
} else {
acceptableDrops = rarity < .05 ? ['Golden'] : rarity < .1 ? ['Zombie', 'CottonCandyPink', 'CottonCandyBlue'] : rarity < .15 ? ['Red', 'Shade', 'Skeleton'] : ['Base', 'White', 'Desert'];
acceptableDrops = rarity < .02 ? ['Golden'] : rarity < .13 ? ['Zombie', 'CottonCandyPink', 'CottonCandyBlue'] : rarity < .29 ? ['Red', 'Shade', 'Skeleton'] : ['Base', 'White', 'Desert'];
drop = helpers.randomVal(_.pick(hatchingPotions, (function(v, k) {
return __indexOf.call(acceptableDrops, k) >= 0;
})));
@ -9970,4 +9970,4 @@ try {
},{"lodash":2}]},{},[7])
;
;

View file

@ -151,13 +151,13 @@ randomDrop = (user, delta, priority, streak = 0, options={}) ->
# Hatching Potion, 30% chance - break down by rarity.
else
acceptableDrops =
# Very Rare: 10% (of 30%)
if rarity < .05 then ['Golden']
# Rare: 20% (of 30%)
else if rarity < .1 then ['Zombie', 'CottonCandyPink', 'CottonCandyBlue']
# Uncommon: 30% (of 30%)
else if rarity < .15 then ['Red', 'Shade', 'Skeleton']
# Common: 40% (of 30%)
# Very Rare: 4% of 50% (4% each)
if rarity < .02 then ['Golden']
# Rare: 22% of 50% (7.33% each)
else if rarity < .13 then ['Zombie', 'CottonCandyPink', 'CottonCandyBlue']
# Uncommon: 32% of 50% (10.66% each)
else if rarity < .29 then ['Red', 'Shade', 'Skeleton']
# Common: 42% of 50% (14% each)
else ['Base', 'White', 'Desert']
# No Rarity (@see https://github.com/HabitRPG/habitrpg/issues/1048, we may want to remove rareness when we add mounts)