Bugfix: More related bugs for town and ui overhaul (#610)

* fix id logic, fix count reset, up to version 0.7.0, trim excess

* attempt to fix loop at cain, etc. when return_to_play() is called

* spell check, simplify

* center mouse after opening NPC menu

* fix messenger item count bug

Author: aliig

src/bot.py

@@ -292,7 +292,7 @@ def on_maintenance(self):
             # Check inventory items
             if personal.inventory_has_items(img):
                 Logger.debug("Inspecting inventory items")
-                items = personal.inspect_items(img, close_window=False)
+                items = personal.inspect_items(img, close_window=False, game_stats=self._game_stats)
             common.close()
         Logger.debug(f"Needs: {consumables.get_needs()}")
         if items:
@@ -303,7 +303,7 @@ def on_maintenance(self):
                 if not self._curr_loc:
                     return self.trigger_or_stop("end_game", failed=True)
                 # recheck inventory
-                items = personal.inspect_items()
+                items = personal.inspect_items(game_stats=self._game_stats)
         keep_items = any([item.keep for item in items]) if items else None
         sell_items = any([item.sell for item in items]) if items else None
 

src/inventory/personal.py

@@ -1,4 +1,5 @@
 import itertools
+from game_stats import GameStats
 from item import ItemFinder, Item
 from item.item_cropper import ItemText
 from logger import Logger
@@ -15,13 +16,11 @@
 from inventory import stash, common, vendor
 from ui import view
 from ui_manager import detect_screen_object, wait_for_screen_object, ScreenObjects, center_mouse
-from game_stats import GameStats
 from item import ItemCropper
 from messages import Messenger
 
 messenger = Messenger()
 item_finder = ItemFinder()
-game_stats = GameStats()
 nontradable_items = ["key of ", "essense of", "wirt's", "jade figurine"]
 
 def inventory_has_items(img: np.ndarray = None, close_window = False) -> bool:
@@ -47,7 +46,7 @@ def stash_all_items(items: list = None):
     """
     Stashing all items in inventory. Stash UI must be open when calling the function.
     """
-    global messenger, game_stats
+    global messenger
     if items is None:
         Logger.debug("No items to stash, skip")
         return False
@@ -258,7 +257,7 @@ def open(img: np.ndarray = None) -> np.ndarray:
         img = grab()
     return img
 
-def inspect_items(inp_img: np.ndarray = None, close_window: bool = True):
+def inspect_items(inp_img: np.ndarray = None, close_window: bool = True, game_stats: GameStats = None):
     """
     Iterate over all picked items in inventory--ID items and decide which to stash
     :param img: Image in which the item is searched (item details should be visible)

src/npc_manager.py

@@ -5,7 +5,7 @@
 from template_finder import TemplateFinder
 from config import Config
 from screen import grab
-from ui_manager import detect_screen_object, ScreenObjects
+from ui_manager import detect_screen_object, ScreenObjects, center_mouse
 from utils.misc import color_filter, wait
 from logger import Logger
 from utils.custom_mouse import mouse
@@ -301,7 +301,7 @@ def press_npc_btn(npc_key: Npc, action_btn_key: str):
         mouse.move(*res.center, randomize=3, delay_factor=[1.0, 1.5])
         wait(0.2, 0.4)
         mouse.click(button="left")
-        wait(0.3, 0.4)
+        center_mouse()
     else:
         Logger.error(f"Could not find {action_btn_key} btn. Should not happen! Continue...")
         keyboard.send("esc")