alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fixing spoiler log suppression for OW locations

Browse Source
This commit is contained in:
codemann8
2022-11-05 21:56:40 -05:00
parent 47b92997df
commit 757fee8220
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseClasses.py
View File

@@ -2876,11 +2876,11 @@ class Spoiler(object):
self.locations = OrderedDict() self.locations = OrderedDict()
listed_locations = set() listed_locations = set()
lw_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.type == RegionType.LightWorld] lw_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.type == RegionType.LightWorld and not loc.skip]
self.locations['Light World'] = OrderedDict([(location.gen_name(), str(location.item) if location.item is not None else 'Nothing') for location in lw_locations]) self.locations['Light World'] = OrderedDict([(location.gen_name(), str(location.item) if location.item is not None else 'Nothing') for location in lw_locations])
listed_locations.update(lw_locations) listed_locations.update(lw_locations)
dw_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.type == RegionType.DarkWorld] dw_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.type == RegionType.DarkWorld and not loc.skip]
self.locations['Dark World'] = OrderedDict([(location.gen_name(), str(location.item) if location.item is not None else 'Nothing') for location in dw_locations]) self.locations['Dark World'] = OrderedDict([(location.gen_name(), str(location.item) if location.item is not None else 'Nothing') for location in dw_locations])
listed_locations.update(dw_locations) listed_locations.update(dw_locations)

2
Fill.py
View File

@@ -511,7 +511,7 @@ def ensure_good_pots(world, write_skips=False):
loc.item = ItemFactory('Rupees (5)', loc.item.player) loc.item = ItemFactory('Rupees (5)', loc.item.player)
# don't write out all pots to spoiler # don't write out all pots to spoiler
if write_skips: if write_skips:
if loc.type == LocationType.Pot and loc.item.name in valid_pot_items: if loc.type in [LocationType.Pot, LocationType.Bonk] and loc.item.name in valid_pot_items:
loc.skip = True loc.skip = True

1
ItemList.py
View File

@@ -563,6 +563,7 @@ def create_farm_locations(world, player):
loc.event = True loc.event = True
loc.locked = True loc.locked = True
loc.address = None loc.address = None
loc.skip = True
world.push_item(loc, ItemFactory(item_name, player), False) world.push_item(loc, ItemFactory(item_name, player), False)