mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
Blasphemous: Add start_inventory_from_pool (#4217)
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
from dataclasses import dataclass
|
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
|
import random
|
||||||
|
|
||||||
|
|
||||||
@@ -213,6 +213,7 @@ class BlasphemousDeathLink(DeathLink):
|
|||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class BlasphemousOptions(PerGameCommonOptions):
|
class BlasphemousOptions(PerGameCommonOptions):
|
||||||
|
start_inventory_from_pool: StartInventoryPool
|
||||||
prie_dieu_warp: PrieDieuWarp
|
prie_dieu_warp: PrieDieuWarp
|
||||||
skip_cutscenes: SkipCutscenes
|
skip_cutscenes: SkipCutscenes
|
||||||
corpse_hints: CorpseHints
|
corpse_hints: CorpseHints
|
||||||
|
@@ -137,12 +137,6 @@ class BlasphemousWorld(World):
|
|||||||
]
|
]
|
||||||
|
|
||||||
skipped_items = []
|
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())
|
skipped_items.extend(unrandomized_dict.values())
|
||||||
|
|
||||||
@@ -194,9 +188,6 @@ class BlasphemousWorld(World):
|
|||||||
for _ in range(count):
|
for _ in range(count):
|
||||||
pool.append(self.create_item(item["name"]))
|
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.multiworld.itempool += pool
|
||||||
|
|
||||||
self.place_items_from_dict(unrandomized_dict)
|
self.place_items_from_dict(unrandomized_dict)
|
||||||
|
Reference in New Issue
Block a user