Merge branch 'master' into 'release'

Master

See merge request Isleward/isleward!585

src/client/ui/templates/equipment/equipment.js

@@ -317,6 +317,7 @@ define([
 					} 
 					method = 'unlearnAbility';
 					data.itemId = this.hoverCompare.id;
+					delete data.slot;
 				}
 			} else if (item.slot === 'finger') {
 				data = {

src/server/components/equipment.js

@@ -126,7 +126,7 @@ module.exports = {
 
 		if ((!obj.mob) || (item.ability)) {
 			if (item.spell)
-				inventory.learnAbility({ itemId }, item.runeSlot);
+				inventory.learnAbility({ itemId, slot: item.runeSlot });
 			else
 				obj.syncer.setArray(true, 'inventory', 'getItems', inventory.simplifyItem(item));
 		}
@@ -164,7 +164,7 @@ module.exports = {
 
 		if (item.spell) {
 			item.eq = true;
-			inventory.unlearnAbility({ itemId }, item.runeSlot);
+			inventory.unlearnAbility({ itemId });
 		} else
 			obj.syncer.setArray(true, 'inventory', 'getItems', inventory.simplifyItem(item));
 

src/server/components/inventory.js

@@ -145,13 +145,7 @@ module.exports = {
 		}
 	},
 
-	learnAbility: function (itemId, runeSlot) {
-		if (itemId.has('itemId')) {
-			let msg = itemId;
-			itemId = msg.itemId;
-			runeSlot = msg.slot;
-		}
-
+	learnAbility: function ({ itemId, slot }) {
 		let item = this.findItem(itemId);
 		let statValues = this.obj.stats.values;
 		if (!item)
@@ -179,20 +173,20 @@ module.exports = {
 		let spellbook = this.obj.spellbook;
 
 		if ((item.slot === 'twoHanded') || (item.slot === 'oneHanded'))
-			runeSlot = 0;
-		else if (!runeSlot) {
-			runeSlot = 4;
+			slot = 0;
+		else if (!slot) {
+			slot = 4;
 			for (let i = 1; i <= 4; i++) {
 				if (!this.items.some(j => (j.runeSlot === i))) {
-					runeSlot = i;
+					slot = i;
 					break;
 				}
 			}
 		}
 
-		let currentEq = this.items.find(i => (i.runeSlot === runeSlot));
+		let currentEq = this.items.find(i => (i.runeSlot === slot));
 		if (currentEq) {
-			spellbook.removeSpellById(runeSlot);
+			spellbook.removeSpellById(slot);
 			delete currentEq.eq;
 			delete currentEq.runeSlot;
 			this.setItemPosition(currentEq.id);
@@ -200,10 +194,10 @@ module.exports = {
 		}
 
 		item.eq = true;
-		item.runeSlot = runeSlot;
+		item.runeSlot = slot;
 		delete item.pos;
 
-		spellbook.addSpellFromRune(item.spell, runeSlot);
+		spellbook.addSpellFromRune(item.spell, slot);
 		this.obj.syncer.setArray(true, 'inventory', 'getItems', item);
 	},
 

src/server/components/inventory/getItem.js

@@ -124,7 +124,7 @@ module.exports = (cpnInv, item, hideMessage, noStack, hideAlert, createBagIfFull
 
 	if (item.eq) {
 		if (item.ability)
-			cpnInv.learnAbility({ itemId: item.id }, item.runeSlot);
+			cpnInv.learnAbility({ itemId: item.id, slot: item.runeSlot });
 		else {
 			delete item.eq;
 			obj.equipment.equip({ itemId: item.id });