fixes #85, changed light patch colour and fixed getmaterials command

src/client/js/components/lightPatch.js

@@ -6,7 +6,7 @@ define([
 	return {
 		type: 'lightPatch',
 
-		color: 'f7ffb2',
+		color: 'ffeb38',
 		patches: [],
 		rays: [],
 

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

@@ -150,12 +150,56 @@ define([
 						.find('.icon')
 						.css('background', 'url("' + spritesheet + '") ' + imgX + 'px ' + imgY + 'px')
 						.off()
+						.on('contextmenu', this.showContext.bind(this, item))
 						.on('mousedown', this.buildSlot.bind(this, elSlot))
 						.on('mousemove', this.onHoverItem.bind(this, elSlot, item, null))
 						.on('mouseleave', this.onHoverItem.bind(this, null, null));
 				});
 		},
 
+		openAugmentUi: function (item) {
+			events.emit('onSetSmithItem', {
+				item: item
+			});
+		},
+
+		showContext: function (item, e) {
+			let menuItems = {
+				unequip: {
+					text: 'unequip',
+					callback: this.unequipItem.bind(this, item)
+				},
+				augment: {
+					text: 'craft',
+					callback: this.openAugmentUi.bind(this, item)
+				}				
+			};
+
+			let config = [];
+
+			config.push(menuItems.unequip);
+
+			if (item.slot)
+				config.push(menuItems.augment);
+
+			events.emit('onContextMenu', config, e);
+
+			e.preventDefault();
+			return false;
+		},
+
+		unequipItem: function (item) {
+			client.request({
+				cpn: 'player',
+				method: 'performAction',
+				data: {
+					cpn: 'equipment',
+					method: 'unequip',
+					data: item.id
+				}
+			});
+		},
+
 		onInspectTarget: function (result) {
 			this.isInspecting = true;
 
@@ -168,6 +212,9 @@ define([
 		},
 
 		buildSlot: function (el, e) {
+			if (e && e.button !== 0) 
+				return;
+
 			if (this.isInspecting)
 				return;
 

src/client/ui/templates/smithing/smithing.js

@@ -145,16 +145,6 @@ define([
 				};
 				events.emit('onGetAnnouncement', resultMsg);
 
-				return;
-			} else if (msg.item.eq) {
-				let resultMsg = {
-					msg: 'Cannot augment equipped items',
-					type: 'failure',
-					zIndex: 9999999,
-					top: 180
-				};
-				events.emit('onGetAnnouncement', resultMsg);
-
 				return;
 			}
 
@@ -180,14 +170,15 @@ define([
 
 			this.offEvent(this.eventClickInv);
 
-			$('.uiInventory').data('ui').toggle();
+			$('.uiInventory').data('ui').hide();
+			this.show();
 
 			this.el.show();
 			this.shown = true;
 
 			msg.success = false;
 
-			if (!msg || !msg.item || !msg.item.slot || msg.item.eq)
+			if (!msg || !msg.item || !msg.item.slot)
 				return;
 
 			this.item = msg.item;

src/server/components/extensions/socialCommands.js

@@ -609,6 +609,9 @@ module.exports = {
 	},
 
 	getMaterials: function (config) {
+		if (typeof(config) === 'object')
+			config = 100;
+		
 		let inventory = this.obj.inventory;
 
 		Object.entries(configMaterials).forEach(([material, blueprint]) => {

src/server/components/inventory.js

@@ -143,12 +143,20 @@ module.exports = {
 
 	enchantItem: function (msg) {
 		let item = this.findItem(msg.itemId);
-		if ((!item) || (!item.slot) || (item.eq) || (item.noAugment) || ((msg.action === 'scour') && (item.power === 0))) {
+		if ((!item) || (!item.slot) || (item.noAugment) || ((msg.action === 'scour') && (item.power === 0))) {
 			this.resolveCallback(msg);
 			return;
 		}
 
+		const equipment = this.obj.equipment;
+		
+		if (item.eq)
+			equipment.unequip(item.id, true);
+
 		enchanter.enchant(this.obj, item, msg);
+
+		if (item.eq) 
+			equipment.equip(item.id);
 	},
 
 	getEnchantMaterials: function (msg) {
@@ -773,7 +781,7 @@ module.exports = {
 			let existItem = this.items.find(i => i.name === item.name);
 			if (existItem) {
 				exists = true;
-				existItem.quantity = (existItem.quantity || 1) + (item.quantity || 1);
+				existItem.quantity = ~~(existItem.quantity || 1) + ~~(item.quantity || 1);
 				item = existItem;
 			}
 		}

src/server/items/enchanter.js

@@ -142,7 +142,10 @@ const augment = (item, inventory, result, msg) => {
 	}
 
 	item.power = newPower;
-	this.addStat(item, result);
+
+	generatorStats.generate(item, {
+		statCount: 1
+	}, result);
 };
 
 module.exports = {
@@ -192,12 +195,6 @@ module.exports = {
 		inventory.resolveCallback(msg, result);
 	},
 
-	addStat: function (item, result) {
-		generatorStats.generate(item, {
-			statCount: 1
-		}, result);
-	},
-
 	getEnchantMaterials: function (item, action) {
 		let result = null;