Merge remote-tracking branch 'origin/main' into more_client

Author: silasary

src/DataValidation.py

@@ -366,7 +366,7 @@ def checkStartingItemsForBadSyntax():
             if type(starting_block) is not dict or len(starting_block.keys()) == 0:
                 raise ValidationError("One of your starting item definitions is not a valid dictionary.\n   Each definition must be inside {}, as demonstrated in the Manual documentation.")
 
-            valid_keys = ["items", "item_categories", "random", "if_previous_item", "_comment"] # _comment is provided by schema
+            valid_keys = ["items", "item_categories", "random", "if_previous_item", "_comment", "yaml_option"] # _comment is provided by schema
             invalid_keys = [f'"{key}"' for key in starting_block.keys() if key not in valid_keys]
 
             if len(invalid_keys) > 0:

src/Options.py

@@ -1,4 +1,4 @@
-from Options import FreeText, NumericOption, Toggle, DefaultOnToggle, Choice, TextChoice, Range, NamedRange, PerGameCommonOptions, DeathLink
+from Options import FreeText, NumericOption, Toggle, DefaultOnToggle, Choice, TextChoice, Range, PerGameCommonOptions, DeathLink, StartInventoryPool
 from dataclasses import make_dataclass
 from .hooks.Options import before_options_defined, after_options_defined
 from .Data import category_table, game_table
@@ -13,6 +13,8 @@ class FillerTrapPercent(Range):
 
 manual_options = before_options_defined({})
 
+manual_options["start_inventory_from_pool"] = StartInventoryPool
+
 if len(victory_names) > 1:
     goal = {'option_' + v: i for i, v in enumerate(victory_names)}
     manual_options['goal'] = type('goal', (Choice,), goal)

src/__init__.py

@@ -54,6 +54,8 @@ class ManualWorld(World):
     item_name_to_item = item_name_to_item
     item_name_groups = item_name_groups
 
+    filler_item_name = filler_item_name
+
     item_counts = {}
     start_inventory = {}
 
@@ -64,7 +66,7 @@ class ManualWorld(World):
     victory_names = victory_names
 
     def get_filler_item_name(self) -> str:
-        return hook_get_filler_item_name(self, self.multiworld, self.player) or filler_item_name
+        return hook_get_filler_item_name(self, self.multiworld, self.player) or self.filler_item_name
 
     def interpret_slot_data(self, slot_data: dict[str, any]):
         #this is called by tools like UT
@@ -106,8 +108,10 @@ def create_items(self):
         configured_item_names = self.item_id_to_name.copy()
 
         for name in configured_item_names.values():
+            # victory gets placed via place_locked_item at the victory location in create_regions
             if name == "__Victory__": continue
-            if name == filler_item_name: continue
+            # the game.json filler item name is added to the item lookup, so skip it until it's potentially needed later
+            if name == filler_item_name: continue # intentionally using the Game.py filler_item_name here because it's a non-Items item
 
             item = self.item_name_to_item[name]
             item_count = int(item.get("count", 1))
@@ -370,7 +374,7 @@ def adjust_filler_items(self, item_pool, traps):
                 item_pool.append(extra_item)
 
             for _ in range(0, filler_count):
-                extra_item = self.create_item(filler_item_name)
+                extra_item = self.create_item(self.get_filler_item_name())
                 item_pool.append(extra_item)
         elif extras < 0:
             logging.warning(f"{self.game} has more items than locations. {abs(extras)} non-progression items will be removed at random.")