Merge branch '135-spears-ignore-los' into 'staging'

Fixes #135

See merge request !83

src/server/components/inventory.js

@@ -33,8 +33,13 @@ define([
 			for (var i = 0; i < iLen; i++) {
 				var item = items[i];
 
+				//Hacks for old items
 				if ((item.spell) && (!item.spell.rolls))
 					continue;
+				else if ((item.spell) && (item.type == 'Spear')) {
+					item.spell.properties = item.spell.properties || {};
+					item.spell.properties.range = item.range;
+				}
 
 				if (item.effects) {
 					item.effects.forEach(function(e) {
@@ -55,9 +60,10 @@ define([
 					spellName: 'arcane barrier'
 				}));*/
 
-				/*for (var i = 0; i < 10; i++) {
+				/*for (var i = 0; i < 1; i++) {
 					var item = generator.generate({
 						slot: 'twoHanded',
+						type: 'Spear',
 						quality: 4,
 						level: 1
 					});

src/server/components/spellbook.js

@@ -135,6 +135,8 @@ define([
 				this.spells.splice(spellId, 0, builtSpell);
 
 			builtSpell.calcDps(null, true);
+			if (builtSpell.init)
+				builtSpell.init();
 
 			if (this.obj.player) 
 				this.obj.syncer.setArray(true, 'spellbook', 'getSpells', builtSpell.simplify());

src/server/config/spells/spellMelee.js

@@ -16,6 +16,11 @@ define([
 		col: 4,
 		row: 1,
 
+		init: function() {
+			if (this.range > 1)
+				this.needLos = true;
+		},
+
 		cast: function(action) {
 			var target = action.target;
 

src/server/items/generators/spellbook.js

@@ -84,6 +84,11 @@ define([
 				}
 			}
 
+			if (item.range) {
+				item.spell.properties = item.spell.properties || {};
+				item.spell.properties.range = item.range;
+			}
+
 			var perfection = ~~(propertyPerfection.reduce((p, n) => p += n, 0) / propertyPerfection.length * 4);
 			if (!item.slot)	
 				item.quality = perfection;