From 6b66e902f167106e3e5e864d7ea595e229ead055 Mon Sep 17 00:00:00 2001 From: alwaysintreble Date: Mon, 18 Nov 2024 17:47:25 -0600 Subject: [PATCH] undo world changes that aren't strictly required --- worlds/messenger/subclasses.py | 2 +- worlds/oot/Dungeon.py | 2 +- worlds/sc2/test/test_Regions.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/worlds/messenger/subclasses.py b/worlds/messenger/subclasses.py index 916d01b03ee8..b60aeb179feb 100644 --- a/worlds/messenger/subclasses.py +++ b/worlds/messenger/subclasses.py @@ -42,7 +42,7 @@ def __init__(self, name: str, world: "MessengerWorld", parent: Optional[str] = N loc_dict = {loc: world.location_name_to_id.get(loc, None) for loc in locations} self.add_locations(loc_dict, MessengerLocation) - world.regions.append(self) + self.multiworld.regions.append(self) class MessengerLocation(Location): diff --git a/worlds/oot/Dungeon.py b/worlds/oot/Dungeon.py index c190bde433b7..149b210fee19 100644 --- a/worlds/oot/Dungeon.py +++ b/worlds/oot/Dungeon.py @@ -11,7 +11,7 @@ def __init__(self, world, name, hint, font_color): self.small_keys = [] self.dungeon_items = [] - for region in world.regions.get_regions(): + for region in world.regions: if region.dungeon == self.name: region.dungeon = self self.regions.append(region) diff --git a/worlds/sc2/test/test_Regions.py b/worlds/sc2/test/test_Regions.py index 286aba396fd8..c268b65da9a8 100644 --- a/worlds/sc2/test/test_Regions.py +++ b/worlds/sc2/test/test_Regions.py @@ -36,6 +36,6 @@ class TestGridGeneration(Sc2TestBase): } def test_size_matches_exclusions(self): - self.assertNotIn(MissionTables.SC2Mission.ZERO_HOUR.mission_name, self.world.regions) + self.assertNotIn(MissionTables.SC2Mission.ZERO_HOUR.mission_name, self.multiworld.regions) # WoL has 29 missions. -1 for Zero Hour being excluded, +1 for the automatically-added menu location - self.assertEqual(len(self.world.regions), 29) + self.assertEqual(len(self.multiworld.regions), 29)