monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TS: putting non consumable items in starting inventory will now remove them from the pool so a duplicate wont drop

This commit is contained in:
Jarno Westhof 2021-12-12 14:52:22 +01:00 committed by Fabian Dill
parent 13036539b7
commit c0b8384319
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
worlds/timespinner/__init__.py
View File

@ -35,8 +35,9 @@ class TimespinnerWorld(World):
self.location_cache = [] self.location_cache = []
self.pyramid_keys_unlock = get_pyramid_keys_unlock(world, player) self.pyramid_keys_unlock = get_pyramid_keys_unlock(world, player)
# for item in self.world.precollected_items[self.player]: #TODO
# if item.name in self.remove_from_start_inventory: #Non local items not getting rewarded locally
#Do not reward starting progression item if you already got one as your starting item
def generate_early(self): def generate_early(self):
if self.world.start_inventory[self.player].value.pop('Meyef', 0) > 0: if self.world.start_inventory[self.player].value.pop('Meyef', 0) > 0:
@ -63,7 +64,7 @@ class TimespinnerWorld(World):
def generate_basic(self): def generate_basic(self):
excluded_items = get_excluded_items_based_on_options(self.world, self.player) excluded_items = get_excluded_items_based(self, self.world, self.player)
assign_starter_items(self.world, self.player, excluded_items, self.locked_locations) assign_starter_items(self.world, self.player, excluded_items, self.locked_locations)
@ -96,7 +97,7 @@ class TimespinnerWorld(World):
spoiler_handle.write('Twin Pyramid Keys unlock: %s\n' % (self.pyramid_keys_unlock)) spoiler_handle.write('Twin Pyramid Keys unlock: %s\n' % (self.pyramid_keys_unlock))
def get_excluded_items_based_on_options(world: MultiWorld, player: int) -> Set[str]: def get_excluded_items_based(self: TimespinnerWorld, world: MultiWorld, player: int) -> Set[str]:
excluded_items: Set[str] = set() excluded_items: Set[str] = set()
if is_option_enabled(world, player, "StartWithJewelryBox"): if is_option_enabled(world, player, "StartWithJewelryBox"):
@ -105,6 +106,10 @@ def get_excluded_items_based_on_options(world: MultiWorld, player: int) -> Set[s
excluded_items.add('Meyef') excluded_items.add('Meyef')
if is_option_enabled(world, player, "QuickSeed"): if is_option_enabled(world, player, "QuickSeed"):
excluded_items.add('Talaria Attachment') excluded_items.add('Talaria Attachment')
for item in world.precollected_items[player]:
if item.name not in self.item_name_groups['UseItem']:
excluded_items.add(item.name)
return excluded_items return excluded_items