Blasphemous: Add start_inventory_from_pool (#4217)

ArchipelagoMW · Nov 30, 2024 · ca6792a · ca6792a
1 parent 7cbd50a
commit ca6792a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/worlds/blasphemous/Options.py b/worlds/blasphemous/Options.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from Options import Choice, Toggle, DefaultOnToggle, DeathLink, PerGameCommonOptions, OptionGroup
+from Options import Choice, Toggle, DefaultOnToggle, DeathLink, PerGameCommonOptions, StartInventoryPool, OptionGroup
 import random
 
 
@@ -213,6 +213,7 @@ class BlasphemousDeathLink(DeathLink):
 
 @dataclass
 class BlasphemousOptions(PerGameCommonOptions):
+    start_inventory_from_pool: StartInventoryPool
     prie_dieu_warp: PrieDieuWarp
     skip_cutscenes: SkipCutscenes
     corpse_hints: CorpseHints

diff --git a/worlds/blasphemous/__init__.py b/worlds/blasphemous/__init__.py
@@ -137,12 +137,6 @@ def create_items(self):
         ]
 
         skipped_items = []
-        junk: int = 0
-
-        for item, count in self.options.start_inventory.value.items():
-            for _ in range(count):
-                skipped_items.append(item)
-                junk += 1
 
         skipped_items.extend(unrandomized_dict.values())
 
@@ -194,9 +188,6 @@ def create_items(self):
                 for _ in range(count):
                     pool.append(self.create_item(item["name"]))
 
-        for _ in range(junk):
-            pool.append(self.create_item(self.get_filler_item_name()))
-
         self.multiworld.itempool += pool
 
         self.place_items_from_dict(unrandomized_dict)