Browse Source

Merge branch '147-faction-item-purchase' into 'staging'

Fixes #147

See merge request !87
tags/v0.1.3^2
Big Bad Waffle 7 years ago
parent
commit
9b92ee4974
2 changed files with 8 additions and 2 deletions
  1. +7
    -1
      src/client/ui/templates/trade/trade.js
  2. +1
    -1
      src/server/components/extensions/factionVendor.js

+ 7
- 1
src/client/ui/templates/trade/trade.js View File

@@ -101,7 +101,13 @@ define([
itemEl.find('.quantity').html('EQ');

if (action == 'buy') {
if (item.worth > window.player.trade.gold)
var noAfford = (item.worth > window.player.trade.gold);
if ((!noAfford) && (item.factions)) {
noAfford = item.factions.some(function(f) {
return f.noEquip;
});
}
if (noAfford)
$('<div class="no-afford"></div>').appendTo(itemEl);
}



+ 1
- 1
src/server/components/extensions/factionVendor.js View File

@@ -148,7 +148,7 @@ define([
item = this.findBuyback(itemId, requestedBy.name);
var result = true;
if (item.faction)
if (item.factions)
result = requestedBy.reputation.canEquipItem(item);

if (!result) {


Loading…
Cancel
Save