krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-10-27 03:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7370 from Alys/v3-7246-unchecking-daily-mana

Browse Source 
remove XP, GP when unticking a Daily with a completed checklist
This commit is contained in:
Blade Barringer
2016-05-19 22:17:27 -05:00
parent b9d55e3562 af37b30363
commit 283c2a0823
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/script/ops/scoreTask.js
View File

@@ -207,7 +207,7 @@ module.exports = function scoreTask (options = {}, req = {}) {
if (!user.stats.buffs.streaks) task.streak = 0;
} else {
delta += _changeTaskValue(user, task, direction, times, cron);
if (direction === 'down') delta = _calculateDelta(task, direction, delta); // recalculate delta for unchecking so the gp and exp come out correctly
if (direction === 'down') delta = _calculateDelta(task, direction, cron); // recalculate delta for unchecking so the gp and exp come out correctly
_addPoints(user, task, stats, direction, delta); // obviously for delta>0, but also a trick to undo accidental checkboxes
_gainMP(user, _.max([1, 0.01 * user._statsComputed.maxMP]) * (direction === 'down' ? -1 : 1));
@@ -236,7 +236,7 @@ module.exports = function scoreTask (options = {}, req = {}) {
}
delta += _changeTaskValue(user, task, direction, times, cron);
if (direction === 'down') delta = _calculateDelta(task, direction, delta); // recalculate delta for unchecking so the gp and exp come out correctly
if (direction === 'down') delta = _calculateDelta(task, direction, cron); // recalculate delta for unchecking so the gp and exp come out correctly
_addPoints(user, task, stats, direction, delta);
// MP++ per checklist item in ToDo, bonus per CLI