From 4bc4abbadc4efed7fe94fcd27bb8843dc2fc222f Mon Sep 17 00:00:00 2001 From: Big Bad Waffle Date: Sat, 25 Feb 2017 10:24:47 +0200 Subject: [PATCH] Fixes #83 --- src/server/config/quests/templates/questKillX.js | 11 +++++++---- src/server/config/quests/templates/questLootGen.js | 10 ++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/server/config/quests/templates/questKillX.js b/src/server/config/quests/templates/questKillX.js index 9503822c..fffd8d7e 100644 --- a/src/server/config/quests/templates/questKillX.js +++ b/src/server/config/quests/templates/questKillX.js @@ -26,14 +26,17 @@ define([ if (!this.mobName) { var mobCounts = this.obj.instance.spawners.mobTypes; var keys = Object.keys(mobTypes).filter(function(m) { + var mobBlueprint = mobTypes[m]; + return ( (m != 'default') && ( - (mobTypes[m].attackable) || - (mobTypes[m].attackable == null) - ) + (mobBlueprint.attackable) || + (mobBlueprint.attackable == null) + ) && + (mobBlueprint.level <= ~~(this.obj.stats.values.level * 1.35)) ); - }); + }, this); this.mobType = keys[~~(Math.random() * keys.length)]; var needMax = 8; this.mobName = this.mobType.replace(/\w\S*/g, function(txt) { diff --git a/src/server/config/quests/templates/questLootGen.js b/src/server/config/quests/templates/questLootGen.js index 3badb2a8..f268d3ca 100644 --- a/src/server/config/quests/templates/questLootGen.js +++ b/src/server/config/quests/templates/questLootGen.js @@ -18,8 +18,14 @@ define([ var mobTypes = this.obj.instance.spawners.zone.mobs; var mobCounts = this.obj.instance.spawners.mobTypes; var keys = Object.keys(mobTypes).filter(function(m) { - return ((m != 'default') && (mobTypes[m].questItem)); - }); + var mobBlueprint = mobTypes[m]; + + return ( + (m != 'default') && + (mobBlueprint.questItem) && + (mobBlueprint.level <= (this.obj.stats.values.level * 1.35)) + ); + }, this); this.mobType = keys[~~(Math.random() * keys.length)]; var needMax = 8; this.mobName = this.mobType.replace(/\w\S*/g, function(txt) {