sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
Tyler Renelle 2013-03-05 17:04:31 -05:00
commit b0b591dc96
3 changed files with 39 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -5,3 +5,4 @@ node_modules
*.swp
.idea*
config.json
npm-debug.log

2
src/app/scoring.coffee
View file

@ -143,8 +143,10 @@ updateStats = (model, newStats, batch) ->
if newStats.exp >= tnl
silent = true
user.set('stats.exp', newStats.exp)
while newStats.exp >= tnl # keep levelling up
newStats.exp -= tnl
obj.stats.lvl++
tnl = algos.tnl(obj.stats.lvl)
obj.stats.hp = 50
obj.stats.exp = newStats.exp

2
views/app/tasks.html
View file

@ -61,7 +61,7 @@
</div>
<app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
{#if _user.flags.petsEnabled}
{#if equals(_user.flags.petsEnabled,true)}
<div class='tabbable tabs-below'>
<div class="tab-content">