Skip to content

Commit

Permalink
Don't allow tagging D1 vendor items or locking finishers
Browse files Browse the repository at this point in the history
  • Loading branch information
bhollis committed Oct 9, 2024
1 parent c2b7eb4 commit f5124be
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* Updated for Episode: Revenant.
* Make room for always-on scrollbars in Organizer to avoid extra weird scrolling.
* Fix vendor finishers offering the "Lock" action, and D1 vendor items offering "tag".

## 8.40.0 <span class="changelog-date">(2024-10-06)</span>

Expand Down
5 changes: 5 additions & 0 deletions src/app/destiny1/vendors/vendor.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,11 @@ async function processVendor(
defs,
buckets,
);
for (const item of items) {
item.instanced = false;
item.taggable = false;
item.lockable = false;
}
const itemsById = _.keyBy(items, (i) => i.id);
const categories = filterMap(Object.values(vendor.saleItemCategories), (category) => {
const categoryInfo = vendorDef.categories[category.categoryIndex];
Expand Down
3 changes: 3 additions & 0 deletions src/app/vendors/vendor-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ function makeVendorItem(
vendorItem.item.id = `${vendorHash}-${vendorItem.vendorItemIndex}`;
vendorItem.item.index = vendorItem.item.id;
vendorItem.item.instanced = false;
// These would normally be false already, but certain rules like "finishers
// are lockable" mess that up, so we set them explicitly here.
vendorItem.item.lockable = false;

// since this is sold by a vendor, add vendor information
vendorItem.item.vendor = { vendorHash, vendorItemIndex, characterId };
Expand Down

0 comments on commit f5124be

Please sign in to comment.