mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-07-22 03:34:14 +00:00
fixed the empty helpers issue. it was circular dependencies - algos
dep'd helpers, helpers dep'd algos. Since one came first, it didn't have the other - so it was an empty object. maybe this top-level index.js combinging ./script/* files isn't such a good idea, because I think manual requires from within a file will resolve circular dependencies @yangit
This commit is contained in:
parent
6998fb70f3
commit
6bf0305ea4
2 changed files with 6 additions and 7 deletions
2
index.js
2
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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
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
|
||||
Loading…
Reference in a new issue