Merge pull request #51 from ManualForArchipelago/client-improvements

avoid doing string comparisons when removing location buttons

Author: FuzzyGamesOn

src/ManualClient.py

@@ -98,7 +98,8 @@ async def connection_closed(self):
     def suggested_game(self) -> str:
         if self.game:
             return self.game
-        return Utils.persistent_load().get("client", {}).get("last_manual_game", "Manual_{\"game\" from game.json}_{\"creator\" from game.json}")
+        from .Game import game_name  # This will at least give us the name of a manual they've installed
+        return Utils.persistent_load().get("client", {}).get("last_manual_game", game_name)
 
     def get_location_by_name(self, name) -> dict[str, Any]:
         location = self.location_table.get(name)
@@ -205,6 +206,7 @@ class LocationsLayoutScrollable(ScrollView):
 
         class TreeViewButton(Button, TreeViewNode):
             victory: bool = False
+            id: int = None
 
         class TreeViewScrollView(ScrollView, TreeViewNode):
             pass
@@ -423,6 +425,7 @@ def build_tracker_and_locations_table(self):
                     for location_id in self.listed_locations[location_category]:
                         location_button = TreeViewButton(text=self.ctx.location_names[location_id], size_hint=(None, None), height=30, width=400)
                         location_button.bind(on_press=lambda *args, loc_id=location_id: self.location_button_callback(loc_id, *args))
+                        location_button.id = location_id
                         category_layout.add_widget(location_button)
 
                     # if this is the category that Victory is in, display the Victory button
@@ -563,9 +566,7 @@ def update_tracker_and_locations_table(self, update_highlights=False):
                                                 reachable_count += 1
                                             continue
 
-                                        location = self.ctx.get_location_by_name(location_button.text)
-
-                                        if ("victory" not in location or not location["victory"]) and location["id"] not in self.ctx.missing_locations:
+                                        if location_button.id and location_button.id not in self.ctx.missing_locations:
                                             import logging
 
                                             logging.info("location button being removed: " + location_button.text)

src/__init__.py

@@ -409,7 +409,7 @@ def __init__(self, display_name: str, script_name: Optional[str] = None, func: O
         self.version = version
 
 def add_client_to_launcher() -> None:
-    version = 2024_04_23 # YYYYMMDD
+    version = 2024_05_05 # YYYYMMDD
     found = False
     for c in components:
         if c.display_name == "Manual Client":