Vision Mode with Highlighting will now check shops as well, which is mostly only useful for the shop in The Den. This juice was not worth the squeeze. (d4lfteam#495)

cjshrader · web-flow · commit e76bccb2bd55 · 2025-05-18T21:13:32.000-04:00
diff --git a/assets/templates/vendor_menu_icon.png b/assets/templates/vendor_menu_icon.png
diff --git a/assets/templates/vendor_menu_icon_1080p.png b/assets/templates/vendor_menu_icon_1080p.png
diff --git a/assets/thumbnail_tts_temp_hopefully.jpg b/assets/thumbnail_tts_temp_hopefully.jpg
diff --git a/src/__init__.py b/src/__init__.py
@@ -2,4 +2,4 @@
 
 TP = concurrent.futures.ThreadPoolExecutor()
 
-__version__ = "7.1.7"
+__version__ = "7.1.8"
diff --git a/src/config/data.py b/src/config/data.py
@@ -53,12 +53,13 @@
         rel_descr_search_left=np.array([-900, 0, 150, 1760]),
         rel_descr_search_right=np.array([60, 0, 120, 1760]),
         rel_fav_flag=np.array([8, 6, 16, 20]),
+        slots_8x1=np.array([1166, 165, 125, 1462]),
         slots_3x11=np.array([2536, 1444, 1214, 486]),
         slots_5x10=np.array([92, 538, 1224, 972]),
         sort_icon=np.array([2440, 1332, 126, 124]),
         stash_menu_icon=np.array([592, 144, 218, 96]),
         tab_slots_6=np.array([300, 284, 800, 102]),
-        vendor_text=np.array([200, 782, 188, 44]),
+        vendor_menu_icon=np.array([182, 757, 220, 90]),
     ),
 )
 
diff --git a/src/config/models.py b/src/config/models.py
@@ -561,9 +561,10 @@ class UiRoiModel(NumpyModel):
     rel_descr_search_left: np_array_pydantic_annotated_typing(dimensions=1)
     rel_descr_search_right: np_array_pydantic_annotated_typing(dimensions=1)
     rel_fav_flag: np_array_pydantic_annotated_typing(dimensions=1)
+    slots_8x1: np_array_pydantic_annotated_typing(dimensions=1)
     slots_3x11: np_array_pydantic_annotated_typing(dimensions=1)
     slots_5x10: np_array_pydantic_annotated_typing(dimensions=1)
     sort_icon: np_array_pydantic_annotated_typing(dimensions=1)
     stash_menu_icon: np_array_pydantic_annotated_typing(dimensions=1)
     tab_slots_6: np_array_pydantic_annotated_typing(dimensions=1)
-    vendor_text: np_array_pydantic_annotated_typing(dimensions=1)
+    vendor_menu_icon: np_array_pydantic_annotated_typing(dimensions=1)
diff --git a/src/config/ui.py b/src/config/ui.py
@@ -84,12 +84,13 @@ def fromUHD(self) -> tuple[UiOffsetsModel, UiPosModel, UiRoiModel, dict[str, Tem
             rel_descr_search_left=self._transform_array(value=POSITIONS[3].rel_descr_search_left, scale_only=True),
             rel_descr_search_right=self._transform_array(value=POSITIONS[3].rel_descr_search_right, scale_only=True),
             rel_fav_flag=self._transform_array(value=POSITIONS[3].rel_fav_flag, scale_only=True),
+            slots_8x1=self._transform_array(value=POSITIONS[3].slots_8x1),
             slots_3x11=self._transform_array(value=POSITIONS[3].slots_3x11),
             slots_5x10=self._transform_array(value=POSITIONS[3].slots_5x10),
             sort_icon=self._transform_array(value=POSITIONS[3].sort_icon),
             stash_menu_icon=self._transform_array(value=POSITIONS[3].stash_menu_icon),
             tab_slots_6=self._transform_array(value=POSITIONS[3].tab_slots_6),
-            vendor_text=self._transform_array(value=POSITIONS[3].vendor_text),
+            vendor_menu_icon=self._transform_array(value=POSITIONS[3].vendor_menu_icon),
         )
         templates = self._transform_templates(load_templates())
         return offsets, pos, roi, templates
diff --git a/src/item/descr/read_descr_tts.py b/src/item/descr/read_descr_tts.py
@@ -177,8 +177,6 @@ def _create_base_item_from_tts(tts_item: list[str]) -> Item | None:
         return Item(item_type=ItemType.Material)
     if any(tts_item[1].lower().endswith(x) for x in ["gem"]):
         return Item(item_type=ItemType.Gem)
-    if any(tts_item[1].lower().endswith(x) for x in ["cache"]):
-        return Item(item_type=ItemType.Cache)
     if any(tts_item[1].lower().endswith(x) for x in ["whispering wood"]):
         return Item(item_type=ItemType.WhisperingWood)
     if any(tts_item[1].lower().startswith(x) for x in ["cosmetic"]):
@@ -191,6 +189,11 @@ def _create_base_item_from_tts(tts_item: list[str]) -> Item | None:
         item.rarity = _get_item_rarity(search_string_split[0])
         return item
     item = Item()
+    if any("Cost : " in value for value in tts_item):
+        item.is_in_shop = True
+    if any(tts_item[1].lower().endswith(x) for x in ["cache"]):
+        item.item_type = ItemType.Cache
+        return item
     if tts_item[1].lower().endswith("elixir"):
         item.item_type = ItemType.Elixir
     elif tts_item[1].lower().endswith("incense"):
diff --git a/src/item/models.py b/src/item/models.py
@@ -17,6 +17,7 @@ class Item:
     codex_upgrade: bool = False
     cosmetic_upgrade: bool = False
     inherent: list[Affix] = field(default_factory=list)
+    is_in_shop: bool = False
     item_type: ItemType | None = None
     name: str | None = None
     power: int | None = None
@@ -53,6 +54,8 @@ def __eq__(self, other):
         if self.rarity != other.rarity:
             # LOGGER.debug("Rarity not the same")
             res = False
+        if self.is_in_shop != other.is_in_shop:
+            res = False
         return res
 
 
diff --git a/src/loot_mover.py b/src/loot_mover.py
@@ -4,8 +4,8 @@
 from src.config.loader import IniConfigLoader
 from src.config.models import MoveItemsType
 from src.ui.char_inventory import CharInventory
-from src.ui.chest import Chest
 from src.ui.inventory_base import ItemSlot
+from src.ui.stash import Stash
 from src.utils.custom_mouse import mouse
 
 LOGGER = logging.getLogger(__name__)
@@ -15,9 +15,9 @@ def move_items_to_stash():
     LOGGER.info("Move inventory items to stash")
 
     inv = CharInventory()
-    chest = Chest()
+    stash = Stash()
 
-    if not chest.is_open():
+    if not stash.is_open():
         LOGGER.error("Moving items only works if stash is open")
         return
 
@@ -28,9 +28,9 @@ def move_items_to_stash():
         return
 
     for i in IniConfigLoader().general.check_chest_tabs:
-        chest.switch_to_tab(i)
+        stash.switch_to_tab(i)
 
-        _, empty_chest = chest.get_item_slots()
+        _, empty_chest = stash.get_item_slots()
 
         if not empty_chest:
             continue
@@ -48,9 +48,9 @@ def move_items_to_inventory():
     LOGGER.info("Move stash items to inventory")
 
     inv = CharInventory()
-    chest = Chest()
+    stash = Stash()
 
-    if not chest.is_open():
+    if not stash.is_open():
         LOGGER.error("Moving items only works if stash is open")
         return
 
@@ -62,8 +62,8 @@ def move_items_to_inventory():
         return
 
     for i in IniConfigLoader().general.check_chest_tabs:
-        chest.switch_to_tab(i)
-        unhandled_slots, _ = chest.get_item_slots()
+        stash.switch_to_tab(i)
+        unhandled_slots, _ = stash.get_item_slots()
 
         LOGGER.debug(
             f"Stash tab {i} - Number of stash items: {len(unhandled_slots)} - Number of empty inventory spaces: {empty_slot_count}"
diff --git a/src/scripts/handler.py b/src/scripts/handler.py
@@ -17,7 +17,7 @@
 from src.loot_mover import move_items_to_inventory, move_items_to_stash
 from src.scripts.common import SETUP_INSTRUCTIONS_URL
 from src.ui.char_inventory import CharInventory
-from src.ui.chest import Chest
+from src.ui.stash import Stash
 from src.utils.custom_mouse import mouse
 from src.utils.process_handler import kill_thread, safe_exit
 from src.utils.window import screenshot
@@ -123,13 +123,13 @@ def run_loot_filter(force_refresh: ItemRefreshType = ItemRefreshType.no_refresh)
     check_items = src.scripts.loot_filter_tts.check_items
 
     inv = CharInventory()
-    chest = Chest()
+    stash = Stash()
 
-    if chest.is_open():
+    if stash.is_open():
         for i in IniConfigLoader().general.check_chest_tabs:
-            chest.switch_to_tab(i)
+            stash.switch_to_tab(i)
             time.sleep(0.3)
-            check_items(chest, force_refresh)
+            check_items(stash, force_refresh)
         mouse.move(*Cam().abs_window_to_monitor((0, 0)))
         time.sleep(0.3)
         check_items(inv, force_refresh)
diff --git a/src/scripts/vision_mode_with_highlighting.py b/src/scripts/vision_mode_with_highlighting.py
@@ -23,7 +23,8 @@
 from src.scripts.common import is_ignored_item, reset_canvas
 from src.tts import Publisher
 from src.ui.char_inventory import CharInventory
-from src.ui.chest import Chest
+from src.ui.stash import Stash
+from src.ui.vendor import Vendor
 from src.utils.custom_mouse import mouse
 from src.utils.image_operations import compare_histograms
 from src.utils.process_handler import kill_thread
@@ -54,20 +55,30 @@ def __init__(self):
         self.thick = int(Cam().window_roi["height"] * 0.0047)
 
         inv = CharInventory()
-        chest = Chest()
+        stash = Stash()
+        vendor = Vendor()
         img = Cam().grab()
-        self.max_slot_size = chest.get_max_slot_size()
+        self.max_slot_size = stash.get_max_slot_size()
         occ_inv, empty_inv = inv.get_item_slots(img)
-        occ_chest, empty_chest = chest.get_item_slots(img)
+        occ_stash, empty_stash = stash.get_item_slots(img)
+        occ_vendor, empty_vendor = vendor.get_item_slots(img)
         possible_centers = []
         possible_centers += [slot.center for slot in occ_inv]
         possible_centers += [slot.center for slot in empty_inv]
-        possible_centers += [slot.center for slot in occ_chest]
-        possible_centers += [slot.center for slot in empty_chest]
+
         # add possible centers of equipped items
         for x in ResManager().pos.possible_centers:
             possible_centers.append(x)
+
+        possible_vendor_centers = possible_centers.copy()
+        possible_vendor_centers += [slot.center for slot in occ_vendor]
+        possible_vendor_centers += [slot.center for slot in empty_vendor]
+
+        possible_centers += [slot.center for slot in occ_stash]
+        possible_centers += [slot.center for slot in empty_stash]
+
         self.possible_centers = np.array(possible_centers)
+        self.possible_vendor_centers = np.array(possible_vendor_centers)
 
         self.screen_off_x = Cam().window_roi["left"]
         self.screen_off_y = Cam().window_roi["top"]
@@ -260,10 +271,11 @@ def evaluate_item_and_queue_draw(self, item_descr: Item):
                 retry_count += 1
                 mouse_pos = Cam().monitor_to_window(mouse.get_position())
                 # get closest pos to a item center
-                delta = self.possible_centers - mouse_pos
+                centers_to_use = self.possible_vendor_centers if item_descr.is_in_shop else self.possible_centers
+                delta = centers_to_use - mouse_pos
                 distances = np.linalg.norm(delta, axis=1)
                 closest_index = np.argmin(distances)
-                item_center = self.possible_centers[closest_index]
+                item_center = centers_to_use[closest_index]
 
                 # Before we get the cropped_descr we need to ensure there is no previous overlay on screen
                 while not self.is_cleared:
diff --git a/src/template_finder.py b/src/template_finder.py
@@ -207,7 +207,6 @@ def _process_cv_result(template: Template, img: np.ndarray) -> bool:
         new_match = False
         res, template_img, new_roi = _get_cv_result(template, img, roi, color_match, use_grayscale)
 
-        # i = 0
         while True and not (matches and mode == "first") and res is not None:
             _, max_val, _, max_pos = cv2.minMaxLoc(res)
 
diff --git a/src/ui/stash.py b/src/ui/stash.py
@@ -10,10 +10,10 @@
 LOGGER = logging.getLogger(__name__)
 
 
-class Chest(InventoryBase):
+class Stash(InventoryBase):
     def __init__(self):
         super().__init__(5, 10, is_stash=True)
-        self.menu_name = "Chest"
+        self.menu_name = "Stash"
         self.is_open_search_args = SearchArgs(
             ref=["stash_menu_icon", "stash_menu_icon_medium"], threshold=0.8, roi="stash_menu_icon", use_grayscale=True
         )
diff --git a/src/ui/vendor.py b/src/ui/vendor.py
@@ -0,0 +1,16 @@
+import logging
+
+from src.template_finder import SearchArgs
+from src.ui.inventory_base import InventoryBase
+
+LOGGER = logging.getLogger(__name__)
+
+
+class Vendor(InventoryBase):
+    def __init__(self):
+        super().__init__(8, 1, is_stash=False)
+        self.menu_name = "Vendor"
+        self.is_open_search_args = SearchArgs(
+            ref=["vendor_menu_icon", "vendor_menu_icon_1080p"], threshold=0.8, roi="vendor_menu_icon", use_grayscale=True
+        )
+        self.curr_tab = 0
diff --git a/tests/config/ui_test.py b/tests/config/ui_test.py
@@ -41,4 +41,4 @@ def test_colors():
 
 
 def test_templates():
-    assert len(ResManager().templates) == 51
+    assert len(ResManager().templates) == 53
diff --git a/tests/ui/chest_test.py b/tests/ui/chest_test.py
@@ -3,7 +3,7 @@
 
 from src.cam import Cam
 from src.config import BASE_DIR
-from src.ui.chest import Chest
+from src.ui.stash import Stash
 
 BASE_PATH = BASE_DIR / "tests/assets/ui"
 
@@ -12,6 +12,6 @@
 def test_chest(img_res, input_img):
     Cam().update_window_pos(0, 0, *img_res)
     img = cv2.imread(input_img)
-    inv = Chest()
+    inv = Stash()
     flag = inv.is_open(img)
     assert flag

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`TP = concurrent.futures.ThreadPoolExecutor()`
`4`	`4`
`5`		`-__version__ = "7.1.7"`
	`5`	`+__version__ = "7.1.8"`