krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 14:17:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Change quest collection to calculate items on the server only

Browse Source
This commit is contained in:
Blade Barringer
2016-06-02 17:36:29 -05:00
parent c04bac44e7
commit 58cd634255
13 changed files with 34 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/script/fns/randomDrop.js
View File

@@ -17,9 +17,7 @@ module.exports = function randomDrop (user, options, req = {}) {
let acceptableDrops;
let chance;
let drop;
let dropK;
let dropMultiplier;
let quest;
let rarity;
let task;
@@ -38,15 +36,8 @@ module.exports = function randomDrop (user, options, req = {}) {
}, 0) || 0));
chance = diminishingReturns(chance, 0.75);
if (user.party.quest.key)
quest = content.quests[user.party.quest.key];
if (quest && quest.collect && predictableRandom(user, user.stats.gp) < chance) {
dropK = randomVal(user, quest.collect, {
key: true,
});
if (!user.party.quest.progress.collect[dropK])
user.party.quest.progress.collect[dropK] = 0;
user.party.quest.progress.collect[dropK]++;
if (predictableRandom(user, user.stats.gp) < chance) {
user.party.quest.progress.collect++;
user.markModified('party.quest.progress');
}

5
test/api/v3/integration/debug/POST-debug_quest-progress.test.js
View File

@@ -44,10 +44,7 @@ describe('POST /debug/quest-progress', () => {
await user.sync();
expect(user.party.quest.progress.collect).to.eql({
tracks: 300,
branches: 300,
});
expect(user.party.quest.progress.collect).to.eql(300);
});
it('returns error when not in production mode', async () => {

2
test/api/v3/integration/quests/POST-groups_groupid_quests_abort.test.js
View File

@@ -102,7 +102,7 @@ describe('POST /groups/:groupId/quests/abort', () => {
progress: {
up: 0,
down: 0,
collect: {},
collect: 0,
},
completed: null,
RSVPNeeded: false,

2
test/api/v3/integration/quests/POST-groups_groupid_quests_cancel.test.js
View File

@@ -114,7 +114,7 @@ describe('POST /groups/:groupId/quests/cancel', () => {
progress: {
up: 0,
down: 0,
collect: {},
collect: 0,
},
completed: null,
RSVPNeeded: false,

2
test/api/v3/integration/quests/POST-groups_groupid_quests_leave.test.js
View File

@@ -113,7 +113,7 @@ describe('POST /groups/:groupId/quests/leave', () => {
progress: {
up: 0,
down: 0,
collect: {},
collect: 0,
},
completed: null,
RSVPNeeded: false,

2
test/api/v3/integration/quests/POST-groups_groupid_quests_reject.test.js
View File

@@ -116,7 +116,7 @@ describe('POST /groups/:groupId/quests/reject', () => {
progress: {
up: 0,
down: 0,
collect: {},
collect: 0,
},
completed: null,
RSVPNeeded: false,

21
test/api/v3/unit/models/group.test.js
View File

@@ -146,7 +146,7 @@ describe('Group Model', () => {
expect(participatingMember.party.quest.key).to.eql('whale');
expect(participatingMember.party.quest.progress.down).to.eql(0);
expect(participatingMember.party.quest.progress.collect).to.eql({});
expect(participatingMember.party.quest.progress.collect).to.eql(0);
expect(participatingMember.party.quest.completed).to.eql(null);
});
@@ -158,12 +158,12 @@ describe('Group Model', () => {
expect(participatingMember.party.quest.key).to.eql('whale');
expect(participatingMember.party.quest.progress.down).to.eql(0);
expect(participatingMember.party.quest.progress.collect).to.eql({});
expect(participatingMember.party.quest.progress.collect).to.eql(0);
expect(participatingMember.party.quest.completed).to.eql(null);
expect(questLeader.party.quest.key).to.eql('whale');
expect(questLeader.party.quest.progress.down).to.eql(0);
expect(questLeader.party.quest.progress.collect).to.eql({});
expect(questLeader.party.quest.progress.collect).to.eql(0);
expect(questLeader.party.quest.completed).to.eql(null);
});
@@ -255,7 +255,6 @@ describe('Group Model', () => {
$set: {
'party.quest.key': 'whale',
'party.quest.progress.down': 0,
'party.quest.progress.collect': {},
'party.quest.completed': null,
},
}
@@ -284,7 +283,7 @@ describe('Group Model', () => {
expect(userQuest.key).to.eql('whale');
expect(userQuest.progress.down).to.eql(0);
expect(userQuest.progress.collect).to.eql({});
expect(userQuest.progress.collect).to.eql(0);
expect(userQuest.completed).to.eql(null);
});
@@ -554,9 +553,7 @@ describe('Group Model', () => {
beforeEach(async () => {
progress = {
collect: {
soapBars: 5,
},
collect: 5,
};
quest = questScrolls.atom1;
@@ -582,7 +579,7 @@ describe('Group Model', () => {
group: party,
});
expect(party.quest.progress.collect.soapBars).to.eq(5)
expect(party.quest.progress.collect.soapBars).to.eq(5);
});
it('sends a chat message about progress', async () => {
@@ -598,7 +595,7 @@ describe('Group Model', () => {
});
it('sends a chat message if no progress is made', async () => {
delete progress.collect.soapBars;
progress.collect = 0;
await Group.processCollectionQuest({
user: participatingMember,
@@ -612,7 +609,7 @@ describe('Group Model', () => {
});
it('sends message about victory', async () => {
progress.collect.soapBars = 500;
progress.collect = 500;
await Group.processCollectionQuest({
user: participatingMember,
@@ -626,7 +623,7 @@ describe('Group Model', () => {
});
it('calls finishQuest when all items are found', async () => {
progress.collect.soapBars = 999;
progress.collect = 999;
sandbox.spy(party, 'finishQuest');
await Group.processCollectionQuest({

14
test/common/fns/randomDrop.test.js
View File

@@ -6,7 +6,6 @@ import {
generateDaily,
generateReward,
} from '../../helpers/common.helper';
import content from '../../../common/script/content/index';
describe('common.fns.randomDrop', () => {
let user;
@@ -22,23 +21,16 @@ describe('common.fns.randomDrop', () => {
};
});
/**
* function signature as follows:
* randomDrop(user, modifiers) {}
* modifiers = { task, delta = null }
**/
it('drops an item for the user.party.quest.progress', () => {
expect(user.party.quest.progress.collect).to.eql({});
expect(user.party.quest.progress.collect).to.eql(0);
user.party.quest.key = 'vice2';
let collectWhat = Object.keys(content.quests[user.party.quest.key].collect)[0]; // lightCrystal
predictableRandom = () => {
return 0.0001;
};
randomDrop(user, { task, predictableRandom });
expect(user.party.quest.progress.collect[collectWhat]).to.eql(1);
expect(user.party.quest.progress.collect).to.eql(1);
randomDrop(user, { task, predictableRandom });
expect(user.party.quest.progress.collect[collectWhat]).to.eql(2);
expect(user.party.quest.progress.collect).to.eql(2);
});
context('drops enabled', () => {

2
test/server_side/controllers/groups.test.js
View File

@@ -380,7 +380,7 @@ describe('Groups Controller', function() {
expect(user.party.quest.progress).to.eql({
up: 0,
down: 0,
collect: {}
collect: 0,
});
});

6
website/server/controllers/api-v3/debug.js
View File

@@ -171,11 +171,7 @@ api.questProgress = {
}
if (quest.collect) {
let collect = user.party.quest.progress.collect;
_.each(quest.collect, (details, item) => {
collect[item] = collect[item] || 0;
collect[item] += 300;
});
user.party.quest.progress.collect += 300;
}
user.markModified('party.quest.progress');

3
website/server/libs/api-v3/cron.js
View File

@@ -277,8 +277,7 @@ export function cron (options = {}) {
// After all is said and done, progress up user's effect on quest, return those values & reset the user's
let progress = user.party.quest.progress;
let _progress = _.cloneDeep(progress);
_.merge(progress, {down: 0, up: 0});
progress.collect = _.transform(progress.collect, (m, v, k) => m[k] = 0);
_.merge(progress, {down: 0, up: 0, collect: 0});
// TODO: Clean PMs - keep 200 for subscribers and 50 for free users. Should also be done while resting in the inn
// let numberOfPMs = Object.keys(user.inbox.messages).length;

17
website/server/models/group.js
View File

@@ -117,7 +117,7 @@ function _cleanQuestProgress (merge) {
progress: {
up: 0,
down: 0,
collect: {},
collect: 0,
},
completed: null,
RSVPNeeded: false,
@@ -365,7 +365,6 @@ schema.methods.startQuest = async function startQuest (user) {
if (userIsParticipating) {
user.party.quest.key = this.quest.key;
user.party.quest.progress.down = 0;
user.party.quest.progress.collect = collected;
user.party.quest.completed = null;
user.markModified('party.quest');
}
@@ -389,7 +388,6 @@ schema.methods.startQuest = async function startQuest (user) {
$set: {
'party.quest.key': this.quest.key,
'party.quest.progress.down': 0,
'party.quest.progress.collect': collected,
'party.quest.completed': null,
},
}, { multi: true }).exec();
@@ -499,11 +497,18 @@ async function processCollectionQuest (options) {
group,
} = options;
_.each(progress.collect, (v, k) => {
group.quest.progress.collect[k] += v;
let itemsFound = {};
_.times(progress.collect, () => {
let item = shared.fns.randomVal(user, quest.collect, {key: true});
if (!itemsFound[item]) {
itemsFound[item] = 0;
}
itemsFound[item]++;
group.quest.progress.collect[item]++;
});
let foundText = _.reduce(progress.collect, (m, v, k) => {
let foundText = _.reduce(itemsFound, (m, v, k) => {
m.push(`${v} ${quest.collect[k].text('en')}`);
return m;
}, []);

4
website/server/models/user.js
View File

@@ -376,9 +376,7 @@ export let schema = new Schema({
progress: {
up: {type: Number, default: 0},
down: {type: Number, default: 0},
collect: {type: Schema.Types.Mixed, default: () => {
return {};
}}, // {feather:1, ingot:2}
collect: {type: Number, default: 0},
},
completed: String, // When quest is done, we move it from key => completed, and it's a one-time flag (for modal) that they unset by clicking "ok" in browser
RSVPNeeded: {type: Boolean, default: false}, // Set to true when invite is pending, set to false when quest invite is accepted or rejected, quest starts, or quest is cancelled