diff --git a/index.js b/index.js index 0a04c43cfa..da0734d50c 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,6 @@ module.exports.items = require('./script/items.coffee'); -module.exports.algos = require('./script/algos.coffee'); module.exports.helpers = require('./script/helpers.coffee'); +module.exports.algos = require('./script/algos.coffee'); try { window; diff --git a/script/helpers.coffee b/script/helpers.coffee index 9091b26e4e..b94a3fa0d6 100644 --- a/script/helpers.coffee +++ b/script/helpers.coffee @@ -1,7 +1,6 @@ moment = require 'moment' _ = require 'lodash' -{algos, items} = require '../index' -{items} = items +{items} = require '../index' sod = (timestamp, dayStart=0) -> #sanity-check reset-time (is it 24h time?) @@ -314,10 +313,10 @@ module.exports = userStr: (level) -> str = (level-1) / 2 totalStr: (level, weapon=0) -> str = (level-1) / 2 - totalStr = (str + items.weapon[weapon].strength) + totalStr = (str + items.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.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 \ No newline at end of file + 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 \ No newline at end of file