Merge parent/master into Hint_extend_information

# Conflicts resolved:
#	schemas/Manual.locations.schema.json

Author: axxroytovu

schemas/Manual.items.schema.json

@@ -94,6 +94,10 @@
                     "type": ["boolean", "integer"],
                     "default": false
                 },
+                "id": {
+                    "description": "(Optional) Skips the item ID forward to the given value.\nThis can be used to provide buffer space for future items.",
+                    "type": "integer"
+                },
                 "_comment": {"$ref": "#/definitions/comment"}
             },
             "required": ["name"]
@@ -107,4 +111,4 @@
             }
         }
     }
-}
+}

schemas/Manual.locations.schema.json

@@ -95,7 +95,11 @@
                 "hint_entrance": {
                     "description": "(Optional) Adds additional text to this location's hints to convey useful information. Typically used for entrance randomization.",
                     "type": "string"
-                }
+                },
+                "id": {
+                    "description": "(Optional) Skips the item ID forward to the given value.\nThis can be used to provide buffer space for future items.",
+                    "type": "integer"
+                },
                 "_comment": {"$ref": "#/definitions/comment"}
             }
         },
@@ -122,4 +126,4 @@
             }
         }
     }
-}
+}

src/Items.py

@@ -23,6 +23,13 @@
 
 # add sequential generated ids to the lists
 for key, val in enumerate(item_table):
+    if "id" in item_table[key]:
+        item_id = item_table[key]["id"]
+        if item_id >= count:
+            count = item_id
+        else:
+            raise ValueError(f"{item_table[key]['name']} has an invalid ID. ID must be at least {count + 1}")
+
     item_table[key]["id"] = count
     item_table[key]["progression"] = val["progression"] if "progression" in val else False
     count += 1

src/Locations.py

@@ -15,6 +15,13 @@
     if "victory" in location_table[key] and location_table[key]["victory"]:
         victory_names.append(location_table[key]["name"])
 
+    if "id" in location_table[key]:
+        item_id = location_table[key]["id"]
+        if item_id >= count:
+            count = item_id
+        else:
+            raise ValueError(f"{location_table[key]['name']} has an invalid ID. ID must be at least {count + 1}")
+
     location_table[key]["id"] = count
 
     if not "region" in location_table[key]:

src/ManualClient.py

@@ -320,7 +320,7 @@ def enable_death_link(self):
                     self.death_link_button = Button(text="Death Link: Primed",
                                                 size_hint_x=None, width=150)
                     self.connect_layout.add_widget(self.death_link_button)
-                    self.death_link_button.bind(on_press=self.send_death_link)
+                    self.death_link_button.bind(on_release=self.send_death_link)
 
             def send_death_link(self, *args):
                 if self.ctx.last_death_link:
@@ -458,7 +458,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.lookup_in_game(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.bind(on_release=lambda *args, loc_id=location_id: self.location_button_callback(loc_id, *args))
                         location_button.id = location_id
                         category_layout.add_widget(location_button)
 
@@ -470,7 +470,7 @@ def build_tracker_and_locations_table(self):
                         victory_text = "VICTORY! (seed finished)" if victory_location["name"] == "__Manual Game Complete__" else "GOAL: " + victory_location["name"]
                         location_button = TreeViewButton(text=victory_text, size_hint=(None, None), height=30, width=400)
                         location_button.victory = True
-                        location_button.bind(on_press=self.victory_button_callback)
+                        location_button.bind(on_release=self.victory_button_callback)
                         category_layout.add_widget(location_button)
 
                 tracker_panel_scrollable.add_widget(tracker_panel)

src/__init__.py

@@ -64,7 +64,7 @@ class ManualWorld(World):
     victory_names = victory_names
 
     def get_filler_item_name(self) -> str:
-        return hook_get_filler_item_name() or filler_item_name
+        return hook_get_filler_item_name(self, self.multiworld, self.player) or filler_item_name
 
     def interpret_slot_data(self, slot_data: dict[str, any]):
         #this is called by tools like UT

src/hooks/World.py

@@ -33,7 +33,7 @@
 
 # Use this function to change the valid filler items to be created to replace item links or starting items.
 # Default value is the `filler_item_name` from game.json
-def hook_get_filler_item_name() -> str | bool:
+def hook_get_filler_item_name(world: World, multiworld: MultiWorld, player: int) -> str | bool:
     return False
 
 # Called before regions and locations are created. Not clear why you'd want this, but it's here. Victory location is included, but Victory event is not placed yet.