sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-19 12:18:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2020-06-22 14:20:43 -05:00
commit 3b7af150cd
5 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.146.3",
"version": "4.146.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View file

@ -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",

1
test/common/fns/randomDrop.test.js
View file

@ -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);
});

2
website/common/script/content/gear/sets/special/index.js
View file

@ -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,

6
website/common/script/fns/randomDrop.js
View file

@ -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,
})));