LADX: use start_inventory_from_pool (#4641)
This commit is contained in:
@@ -3,7 +3,7 @@ from dataclasses import dataclass
|
||||
import os.path
|
||||
import typing
|
||||
import logging
|
||||
from Options import Choice, Toggle, DefaultOnToggle, Range, FreeText, PerGameCommonOptions, OptionGroup, Removed
|
||||
from Options import Choice, Toggle, DefaultOnToggle, Range, FreeText, PerGameCommonOptions, OptionGroup, Removed, StartInventoryPool
|
||||
from collections import defaultdict
|
||||
import Utils
|
||||
|
||||
@@ -665,6 +665,7 @@ class LinksAwakeningOptions(PerGameCommonOptions):
|
||||
tarins_gift: TarinsGift
|
||||
overworld: Overworld
|
||||
stabilize_item_pool: StabilizeItemPool
|
||||
start_inventory_from_pool: StartInventoryPool
|
||||
|
||||
warp_improvements: Removed
|
||||
additional_warp_points: Removed
|
||||
|
||||
@@ -225,8 +225,6 @@ class LinksAwakeningWorld(World):
|
||||
def create_items(self) -> None:
|
||||
itempool = []
|
||||
|
||||
exclude = [item.name for item in self.multiworld.precollected_items[self.player]]
|
||||
|
||||
self.prefill_original_dungeon = [ [], [], [], [], [], [], [], [], [] ]
|
||||
self.prefill_own_dungeons = []
|
||||
self.pre_fill_items = []
|
||||
@@ -243,10 +241,6 @@ class LinksAwakeningWorld(World):
|
||||
continue
|
||||
item_name = ladxr_item_to_la_item_name[ladx_item_name]
|
||||
for _ in range(count):
|
||||
if item_name in exclude:
|
||||
exclude.remove(item_name) # this is destructive. create unique list above
|
||||
self.multiworld.itempool.append(self.create_item(self.get_filler_item_name()))
|
||||
else:
|
||||
item = self.create_item(item_name)
|
||||
|
||||
if not self.options.tradequest and isinstance(item.item_data, TradeItemData):
|
||||
|
||||
Reference in New Issue
Block a user