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

Aquaria: Fixing no progression bug (#4199)

This commit is contained in:
Louis M 2024-11-17 10:59:50 -05:00 committed by GitHub
parent a3d6036939
commit 75e18e3cc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
worlds/aquaria/Regions.py
View File

@ -1152,79 +1152,79 @@ class AquariaRegions:
def __no_progression_hard_or_hidden_location(self) -> None: def __no_progression_hard_or_hidden_location(self) -> None:
self.multiworld.get_location("Energy Temple boss area, Fallen God Tooth", self.multiworld.get_location("Energy Temple boss area, Fallen God Tooth",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Mithalas boss area, beating Mithalan God", self.multiworld.get_location("Mithalas boss area, beating Mithalan God",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Kelp Forest boss area, beating Drunian God", self.multiworld.get_location("Kelp Forest boss area, beating Drunian God",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Sun Temple boss area, beating Sun God", self.multiworld.get_location("Sun Temple boss area, beating Sun God",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Sunken City, bulb on top of the boss area", self.multiworld.get_location("Sunken City, bulb on top of the boss area",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Home Water, Nautilus Egg", self.multiworld.get_location("Home Water, Nautilus Egg",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Energy Temple blaster room, Blaster Egg", self.multiworld.get_location("Energy Temple blaster room, Blaster Egg",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Mithalas City Castle, beating the Priests", self.multiworld.get_location("Mithalas City Castle, beating the Priests",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Mermog cave, Piranha Egg", self.multiworld.get_location("Mermog cave, Piranha Egg",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Octopus Cave, Dumbo Egg", self.multiworld.get_location("Octopus Cave, Dumbo Egg",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("King Jellyfish Cave, bulb in the right path from King Jelly", self.multiworld.get_location("King Jellyfish Cave, bulb in the right path from King Jelly",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("King Jellyfish Cave, Jellyfish Costume", self.multiworld.get_location("King Jellyfish Cave, Jellyfish Costume",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Final Boss area, bulb in the boss third form room", self.multiworld.get_location("Final Boss area, bulb in the boss third form room",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Sun Worm path, first cliff bulb", self.multiworld.get_location("Sun Worm path, first cliff bulb",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Sun Worm path, second cliff bulb", self.multiworld.get_location("Sun Worm path, second cliff bulb",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("The Veil top right area, bulb at the top of the waterfall", self.multiworld.get_location("The Veil top right area, bulb at the top of the waterfall",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Bubble Cave, bulb in the left cave wall", self.multiworld.get_location("Bubble Cave, bulb in the left cave wall",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Bubble Cave, bulb in the right cave wall (behind the ice crystal)", self.multiworld.get_location("Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Bubble Cave, Verse Egg", self.multiworld.get_location("Bubble Cave, Verse Egg",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Kelp Forest bottom left area, bulb close to the spirit crystals", self.multiworld.get_location("Kelp Forest bottom left area, bulb close to the spirit crystals",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Kelp Forest bottom left area, Walker Baby", self.multiworld.get_location("Kelp Forest bottom left area, Walker Baby",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Sun Temple, Sun Key", self.multiworld.get_location("Sun Temple, Sun Key",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("The Body bottom area, Mutant Costume", self.multiworld.get_location("The Body bottom area, Mutant Costume",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Sun Temple, bulb in the hidden room of the right part", self.multiworld.get_location("Sun Temple, bulb in the hidden room of the right part",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
self.multiworld.get_location("Arnassi Ruins, Arnassi Armor", self.multiworld.get_location("Arnassi Ruins, Arnassi Armor",
self.player).item_rule = \ self.player).item_rule = \
lambda item: item.classification != ItemClassification.progression lambda item: not item.advancement
def adjusting_rules(self, options: AquariaOptions) -> None: def adjusting_rules(self, options: AquariaOptions) -> None:
""" """

2
worlds/aquaria/test/test_no_progression_hard_hidden_locations.py
View File

@ -49,7 +49,7 @@ class UNoProgressionHardHiddenTest(AquariaTestBase):
for location in self.unfillable_locations: for location in self.unfillable_locations:
for item_name in self.world.item_names: for item_name in self.world.item_names:
item = self.get_item_by_name(item_name) item = self.get_item_by_name(item_name)
if item.classification == ItemClassification.progression: if item.advancement:
self.assertFalse( self.assertFalse(
self.world.get_location(location).can_fill(self.multiworld.state, item, False), self.world.get_location(location).can_fill(self.multiworld.state, item, False),
"The location \"" + location + "\" can be filled with \"" + item_name + "\"") "The location \"" + location + "\" can be filled with \"" + item_name + "\"")