Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "change to require('./index.js') as per https://github.com/HabitRPG/habitrpg-shared/commit/002d4f9541ca531955be611f7c0fc2ba813f18ea"

Browse Source 
This reverts commit 6ca82b2443.
This commit is contained in:
Tyler Renelle
2013-06-04 12:51:33 -04:00
parent 6ca82b2443
commit 06a2989d3b
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/algos.coffee
+3 -2
View File
@@ -1,9 +1,10 @@
moment = require('moment')
_ = require('lodash')
{helpers, items} = require('./index.js')
helpers = require('./helpers.coffee')
items = require('./items.coffee')
{pets, hatchingPotions} = items.items
# Very strange bug where `require(./helpers.coffee)` is returning a blank object under certain circumsntances I haven't yet figured out
# Very strange bug where `require(./script/helpers.coffee)` is returning a blank object under certain circumsntances I haven't yet figured out
helpers = require('habitrpg-shared/script/helpers') if _.isEmpty(helpers)
XP = 15
script/helpers.coffee
+6 -5
View File
@@ -1,6 +1,7 @@
moment = require 'moment'
_ = require 'lodash'
{algos, items} = require('./index.js')
algos = require './algos.coffee'
items = require('./items.coffee').items
sod = (timestamp, dayStart=0) ->
#sanity-check reset-time (is it 24h time?)
@@ -313,10 +314,10 @@ module.exports =
userStr: (level) -> str = (level-1) / 2
totalStr: (level, weapon=0) ->
str = (level-1) / 2
totalStr = (str + items.items.weapon[weapon].strength)
totalStr = (str + items.weapon[weapon].strength)
userDef: (level) -> def = (level-1) / 2
totalDef: (level, armor=0, helm=0, shield=0) ->
def = (level-1) / 2
totalDef = (def + items.items.armor[armor].defense + items.items.head[helm].defense + items.items.shield[shield].defense)
itemText: (type, item=0) -> items.items[type][parseInt(item)].text
itemStat: (type, item=0) -> if type is 'weapon' then items.items[type][parseInt(item)].strength else items.items[type][parseInt(item)].defense
totalDef = (def + items.armor[armor].defense + items.head[helm].defense + items.shield[shield].defense)
itemText: (type, item=0) -> items[type][parseInt(item)].text
itemStat: (type, item=0) -> if type is 'weapon' then items[type][parseInt(item)].strength else items[type][parseInt(item)].defense