sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 15:38:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'sabe/attributes' into develop

Browse source 
Conflicts:
	dist/habitrpg-shared.js
	locales/en/main.json
This commit is contained in:
Cole Gleason 2014-01-30 10:44:49 -06:00
commit 8fdae0b35c
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dist/habitrpg-shared.js vendored
View file

@ -11656,6 +11656,14 @@ var process=require("__browserify_process");(function() {
} }
return typeof cb === "function" ? cb(null, user) : void 0; return typeof cb === "function" ? cb(null, user) : void 0;
}, },
allocateNow: function(req, cb) {
_.times(user.stats.points, user.fns.autoAllocate);
user.stats.points = 0;
if (typeof user.markModified === "function") {
user.markModified('stats');
}
return typeof cb === "function" ? cb(null, user.stats) : void 0;
},
clearCompleted: function(req, cb) { clearCompleted: function(req, cb) {
_.remove(user.todos, function(t) { _.remove(user.todos, function(t) {
var _ref; var _ref;

6
script/index.coffee
View file

@ -467,6 +467,12 @@ api.wrap = (user, main=true) ->
user.achievements.rebirthLevel = lvl user.achievements.rebirthLevel = lvl
cb? null, user cb? null, user
allocateNow: (req, cb) ->
_.times user.stats.points, user.fns.autoAllocate
user.stats.points = 0
user.markModified? 'stats'
cb? null, user.stats
# ------ # ------
# Tasks # Tasks
# ------ # ------