fixes #149

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

@@ -173,7 +173,7 @@ define([
 			this.show();
 
 			this.onGetStats(result.stats);
-			this.onGetItems(result.items);
+			this.onGetItems(result.equipment);
 		},
 
 		buildSlot: function (el) {

src/client/ui/templates/target/target.js

@@ -1,8 +1,10 @@
 define([
+	'js/system/client',
 	'js/system/events',
 	'html!ui/templates/target/template',
 	'css!ui/templates/target/styles'
 ], function (
+	client,
 	events,
 	template,
 	styles
@@ -40,7 +42,7 @@ define([
 			// target.player (only the logged-in player has a player component)
 			if ((e.button !== 2) || (!target) || (!target.dialogue) || (target === window.player) || (target.prophecies)) {
 				if (target.prophecies) {
-					let context = [
+					let inspectContext = [
 						target.name,
 						'----------', {
 							text: 'inspect',
@@ -48,13 +50,13 @@ define([
 						}
 					];
 
-					events.emit('onContextMenu', context, e.event);
+					events.emit('onContextMenu', inspectContext, e.event);
 				}
 
 				return;
 			}
 
-			let context = [
+			let talkContext = [
 				target.name,
 				'----------', {
 					text: 'talk',
@@ -62,7 +64,7 @@ define([
 				}
 			];
 
-			events.emit('onContextMenu', context, e.event);
+			events.emit('onContextMenu', talkContext, e.event);
 
 			e.event.preventDefault();
 			return false;
@@ -74,10 +76,14 @@ define([
 
 		onInspect: function () {
 			client.request({
-				cpn: 'equipment',
-				method: 'inspect',
+				cpn: 'player',
+				method: 'performAction',
 				data: {
-					playerId: this.target.id
+					cpn: 'equipment',
+					method: 'inspect',
+					data: {
+						playerId: this.target.id
+					}
 				}
 			});
 		},

src/server/components/equipment.js

@@ -137,7 +137,7 @@ module.exports = {
 			if (item.spell)
 				inventory.learnAbility(itemId, item.runeSlot);
 			else
-				obj.syncer.setArray(true, 'inventory', 'getItems', result);
+				obj.syncer.setArray(true, 'inventory', 'getItems', item);
 		}
 
 		obj.fireEvent('afterEquipItem', item);
@@ -328,26 +328,22 @@ module.exports = {
 	},
 
 	inspect: function (msg) {
-		const targetPlayer = this.obj.instance.objects.find(o => o.id === msg.id);
-		if (!targetPlayer)
+		const targetPlayer = this.obj.instance.objects.find(o => o.id === msg.playerId);
+		if (!targetPlayer || !targetPlayer.player)
 			return;
 
 		const targetInv = targetPlayer.inventory;
 		const targetEq = targetPlayer.equipment.eq;
 		const targetStats = targetPlayer.stats.values;
 
-		const mappedEq = Object.keys(targetEq).map(m => targetInv.simplifyItem(targetInv.find(m)));
+		const mappedEq = Object.keys(targetEq).map(m => targetInv.simplifyItem(targetInv.findItem(targetEq[m])));
 		const mappedStats = extend({}, targetStats);
-		Object.keys(mappedStats).forEach(m => {
-			if (m.indexOf('xp') > -1)
-				delete mappedStats[m];
-		});
 
 		let result = {
 			equipment: mappedEq,
 			stats: mappedStats
 		};
 
-		this.obj.syncer.queue('onInspectTarget', result, [this.obj.serverId]);
+		this.obj.instance.syncer.queue('onInspectTarget', result, [this.obj.serverId]);
 	}
 };

src/server/components/extensions/factionVendor.js

@@ -1,7 +1,6 @@
 let generator = require('../../items/generator');
 let skins = require('../../config/skins');
 let factions = require('../../config/factions');
-let itemEffects = require('../../items/itemEffects');
 
 module.exports = {
 	baseItems: [],
@@ -46,8 +45,6 @@ module.exports = {
 		} else if (list.level !== requestLevel)
 			this.regenList(list);
 
-		let reputation = requestedBy.reputation;
-
 		let result = list.items.map(m => requestedBy.inventory.simplifyItem(m));
 
 		return result;

src/server/components/inventory.js

@@ -79,8 +79,6 @@ module.exports = {
 		if (!self)
 			return null;
 
-		let reputation = this.obj.reputation;
-
 		return {
 			type: 'inventory',
 			items: this.items.map(this.simplifyItem)
@@ -102,6 +100,8 @@ module.exports = {
 		}
 
 		if (result.factions) {
+			let reputation = this.obj.reputation;
+
 			result.factions = result.factions.map(function (f) {
 				let faction = reputation.getBlueprint(f.id);
 				let factionTier = reputation.getTier(f.id);

src/server/components/trade.js

@@ -318,8 +318,6 @@ module.exports = {
 
 		this.target = target;
 
-		let reputation = this.obj.reputation;
-
 		let itemList = this.obj.inventory.items
 			.filter(i => ((i.worth > 0) && (!i.eq)));
 		itemList = extend([], itemList);
@@ -344,8 +342,6 @@ module.exports = {
 	},
 
 	getItems: function (requestedBy) {
-		let reputation = requestedBy.reputation;
-
 		let items = this.items.map(i => requestedBy.inventory.simplifyItem(i));
 
 		return items;

src/server/misc/clone.js

@@ -30,7 +30,7 @@ let clone = function (o) {
 		for (let i = 1; i < aLen; i++) 
 			cloneRecursive(arguments[i], o);
 	} catch (e) {
-		console.log(arguments[0]);
+		throw e;
 	}
 
 	return o;

src/server/misc/scheduler.js

@@ -11,7 +11,7 @@ module.exports = {
 		this.lastTime = this.getTime();
 	},
 
-	isActive: function(c) {
+	isActive: function (c) {
 		let cron = c.cron.split(' ');
 		if (cron.length !== 5)
 			return false;