morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

LttP: fix Inverted Big Bomb Shop indirect connection rule

Browse Source
This commit is contained in:
Fabian Dill
2022-10-20 03:35:28 +02:00
committed by Fabian Dill
parent 28483a6c14
commit 40c3ef35c7
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
worlds/alttp/__init__.py
View File

@@ -7,7 +7,8 @@ import typing
import Utils
from BaseClasses import Item, CollectionState, Tutorial
from .Dungeons import create_dungeons
from .EntranceShuffle import link_entrances, link_inverted_entrances, plando_connect, indirect_connections
from .EntranceShuffle import link_entrances, link_inverted_entrances, plando_connect, \
indirect_connections, indirect_connections_inverted, indirect_connections_not_inverted
from .InvertedRegions import create_inverted_regions, mark_dark_world_regions
from .ItemPool import generate_itempool, difficulties
from .Items import item_init_table, item_name_groups, item_table, GetBeemizerItem
@@ -216,9 +217,15 @@ class ALTTPWorld(World):
if world.mode[player] != 'inverted':
link_entrances(world, player)
mark_light_world_regions(world, player)
for region_name, entrance_name in indirect_connections_not_inverted.items():
world.register_indirect_condition(self.world.get_region(region_name, player),
self.world.get_entrance(entrance_name, player))
else:
link_inverted_entrances(world, player)
mark_dark_world_regions(world, player)
for region_name, entrance_name in indirect_connections_inverted.items():
world.register_indirect_condition(self.world.get_region(region_name, player),
self.world.get_entrance(entrance_name, player))
world.random = old_random
plando_connect(world, player)
@@ -227,6 +234,7 @@ class ALTTPWorld(World):
world.register_indirect_condition(self.world.get_region(region_name, player),
self.world.get_entrance(entrance_name, player))
def collect_item(self, state: CollectionState, item: Item, remove=False):
item_name = item.name
if item_name.startswith('Progressive '):