mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-04 09:39:23 +00:00
hp now docking on cron
This commit is contained in:
parent
1d8d25f6e1
commit
b9e479e589
3 changed files with 16 additions and 13 deletions
|
|
@ -26,7 +26,8 @@ get '/', (page, model, next) ->
|
||||||
#if req.headers['x-forwarded-proto']!='https' and process.env.NODE_ENV=='production'
|
#if req.headers['x-forwarded-proto']!='https' and process.env.NODE_ENV=='production'
|
||||||
# return page.redirect 'https://' + req.headers.host + req.url
|
# return page.redirect 'https://' + req.headers.host + req.url
|
||||||
|
|
||||||
model.subscribe "users.#{model.session.userId}", (err, user) ->
|
userPath = "users.#{model.session.userId}"
|
||||||
|
model.subscribe userPath, (err, user) ->
|
||||||
userObj = user.get()
|
userObj = user.get()
|
||||||
return page.redirect '/500.html' unless userObj? #this should never happen, but it is. Looking into it
|
return page.redirect '/500.html' unless userObj? #this should never happen, but it is. Looking into it
|
||||||
|
|
||||||
|
|
@ -59,7 +60,8 @@ get '/', (page, model, next) ->
|
||||||
scoring.setModel(model)
|
scoring.setModel(model)
|
||||||
scoring.cron(userObj)
|
scoring.cron(userObj)
|
||||||
|
|
||||||
model.set "users.#{userObj.id}", userObj unless _.isEqual(user.get(), userObj)
|
model.set userPath, userObj unless _.isEqual(user.get(), userObj)
|
||||||
|
|
||||||
model.set '_view', _view
|
model.set '_view', _view
|
||||||
|
|
||||||
# Setup Task Lists
|
# Setup Task Lists
|
||||||
|
|
@ -84,6 +86,7 @@ ready (model) ->
|
||||||
browser.setupSortable(model)
|
browser.setupSortable(model)
|
||||||
browser.setupTooltips(model)
|
browser.setupTooltips(model)
|
||||||
browser.setupTour(model)
|
browser.setupTour(model)
|
||||||
|
browser.setupGrowlNotifications(model) unless model.get('_view.mobileDevice')
|
||||||
|
|
||||||
# Setup model in scoring functions
|
# Setup model in scoring functions
|
||||||
scoring.setModel(model)
|
scoring.setModel(model)
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ updateStats = (newStats, update) ->
|
||||||
userSet 'stats.hp', 0, update
|
userSet 'stats.hp', 0, update
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
userSet 'stats.hp', newStats.hp
|
userSet 'stats.hp', newStats.hp, update
|
||||||
|
|
||||||
if newStats.exp?
|
if newStats.exp?
|
||||||
# level up & carry-over exp
|
# level up & carry-over exp
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ casper.then ->
|
||||||
@reload()
|
@reload()
|
||||||
|
|
||||||
@then ->
|
@then ->
|
||||||
@wait 2000, ->
|
# @wait 1000, ->
|
||||||
user = getUser()
|
user = getUser()
|
||||||
tasksAfter = @evaluate ->
|
tasksAfter = @evaluate ->
|
||||||
model = window.DERBY.app.model
|
model = window.DERBY.app.model
|
||||||
|
|
@ -86,7 +86,7 @@ casper.then ->
|
||||||
@test.assert tasksBefore.count == tasksAfter.count, "[√] We didn't lose anything"
|
@test.assert tasksBefore.count == tasksAfter.count, "[√] We didn't lose anything"
|
||||||
utils.dump {before:tasksBefore.todos[4], after:tasksAfter.todos[4]}
|
utils.dump {before:tasksBefore.todos[4], after:tasksAfter.todos[4]}
|
||||||
@test.assert tasksBefore.todos[4].value < tasksAfter.todos[4].value, "Todo gained value on cron"
|
@test.assert tasksBefore.todos[4].value < tasksAfter.todos[4].value, "Todo gained value on cron"
|
||||||
@test.assert user.stats.hp < 50, 'User lost HP on cron'
|
@test.assertEqual user.stats.hp, 13, 'User lost HP on cron'
|
||||||
|
|
||||||
|
|
||||||
# ---------- Misc Pages ------------
|
# ---------- Misc Pages ------------
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue