sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:lefnire/habitrpg

Browse source
This commit is contained in:
Tyler Renelle 2013-02-21 10:34:24 -05:00
commit 61ec5c19da
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/items.coffee
View file

@ -28,7 +28,7 @@ items = module.exports.items =
]
shield: [
{index: 0, text: "No Shield", classes: 'shield_0', notes:'No Shield.', modifier: 0.00, value:0}
{index: 1, text: "Wooden Shield", classes: 'shield_1', notes:'Decreases HP loss by 2%', modifier: 0.02, value:20}
{index: 1, text: "Wooden Shield", classes: 'shield_1', notes:'Decreases HP loss by 3%', modifier: 0.03, value:20}
{index: 2, text: "Buckler", classes: 'shield_2', notes:'Decreases HP loss by 4%.', modifier: 0.04, value:35}
{index: 3, text: "Enforced Shield", classes: 'shield_3', notes:'Decreases HP loss by 5%.', modifier: 0.05, value:55}
{index: 4, text: "Red Shield", classes: 'shield_4', notes:'Decreases HP loss by 7%.', modifier: 0.07, value:70}

6
src/app/tasks.coffee
View file

@ -43,8 +43,8 @@ module.exports.app = (appExports, model) ->
list = model.at "_#{type}List"
newModel = model.at('_new' + type.charAt(0).toUpperCase() + type.slice(1))
text = newModel.get()
# Don't add a blank task
if /^(\s)*$/.test(text)
# Don't add a blank task; 20/02/13 Added a check for undefined value, more at issue #463 -lancemanfv
if /^(\s)*$/.test(text) || text == undefined
console.error "Task text entered was an empty string."
return
@ -171,4 +171,4 @@ module.exports.app = (appExports, model) ->
direction = 'up' if direction == 'true/'
direction = 'down' if direction == 'false/'
task = model.at $(el).parents('li')[0]
scoring.score(task.get('id'), direction)
scoring.score(task.get('id'), direction)