diff --git a/src/server/components/aggro.js b/src/server/components/aggro.js index f8108292..a97fc674 100644 --- a/src/server/components/aggro.js +++ b/src/server/components/aggro.js @@ -59,11 +59,11 @@ module.exports = { // this only counts for mobs, players can have multiple attackers let list = this.list; if (obj.isMob) { - var lLen = list.length; - for (var i = 0; i < lLen; i++) { + let lLen = list.length; + for (let i = 0; i < lLen; i++) { let l = list[i]; - var lThreat = l.obj.aggro.getHighest(); + let lThreat = l.obj.aggro.getHighest(); if (lThreat) { l.obj.aggro.list.forEach(function (a) { a.obj.aggro.unIgnore(lThreat); @@ -75,8 +75,8 @@ module.exports = { return; } } else { - var lLen = list.length; - for (var i = 0; i < lLen; i++) { + let lLen = list.length; + for (let i = 0; i < lLen; i++) { let targetAggro = list[i].obj.aggro; //Maybe the aggro component has been removed? if (targetAggro) @@ -96,7 +96,7 @@ module.exports = { return; let iLen = inRange.length; - for (var i = 0; i < iLen; i++) { + for (let i = 0; i < iLen; i++) { let enemy = inRange[i]; //The length could change @@ -300,7 +300,7 @@ module.exports = { for (let i = 0; i < lLen; i++) { let l = list[i]; - var obj = l.obj; + let obj = l.obj; if (this.ignoreList.some(o => o == obj)) continue; diff --git a/src/server/components/auth.js b/src/server/components/auth.js index 715e338e..f2808b6e 100644 --- a/src/server/components/auth.js +++ b/src/server/components/auth.js @@ -182,7 +182,7 @@ module.exports = { let characters = JSON.parse(result || '[]'); this.characterList = characters; - var result = characters + let result = characters .map(c => ({ name: c.name ? c.name : c, level: leaderboard.getLevel(c.name ? c.name : c) @@ -592,7 +592,7 @@ module.exports = { leaderboard.deleteCharacter(msg.data.name); }, onRemoveFromList: function (msg, result) { - var result = this.characterList + let result = this.characterList .map(c => ({ name: c.name ? c.name : c, level: leaderboard.getLevel(c.name ? c.name : c) diff --git a/src/server/components/dialogue.js b/src/server/components/dialogue.js index df1cced7..547ed24b 100644 --- a/src/server/components/dialogue.js +++ b/src/server/components/dialogue.js @@ -93,7 +93,7 @@ module.exports = { let cpn = sourceObj[stateConfig.cpn]; let newArgs = extend(true, [], stateConfig.args); newArgs.push(this.obj); - var result = cpn[stateConfig.method].apply(cpn, newArgs); + let result = cpn[stateConfig.method].apply(cpn, newArgs); if (stateConfig.goto) { if (result) @@ -116,7 +116,7 @@ module.exports = { return; } - var result = { + let result = { id: this.obj.id, msg: null, from: this.obj.name, diff --git a/src/server/components/effects.js b/src/server/components/effects.js index 94b3692b..42c5c532 100644 --- a/src/server/components/effects.js +++ b/src/server/components/effects.js @@ -134,7 +134,7 @@ module.exports = { if (exists) { exists.ttl += options.ttl; - for (var p in options) { + for (let p in options) { if (p == 'ttl') continue; @@ -158,7 +158,7 @@ module.exports = { } let builtEffect = extend(true, {}, typeTemplate); - for (var p in options) + for (let p in options) builtEffect[p] = options[p]; builtEffect.obj = this.obj; diff --git a/src/server/components/equipment.js b/src/server/components/equipment.js index f77c9839..9940ad60 100644 --- a/src/server/components/equipment.js +++ b/src/server/components/equipment.js @@ -64,15 +64,15 @@ module.exports = { if (!slot) slot = item.equipSlot || item.slot; if (slot == 'twoHanded') { - var currentEqId = this.eq.offHand; + let currentEqId = this.eq.offHand; if (currentEqId != null) this.unequip(currentEqId); slot = 'oneHanded'; } else if (slot == 'offHand') { - var currentEqId = this.eq.oneHanded; + let currentEqId = this.eq.oneHanded; if (currentEqId != null) { - var currentEq = this.obj.inventory.findItem(currentEqId); + let currentEq = this.obj.inventory.findItem(currentEqId); if ((currentEq != null) && (currentEq.slot == 'twoHanded')) this.unequip(currentEqId); } @@ -112,8 +112,8 @@ module.exports = { } let spellId = null; - var currentEqId = this.eq[slot]; - var currentEq = this.obj.inventory.findItem(currentEqId); + let currentEqId = this.eq[slot]; + let currentEq = this.obj.inventory.findItem(currentEqId); if (currentEq == item) return; if (currentEqId != null) { diff --git a/src/server/components/extensions/factionVendor.js b/src/server/components/extensions/factionVendor.js index 56f418b2..4aec8085 100644 --- a/src/server/components/extensions/factionVendor.js +++ b/src/server/components/extensions/factionVendor.js @@ -100,12 +100,12 @@ module.exports = { let statGenerator = faction.uniqueStat; let itemCount = blueprint.items.min + ~~(Math.random() * (blueprint.items.max - blueprint.items.min)); - for (var i = 0; i < itemCount; i++) { + for (let i = 0; i < itemCount; i++) { let minLevel = blueprint.items.minLevel || Math.max(1, list.level * 0.75); let maxLevel = blueprint.items.maxLevel || (list.level * 1.25); let level = ~~(minLevel + (Math.random() * (maxLevel - minLevel))); - var item = generator.generate({ + let item = generator.generate({ noSpell: true, magicFind: 150, slot: blueprint.items.slot, @@ -115,7 +115,7 @@ module.exports = { let randomQuality = ~~(Math.random() * 5); item.worth = Math.pow(item.level, 1.5) + (Math.pow((randomQuality + 1), 2) * 10); - var id = 0; + let id = 0; list.items.forEach(function (checkItem) { if (checkItem.id >= id) id = checkItem.id + 1; @@ -135,7 +135,7 @@ module.exports = { let baseItems = this.baseItems; let bLen = baseItems.length; - for (var i = 0; i < bLen; i++) + for (let i = 0; i < bLen; i++) list.items.push(baseItems[i]); let extra = blueprint.items.extra; @@ -143,10 +143,10 @@ module.exports = { return; let eLen = extra.length; - for (var i = 0; i < eLen; i++) { + for (let i = 0; i < eLen; i++) { let e = extra[i]; - var item = extend(true, {}, e); + let item = extend(true, {}, e); if (item.type == 'skin') { let skinBlueprint = skins.getBlueprint(item.id); @@ -166,7 +166,7 @@ module.exports = { item = generated; } - var id = 0; + let id = 0; list.items.forEach(function (checkItem) { if (checkItem.id >= id) id = checkItem.id + 1; diff --git a/src/server/components/extensions/socialCommands.js b/src/server/components/extensions/socialCommands.js index d456d2e9..ac1e5bab 100644 --- a/src/server/components/extensions/socialCommands.js +++ b/src/server/components/extensions/socialCommands.js @@ -136,7 +136,7 @@ module.exports = { let obj = this.obj; - var channels = obj.auth.customChannels; + let channels = obj.auth.customChannels; if (!channels.some(c => (c == value))) { obj.socket.emit('events', { onGetMessages: [{ @@ -151,7 +151,7 @@ module.exports = { return; } - var channels = obj.auth.customChannels; + let channels = obj.auth.customChannels; channels.spliceWhere(c => (c == value)); let charname = obj.auth.charname; diff --git a/src/server/components/follower.js b/src/server/components/follower.js index 6864e7c9..951013ef 100644 --- a/src/server/components/follower.js +++ b/src/server/components/follower.js @@ -107,14 +107,14 @@ module.exports = { let maxDistance = this.maxDistance; let distance = Math.max(Math.abs(obj.x - master.x), Math.abs(obj.y - master.y)); - var doMove = (distance >= maxDistance); + let doMove = (distance >= maxDistance); //When we're too far, just teleport if ((!attacker) && (distance >= maxDistance * 2)) { this.teleport(); return; } - var doMove = false; + let doMove = false; //If we're not too far from the master but the master is not in combat, move anyway if (!attacker) { let lastMasterPos = this.lastMasterPos; diff --git a/src/server/components/gatherer.js b/src/server/components/gatherer.js index 79190d03..1b9c9dff 100644 --- a/src/server/components/gatherer.js +++ b/src/server/components/gatherer.js @@ -107,7 +107,7 @@ module.exports = { this.obj.syncer.set(false, 'gatherer', 'progress', 100); if (isFish) { - var rod = this.obj.equipment.eq.tool; + let rod = this.obj.equipment.eq.tool; rod = this.obj.inventory.findItem(rod); let catchChance = 40 + this.obj.stats.values.catchChance; @@ -156,7 +156,7 @@ module.exports = { } if (isFish) { - var rod = this.obj.equipment.eq.tool; + let rod = this.obj.equipment.eq.tool; rod = this.obj.inventory.findItem(rod); let itemChance = 1 + this.obj.stats.values.fishItems; if (~~(Math.random() * 100) < itemChance) { diff --git a/src/server/components/inventory.js b/src/server/components/inventory.js index cd72a15b..bac0d9ef 100644 --- a/src/server/components/inventory.js +++ b/src/server/components/inventory.js @@ -29,8 +29,8 @@ module.exports = { return (aId - bId); }); - for (var i = 0; i < iLen; i++) { - var item = items[i]; + for (let i = 0; i < iLen; i++) { + let item = items[i]; if ((item.pos >= this.inventorySize) || (item.eq)) delete item.pos; @@ -40,8 +40,8 @@ module.exports = { this.hookItemEvents(items); - for (var i = 0; i < iLen; i++) { - var item = items[i]; + for (let i = 0; i < iLen; i++) { + let item = items[i]; let pos = item.pos; let newItem = this.getItem(item, true, true); @@ -195,7 +195,7 @@ module.exports = { runeSlot = 0; else if (runeSlot == null) { runeSlot = 4; - for (var i = 1; i <= 4; i++) { + for (let i = 1; i <= 4; i++) { if (!this.items.some(j => (j.runeSlot == i))) { runeSlot = i; break; @@ -471,10 +471,10 @@ module.exports = { //Helpers hookItemEvents: function (items) { - var items = items || this.items; + let items = items || this.items; let iLen = items.length; for (let i = 0; i < iLen; i++) { - var item = items[i]; + let item = items[i]; if (item.effects) { item.effects.forEach(function (e) { @@ -497,8 +497,8 @@ module.exports = { } if ((item.pos == null) && (!item.eq)) { - var pos = i; - for (var j = 0; j < iLen; j++) { + let pos = i; + for (let j = 0; j < iLen; j++) { if (!items.some(fj => (fj.pos == j))) { pos = j; break; @@ -506,8 +506,8 @@ module.exports = { } item.pos = pos; } else if ((!item.eq) && (items.some(ii => ((ii != item) && (ii.pos == item.pos))))) { - var pos = item.pos; - for (var j = 0; j < iLen; j++) { + let pos = item.pos; + for (let j = 0; j < iLen; j++) { if (!items.some(fi => ((fi != item) && (fi.pos == j)))) { pos = j; break; @@ -524,7 +524,7 @@ module.exports = { return; let iSize = this.inventorySize; - for (var i = 0; i < iSize; i++) { + for (let i = 0; i < iSize; i++) { if (!this.items.some(j => (j.pos == i))) { item.pos = i; break; @@ -703,7 +703,7 @@ module.exports = { return false; } - for (var i = 0; i < iLen; i++) { + for (let i = 0; i < iLen; i++) { let fItem = items[i]; if (fItem.id >= id) id = fItem.id + 1; @@ -715,7 +715,7 @@ module.exports = { if ((item.pos == null) && (!item.eq)) { let pos = iLen; - for (var i = 0; i < iLen; i++) { + for (let i = 0; i < iLen; i++) { if (!items.some(fi => (fi.pos == i))) { pos = i; break; @@ -756,7 +756,7 @@ module.exports = { if (item.stats) { let stats = Object.keys(item.stats); let sLen = stats.length; - for (var i = 0; i < sLen; i++) { + for (let i = 0; i < sLen; i++) { let s = stats[i]; let val = item.stats[s]; if (s == 'maxHp') { @@ -860,7 +860,7 @@ module.exports = { let items = this.items; let iLen = items.length; - for (var i = 0; i < iLen; i++) { + for (let i = 0; i < iLen; i++) { delete items[i].eq; delete items[i].pos; } @@ -878,7 +878,7 @@ module.exports = { playerObject.fireEvent('beforeGenerateLoot', dropEvent); if ((!blueprint.noRandom) || (blueprint.alsoRandom)) { - var magicFind = (blueprint.magicFind || 0); + let magicFind = (blueprint.magicFind || 0); let bonusMagicFind = killSource.stats.values.magicFind; let rolls = blueprint.rolls; @@ -887,7 +887,7 @@ module.exports = { if ((Math.random() * 100) < (itemQuantity % 100)) rolls++; - for (var i = 0; i < rolls; i++) { + for (let i = 0; i < rolls; i++) { if (Math.random() * 100 >= (blueprint.chance || 35) * dropEvent.chanceMultiplier) continue; @@ -906,7 +906,7 @@ module.exports = { if (blueprint.noRandom) { let blueprints = blueprint.blueprints; - for (var i = 0; i < blueprints.length; i++) { + for (let i = 0; i < blueprints.length; i++) { let drop = blueprints[i]; if ((blueprint.chance) && (~~(Math.random() * 100) >= blueprint.chance * dropEvent.chanceMultiplier)) continue; diff --git a/src/server/components/notice.js b/src/server/components/notice.js index f454dc4c..08371911 100644 --- a/src/server/components/notice.js +++ b/src/server/components/notice.js @@ -31,7 +31,7 @@ module.exports = { if (action.targetId) { let target = this.obj.instance.objects.find(o => o.id == action.targetId); if (target) { - var cpn = target[action.cpn]; + let cpn = target[action.cpn]; if ((cpn) && (cpn[action.method])) cpn[action.method].call(cpn, obj, action.args); } @@ -39,7 +39,7 @@ module.exports = { return; } - var cpn = obj[action.cpn]; + let cpn = obj[action.cpn]; if ((cpn) && (cpn[action.method])) cpn[action.method].apply(cpn, action.args); }, diff --git a/src/server/components/player.js b/src/server/components/player.js index 3778edb9..d5f39ca9 100644 --- a/src/server/components/player.js +++ b/src/server/components/player.js @@ -50,14 +50,14 @@ module.exports = { if (!blueprintStats.values.hp) blueprintStats.values.hp = blueprintStats.values.hpMax; let stats = obj.addComponent('stats'); - for (var s in blueprintStats.values) + for (let s in blueprintStats.values) stats.values[s] = blueprintStats.values[s]; - for (var s in blueprintStats.stats) + for (let s in blueprintStats.stats) stats.stats[s] = blueprintStats.stats[s]; let gainStats = classes.stats[character.class].gainStats; - for (var s in gainStats) + for (let s in gainStats) stats.values[s] += (gainStats[s] * stats.values.level); obj.portrait = classes.portraits[character.class]; diff --git a/src/server/components/prophecies.js b/src/server/components/prophecies.js index 84437484..0e56de4c 100644 --- a/src/server/components/prophecies.js +++ b/src/server/components/prophecies.js @@ -5,9 +5,9 @@ module.exports = { init: function (blueprint) { (blueprint.list || []).forEach(function (p) { - var template = null; + let template = null; try { - var template = require('config/prophecies/' + p); + let template = require('config/prophecies/' + p); } catch (e) { console.log(e); } @@ -17,7 +17,7 @@ module.exports = { else if (this.list.some(l => (l.type == p))) return; - var p = extend(true, {}, template); + let p = extend(true, {}, template); p.obj = this.obj; p.init(); diff --git a/src/server/components/spellbook.js b/src/server/components/spellbook.js index 380ed8eb..0869e48a 100644 --- a/src/server/components/spellbook.js +++ b/src/server/components/spellbook.js @@ -328,10 +328,10 @@ module.exports = { } } else if (spell.range != null) { //Distance Check - var fromX = this.obj.x; - var fromY = this.obj.y; - var toX = action.target.x; - var toY = action.target.y; + let fromX = this.obj.x; + let fromY = this.obj.y; + let toX = action.target.x; + let toY = action.target.y; let distance = Math.max(Math.abs(toX - fromX), Math.abs(toY - fromY)); let range = spell.range; if ((spell.useWeaponRange) && (this.obj.player)) { @@ -448,7 +448,7 @@ module.exports = { let auto = this.auto; let aLen = auto.length; - for (var i = 0; i < aLen; i++) { + for (let i = 0; i < aLen; i++) { let a = auto[i]; if ((!a.target) || (a.target.destroyed)) { auto.splice(i, 1); @@ -464,7 +464,7 @@ module.exports = { let callbacks = this.callbacks; let cLen = callbacks.length; - for (var i = 0; i < cLen; i++) { + for (let i = 0; i < cLen; i++) { let c = callbacks[i]; //If a spellCallback kills a mob he'll unregister his callbacks diff --git a/src/server/components/stats.js b/src/server/components/stats.js index 8329d9cf..d13db315 100644 --- a/src/server/components/stats.js +++ b/src/server/components/stats.js @@ -106,11 +106,11 @@ module.exports = { this.syncer = this.obj.instance.syncer; let values = (blueprint || {}).values || {}; - for (var v in values) + for (let v in values) this.values[v] = values[v]; let stats = (blueprint || {}).stats || {}; - for (var v in stats) + for (let v in stats) this.stats[v] = stats[v]; this.calcXpMax(); @@ -172,7 +172,7 @@ module.exports = { if (values.mana < manaMax) { values.mana += regenMana; //Show others what mana is? - var onlySelf = true; + let onlySelf = true; if (this.obj.player) onlySelf = false; this.obj.syncer.setObject(onlySelf, 'stats', 'values', 'mana', values.mana); @@ -199,11 +199,11 @@ module.exports = { this.obj.syncer.setObject(false, 'stats', 'values', stat, values[stat]); if (['addCritChance', 'addAttackCritChance', 'addSpellCritChance'].indexOf(stat) > -1) { - var morphStat = stat.substr(3); + let morphStat = stat.substr(3); morphStat = morphStat[0].toLowerCase() + morphStat.substr(1); this.addStat(morphStat, (0.05 * value)); } else if (['addCritMultiplier', 'addAttackCritMultiplier', 'addSpellCritMultiplier'].indexOf(stat) > -1) { - var morphStat = stat.substr(3); + let morphStat = stat.substr(3); morphStat = morphStat[0].toLowerCase() + morphStat.substr(1); this.addStat(morphStat, value); } else if (stat == 'vit') @@ -344,7 +344,7 @@ module.exports = { let hpMax = target.stats.values.hpMax; let aLen = aggroList.length; for (let i = 0; i < aLen; i++) { - var a = aggroList[i]; + let a = aggroList[i]; let dmg = a.damage; if (dmg <= 0) continue; @@ -352,7 +352,7 @@ module.exports = { let mult = 1; //How many party members contributed // Remember, maybe one of the aggro-ees might be a mob too - var party = a.obj.social ? a.obj.social.party : null; + let party = a.obj.social ? a.obj.social.party : null; if (party) { let partySize = aggroList.filter(function (f) { return ((a.damage > 0) && (party.indexOf(f.obj.serverId) > -1)); @@ -382,7 +382,7 @@ module.exports = { }, die: function (source) { - var obj = this.obj; + let obj = this.obj; let values = this.values; this.syncer.queue('onGetDamage', { @@ -393,7 +393,7 @@ module.exports = { obj.syncer.set(true, null, 'dead', true); - var obj = obj; + let obj = obj; let syncO = obj.syncer.o; obj.hidden = true; diff --git a/src/server/components/trade.js b/src/server/components/trade.js index 56d70c17..b2a079f7 100644 --- a/src/server/components/trade.js +++ b/src/server/components/trade.js @@ -65,7 +65,7 @@ module.exports = { level: level }); - var id = 0; + let id = 0; this.items.forEach(function (checkItem) { if (checkItem.id >= id) id = checkItem.id + 1; @@ -141,7 +141,7 @@ module.exports = { let canAfford = false; if (item.worth.currency) { - var currencyItem = this.obj.inventory.items.find(i => (i.name == item.worth.currency)); + let currencyItem = this.obj.inventory.items.find(i => (i.name == item.worth.currency)); canAfford = ((currencyItem) && (currencyItem.quantity >= item.worth.amount)); } else canAfford = this.gold >= ~~(item.worth * markup); @@ -189,7 +189,7 @@ module.exports = { targetTrade.removeItem(msg.itemId, this.obj.name); if (item.worth.currency) { - var currencyItem = this.obj.inventory.items.find(i => (i.name == item.worth.currency)); + let currencyItem = this.obj.inventory.items.find(i => (i.name == item.worth.currency)); this.obj.inventory.destroyItem(currencyItem.id, item.worth.amount, true); } else { targetTrade.gold += ~~(item.worth * markup); diff --git a/src/server/config/eventPhases/phaseEventChain.js b/src/server/config/eventPhases/phaseEventChain.js index 825de7b9..648885d0 100644 --- a/src/server/config/eventPhases/phaseEventChain.js +++ b/src/server/config/eventPhases/phaseEventChain.js @@ -69,7 +69,7 @@ module.exports = { mobs = [mobs]; let mLen = mobs.length; - for (var i = 0; i < mLen; i++) { + for (let i = 0; i < mLen; i++) { let mob = objects.find(o => (o.id == mobs[i])); for (let j = 0; j < cLen; j++) { let c = components[j]; @@ -90,7 +90,7 @@ module.exports = { mobs = [mobs]; let mLen = mobs.length; - for (var i = 0; i < mLen; i++) { + for (let i = 0; i < mLen; i++) { let mob = objects.find(o => (o.id == mobs[i])); for (let j = 0; j < cLen; j++) mob.removeComponent(components[j]); diff --git a/src/server/config/eventPhases/phaseModifyDialogue.js b/src/server/config/eventPhases/phaseModifyDialogue.js index 00ed3364..6c317261 100644 --- a/src/server/config/eventPhases/phaseModifyDialogue.js +++ b/src/server/config/eventPhases/phaseModifyDialogue.js @@ -35,7 +35,7 @@ module.exports = { continue; } - for (var o in source) { + for (let o in source) { let targetOptions = target.msg[0].options; if (targetOptions.options) targetOptions.spliceWhere(t => (t == o)); diff --git a/src/server/config/eventPhases/phaseSpawnMob.js b/src/server/config/eventPhases/phaseSpawnMob.js index 46896c75..682f1a5a 100644 --- a/src/server/config/eventPhases/phaseSpawnMob.js +++ b/src/server/config/eventPhases/phaseSpawnMob.js @@ -47,7 +47,7 @@ module.exports = { } if (l.exists) { - var mob = objects.objects.find(o => (o.name == l.name)); + let mob = objects.objects.find(o => (o.name == l.name)); mob.mob.walkDistance = 0; this.spawnAnimation(mob); mob.performMove({ @@ -60,7 +60,7 @@ module.exports = { this.spawnAnimation(mob); this.event.objects.push(mob); } else { - var mob = objects.buildObjects([{ + let mob = objects.buildObjects([{ x: x, y: y, sheetName: l.sheetName || 'mobs', diff --git a/src/server/config/factions/gaekatla.js b/src/server/config/factions/gaekatla.js index e82de2a7..442ff584 100644 --- a/src/server/config/factions/gaekatla.js +++ b/src/server/config/factions/gaekatla.js @@ -57,7 +57,7 @@ module.exports = { return; //Spawn a mob - var mob = mob.instance.spawners.spawn({ + let mob = mob.instance.spawners.spawn({ amountLeft: 1, blueprint: { x: mob.x, diff --git a/src/server/config/loginRewards.js b/src/server/config/loginRewards.js index 6350fb45..33307fa6 100644 --- a/src/server/config/loginRewards.js +++ b/src/server/config/loginRewards.js @@ -50,7 +50,7 @@ module.exports = { let picks = config[p]; while (total > 0) { - var pick = picks[~~(Math.random() * picks.length)]; + let pick = picks[~~(Math.random() * picks.length)]; let amount = 1 + ~~(Math.random() * (total - 1)); total -= amount; diff --git a/src/server/config/roles.js b/src/server/config/roles.js index b2fb13f4..2329de63 100644 --- a/src/server/config/roles.js +++ b/src/server/config/roles.js @@ -62,7 +62,7 @@ module.exports = { getSkins: function (account) { let skins = []; - var account = this.getAccount(account) || { + let account = this.getAccount(account) || { skins: [] }; (account.skins || []).forEach(function (s) { diff --git a/src/server/config/spells/spellSlowBlast.js b/src/server/config/spells/spellSlowBlast.js index f2808612..1084fdb1 100644 --- a/src/server/config/spells/spellSlowBlast.js +++ b/src/server/config/spells/spellSlowBlast.js @@ -39,8 +39,8 @@ module.exports = { let obj = this.obj; - var x = obj.x; - var y = obj.y; + let x = obj.x; + let y = obj.y; let physics = obj.instance.physics; let syncer = obj.instance.syncer; diff --git a/src/server/config/spells/spellTemplate.js b/src/server/config/spells/spellTemplate.js index 59111041..e3fbe7af 100644 --- a/src/server/config/spells/spellTemplate.js +++ b/src/server/config/spells/spellTemplate.js @@ -158,7 +158,7 @@ module.exports = { }, getDamage: function (target, noMitigate) { - var damage = { + let damage = { source: this.obj, target: target, damage: (this.damage || this.healing) * (this.dmgMult || 1), @@ -172,7 +172,7 @@ module.exports = { this.obj.fireEvent('onBeforeCalculateDamage', damage); - var damage = combat.getDamage(damage); + let damage = combat.getDamage(damage); return damage; }, diff --git a/src/server/events/events.js b/src/server/events/events.js index fe2fd039..a615ffe4 100644 --- a/src/server/events/events.js +++ b/src/server/events/events.js @@ -172,8 +172,8 @@ module.exports = { updateEvent: function (event) { let objects = event.objects; - var oLen = objects.length; - for (var i = 0; i < oLen; i++) { + let oLen = objects.length; + for (let i = 0; i < oLen; i++) { if (objects[i].destroyed) { objects.splice(i, 1); i--; @@ -184,8 +184,8 @@ module.exports = { let currentPhases = event.phases; let cLen = currentPhases.length; let stillBusy = false; - for (var i = 0; i < cLen; i++) { - var phase = currentPhases[i]; + for (let i = 0; i < cLen; i++) { + let phase = currentPhases[i]; if (!phase.destroyed) { if ((phase.end) || (phase.endMark <= event.age)) { if ((phase.destroy) && (!phase.destroyed)) @@ -232,12 +232,12 @@ module.exports = { let phases = config.phases; let pLen = phases.length; - for (var i = event.nextPhase; i < pLen; i++) { + for (let i = event.nextPhase; i < pLen; i++) { let p = phases[i]; let phaseFile = 'phase' + p.type[0].toUpperCase() + p.type.substr(1); let typeTemplate = require('../config/eventPhases/' + phaseFile); - var phase = extend(true, { + let phase = extend(true, { instance: this.instance, event: event }, phaseTemplate, typeTemplate, p); @@ -258,8 +258,8 @@ module.exports = { event.done = true; let oList = this.instance.objects.objects; - var oLen = oList.length; - for (var i = 0; i < oLen; i++) { + let oLen = oList.length; + for (let i = 0; i < oLen; i++) { let o = oList[i]; if (!o.player) continue; @@ -283,7 +283,7 @@ module.exports = { if (!event) continue; - var exists = event.participators.find(p => (p.name == obj.name)); + let exists = event.participators.find(p => (p.name == obj.name)); if (exists) { event.participators.spliceWhere(p => (p == exists)); event.participators.push(obj); @@ -296,7 +296,7 @@ module.exports = { event.participators.push(obj); result.push(event); - var rList = [{ + let rList = [{ nameLike: 'Ancient Carp', removeAll: true }]; @@ -322,7 +322,7 @@ module.exports = { event.participators.push(obj); result.push(event); - var rList = [{ + let rList = [{ nameLike: 'Ancient Carp', removeAll: true }]; diff --git a/src/server/items/enchanter.js b/src/server/items/enchanter.js index a5d4ad8c..7cf17b1c 100644 --- a/src/server/items/enchanter.js +++ b/src/server/items/enchanter.js @@ -37,7 +37,7 @@ module.exports = { }); if (msg.action == 'reroll') { - var enchantedStats = item.enchantedStats || {}; + let enchantedStats = item.enchantedStats || {}; delete item.enchantedStats; delete msg.addStatMsgs; @@ -57,7 +57,7 @@ module.exports = { generatorTypes.generate(item, bpt); generatorStats.generate(item, bpt); - for (var p in enchantedStats) { + for (let p in enchantedStats) { if (!item.stats[p]) item.stats[p] = 0; @@ -90,7 +90,7 @@ module.exports = { if (item.originalLevel) item.level = item.originalLevel; - var enchantedStats = item.enchantedStats || {}; + let enchantedStats = item.enchantedStats || {}; delete item.enchantedStats; delete msg.addStatMsgs; @@ -105,7 +105,7 @@ module.exports = { delete item.stats; delete item.spell; - for (var p in enchantedStats) { + for (let p in enchantedStats) { if (!newItem.stats[p]) newItem.stats[p] = 0; @@ -136,7 +136,7 @@ module.exports = { if (!item.power) return; - for (var p in item.enchantedStats) { + for (let p in item.enchantedStats) { let value = item.enchantedStats[p]; if (item.stats[p]) { @@ -195,7 +195,7 @@ module.exports = { else { let powerLevel = item.power || 0; if (powerLevel < 3) - var mult = [5, 10, 20][powerLevel]; + let mult = [5, 10, 20][powerLevel]; else return; diff --git a/src/server/items/generators/quality.js b/src/server/items/generators/quality.js index 3ddba9c9..eb271264 100644 --- a/src/server/items/generators/quality.js +++ b/src/server/items/generators/quality.js @@ -26,7 +26,7 @@ module.exports = { let bonusMagicFind = blueprint.bonusMagicFind || 0; let mLen = magicFind.length; - for (var i = 0; i < mLen; i++) { + for (let i = 0; i < mLen; i++) { qualities[i] = Math.max(0, qualities[i] - magicFind[i]); if (qualities[i] > 0) { if (i == 0) { @@ -43,7 +43,7 @@ module.exports = { let gen = ~~(Math.random() * max); let total = 0; - for (var i = 0; i < qualities.length; i++) { + for (let i = 0; i < qualities.length; i++) { total += qualities[i]; if (gen < total) { diff --git a/src/server/items/generators/stats.js b/src/server/items/generators/stats.js index e77f36e4..eb047dee 100644 --- a/src/server/items/generators/stats.js +++ b/src/server/items/generators/stats.js @@ -479,7 +479,7 @@ module.exports = { //If we enchant something we don't add armor if (!blueprint.statMult) blueprint.statMult = {}; - for (var s in blueprint.statMult) { + for (let s in blueprint.statMult) { if (blueprint.statMult[s] > 0) this.buildStat(item, blueprint, s); } @@ -487,8 +487,8 @@ module.exports = { let statCount = blueprint.statCount || (item.quality + 1); if (blueprint.forceStats) { - for (var i = 0; i < Math.min(statCount, blueprint.forceStats.length); i++) { - var choice = blueprint.forceStats[i]; + for (let i = 0; i < Math.min(statCount, blueprint.forceStats.length); i++) { + let choice = blueprint.forceStats[i]; this.buildStat(item, blueprint, choice, result); statCount--; } @@ -507,18 +507,18 @@ module.exports = { if (blueprint.stats) { let useStats = extend(true, [], blueprint.stats); let addStats = Math.min(statCount, blueprint.stats.length); - for (var i = 0; i < addStats; i++) { - var choice = useStats[~~(Math.random() * useStats.length)]; + for (let i = 0; i < addStats; i++) { + let choice = useStats[~~(Math.random() * useStats.length)]; useStats.spliceFirstWhere(s => s == choice); this.buildStat(item, blueprint, choice, result); statCount--; } } - for (var i = 0; i < statCount; i++) + for (let i = 0; i < statCount; i++) this.buildStat(item, blueprint, null, result); - for (var s in item.stats) { + for (let s in item.stats) { item.stats[s] = Math.ceil(item.stats[s]); if (item.stats[s] == 0) delete item.stats[s]; diff --git a/src/server/leaderboard/leaderboard.js b/src/server/leaderboard/leaderboard.js index 4c91f81b..58952bae 100644 --- a/src/server/leaderboard/leaderboard.js +++ b/src/server/leaderboard/leaderboard.js @@ -24,7 +24,7 @@ module.exports = { let rProphecies = r.prophecies || []; let match = true; - for (var i = 0; i < pLen; i++) { + for (let i = 0; i < pLen; i++) { if (!rProphecies.some(rp => rp == prophecyFilter[i])) { match = false; break; diff --git a/src/server/misc/helpers.js b/src/server/misc/helpers.js index 05cab711..4712c9ff 100644 --- a/src/server/misc/helpers.js +++ b/src/server/misc/helpers.js @@ -6,7 +6,7 @@ Array.prototype.firstIndex = function (callback, thisArg) { let k = 0; while (k < len) { - var kValue; + let kValue; if (k in O) { kValue = O[k]; @@ -28,7 +28,7 @@ Array.prototype.spliceWhere = function (callback, thisArg) { let k = 0; while (k < len) { - var kValue; + let kValue; if (k in O) { kValue = O[k]; @@ -50,7 +50,7 @@ Array.prototype.spliceFirstWhere = function (callback, thisArg) { let k = 0; while (k < len) { - var kValue; + let kValue; if (k in O) { kValue = O[k]; diff --git a/src/server/misc/mail.js b/src/server/misc/mail.js index f311a1cc..b5042b4c 100644 --- a/src/server/misc/mail.js +++ b/src/server/misc/mail.js @@ -50,8 +50,8 @@ module.exports = { result.forEach(function (r) { if (r.removeAll) { - for (var i = 0; i < inventory.items.length; i++) { - var item = inventory.items[i]; + for (let i = 0; i < inventory.items.length; i++) { + let item = inventory.items[i]; if ((r.nameLike) && (item.name.indexOf(r.nameLike) > -1)) { inventory.destroyItem(item.id, item.quantity ? item.quantity : null); i--; @@ -59,8 +59,8 @@ module.exports = { } if (stash) { - for (var i = 0; i < stash.items.length; i++) { - var item = stash.items[i]; + for (let i = 0; i < stash.items.length; i++) { + let item = stash.items[i]; if ((r.nameLike) && (item.name.indexOf(r.nameLike) > -1)) { stash.destroyItem(item.id); i--; diff --git a/src/server/misc/pathfinder.js b/src/server/misc/pathfinder.js index a075e763..2c57f3ac 100644 --- a/src/server/misc/pathfinder.js +++ b/src/server/misc/pathfinder.js @@ -32,7 +32,7 @@ }); } - var astar = { + let astar = { /** * Perform an A* Search on a graph given a start and end node. * @param {Graph} graph @@ -368,7 +368,7 @@ let child1N = child2N - 1; // This is used to store the new position of the element, if any. let swap = null; - var child1Score; + let child1Score; // If the first child exists (is inside the array)... if (child1N < length) { // Look it up and compute its score. diff --git a/src/server/misc/random.js b/src/server/misc/random.js index 01152172..be640cca 100644 --- a/src/server/misc/random.js +++ b/src/server/misc/random.js @@ -5,7 +5,7 @@ let Random = function (a) { }; Random.prototype.init_by_array = function (a, c) { let b, f, e; this.init_genrand(19650218); b = 1; f = 0; for (e = this.N > c ? this.N : c; e; e--) { - var d = this.mt[b - 1] ^ this.mt[b - 1] >>> 30; this.mt[b] = (this.mt[b] ^ (((d & 4294901760) >>> 16) * 1664525 << 16) + (d & 65535) * 1664525) + a[f] + f; this.mt[b] >>>= 0; b++; f++; b >= this.N && (this.mt[0] = this.mt[this.N - 1], b = 1); f >= c && (f = 0); + let d = this.mt[b - 1] ^ this.mt[b - 1] >>> 30; this.mt[b] = (this.mt[b] ^ (((d & 4294901760) >>> 16) * 1664525 << 16) + (d & 65535) * 1664525) + a[f] + f; this.mt[b] >>>= 0; b++; f++; b >= this.N && (this.mt[0] = this.mt[this.N - 1], b = 1); f >= c && (f = 0); } for (e = this.N - 1; e; e--) { d = this.mt[b - 1] ^ this.mt[b - 1] >>> 30, this.mt[b] = (this.mt[b] ^ (((d & 4294901760) >>> 16) * 1566083941 << 16) + (d & 65535) * 1566083941) - b, this.mt[b] >>>= 0, b++, b >= this.N && (this.mt[0] = this.mt[this.N - 1], b = 1); @@ -33,12 +33,12 @@ Random.prototype.genrand_real3 = function () { Random.prototype.gamma = function (a, c) { if (a > 1) { for (let b = Math.sqrt(2 * a - 1), f = a - this.LOG4, e = a + b; ;) { - var d = this.random(); if (!(d < 1.0E-7 || g > 0.9999999)) { - var j = 1 - this.random(), i = Math.log(d / (1 - d)) / b, h = a * Math.exp(i), d = d * d * j, i = f + e * i - h; if (i + this.SG_MAGICCONST - 4.5 * d >= 0 || i >= Math.log(d)) return h * c; + let d = this.random(); if (!(d < 1.0E-7 || g > 0.9999999)) { + let j = 1 - this.random(), i = Math.log(d / (1 - d)) / b, h = a * Math.exp(i), d = d * d * j, i = f + e * i - h; if (i + this.SG_MAGICCONST - 4.5 * d >= 0 || i >= Math.log(d)) return h * c; } } } else if (a == 1) { - for (var g = this.random(); g <= 1.0E-7;)g = this.random(); return -Math.log(g) * c; + for (let g = this.random(); g <= 1.0E-7;)g = this.random(); return -Math.log(g) * c; } else { for (;;) { if (g = this.random(), h = (Math.E + a) / Math.E, g *= h, h = g <= 1 ? Math.pow(g, 1 / a) : -Math.log((h - g) / a), d = this.random(), g > 1) { @@ -48,8 +48,8 @@ Random.prototype.gamma = function (a, c) { } return h * c; } }; Random.prototype.normal = function (a, c) { - var b = this.lastNormal; this.lastNormal = NaN; if (!b) { - var f = this.random() * 2 * Math.PI, e = Math.sqrt(-2 * Math.log(1 - this.random())), b = Math.cos(f) * e; this.lastNormal = Math.sin(f) * e; + let b = this.lastNormal; this.lastNormal = NaN; if (!b) { + let f = this.random() * 2 * Math.PI, e = Math.sqrt(-2 * Math.log(1 - this.random())), b = Math.cos(f) * e; this.lastNormal = Math.sin(f) * e; } return a + b * c; }; Random.prototype.pareto = function (a) { let c = this.random(); return 1 / Math.pow(1 - c, 1 / a); diff --git a/src/server/mods/event-xmas/maps/fjolarok/events/xmas.js b/src/server/mods/event-xmas/maps/fjolarok/events/xmas.js index df352828..081892bd 100644 --- a/src/server/mods/event-xmas/maps/fjolarok/events/xmas.js +++ b/src/server/mods/event-xmas/maps/fjolarok/events/xmas.js @@ -101,7 +101,7 @@ module.exports = { obj.reputation.getReputation('theWinterMan', 100); - var chances = { + let chances = { 'Bottomless Eggnog': 3, 'Sprig of Mistletoe': 50, 'Merrywinter Play Script': 20, @@ -146,13 +146,13 @@ module.exports = { quantity: 1 }]; - var pool = []; + let pool = []; Object.keys(chances).forEach(function (c) { for (let i = 0; i < chances[c]; i++) pool.push(c); }); - var pick = pool[~~(Math.random() * pool.length)]; + let pick = pool[~~(Math.random() * pool.length)]; let blueprint = rewards.find(r => (r.name == pick)); inventory.getItem(extend(true, {}, blueprint)); diff --git a/src/server/objects/objBase.js b/src/server/objects/objBase.js index 830417b9..cd5974ed 100644 --- a/src/server/objects/objBase.js +++ b/src/server/objects/objBase.js @@ -6,7 +6,7 @@ module.exports = { actionQueue: [], addComponent: function (type, blueprint, isTransfer) { - var cpn = this[type]; + let cpn = this[type]; if (!cpn) { let template = components.components[type]; if (!template) { @@ -15,7 +15,7 @@ module.exports = { }, blueprint || {}); } - var cpn = extend(true, {}, template); + let cpn = extend(true, {}, template); cpn.obj = this; this.components.push(cpn); @@ -58,7 +58,7 @@ module.exports = { let components = this.components; let len = components.length; for (let i = 0; i < len; i++) { - var c = components[i]; + let c = components[i]; if (c.destroyed) { this.syncer.setSelfArray(false, 'removeComponents', c.type); @@ -224,13 +224,13 @@ module.exports = { q.isDouble = true; } } - var success = this.performMove(q); + let success = this.performMove(q); if (!success) this.clearQueue(); } else if (q.action == 'clearQueue') this.clearQueue(); else if (q.action == 'spell') { - var success = this.spellbook.cast(q); + let success = this.spellbook.cast(q); if (!success) this.performQueue(); } diff --git a/src/server/objects/objects.js b/src/server/objects/objects.js index 40c3e41b..82877335 100644 --- a/src/server/objects/objects.js +++ b/src/server/objects/objects.js @@ -39,7 +39,7 @@ module.exports = { delete o.components; delete o.id; - for (var p in o) + for (let p in o) obj[p] = o[p]; let cLen = components.length; @@ -48,7 +48,7 @@ module.exports = { let cpn = obj.addComponent(c.type, null, true); - for (var p in c) + for (let p in c) cpn[p] = c[p]; if (cpn.transfer) @@ -63,7 +63,7 @@ module.exports = { for (let i = 0; i < lLen; i++) { let l = list[i]; - var obj = this.build(skipPush, l.clientObj); + let obj = this.build(skipPush, l.clientObj); obj.sheetName = l.sheetName; obj.cell = l.cell; @@ -82,7 +82,7 @@ module.exports = { //Add components (certain ones need to happen first) //TODO: Clean this part up - var properties = extend(true, {}, l.properties); + let properties = extend(true, {}, l.properties); ['cpnMob'].forEach(function (c) { let blueprint = properties[c] || null; if ((blueprint) && (typeof (blueprint) == 'string')) @@ -98,7 +98,7 @@ module.exports = { obj.addComponent(type, blueprint); }, this); - for (var p in properties) { + for (let p in properties) { if (p.indexOf('cpn') == -1) { obj[p] = properties[p]; continue; @@ -114,7 +114,7 @@ module.exports = { } let extraProperties = l.extraProperties || {}; - for (var p in extraProperties) { + for (let p in extraProperties) { let cpn = obj[p]; let e = extraProperties[p]; for (let pp in e) @@ -181,7 +181,7 @@ module.exports = { delete o.components; - for (var p in o) + for (let p in o) newO[p] = o[p]; let len = components.length; @@ -191,7 +191,7 @@ module.exports = { newO.addComponent(c.type, c); let newC = newO[c.type]; - for (var p in c) + for (let p in c) newC[p] = c[p]; } @@ -231,9 +231,9 @@ module.exports = { let to = eventEntry.to; let toLen = to.length; for (let i = 0; i < toLen; i++) { - var toId = to[i]; + let toId = to[i]; - var player = players[toId]; + let player = players[toId]; if (!player) { let findPlayer = objects.find(o => o.id == toId); if (!findPlayer) @@ -255,7 +255,7 @@ module.exports = { } for (let p in players) { - var player = players[p]; + let player = players[p]; player.socket.emit('events', player.events); } }, diff --git a/src/server/server.js b/src/server/server.js index b67478f1..6333ee79 100644 --- a/src/server/server.js +++ b/src/server/server.js @@ -71,7 +71,7 @@ module.exports = { }, requests: { root: function (req, res) { - //var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress; + //let ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress; //if (ip != '::1') // return; diff --git a/src/server/world/atlas.js b/src/server/world/atlas.js index 8de134c9..14ed967f 100644 --- a/src/server/world/atlas.js +++ b/src/server/world/atlas.js @@ -165,7 +165,7 @@ module.exports = { let obj = connections.players.find(p => (p.name == message.playerName)); if (!obj) return; - var thread = this.getThreadFromName(obj.zoneName); + let thread = this.getThreadFromName(obj.zoneName); if (!thread) return; @@ -184,7 +184,7 @@ module.exports = { let serverObj = objects.objects.find(o => o.id == obj.id); serverObj.zoneName = obj.zoneName; - var thread = this.getThreadFromName(obj.zoneName); + let thread = this.getThreadFromName(obj.zoneName); if (!thread) { thread = this.getThreadFromName(serverConfig.defaultZone); diff --git a/src/server/world/instancer.js b/src/server/world/instancer.js index a44633ed..7eadffcf 100644 --- a/src/server/world/instancer.js +++ b/src/server/world/instancer.js @@ -151,14 +151,14 @@ module.exports = { let components = msgObj.components || []; delete msgObj.components; - for (var p in msgObj) + for (let p in msgObj) obj[p] = msgObj[p]; let cLen = components.length; for (let i = 0; i < cLen; i++) { let c = components[i]; let component = obj[c.type]; - for (var p in c) + for (let p in c) component[p] = c[p]; } }, @@ -311,7 +311,7 @@ module.exports = { msg.keepPos = false; } - var spawnPos = map.getSpawnPos(obj); + let spawnPos = map.getSpawnPos(obj); if (exists) spawnPos = exists.map.getSpawnPos(obj); @@ -328,7 +328,7 @@ module.exports = { obj.serverId = obj.id; delete obj.id; - var spawnPos = exists.map.getSpawnPos(obj); + let spawnPos = exists.map.getSpawnPos(obj); obj.spawn = exists.map.spawn; @@ -390,14 +390,14 @@ module.exports = { let components = msgObj.components || []; delete msgObj.components; - for (var p in msgObj) + for (let p in msgObj) obj[p] = msgObj[p]; let cLen = components.length; for (let i = 0; i < cLen; i++) { let c = components[i]; let component = obj[c.type]; - for (var p in c) + for (let p in c) component[p] = c[p]; } }, @@ -438,14 +438,14 @@ module.exports = { }, removeObject: function (msg) { - var obj = msg.obj; + let obj = msg.obj; let instanceId = msg.instanceId; let exists = this.instances.find(i => i.id == instanceId); if (!exists) return; - var obj = msg.obj; + let obj = msg.obj; obj = exists.objects.find(o => o.serverId == obj.id); if (!obj) diff --git a/src/server/world/map.js b/src/server/world/map.js index d24241c9..fc8e8315 100644 --- a/src/server/world/map.js +++ b/src/server/world/map.js @@ -211,7 +211,7 @@ module.exports = { let data = layer.data || layer.objects; let firstItem = data[0]; if ((firstItem) && (firstItem.width != null)) { - var info = { + let info = { map: this.name, layer: layerName, objects: data @@ -229,7 +229,7 @@ module.exports = { let y = ~~(j / this.size.w); let x = j - (y * this.size.w); - var info = { + let info = { map: this.name, layer: layerName, cell: cell, @@ -282,7 +282,7 @@ module.exports = { let cellInfo = this.builders.getCellInfo(cell); let sheetName = cellInfo.sheetName; - var cell = cellInfo.cell; + let cell = cellInfo.cell; if (sheetName == 'walls') cell += 192; else if (sheetName == 'objects') @@ -349,7 +349,7 @@ module.exports = { if (layerName == 'rooms') { if (blueprint.properties.exit) { - var room = this.rooms.find(function (r) { + let room = this.rooms.find(function (r) { return (!( (blueprint.x + blueprint.width < r.x) || (blueprint.y + blueprint.height < r.y) || @@ -372,7 +372,7 @@ module.exports = { if (!mapFile.properties.isRandom) spawners.register(blueprint, blueprint.spawnCd || mapFile.properties.spawnCd); else { - var room = this.rooms.find(function (r) { + let room = this.rooms.find(function (r) { return (!( (blueprint.x < r.x) || (blueprint.y < r.y) || diff --git a/src/server/world/mobBuilder.js b/src/server/world/mobBuilder.js index 6345e03d..a53d4f87 100644 --- a/src/server/world/mobBuilder.js +++ b/src/server/world/mobBuilder.js @@ -1,6 +1,5 @@ let animations = require('../config/animations'); let itemGenerator = require('../items/generator'); -let combat = require('../combat/combat'); module.exports = { build: function (mob, blueprint, scaleDrops, type, zoneName) { @@ -181,7 +180,7 @@ module.exports = { statValues.hp = statValues.hpMax; statValues.mana = statValues.manaMax; - mob.spellbook.spells.forEach(function (s, i) { + mob.spellbook.spells.forEach(function (s) { s.dmgMult = dmgMult; s.statType = preferStat; s.element = elementType; diff --git a/src/server/world/physics.js b/src/server/world/physics.js index efed6fca..15f7cf6c 100644 --- a/src/server/world/physics.js +++ b/src/server/world/physics.js @@ -395,7 +395,7 @@ module.exports = { let x2 = toX + c; let y2 = toY + c; - var lowX, lowY, highX, highY, incX, incY; + let lowX, lowY, highX, highY, incX, incY; if (reverseX) { incX = -1; @@ -498,7 +498,7 @@ module.exports = { let grid = this.graph.grid; if (!grid[x][y]) grid[x][y] = new pathfinder.gridNode(x, y, collides ? 0 : 1); - else { + else { grid[x][y].weight = collides ? 0 : 1; pathfinder.astar.cleanNode(grid[x][y]); } diff --git a/src/server/world/randomMap.js b/src/server/world/randomMap.js index ae395e77..89b00c0e 100644 --- a/src/server/world/randomMap.js +++ b/src/server/world/randomMap.js @@ -66,7 +66,7 @@ module.exports = { if (i + j + k == 0) continue; - var flipped = extend(true, { + let flipped = extend(true, { flipX: !!i, flipY: !!j, rotate: !!k @@ -264,9 +264,9 @@ module.exports = { let collisionMap = instance.map.clientMap.collisionMap; for (let i = 0; i < template.width; i++) { - var x = room.x + i; + let x = room.x + i; for (let j = 0; j < template.height; j++) { - var y = room.y + j; + let y = room.y + j; let tile = template.map[i][j]; if (!tile) @@ -332,8 +332,6 @@ module.exports = { let spawners = instance.spawners; let spawnCd = instance.map.mapFile.properties.spawnCd; - let collisionMap = instance.map.clientMap.collisionMap; - template.objects.forEach(function (o) { o.x = o.x - template.x + room.x; o.y = o.y - template.y + room.y; diff --git a/src/server/world/resourceSpawner.js b/src/server/world/resourceSpawner.js index 7ac28110..87072270 100644 --- a/src/server/world/resourceSpawner.js +++ b/src/server/world/resourceSpawner.js @@ -8,7 +8,6 @@ module.exports = { zone: null, physics: null, map: null, - zone: null, cdMax: 50, diff --git a/src/server/world/spawners.js b/src/server/world/spawners.js index 53f4b7fb..aa5e1a6b 100644 --- a/src/server/world/spawners.js +++ b/src/server/world/spawners.js @@ -2,14 +2,6 @@ let mobBuilder = require('./mobBuilder'); let animations = require('../config/animations'); let scheduler = require('../misc/scheduler'); -let cSpawner = { - cd: -1, - cdMax: null, - blueprint: null, - mob: null, - amountLeft: -1 -}; - module.exports = { list: [], mobTypes: {}, @@ -123,7 +115,7 @@ module.exports = { if (!l.cron) { if (l.cd > 0) l.cd--; - else if ((l.mob) && (l.mob.destroyed)) + else if ((l.mob) && (l.mob.destroyed)) l.cd = l.cdMax; } @@ -178,7 +170,7 @@ module.exports = { if (!l.zonePrint) return; - if (l.zonePrint.level != null) + if (l.zonePrint.level !== null) l.zonePrint.level = level; if ((!l.mob) || (l.mob.destroyed)) diff --git a/src/server/world/worker.js b/src/server/world/worker.js index a69aac77..2daa5a86 100644 --- a/src/server/world/worker.js +++ b/src/server/world/worker.js @@ -1,6 +1,6 @@ global.io = true; -let extend = require('extend'); +global.extend = require('extend'); let helpers = require('../misc/helpers'); let components = require('../components/components'); let instancer = require('./instancer'); @@ -37,7 +37,6 @@ let onModsReady = function () { }; let onDbReady = function () { - global.extend = extend; global._ = helpers; global.instancer = instancer; require('../misc/random');