Skip to content

Commit

Permalink
Fixed merchant visible message
Browse files Browse the repository at this point in the history
  • Loading branch information
Haxxer committed Jul 21, 2023
1 parent 347457a commit 97546f3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- Tweaked the way items that cost items are stored in the item's flags to avoid deeply nested data. Instead, the items that are required to buy other items are stored in a compendium for ease of access and long term storage.
- Fixed free items still showing up in merchants when the setting to hide them was enabled
- Fixed merchants with nothing for sale not displaying the text about this fact in the interface

## Version 2.7.3

Expand Down
12 changes: 6 additions & 6 deletions src/applications/merchant-app/MerchantItemTab.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,9 @@
{/if}
</div>
{#if !$categoryStore.length}
{#if !$categoryStore.length}
<div style="height: calc(100% - 51px);" class="item-piles-flexcol align-center-col">
<div style="height: calc(100% - 51px);" class="item-piles-flexcol align-center-col">
<span class="align-center-row" style="font-size:1.25rem; opacity: 0.8;">
{#if visibleItems.length}
Expand All @@ -134,9 +132,11 @@
{/if}
</span>
</div>
</div>
{/if}
{/if}
</div>
<style lang="scss">
Expand Down
2 changes: 1 addition & 1 deletion src/applications/merchant-app/MerchantRightPane.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<span>{localize("ITEM-PILES.Merchant.MerchantClosed")}</span>
</div>
{:else if $activeTab === "buy"}
<MerchantItemTab {store}/>
<MerchantItemTab {store} noItemsLabel="ITEM-PILES.Merchant.NoItemsForSale"/>
{:else if $activeTab === "services" }
<MerchantItemTab {store} services={true}/>
{:else if $activeTab === "sell"}
Expand Down

0 comments on commit 97546f3

Please sign in to comment.