Browse Source

Merge branch 'bug/sell/equipped' into 'master'

Fixed #1

Closes #1

See merge request !1
tags/v0.1.2
Big Bad Waffle 7 years ago
parent
commit
f434ec990e
2 changed files with 1 additions and 4 deletions
  1. +0
    -3
      src/client/ui/templates/trade/trade.js
  2. +1
    -1
      src/server/components/trade.js

+ 0
- 3
src/client/ui/templates/trade/trade.js View File

@@ -111,9 +111,6 @@ define([
},

onClick: function(el, item, action, e) {
//if ((action == 'buy') && (item.worth > window.player.trade.gold))
// return;

el.addClass('disabled');

client.request({


+ 1
- 1
src/server/components/trade.js View File

@@ -239,7 +239,7 @@ define([

this.obj.syncer.set(true, 'trade', 'sellList', {
markup: target.trade.markup.buy,
items: this.obj.inventory.items
items: this.obj.inventory.items.filter(i => ((i.worth > 0) && (!i.eq)))
});
},



Loading…
Cancel
Save