mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-07-13 15:38:59 +00:00
Merge pull request #123 from HabitRPG/sabe/fix
fix(checklists): Bring MP behavior in sync with XP/Gold
This commit is contained in:
commit
35d0688f4a
2 changed files with 7 additions and 3 deletions
8
dist/habitrpg-shared.js
vendored
8
dist/habitrpg-shared.js
vendored
|
|
@ -12264,7 +12264,7 @@ var process=require("__browserify_process");(function() {
|
|||
return typeof cb === "function" ? cb(null, _.pick(user, $w('stats'))) : void 0;
|
||||
},
|
||||
score: function(req, cb) {
|
||||
var addPoints, calculateDelta, delta, direction, id, mpDelta, multiplier, num, options, stats, subtractPoints, task, th, _ref, _ref1, _ref2, _ref3;
|
||||
var addPoints, calculateDelta, delta, direction, id, mpDelta, multiplier, num, options, stats, subtractPoints, task, th, _ref, _ref1, _ref2;
|
||||
|
||||
_ref = req.params, id = _ref.id, direction = _ref.direction;
|
||||
task = user.tasks[id];
|
||||
|
|
@ -12402,7 +12402,11 @@ var process=require("__browserify_process");(function() {
|
|||
task.dateCompleted = direction === 'up' ? new Date : void 0;
|
||||
calculateDelta();
|
||||
addPoints();
|
||||
multiplier = ((_ref3 = task.checklist) != null ? _ref3.length : void 0) || 1;
|
||||
multiplier = _.max([
|
||||
_.reduce(task.checklist, (function(m, i) {
|
||||
return m + (i.completed ? 1 : 0);
|
||||
}), 1), 1
|
||||
]);
|
||||
mpDelta = _.max([multiplier, .01 * user._statsComputed.maxMP * multiplier]);
|
||||
if (direction === 'down') {
|
||||
mpDelta *= -1;
|
||||
|
|
|
|||
|
|
@ -861,7 +861,7 @@ api.wrap = (user, main=true) ->
|
|||
calculateDelta()
|
||||
addPoints() # obviously for delta>0, but also a trick to undo accidental checkboxes
|
||||
# MP++ per checklist item in ToDo, bonus per CLI
|
||||
multiplier = task.checklist?.length || 1
|
||||
multiplier = _.max([(_.reduce(task.checklist,((m,i)->m+(if i.completed then 1 else 0)),1)),1])
|
||||
mpDelta = _.max([(multiplier), (.01 * user._statsComputed.maxMP * multiplier)])
|
||||
mpDelta *= -1 if direction is 'down' # unticking a todo
|
||||
user.stats.mp += mpDelta
|
||||
|
|
|
|||
Loading…
Reference in a new issue