balance

src/server/components/extensions/socialCommands.js

@@ -2,12 +2,14 @@ define([
 	'config/roles',
 	'world/atlas',
 	'items/generator',
-	'misc/random'
+	'misc/random',
+	'items/config/slots'
 ], function(
 	roles,
 	atlas,
 	generator,
-	random
+	random,
+	configSlots
 ) {
 	return {
 		roleLevel: null,
@@ -51,6 +53,21 @@ define([
 
 		//actions
 		getItem: function(config) {
+			if (config.slot == 'set') {
+				configSlots.slots.forEach(function(s) {
+					if (s == 'tool')
+						return;
+
+					var newConfig = extend(true, {}, config, {
+						slot: s
+					});
+
+					this.getItem(newConfig);
+				}, this);
+
+				return;
+			}
+
 			if (config.stats)
 				config.stats = config.stats.split(',');
 

src/server/components/follower.js

@@ -104,19 +104,19 @@ define([
 				return;
 			}
 
+			var attacker = this.fGetHighest.inCombat();
 			var maxDistance = this.maxDistance;
 			var distance = Math.max(Math.abs(obj.x - master.x), Math.abs(obj.y - master.y));
 
 			var doMove = (distance >= maxDistance);
 			//When we're too far, just teleport
-			if (distance >= maxDistance * 2) {
+			if ((!attacker) && (distance >= maxDistance * 2)) {
 				this.teleport();
 				return;
 			}
 
 			var doMove = false;
 			//If we're not too far from the master but the master is not in combat, move anyway
-			var attacker = this.fGetHighest.inCombat();
 			if (!attacker) {
 				var lastMasterPos = this.lastMasterPos;
 

src/server/components/inventory.js

@@ -330,12 +330,11 @@ define([
 				this.getItem(item);
 			}
 
+			var secondarySpellName = classes.spells[this.obj.class][0];
 			var hasSpell = this.items.some(function(i) {
 				return (
 					(i.spell) &&
-					(i.spell.rolls) &&
-					((i.spell.rolls.damage != null) || (i.spell.rolls.healing != null)) &&
-					(i.slot != 'twoHanded')
+					(i.spell.name.toLowerCase() == secondarySpellName)
 				);
 			});
 
@@ -343,7 +342,7 @@ define([
 				var item = generator.generate({
 					spell: true,
 					spellQuality: 'basic',
-					spellName: classes.spells[this.obj.class][0]
+					spellName: secondarySpellName
 				});
 				item.eq = true;
 				item.noSalvage = true;

src/server/config/maps/cave/zone.js

@@ -36,13 +36,13 @@ module.exports = {
 			}, {
 				type: 'smokeBomb',
 				radius: 1,
-				duration: 3,
+				duration: 10,
 				randomPos: true,
 				range: 2,
-				selfCast: 0.2,
+				selfCast: 0.1,
 				statMult: 1,
-				damage: 0.25,
-				element: 'poison',
+				damage: 10,
+				element: 'arcane',
 				cdMax: 5,
 				particles: {
 					scale: {
@@ -71,7 +71,7 @@ module.exports = {
 						start: ['fc66f7', 'a24eff'],
 						end: ['933159', '393268']
 					},
-					chance: 0.085,
+					chance: 0.1,
 					randomColor: true,
 					randomScale: true,
 					blendMode: 'add',
@@ -119,7 +119,7 @@ module.exports = {
 				selfCast: 0.3,
 				statMult: 1,
 				damage: 0.25,
-				element: 'poison',
+				element: 'arcane',
 				cdMax: 5,
 				particles: {
 					scale: {

src/server/config/roles.js

@@ -15,6 +15,17 @@ define([
 					sprite: [12, 0],
 					keyId: 'world'
 				}]
+			},
+			asd: {
+				level: 10,
+				messageStyle: 'color-cyan',
+				messagePrefix: '(dev) ',
+				items: [{
+					type: 'key',
+					name: 'Key to the world',
+					sprite: [12, 0],
+					keyId: 'world'
+				}]
 			}
 		},
 

src/server/mods/class-necromancer/spells/spellSummonSkeleton.js

@@ -92,8 +92,8 @@ define([
 
 			var spell = mob.spellbook.spells[0];
 			spell.statType = ['str', 'int'];
-			mob.stats.values.str = obj.stats.values.str;
-			mob.stats.values.int = obj.stats.values.int;
+			mob.stats.values.str = obj.stats.values.str || 1;
+			mob.stats.values.int = obj.stats.values.int || 1;
 			spell.threatMult *= 10;
 
 			mob.follower.bindEvents();