From 1f916e85bc1a94215d7bb7bae515e91609936d38 Mon Sep 17 00:00:00 2001 From: CookieCat Date: Sat, 2 Sep 2023 11:56:57 -0400 Subject: [PATCH] AttributeError fix --- worlds/ahit/DeathWishLocations.py | 52 +++++++++++++++++++++++++++++++ worlds/ahit/DeathWishRules.py | 0 worlds/ahit/Regions.py | 2 -- worlds/ahit/Rules.py | 1 - worlds/ahit/__init__.py | 1 - 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 worlds/ahit/DeathWishLocations.py create mode 100644 worlds/ahit/DeathWishRules.py diff --git a/worlds/ahit/DeathWishLocations.py b/worlds/ahit/DeathWishLocations.py new file mode 100644 index 00000000000..244c790ffbf --- /dev/null +++ b/worlds/ahit/DeathWishLocations.py @@ -0,0 +1,52 @@ + +death_wishes = [ + "Beat the Heat", + "So You're Back From Outer Space", + "Mafia's Jumps", + "Collect-a-thon", + "She Speedran from Outerspace", + "Vault Codes in the Wind", + "Encore! Encore!", + "Rift Collapse: Mafia of Cooks", + "Snatcher's Hit List", + "Snatcher Coins in Mafia Town" + + "Security Breach", + "10 Seconds until Self-Destruct", + "The Great Big Hootenanny", + "Killing Two Birds", + "Rift Collapse: Dead Bird Studio", + "Snatcher Coins in Battle of the Birds", + "Zero Jumps", + + "Speedrun Well", + "Boss Rush", + "Quality Time with Snatcher", + "Breaching the Contract", + "Rift Collapse: Sleepy Subcon", + "Snatcher Coins in Subcon Forest", + + "Bird Sanctuary", + "Wound-Up Windmill", + "The Illness has Speedrun", + "Rift Collapse: Alpine Skyline", + "Snatcher Coins in Alpine Skyline", + "Camera Tourist", + + "The Mustache Gauntlet", + "No More Bad Guys", + + "Seal the Deal", + "Rift Collapse: Deep Sea", + "Cruisin' for a Bruisin'", + + "Community Map: Rhythm Jump Studio", + "Community Map: Twilight Travels", + "Community Map: The Mountain Rift", + "Snatcher Coins in Nyakuza Metro", +] + +dw_prereqs = { + "Snatcher's Hit List": ["Beat the Heat"], + +} \ No newline at end of file diff --git a/worlds/ahit/DeathWishRules.py b/worlds/ahit/DeathWishRules.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/worlds/ahit/Regions.py b/worlds/ahit/Regions.py index ba839a1810f..1473d2f6051 100644 --- a/worlds/ahit/Regions.py +++ b/worlds/ahit/Regions.py @@ -551,8 +551,6 @@ def randomize_act_entrances(world: World): for e in candidate.entrances.copy(): e.parent_region.exits.remove(e) e.connected_region.entrances.remove(e) - del e.parent_region - del e.connected_region entrance = world.multiworld.get_entrance(act_entrances[region.name], world.player) reconnect_regions(entrance, world.multiworld.get_region(act_chapters[region.name], world.player), candidate) diff --git a/worlds/ahit/Rules.py b/worlds/ahit/Rules.py index b6628e16e60..eb08c2a0c34 100644 --- a/worlds/ahit/Rules.py +++ b/worlds/ahit/Rules.py @@ -308,7 +308,6 @@ def set_rules(world: World): region: Region = entrance.connected_region access_rules: typing.List[typing.Callable[[CollectionState], bool]] = [] entrance.parent_region.exits.remove(entrance) - del entrance.parent_region # Entrances to this act that we have to set access_rules on entrances: typing.List[Entrance] = [] diff --git a/worlds/ahit/__init__.py b/worlds/ahit/__init__.py index e8094845692..0f6b4aff234 100644 --- a/worlds/ahit/__init__.py +++ b/worlds/ahit/__init__.py @@ -89,7 +89,6 @@ def create_items(self): self.calculate_yarn_costs() yarn_pool: typing.List[Item] = create_multiple_items(self, "Yarn", self.multiworld.YarnAvailable[self.player].value) - # 1/5 is progression balanced for i in range(int(len(yarn_pool) * (0.01 * self.multiworld.YarnBalancePercent[self.player].value))): yarn_pool[i].classification = ItemClassification.progression