diff --git a/package-lock.json b/package-lock.json index 17d901240e..672f0ee438 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.146.3", + "version": "4.146.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 76a51ea315..501ddaa5ad 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.146.3", + "version": "4.146.4", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.10.3", diff --git a/test/common/fns/randomDrop.test.js b/test/common/fns/randomDrop.test.js index 74b9e0493c..4752fa0cca 100644 --- a/test/common/fns/randomDrop.test.js +++ b/test/common/fns/randomDrop.test.js @@ -16,6 +16,7 @@ describe('common.fns.randomDrop', () => { user = generateUser(); user._tmp = user._tmp ? user._tmp : {}; user.items.eggs.Wolf = 0; + user.items.food.Meat = 0; task = generateTodo({ userId: user._id }); predictableRandom = sandbox.stub().returns(0.5); }); diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js index c80128fb71..61c7d493d7 100644 --- a/website/common/script/content/gear/sets/special/index.js +++ b/website/common/script/content/gear/sets/special/index.js @@ -5143,7 +5143,7 @@ const weapon = { set: 'summer2020OarfishMageSet', text: t('weaponSpecialSummer2020MageText'), notes: t('weaponSpecialSummer2020MageNotes', { int: 15, per: 7 }), - value: 90, + value: 160, int: 15, per: 7, twoHanded: true, diff --git a/website/common/script/fns/randomDrop.js b/website/common/script/fns/randomDrop.js index 605924dd1d..30d4f16522 100644 --- a/website/common/script/fns/randomDrop.js +++ b/website/common/script/fns/randomDrop.js @@ -82,10 +82,12 @@ export default function randomDrop (user, options, req = {}, analytics) { return; } - if (predictableRandom() < chance) { + const firstFoodDrop = size(user.items.food) < 1; + + if (firstFoodDrop || predictableRandom() < chance) { rarity = predictableRandom(); - if (rarity > 0.6) { // food 40% chance + if (firstFoodDrop || rarity > 0.6) { // food 40% chance drop = cloneDropItem(randomVal(filter(content.food, { canDrop: true, })));