Merge remote-tracking branch 'remotes/upstream/master'

This commit is contained in:
yangit 2013-06-26 09:56:29 +07:00
commit 68e8819c21
3 changed files with 14 additions and 11 deletions

8
index.js Normal file
View file

@ -0,0 +1,8 @@
module.exports.items = require('./script/items.coffee');
module.exports.helpers = require('./script/helpers.coffee');
module.exports.algos = require('./script/algos.coffee');
try {
window;
window.habitrpgShared = exports;
} catch(e) {}

View file

@ -1,12 +1,8 @@
moment = require('moment')
_ = require('lodash')
helpers = require('./helpers.coffee')
items = require('./items.coffee')
{helpers, items} = require('../index')
{pets, hatchingPotions} = items.items
# 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
HP = 2
obj = module.exports = {}

View file

@ -1,7 +1,6 @@
moment = require 'moment'
_ = require 'lodash'
algos = require './algos.coffee'
items = require('./items.coffee').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