Update priced item highlight to handle pricing with premium stash tabs

cptpingu · Aug 11, 2019 · f495df2 · f495df2
1 parent fb3ce5d
commit f495df2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/README b/README
@@ -11,3 +11,4 @@ TODO
  More rigourous item description generation
  Shop id for the link after shop generation
  Don't hardcode account passwords!
+ Search bar?
diff --git a/data/template/parts/helpers.js.tmpl b/data/template/parts/helpers.js.tmpl
@@ -557,6 +557,24 @@
             realm.options[realm.selectedIndex].value);
     }
 
+    function itemIsForSale(id) {
+        // Check if item has a price attached to it.
+        var currency = document.getElementById(id + '-currency');
+        if (currency.style.display != 'none') {
+            return true;
+        }
+
+        // Check if item has a price set in game with a premium tab.
+        var item = document.getElementById(id);
+        var desc = item.getAttribute("data-premium-price");
+        if (desc != undefined && desc != "" ) {
+            return true;
+        }
+
+        // No price found anywhere.
+        return false;
+    }
+
     function highlightItems(highlightType) {
         var items = document.getElementsByClassName('newItemContainer');
         // Retrieve all sellable objects
@@ -569,14 +587,14 @@
                         items[i].style.opacity = 1.0;
                         break;
                     case 'sell':
-                        if (currency.style.display != 'none') {
+                        if (itemIsForSale(id)) {
                             items[i].style.opacity = 1.0;
                         } else {
                             items[i].style.opacity = 0.3;
                         }
                         break;
                     case 'noprice':
-                        if (currency.style.display == 'none') {
+                        if (!itemIsForSale(id)) {
                             items[i].style.opacity = 1.0;
                         } else {
                             items[i].style.opacity = 0.3;

diff --git a/data/template/parts/item.tmpl b/data/template/parts/item.tmpl
@@ -28,6 +28,7 @@
                 style="position: absolute; left: {{ DeducePosX $layoutType .InventoryId $layout .X .Y $idx }}px; top: {{ DeducePosY $layoutType .InventoryId $layout .X .Y $idx }}px; display: {{ $visibility }};"
                 data-sell="{{ SellDescription . $charName }}"
                 data-desc="{{ template "itemtext" $item }}"
+                data-premium-price="{{ .Note }}"
                 onclick="openModal('item-{{ .Id }}', '{{ .Name }}', '{{ .Type }}')">
                 <div id="item-{{ .Id }}-currency" class="item-price" style="display: none;">
                   <img id="item-{{ .Id }}-currency-img" class="thumbnail" src="" />