diff --git a/src/client/js/components/effects.js b/src/client/js/components/effects.js index c362351b..261e9c16 100644 --- a/src/client/js/components/effects.js +++ b/src/client/js/components/effects.js @@ -71,9 +71,7 @@ define([ } if (blueprint.removeEffects) { blueprint.removeEffects.forEach(function (r) { - let effect = this.effects.find(function (e) { - return (e.name === r); - }); + let effect = this.effects.find(e => e.name === r); if (!effect) return; @@ -83,9 +81,7 @@ define([ sprite: effect.sprite }); - this.effects.spliceFirstWhere(function (e) { - return (e.name === r); - }); + this.effects.spliceFirstWhere(e => e.name === r); }, this); } }, diff --git a/src/client/js/components/inventory.js b/src/client/js/components/inventory.js index c6f7d083..4af62b79 100644 --- a/src/client/js/components/inventory.js +++ b/src/client/js/components/inventory.js @@ -29,9 +29,7 @@ define([ let nItem = newItems[i]; let nId = nItem.id; - let findItem = items.find(function (item) { - return (item.id === nId); - }); + let findItem = items.find(f => i.id === nId); if (findItem) { if (!rerender) { rerender = ( diff --git a/src/client/js/components/stash.js b/src/client/js/components/stash.js index a60d6d8d..7e51bf1a 100644 --- a/src/client/js/components/stash.js +++ b/src/client/js/components/stash.js @@ -27,9 +27,7 @@ define([ let nItem = newItems[i]; let nId = nItem.id; - let findItem = items.find(function (item) { - return (item.id === nId); - }); + let findItem = items.find(f => f.id === nId); if (findItem) { $.extend(true, findItem, nItem); diff --git a/src/client/ui/templates/smithing/smithing.js b/src/client/ui/templates/smithing/smithing.js index 40e6dbbd..455791ff 100644 --- a/src/client/ui/templates/smithing/smithing.js +++ b/src/client/ui/templates/smithing/smithing.js @@ -36,6 +36,7 @@ define([ this.onEvent('onHideInventory', this.hackMethod.bind(this)); this.onEvent('beforeInventoryClickItem', this.hackMethod.bind(this)); + this.onEvent('onGetItems', this.onGetItems.bind(this)); this.onEvent('onSetSmithItem', this.onHideInventory.bind(this)); @@ -179,7 +180,7 @@ define([ msg.success = false; - if ((!msg) || (!msg.item) || (!msg.item.slot) || (msg.item.eq)) + if (!msg || !msg.item || !msg.item.slot || msg.item.eq) return; this.item = msg.item; @@ -214,9 +215,7 @@ define([ if (result.materials) { let material = result.materials[0]; if (material) { - let hasMaterials = window.player.inventory.items.find(function (i) { - return (i.name === material.name); - }); + let hasMaterials = window.player.inventory.items.find(i => i.name === material.name); if (hasMaterials) { material.quantityText = hasMaterials.quantity + '/' + material.quantity; hasMaterials = hasMaterials.quantity >= material.quantity; @@ -236,6 +235,20 @@ define([ this.setDisabled(false); }, + onGetItems: function (items) { + let elMaterial = this.find('.material .item'); + if (!elMaterial.length) + return; + + let itemMaterial = elMaterial.data('item'); + let elQuantity = elMaterial.find('.quantity'); + let invMaterial = items.find(i => i.name === itemMaterial.name); + + let newText = elQuantity.html().split('/'); + newText = invMaterial.quantity + '/' + newText[1]; + elQuantity.html(newText); + }, + drawItem: function (container, item, redQuantity) { container.find('.icon').hide();