Browse Source

fixes #857

tags/v0.3.0
Big Bad Waffle 5 years ago
parent
commit
229ee074c4
4 changed files with 21 additions and 16 deletions
  1. +2
    -6
      src/client/js/components/effects.js
  2. +1
    -3
      src/client/js/components/inventory.js
  3. +1
    -3
      src/client/js/components/stash.js
  4. +17
    -4
      src/client/ui/templates/smithing/smithing.js

+ 2
- 6
src/client/js/components/effects.js View File

@@ -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);
}
},


+ 1
- 3
src/client/js/components/inventory.js View File

@@ -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 = (


+ 1
- 3
src/client/js/components/stash.js View File

@@ -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);



+ 17
- 4
src/client/ui/templates/smithing/smithing.js View File

@@ -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();



Loading…
Cancel
Save