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

Core: remove legacy "dynamic_regions", as all regions are now dynamic

This commit is contained in:
Fabian Dill 2022-02-15 06:29:57 +01:00
parent aaa9bc906e
commit 53340ab22c
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BaseClasses.py
View File

@ -80,8 +80,6 @@ class MultiWorld():
self.custom = False self.custom = False
self.customitemarray = [] self.customitemarray = []
self.shuffle_ganon = True self.shuffle_ganon = True
self.dynamic_regions = []
self.dynamic_locations = []
self.spoiler = Spoiler(self) self.spoiler = Spoiler(self)
self.fix_trock_doors = self.AttributeProxy( self.fix_trock_doors = self.AttributeProxy(
lambda player: self.shuffle[player] != 'vanilla' or self.mode[player] == 'inverted') lambda player: self.shuffle[player] != 'vanilla' or self.mode[player] == 'inverted')

1
Fill.py
View File

@ -432,6 +432,7 @@ def swap_location_item(location_1: Location, location_2: Location, check_locked=
location_2.item.location = location_2 location_2.item.location = location_2
location_1.event, location_2.event = location_2.event, location_1.event location_1.event, location_2.event = location_2.event, location_1.event
def distribute_planned(world: MultiWorld): def distribute_planned(world: MultiWorld):
def warn(warning: str, force): def warn(warning: str, force):
if force in [True, 'fail', 'failure', 'none', False, 'warn', 'warning']: if force in [True, 'fail', 'failure', 'none', False, 'warn', 'warning']:

4
worlds/alttp/ItemPool.py
View File

@ -290,7 +290,6 @@ def generate_itempool(world):
loc.access_rule = lambda state: state.has_triforce_pieces(state.world.treasure_hunt_count[player], player) loc.access_rule = lambda state: state.has_triforce_pieces(state.world.treasure_hunt_count[player], player)
region.locations.append(loc) region.locations.append(loc)
world.dynamic_locations.append(loc)
world.clear_location_cache() world.clear_location_cache()
world.push_item(loc, ItemFactory('Triforce', player), False) world.push_item(loc, ItemFactory('Triforce', player), False)
@ -474,7 +473,6 @@ def set_up_take_anys(world, player):
old_man_take_any = Region("Old Man Sword Cave", RegionType.Cave, 'the sword cave', player) old_man_take_any = Region("Old Man Sword Cave", RegionType.Cave, 'the sword cave', player)
world.regions.append(old_man_take_any) world.regions.append(old_man_take_any)
world.dynamic_regions.append(old_man_take_any)
reg = regions.pop() reg = regions.pop()
entrance = world.get_region(reg, player).entrances[0] entrance = world.get_region(reg, player).entrances[0]
@ -495,7 +493,6 @@ def set_up_take_anys(world, player):
for num in range(4): for num in range(4):
take_any = Region("Take-Any #{}".format(num+1), RegionType.Cave, 'a cave of choice', player) take_any = Region("Take-Any #{}".format(num+1), RegionType.Cave, 'a cave of choice', player)
world.regions.append(take_any) world.regions.append(take_any)
world.dynamic_regions.append(take_any)
target, room_id = world.random.choice([(0x58, 0x0112), (0x60, 0x010F), (0x46, 0x011F)]) target, room_id = world.random.choice([(0x58, 0x0112), (0x60, 0x010F), (0x46, 0x011F)])
reg = regions.pop() reg = regions.pop()
@ -519,7 +516,6 @@ def create_dynamic_shop_locations(world, player):
if item['create_location']: if item['create_location']:
loc = ALttPLocation(player, f"{shop.region.name} {shop.slot_names[i]}", parent=shop.region) loc = ALttPLocation(player, f"{shop.region.name} {shop.slot_names[i]}", parent=shop.region)
shop.region.locations.append(loc) shop.region.locations.append(loc)
world.dynamic_locations.append(loc)
world.clear_location_cache() world.clear_location_cache()

1
worlds/alttp/Shops.py
View File

@ -337,7 +337,6 @@ def create_shops(world, player: int):
loc.shop_slot_disabled = True loc.shop_slot_disabled = True
loc.item.world = world loc.item.world = world
shop.region.locations.append(loc) shop.region.locations.append(loc)
world.dynamic_locations.append(loc)
world.clear_location_cache() world.clear_location_cache()