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

Aquatia: Locations name changed due to typo's, grammar, or inconsistencies (#3421)

This commit is contained in:
Louis M 2024-06-01 07:09:34 -04:00 committed by GitHub
parent 2a5de8567e
commit f2587d5d27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
24 changed files with 838 additions and 838 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
worlds/aquaria/Items.py
View File

@ -77,41 +77,41 @@ class ItemData:
item_table = { item_table = {
# name: ID, Nb, Item Type, Item Group # name: ID, Nb, Item Type, Item Group
"Anemone": ItemData(698000, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_anemone "Anemone": ItemData(698000, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_anemone
"Arnassi statue": ItemData(698001, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_arnassi_statue "Arnassi Statue": ItemData(698001, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_arnassi_statue
"Big seed": ItemData(698002, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_big_seed "Big Seed": ItemData(698002, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_big_seed
"Glowing seed": ItemData(698003, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_bio_seed "Glowing Seed": ItemData(698003, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_bio_seed
"Black pearl": ItemData(698004, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_blackpearl "Black Pearl": ItemData(698004, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_blackpearl
"Baby blaster": ItemData(698005, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_blaster "Baby Blaster": ItemData(698005, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_blaster
"Crab armor": ItemData(698006, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_crab_costume "Crab Armor": ItemData(698006, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_crab_costume
"Baby dumbo": ItemData(698007, 1, ItemType.PROGRESSION, ItemGroup.UTILITY), # collectible_dumbo "Baby Dumbo": ItemData(698007, 1, ItemType.PROGRESSION, ItemGroup.UTILITY), # collectible_dumbo
"Tooth": ItemData(698008, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_energy_boss "Tooth": ItemData(698008, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_energy_boss
"Energy statue": ItemData(698009, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_energy_statue "Energy Statue": ItemData(698009, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_energy_statue
"Krotite armor": ItemData(698010, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_energy_temple "Krotite Armor": ItemData(698010, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_energy_temple
"Golden starfish": ItemData(698011, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_gold_star "Golden Starfish": ItemData(698011, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_gold_star
"Golden gear": ItemData(698012, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_golden_gear "Golden Gear": ItemData(698012, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_golden_gear
"Jelly beacon": ItemData(698013, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_jelly_beacon "Jelly Beacon": ItemData(698013, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_jelly_beacon
"Jelly costume": ItemData(698014, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_jelly_costume "Jelly Costume": ItemData(698014, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_jelly_costume
"Jelly plant": ItemData(698015, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_jelly_plant "Jelly Plant": ItemData(698015, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_jelly_plant
"Mithalas doll": ItemData(698016, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_mithala_doll "Mithalas Doll": ItemData(698016, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_mithala_doll
"Mithalan dress": ItemData(698017, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_mithalan_costume "Mithalan Dress": ItemData(698017, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_mithalan_costume
"Mithalas banner": ItemData(698018, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_mithalas_banner "Mithalas Banner": ItemData(698018, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_mithalas_banner
"Mithalas pot": ItemData(698019, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_mithalas_pot "Mithalas Pot": ItemData(698019, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_mithalas_pot
"Mutant costume": ItemData(698020, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_mutant_costume "Mutant Costume": ItemData(698020, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_mutant_costume
"Baby nautilus": ItemData(698021, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_nautilus "Baby Nautilus": ItemData(698021, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_nautilus
"Baby piranha": ItemData(698022, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_piranha "Baby Piranha": ItemData(698022, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_piranha
"Arnassi Armor": ItemData(698023, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_seahorse_costume "Arnassi Armor": ItemData(698023, 1, ItemType.NORMAL, ItemGroup.UTILITY), # collectible_seahorse_costume
"Seed bag": ItemData(698024, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_seed_bag "Seed Bag": ItemData(698024, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_seed_bag
"King's Skull": ItemData(698025, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_skull "King's Skull": ItemData(698025, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_skull
"Song plant spore": ItemData(698026, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_spore_seed "Song Plant Spore": ItemData(698026, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_spore_seed
"Stone head": ItemData(698027, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_stone_head "Stone Head": ItemData(698027, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_stone_head
"Sun key": ItemData(698028, 1, ItemType.NORMAL, ItemGroup.COLLECTIBLE), # collectible_sun_key "Sun Key": ItemData(698028, 1, ItemType.NORMAL, ItemGroup.COLLECTIBLE), # collectible_sun_key
"Girl costume": ItemData(698029, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_teen_costume "Girl Costume": ItemData(698029, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_teen_costume
"Odd container": ItemData(698030, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_treasure_chest "Odd Container": ItemData(698030, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_treasure_chest
"Trident": ItemData(698031, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_trident_head "Trident": ItemData(698031, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_trident_head
"Turtle egg": ItemData(698032, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_turtle_egg "Turtle Egg": ItemData(698032, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_turtle_egg
"Jelly egg": ItemData(698033, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_upsidedown_seed "Jelly Egg": ItemData(698033, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_upsidedown_seed
"Urchin costume": ItemData(698034, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_urchin_costume "Urchin Costume": ItemData(698034, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_urchin_costume
"Baby walker": ItemData(698035, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_walker "Baby Walker": ItemData(698035, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE), # collectible_walker
"Vedha's Cure-All-All": ItemData(698036, 1, ItemType.NORMAL, ItemGroup.RECIPE), # ingredient_Vedha'sCure-All "Vedha's Cure-All-All": ItemData(698036, 1, ItemType.NORMAL, ItemGroup.RECIPE), # ingredient_Vedha'sCure-All
"Zuuna's perogi": ItemData(698037, 1, ItemType.NORMAL, ItemGroup.RECIPE), # ingredient_Zuuna'sperogi "Zuuna's perogi": ItemData(698037, 1, ItemType.NORMAL, ItemGroup.RECIPE), # ingredient_Zuuna'sperogi
"Arcane poultice": ItemData(698038, 7, ItemType.NORMAL, ItemGroup.RECIPE), # ingredient_arcanepoultice "Arcane poultice": ItemData(698038, 7, ItemType.NORMAL, ItemGroup.RECIPE), # ingredient_arcanepoultice
@ -206,9 +206,9 @@ item_table = {
"Transturtle Open Water top right": ItemData(698127, 1, ItemType.PROGRESSION, "Transturtle Open Water top right": ItemData(698127, 1, ItemType.PROGRESSION,
ItemGroup.TURTLE), # transport_openwater03 ItemGroup.TURTLE), # transport_openwater03
"Transturtle Forest bottom left": ItemData(698128, 1, ItemType.PROGRESSION, ItemGroup.TURTLE), # transport_forest04 "Transturtle Forest bottom left": ItemData(698128, 1, ItemType.PROGRESSION, ItemGroup.TURTLE), # transport_forest04
"Transturtle Home water": ItemData(698129, 1, ItemType.NORMAL, ItemGroup.TURTLE), # transport_mainarea "Transturtle Home Water": ItemData(698129, 1, ItemType.NORMAL, ItemGroup.TURTLE), # transport_mainarea
"Transturtle Abyss right": ItemData(698130, 1, ItemType.PROGRESSION, ItemGroup.TURTLE), # transport_abyss03 "Transturtle Abyss right": ItemData(698130, 1, ItemType.PROGRESSION, ItemGroup.TURTLE), # transport_abyss03
"Transturtle Final Boss": ItemData(698131, 1, ItemType.PROGRESSION, ItemGroup.TURTLE), # transport_finalboss "Transturtle Final Boss": ItemData(698131, 1, ItemType.PROGRESSION, ItemGroup.TURTLE), # transport_finalboss
"Transturtle Simon says": ItemData(698132, 1, ItemType.PROGRESSION, ItemGroup.TURTLE), # transport_forest05 "Transturtle Simon Says": ItemData(698132, 1, ItemType.PROGRESSION, ItemGroup.TURTLE), # transport_forest05
"Transturtle Arnassi ruins": ItemData(698133, 1, ItemType.PROGRESSION, ItemGroup.TURTLE), # transport_seahorse "Transturtle Arnassi Ruins": ItemData(698133, 1, ItemType.PROGRESSION, ItemGroup.TURTLE), # transport_seahorse
} }

364
worlds/aquaria/Locations.py
View File

@ -29,213 +29,213 @@ class AquariaLocation(Location):
class AquariaLocations: class AquariaLocations:
locations_verse_cave_r = { locations_verse_cave_r = {
"Verse cave, bulb in the skeleton room": 698107, "Verse Cave, bulb in the skeleton room": 698107,
"Verse cave, bulb in the path left of the skeleton room": 698108, "Verse Cave, bulb in the path left of the skeleton room": 698108,
"Verse cave right area, Big Seed": 698175, "Verse Cave right area, Big Seed": 698175,
} }
locations_verse_cave_l = { locations_verse_cave_l = {
"Verse cave, the Naija hint about here shield ability": 698200, "Verse Cave, the Naija hint about the shield ability": 698200,
"Verse cave left area, bulb in the center part": 698021, "Verse Cave left area, bulb in the center part": 698021,
"Verse cave left area, bulb in the right part": 698022, "Verse Cave left area, bulb in the right part": 698022,
"Verse cave left area, bulb under the rock at the end of the path": 698023, "Verse Cave left area, bulb under the rock at the end of the path": 698023,
} }
locations_home_water = { locations_home_water = {
"Home water, bulb below the grouper fish": 698058, "Home Water, bulb below the grouper fish": 698058,
"Home water, bulb in the path below Nautilus Prime": 698059, "Home Water, bulb in the path below Nautilus Prime": 698059,
"Home water, bulb in the little room above the grouper fish": 698060, "Home Water, bulb in the little room above the grouper fish": 698060,
"Home water, bulb in the end of the left path from the verse cave": 698061, "Home Water, bulb in the end of the left path from the Verse Cave": 698061,
"Home water, bulb in the top left path": 698062, "Home Water, bulb in the top left path": 698062,
"Home water, bulb in the bottom left room": 698063, "Home Water, bulb in the bottom left room": 698063,
"Home water, bulb close to the Naija's home": 698064, "Home Water, bulb close to Naija's Home": 698064,
"Home water, bulb under the rock in the left path from the verse cave": 698065, "Home Water, bulb under the rock in the left path from the Verse Cave": 698065,
} }
locations_home_water_nautilus = { locations_home_water_nautilus = {
"Home water, Nautilus Egg": 698194, "Home Water, Nautilus Egg": 698194,
} }
locations_home_water_transturtle = { locations_home_water_transturtle = {
"Home water, Transturtle": 698213, "Home Water, Transturtle": 698213,
} }
locations_naija_home = { locations_naija_home = {
"Naija's home, bulb after the energy door": 698119, "Naija's Home, bulb after the energy door": 698119,
"Naija's home, bulb under the rock at the right of the main path": 698120, "Naija's Home, bulb under the rock at the right of the main path": 698120,
} }
locations_song_cave = { locations_song_cave = {
"Song cave, Erulian spirit": 698206, "Song Cave, Erulian spirit": 698206,
"Song cave, bulb in the top left part": 698071, "Song Cave, bulb in the top left part": 698071,
"Song cave, bulb in the big anemone room": 698072, "Song Cave, bulb in the big anemone room": 698072,
"Song cave, bulb in the path to the singing statues": 698073, "Song Cave, bulb in the path to the singing statues": 698073,
"Song cave, bulb under the rock in the path to the singing statues": 698074, "Song Cave, bulb under the rock in the path to the singing statues": 698074,
"Song cave, bulb under the rock close to the song door": 698075, "Song Cave, bulb under the rock close to the song door": 698075,
"Song cave, Verse egg": 698160, "Song Cave, Verse Egg": 698160,
"Song cave, Jelly beacon": 698178, "Song Cave, Jelly Beacon": 698178,
"Song cave, Anemone seed": 698162, "Song Cave, Anemone Seed": 698162,
} }
locations_energy_temple_1 = { locations_energy_temple_1 = {
"Energy temple first area, beating the energy statue": 698205, "Energy Temple first area, beating the Energy Statue": 698205,
"Energy temple first area, bulb in the bottom room blocked by a rock": 698027, "Energy Temple first area, bulb in the bottom room blocked by a rock": 698027,
} }
locations_energy_temple_idol = { locations_energy_temple_idol = {
"Energy temple first area, Energy Idol": 698170, "Energy Temple first area, Energy Idol": 698170,
} }
locations_energy_temple_2 = { locations_energy_temple_2 = {
"Energy temple second area, bulb under the rock": 698028, "Energy Temple second area, bulb under the rock": 698028,
} }
locations_energy_temple_altar = { locations_energy_temple_altar = {
"Energy temple bottom entrance, Krotite armor": 698163, "Energy Temple bottom entrance, Krotite Armor": 698163,
} }
locations_energy_temple_3 = { locations_energy_temple_3 = {
"Energy temple third area, bulb in the bottom path": 698029, "Energy Temple third area, bulb in the bottom path": 698029,
} }
locations_energy_temple_boss = { locations_energy_temple_boss = {
"Energy temple boss area, Fallen god tooth": 698169, "Energy Temple boss area, Fallen God Tooth": 698169,
} }
locations_energy_temple_blaster_room = { locations_energy_temple_blaster_room = {
"Energy temple blaster room, Blaster egg": 698195, "Energy Temple blaster room, Blaster Egg": 698195,
} }
locations_openwater_tl = { locations_openwater_tl = {
"Open water top left area, bulb under the rock in the right path": 698001, "Open Water top left area, bulb under the rock in the right path": 698001,
"Open water top left area, bulb under the rock in the left path": 698002, "Open Water top left area, bulb under the rock in the left path": 698002,
"Open water top left area, bulb to the right of the save cristal": 698003, "Open Water top left area, bulb to the right of the save crystal": 698003,
} }
locations_openwater_tr = { locations_openwater_tr = {
"Open water top right area, bulb in the small path before Mithalas": 698004, "Open Water top right area, bulb in the small path before Mithalas": 698004,
"Open water top right area, bulb in the path from the left entrance": 698005, "Open Water top right area, bulb in the path from the left entrance": 698005,
"Open water top right area, bulb in the clearing close to the bottom exit": 698006, "Open Water top right area, bulb in the clearing close to the bottom exit": 698006,
"Open water top right area, bulb in the big clearing close to the save cristal": 698007, "Open Water top right area, bulb in the big clearing close to the save crystal": 698007,
"Open water top right area, bulb in the big clearing to the top exit": 698008, "Open Water top right area, bulb in the big clearing to the top exit": 698008,
"Open water top right area, first urn in the Mithalas exit": 698148, "Open Water top right area, first urn in the Mithalas exit": 698148,
"Open water top right area, second urn in the Mithalas exit": 698149, "Open Water top right area, second urn in the Mithalas exit": 698149,
"Open water top right area, third urn in the Mithalas exit": 698150, "Open Water top right area, third urn in the Mithalas exit": 698150,
} }
locations_openwater_tr_turtle = { locations_openwater_tr_turtle = {
"Open water top right area, bulb in the turtle room": 698009, "Open Water top right area, bulb in the turtle room": 698009,
"Open water top right area, Transturtle": 698211, "Open Water top right area, Transturtle": 698211,
} }
locations_openwater_bl = { locations_openwater_bl = {
"Open water bottom left area, bulb behind the chomper fish": 698011, "Open Water bottom left area, bulb behind the chomper fish": 698011,
"Open water bottom left area, bulb inside the lowest fish pass": 698010, "Open Water bottom left area, bulb inside the lowest fish pass": 698010,
} }
locations_skeleton_path = { locations_skeleton_path = {
"Open water skeleton path, bulb close to the right exit": 698012, "Open Water skeleton path, bulb close to the right exit": 698012,
"Open water skeleton path, bulb behind the chomper fish": 698013, "Open Water skeleton path, bulb behind the chomper fish": 698013,
} }
locations_skeleton_path_sc = { locations_skeleton_path_sc = {
"Open water skeleton path, King skull": 698177, "Open Water skeleton path, King Skull": 698177,
} }
locations_arnassi = { locations_arnassi = {
"Arnassi Ruins, bulb in the right part": 698014, "Arnassi Ruins, bulb in the right part": 698014,
"Arnassi Ruins, bulb in the left part": 698015, "Arnassi Ruins, bulb in the left part": 698015,
"Arnassi Ruins, bulb in the center part": 698016, "Arnassi Ruins, bulb in the center part": 698016,
"Arnassi ruins, Song plant spore on the top of the ruins": 698179, "Arnassi Ruins, Song Plant Spore": 698179,
"Arnassi ruins, Arnassi Armor": 698191, "Arnassi Ruins, Arnassi Armor": 698191,
} }
locations_arnassi_path = { locations_arnassi_path = {
"Arnassi Ruins, Arnassi statue": 698164, "Arnassi Ruins, Arnassi Statue": 698164,
"Arnassi Ruins, Transturtle": 698217, "Arnassi Ruins, Transturtle": 698217,
} }
locations_arnassi_crab_boss = { locations_arnassi_crab_boss = {
"Arnassi ruins, Crab armor": 698187, "Arnassi Ruins, Crab Armor": 698187,
} }
locations_simon = { locations_simon = {
"Kelp forest, beating Simon says": 698156, "Simon Says area, beating Simon Says": 698156,
"Simon says area, Transturtle": 698216, "Simon Says area, Transturtle": 698216,
} }
locations_mithalas_city = { locations_mithalas_city = {
"Mithalas city, first bulb in the left city part": 698030, "Mithalas City, first bulb in the left city part": 698030,
"Mithalas city, second bulb in the left city part": 698035, "Mithalas City, second bulb in the left city part": 698035,
"Mithalas city, bulb in the right part": 698031, "Mithalas City, bulb in the right part": 698031,
"Mithalas city, bulb at the top of the city": 698033, "Mithalas City, bulb at the top of the city": 698033,
"Mithalas city, first bulb in a broken home": 698034, "Mithalas City, first bulb in a broken home": 698034,
"Mithalas city, second bulb in a broken home": 698041, "Mithalas City, second bulb in a broken home": 698041,
"Mithalas city, bulb in the bottom left part": 698037, "Mithalas City, bulb in the bottom left part": 698037,
"Mithalas city, first bulb in one of the homes": 698038, "Mithalas City, first bulb in one of the homes": 698038,
"Mithalas city, second bulb in one of the homes": 698039, "Mithalas City, second bulb in one of the homes": 698039,
"Mithalas city, first urn in one of the homes": 698123, "Mithalas City, first urn in one of the homes": 698123,
"Mithalas city, second urn in one of the homes": 698124, "Mithalas City, second urn in one of the homes": 698124,
"Mithalas city, first urn in the city reserve": 698125, "Mithalas City, first urn in the city reserve": 698125,
"Mithalas city, second urn in the city reserve": 698126, "Mithalas City, second urn in the city reserve": 698126,
"Mithalas city, third urn in the city reserve": 698127, "Mithalas City, third urn in the city reserve": 698127,
} }
locations_mithalas_city_top_path = { locations_mithalas_city_top_path = {
"Mithalas city, first bulb at the end of the top path": 698032, "Mithalas City, first bulb at the end of the top path": 698032,
"Mithalas city, second bulb at the end of the top path": 698040, "Mithalas City, second bulb at the end of the top path": 698040,
"Mithalas city, bulb in the top path": 698036, "Mithalas City, bulb in the top path": 698036,
"Mithalas city, Mithalas pot": 698174, "Mithalas City, Mithalas Pot": 698174,
"Mithalas city, urn in the cathedral flower tube entrance": 698128, "Mithalas City, urn in the Cathedral flower tube entrance": 698128,
} }
locations_mithalas_city_fishpass = { locations_mithalas_city_fishpass = {
"Mithalas city, Doll": 698173, "Mithalas City, Doll": 698173,
"Mithalas city, urn inside a home fish pass": 698129, "Mithalas City, urn inside a home fish pass": 698129,
} }
locations_cathedral_l = { locations_cathedral_l = {
"Mithalas city castle, bulb in the flesh hole": 698042, "Mithalas City Castle, bulb in the flesh hole": 698042,
"Mithalas city castle, Blue banner": 698165, "Mithalas City Castle, Blue banner": 698165,
"Mithalas city castle, urn in the bedroom": 698130, "Mithalas City Castle, urn in the bedroom": 698130,
"Mithalas city castle, first urn of the single lamp path": 698131, "Mithalas City Castle, first urn of the single lamp path": 698131,
"Mithalas city castle, second urn of the single lamp path": 698132, "Mithalas City Castle, second urn of the single lamp path": 698132,
"Mithalas city castle, urn in the bottom room": 698133, "Mithalas City Castle, urn in the bottom room": 698133,
"Mithalas city castle, first urn on the entrance path": 698134, "Mithalas City Castle, first urn on the entrance path": 698134,
"Mithalas city castle, second urn on the entrance path": 698135, "Mithalas City Castle, second urn on the entrance path": 698135,
} }
locations_cathedral_l_tube = { locations_cathedral_l_tube = {
"Mithalas castle, beating the priests": 698208, "Mithalas City Castle, beating the Priests": 698208,
} }
locations_cathedral_l_sc = { locations_cathedral_l_sc = {
"Mithalas city castle, Trident head": 698183, "Mithalas City Castle, Trident Head": 698183,
} }
locations_cathedral_r = { locations_cathedral_r = {
"Mithalas cathedral, first urn in the top right room": 698136, "Mithalas Cathedral, first urn in the top right room": 698136,
"Mithalas cathedral, second urn in the top right room": 698137, "Mithalas Cathedral, second urn in the top right room": 698137,
"Mithalas cathedral, third urn in the top right room": 698138, "Mithalas Cathedral, third urn in the top right room": 698138,
"Mithalas cathedral, urn in the flesh room with fleas": 698139, "Mithalas Cathedral, urn in the flesh room with fleas": 698139,
"Mithalas cathedral, first urn in the bottom right path": 698140, "Mithalas Cathedral, first urn in the bottom right path": 698140,
"Mithalas cathedral, second urn in the bottom right path": 698141, "Mithalas Cathedral, second urn in the bottom right path": 698141,
"Mithalas cathedral, urn behind the flesh vein": 698142, "Mithalas Cathedral, urn behind the flesh vein": 698142,
"Mithalas cathedral, urn in the top left eyes boss room": 698143, "Mithalas Cathedral, urn in the top left eyes boss room": 698143,
"Mithalas cathedral, first urn in the path behind the flesh vein": 698144, "Mithalas Cathedral, first urn in the path behind the flesh vein": 698144,
"Mithalas cathedral, second urn in the path behind the flesh vein": 698145, "Mithalas Cathedral, second urn in the path behind the flesh vein": 698145,
"Mithalas cathedral, third urn in the path behind the flesh vein": 698146, "Mithalas Cathedral, third urn in the path behind the flesh vein": 698146,
"Mithalas cathedral, one of the urns in the top right room": 698147, "Mithalas Cathedral, fourth urn in the top right room": 698147,
"Mithalas cathedral, Mithalan Dress": 698189, "Mithalas Cathedral, Mithalan Dress": 698189,
"Mithalas cathedral right area, urn below the left entrance": 698198, "Mithalas Cathedral right area, urn below the left entrance": 698198,
} }
locations_cathedral_underground = { locations_cathedral_underground = {
"Cathedral underground, bulb in the center part": 698113, "Cathedral Underground, bulb in the center part": 698113,
"Cathedral underground, first bulb in the top left part": 698114, "Cathedral Underground, first bulb in the top left part": 698114,
"Cathedral underground, second bulb in the top left part": 698115, "Cathedral Underground, second bulb in the top left part": 698115,
"Cathedral underground, third bulb in the top left part": 698116, "Cathedral Underground, third bulb in the top left part": 698116,
"Cathedral underground, bulb close to the save cristal": 698117, "Cathedral Underground, bulb close to the save crystal": 698117,
"Cathedral underground, bulb in the bottom right path": 698118, "Cathedral Underground, bulb in the bottom right path": 698118,
} }
locations_cathedral_boss = { locations_cathedral_boss = {
@ -250,8 +250,8 @@ class AquariaLocations:
} }
locations_forest_tl_fp = { locations_forest_tl_fp = {
"Kelp Forest top left area, bulb close to the Verse egg": 698047, "Kelp Forest top left area, bulb close to the Verse Egg": 698047,
"Kelp forest top left area, Verse egg": 698158, "Kelp Forest top left area, Verse Egg": 698158,
} }
locations_forest_tr = { locations_forest_tr = {
@ -260,7 +260,7 @@ class AquariaLocations:
"Kelp Forest top right area, bulb in the left path's big room": 698051, "Kelp Forest top right area, bulb in the left path's big room": 698051,
"Kelp Forest top right area, bulb in the left path's small room": 698052, "Kelp Forest top right area, bulb in the left path's small room": 698052,
"Kelp Forest top right area, bulb at the top of the center clearing": 698053, "Kelp Forest top right area, bulb at the top of the center clearing": 698053,
"Kelp forest top right area, Black pearl": 698167, "Kelp Forest top right area, Black Pearl": 698167,
} }
locations_forest_tr_fp = { locations_forest_tr_fp = {
@ -269,16 +269,16 @@ class AquariaLocations:
locations_forest_bl = { locations_forest_bl = {
"Kelp Forest bottom left area, bulb close to the spirit crystals": 698054, "Kelp Forest bottom left area, bulb close to the spirit crystals": 698054,
"Kelp forest bottom left area, Walker baby": 698186, "Kelp Forest bottom left area, Walker baby": 698186,
"Kelp Forest bottom left area, Transturtle": 698212, "Kelp Forest bottom left area, Transturtle": 698212,
} }
locations_forest_br = { locations_forest_br = {
"Kelp forest bottom right area, Odd Container": 698168, "Kelp Forest bottom right area, Odd Container": 698168,
} }
locations_forest_boss = { locations_forest_boss = {
"Kelp forest boss area, beating Drunian God": 698204, "Kelp Forest boss area, beating Drunian God": 698204,
} }
locations_forest_boss_entrance = { locations_forest_boss_entrance = {
@ -286,7 +286,7 @@ class AquariaLocations:
} }
locations_forest_fish_cave = { locations_forest_fish_cave = {
"Kelp Forest bottom left area, Fish cave puzzle": 698207, "Kelp Forest bottom left area, Fish Cave puzzle": 698207,
} }
locations_forest_sprite_cave = { locations_forest_sprite_cave = {
@ -295,7 +295,7 @@ class AquariaLocations:
locations_forest_sprite_cave_tube = { locations_forest_sprite_cave_tube = {
"Kelp Forest sprite cave, bulb in the second room": 698057, "Kelp Forest sprite cave, bulb in the second room": 698057,
"Kelp Forest Sprite Cave, Seed bag": 698176, "Kelp Forest sprite cave, Seed Bag": 698176,
} }
locations_mermog_cave = { locations_mermog_cave = {
@ -307,14 +307,14 @@ class AquariaLocations:
} }
locations_veil_tl = { locations_veil_tl = {
"The veil top left area, In the Li cave": 698199, "The Veil top left area, In Li's cave": 698199,
"The veil top left area, bulb under the rock in the top right path": 698078, "The Veil top left area, bulb under the rock in the top right path": 698078,
"The veil top left area, bulb hidden behind the blocking rock": 698076, "The Veil top left area, bulb hidden behind the blocking rock": 698076,
"The veil top left area, Transturtle": 698209, "The Veil top left area, Transturtle": 698209,
} }
locations_veil_tl_fp = { locations_veil_tl_fp = {
"The veil top left area, bulb inside the fish pass": 698077, "The Veil top left area, bulb inside the fish pass": 698077,
} }
locations_turtle_cave = { locations_turtle_cave = {
@ -322,56 +322,56 @@ class AquariaLocations:
} }
locations_turtle_cave_bubble = { locations_turtle_cave_bubble = {
"Turtle cave, bulb in bubble cliff": 698000, "Turtle cave, bulb in Bubble Cliff": 698000,
"Turtle cave, Urchin costume": 698193, "Turtle cave, Urchin Costume": 698193,
} }
locations_veil_tr_r = { locations_veil_tr_r = {
"The veil top right area, bulb in the middle of the wall jump cliff": 698079, "The Veil top right area, bulb in the middle of the wall jump cliff": 698079,
"The veil top right area, golden starfish at the bottom right of the bottom path": 698180, "The Veil top right area, Golden Starfish": 698180,
} }
locations_veil_tr_l = { locations_veil_tr_l = {
"The veil top right area, bulb in the top of the water fall": 698080, "The Veil top right area, bulb in the top of the waterfall": 698080,
"The veil top right area, Transturtle": 698210, "The Veil top right area, Transturtle": 698210,
} }
locations_veil_bl = { locations_veil_bl = {
"The veil bottom area, bulb in the left path": 698082, "The Veil bottom area, bulb in the left path": 698082,
} }
locations_veil_b_sc = { locations_veil_b_sc = {
"The veil bottom area, bulb in the spirit path": 698081, "The Veil bottom area, bulb in the spirit path": 698081,
} }
locations_veil_bl_fp = { locations_veil_bl_fp = {
"The veil bottom area, Verse egg": 698157, "The Veil bottom area, Verse Egg": 698157,
} }
locations_veil_br = { locations_veil_br = {
"The veil bottom area, Stone Head": 698181, "The Veil bottom area, Stone Head": 698181,
} }
locations_octo_cave_t = { locations_octo_cave_t = {
"Octopus cave, Dumbo Egg": 698196, "Octopus Cave, Dumbo Egg": 698196,
} }
locations_octo_cave_b = { locations_octo_cave_b = {
"Octopus cave, bulb in the path below the octopus cave path": 698122, "Octopus Cave, bulb in the path below the Octopus Cave path": 698122,
} }
locations_sun_temple_l = { locations_sun_temple_l = {
"Sun temple, bulb in the top left part": 698094, "Sun Temple, bulb in the top left part": 698094,
"Sun temple, bulb in the top right part": 698095, "Sun Temple, bulb in the top right part": 698095,
"Sun temple, bulb at the top of the high dark room": 698096, "Sun Temple, bulb at the top of the high dark room": 698096,
"Sun temple, Golden Gear": 698171, "Sun Temple, Golden Gear": 698171,
} }
locations_sun_temple_r = { locations_sun_temple_r = {
"Sun temple, first bulb of the temple": 698091, "Sun Temple, first bulb of the temple": 698091,
"Sun temple, bulb on the left part": 698092, "Sun Temple, bulb on the left part": 698092,
"Sun temple, bulb in the hidden room of the right part": 698093, "Sun Temple, bulb in the hidden room of the right part": 698093,
"Sun temple, Sun key": 698182, "Sun Temple, Sun Key": 698182,
} }
locations_sun_temple_boss_path = { locations_sun_temple_boss_path = {
@ -382,13 +382,13 @@ class AquariaLocations:
} }
locations_sun_temple_boss = { locations_sun_temple_boss = {
"Sun temple boss area, beating Sun God": 698203, "Sun Temple boss area, beating Sun God": 698203,
} }
locations_abyss_l = { locations_abyss_l = {
"Abyss left area, bulb in hidden path room": 698024, "Abyss left area, bulb in hidden path room": 698024,
"Abyss left area, bulb in the right part": 698025, "Abyss left area, bulb in the right part": 698025,
"Abyss left area, Glowing seed": 698166, "Abyss left area, Glowing Seed": 698166,
"Abyss left area, Glowing Plant": 698172, "Abyss left area, Glowing Plant": 698172,
} }
@ -405,87 +405,87 @@ class AquariaLocations:
} }
locations_ice_cave = { locations_ice_cave = {
"Ice cave, bulb in the room to the right": 698083, "Ice Cave, bulb in the room to the right": 698083,
"Ice cave, First bulbs in the top exit room": 698084, "Ice Cave, first bulb in the top exit room": 698084,
"Ice cave, Second bulbs in the top exit room": 698085, "Ice Cave, second bulb in the top exit room": 698085,
"Ice cave, third bulbs in the top exit room": 698086, "Ice Cave, third bulb in the top exit room": 698086,
"Ice cave, bulb in the left room": 698087, "Ice Cave, bulb in the left room": 698087,
} }
locations_bubble_cave = { locations_bubble_cave = {
"Bubble cave, bulb in the left cave wall": 698089, "Bubble Cave, bulb in the left cave wall": 698089,
"Bubble cave, bulb in the right cave wall (behind the ice cristal)": 698090, "Bubble Cave, bulb in the right cave wall (behind the ice crystal)": 698090,
} }
locations_bubble_cave_boss = { locations_bubble_cave_boss = {
"Bubble cave, Verse egg": 698161, "Bubble Cave, Verse Egg": 698161,
} }
locations_king_jellyfish_cave = { locations_king_jellyfish_cave = {
"King Jellyfish cave, bulb in the right path from King Jelly": 698088, "King Jellyfish Cave, bulb in the right path from King Jelly": 698088,
"King Jellyfish cave, Jellyfish Costume": 698188, "King Jellyfish Cave, Jellyfish Costume": 698188,
} }
locations_whale = { locations_whale = {
"The whale, Verse egg": 698159, "The Whale, Verse Egg": 698159,
} }
locations_sunken_city_r = { locations_sunken_city_r = {
"Sunken city right area, crate close to the save cristal": 698154, "Sunken City right area, crate close to the save crystal": 698154,
"Sunken city right area, crate in the left bottom room": 698155, "Sunken City right area, crate in the left bottom room": 698155,
} }
locations_sunken_city_l = { locations_sunken_city_l = {
"Sunken city left area, crate in the little pipe room": 698151, "Sunken City left area, crate in the little pipe room": 698151,
"Sunken city left area, crate close to the save cristal": 698152, "Sunken City left area, crate close to the save crystal": 698152,
"Sunken city left area, crate before the bedroom": 698153, "Sunken City left area, crate before the bedroom": 698153,
} }
locations_sunken_city_l_bedroom = { locations_sunken_city_l_bedroom = {
"Sunken city left area, Girl Costume": 698192, "Sunken City left area, Girl Costume": 698192,
} }
locations_sunken_city_boss = { locations_sunken_city_boss = {
"Sunken city, bulb on the top of the boss area (boiler room)": 698043, "Sunken City, bulb on top of the boss area": 698043,
} }
locations_body_c = { locations_body_c = {
"The body center area, breaking li cage": 698201, "The Body center area, breaking Li's cage": 698201,
"The body main area, bulb on the main path blocking tube": 698097, "The Body main area, bulb on the main path blocking tube": 698097,
} }
locations_body_l = { locations_body_l = {
"The body left area, first bulb in the top face room": 698066, "The Body left area, first bulb in the top face room": 698066,
"The body left area, second bulb in the top face room": 698069, "The Body left area, second bulb in the top face room": 698069,
"The body left area, bulb below the water stream": 698067, "The Body left area, bulb below the water stream": 698067,
"The body left area, bulb in the top path to the top face room": 698068, "The Body left area, bulb in the top path to the top face room": 698068,
"The body left area, bulb in the bottom face room": 698070, "The Body left area, bulb in the bottom face room": 698070,
} }
locations_body_rt = { locations_body_rt = {
"The body right area, bulb in the top face room": 698100, "The Body right area, bulb in the top face room": 698100,
} }
locations_body_rb = { locations_body_rb = {
"The body right area, bulb in the top path to the bottom face room": 698098, "The Body right area, bulb in the top path to the bottom face room": 698098,
"The body right area, bulb in the bottom face room": 698099, "The Body right area, bulb in the bottom face room": 698099,
} }
locations_body_b = { locations_body_b = {
"The body bottom area, bulb in the Jelly Zap room": 698101, "The Body bottom area, bulb in the Jelly Zap room": 698101,
"The body bottom area, bulb in the nautilus room": 698102, "The Body bottom area, bulb in the nautilus room": 698102,
"The body bottom area, Mutant Costume": 698190, "The Body bottom area, Mutant Costume": 698190,
} }
locations_final_boss_tube = { locations_final_boss_tube = {
"Final boss area, first bulb in the turtle room": 698103, "Final Boss area, first bulb in the turtle room": 698103,
"Final boss area, second bulbs in the turtle room": 698104, "Final Boss area, second bulb in the turtle room": 698104,
"Final boss area, third bulbs in the turtle room": 698105, "Final Boss area, third bulb in the turtle room": 698105,
"Final boss area, Transturtle": 698215, "Final Boss area, Transturtle": 698215,
} }
locations_final_boss = { locations_final_boss = {
"Final boss area, bulb in the boss third form room": 698106, "Final Boss area, bulb in the boss third form room": 698106,
} }

2
worlds/aquaria/Options.py
View File

@ -113,7 +113,7 @@ class BindSongNeededToGetUnderRockBulb(Toggle):
class UnconfineHomeWater(Choice): class UnconfineHomeWater(Choice):
""" """
Open the way out of the Home water area so that Naija can go to open water and beyond without the bind song. Open the way out of the Home Water area so that Naija can go to open water and beyond without the bind song.
""" """
display_name = "Unconfine Home Water Area" display_name = "Unconfine Home Water Area"
option_off = 0 option_off = 0

438
worlds/aquaria/Regions.py
View File

@ -36,8 +36,8 @@ def _has_li(state:CollectionState, player: int) -> bool:
def _has_damaging_item(state:CollectionState, player: int) -> bool: def _has_damaging_item(state:CollectionState, player: int) -> bool:
"""`player` in `state` has the shield song item""" """`player` in `state` has the shield song item"""
return state.has_any({"Energy form", "Nature form", "Beast form", "Li and Li song", "Baby nautilus", return state.has_any({"Energy form", "Nature form", "Beast form", "Li and Li song", "Baby Nautilus",
"Baby piranha", "Baby blaster"}, player) "Baby Piranha", "Baby Blaster"}, player)
def _has_shield_song(state:CollectionState, player: int) -> bool: def _has_shield_song(state:CollectionState, player: int) -> bool:
@ -72,7 +72,7 @@ def _has_sun_form(state:CollectionState, player: int) -> bool:
def _has_light(state:CollectionState, player: int) -> bool: def _has_light(state:CollectionState, player: int) -> bool:
"""`player` in `state` has the light item""" """`player` in `state` has the light item"""
return state.has("Baby dumbo", player) or _has_sun_form(state, player) return state.has("Baby Dumbo", player) or _has_sun_form(state, player)
def _has_dual_form(state:CollectionState, player: int) -> bool: def _has_dual_form(state:CollectionState, player: int) -> bool:
@ -237,26 +237,26 @@ class AquariaRegions:
AquariaLocations.locations_home_water_nautilus) AquariaLocations.locations_home_water_nautilus)
self.home_water_transturtle = self.__add_region("Home Water, turtle room", self.home_water_transturtle = self.__add_region("Home Water, turtle room",
AquariaLocations.locations_home_water_transturtle) AquariaLocations.locations_home_water_transturtle)
self.naija_home = self.__add_region("Naija's home", AquariaLocations.locations_naija_home) self.naija_home = self.__add_region("Naija's Home", AquariaLocations.locations_naija_home)
self.song_cave = self.__add_region("Song cave", AquariaLocations.locations_song_cave) self.song_cave = self.__add_region("Song Cave", AquariaLocations.locations_song_cave)
def __create_energy_temple(self) -> None: def __create_energy_temple(self) -> None:
""" """
Create the `energy_temple_*` regions Create the `energy_temple_*` regions
""" """
self.energy_temple_1 = self.__add_region("Energy temple first area", self.energy_temple_1 = self.__add_region("Energy Temple first area",
AquariaLocations.locations_energy_temple_1) AquariaLocations.locations_energy_temple_1)
self.energy_temple_2 = self.__add_region("Energy temple second area", self.energy_temple_2 = self.__add_region("Energy Temple second area",
AquariaLocations.locations_energy_temple_2) AquariaLocations.locations_energy_temple_2)
self.energy_temple_3 = self.__add_region("Energy temple third area", self.energy_temple_3 = self.__add_region("Energy Temple third area",
AquariaLocations.locations_energy_temple_3) AquariaLocations.locations_energy_temple_3)
self.energy_temple_altar = self.__add_region("Energy temple bottom entrance", self.energy_temple_altar = self.__add_region("Energy Temple bottom entrance",
AquariaLocations.locations_energy_temple_altar) AquariaLocations.locations_energy_temple_altar)
self.energy_temple_boss = self.__add_region("Energy temple fallen God room", self.energy_temple_boss = self.__add_region("Energy Temple fallen God room",
AquariaLocations.locations_energy_temple_boss) AquariaLocations.locations_energy_temple_boss)
self.energy_temple_idol = self.__add_region("Energy temple Idol room", self.energy_temple_idol = self.__add_region("Energy Temple Idol room",
AquariaLocations.locations_energy_temple_idol) AquariaLocations.locations_energy_temple_idol)
self.energy_temple_blaster_room = self.__add_region("Energy temple blaster room", self.energy_temple_blaster_room = self.__add_region("Energy Temple blaster room",
AquariaLocations.locations_energy_temple_blaster_room) AquariaLocations.locations_energy_temple_blaster_room)
def __create_openwater(self) -> None: def __create_openwater(self) -> None:
@ -264,18 +264,18 @@ class AquariaRegions:
Create the `openwater_*`, `skeleton_path`, `arnassi*` and `simon` Create the `openwater_*`, `skeleton_path`, `arnassi*` and `simon`
regions regions
""" """
self.openwater_tl = self.__add_region("Open water top left area", self.openwater_tl = self.__add_region("Open Water top left area",
AquariaLocations.locations_openwater_tl) AquariaLocations.locations_openwater_tl)
self.openwater_tr = self.__add_region("Open water top right area", self.openwater_tr = self.__add_region("Open Water top right area",
AquariaLocations.locations_openwater_tr) AquariaLocations.locations_openwater_tr)
self.openwater_tr_turtle = self.__add_region("Open water top right area, turtle room", self.openwater_tr_turtle = self.__add_region("Open Water top right area, turtle room",
AquariaLocations.locations_openwater_tr_turtle) AquariaLocations.locations_openwater_tr_turtle)
self.openwater_bl = self.__add_region("Open water bottom left area", self.openwater_bl = self.__add_region("Open Water bottom left area",
AquariaLocations.locations_openwater_bl) AquariaLocations.locations_openwater_bl)
self.openwater_br = self.__add_region("Open water bottom right area", None) self.openwater_br = self.__add_region("Open Water bottom right area", None)
self.skeleton_path = self.__add_region("Open water skeleton path", self.skeleton_path = self.__add_region("Open Water skeleton path",
AquariaLocations.locations_skeleton_path) AquariaLocations.locations_skeleton_path)
self.skeleton_path_sc = self.__add_region("Open water skeleton path spirit cristal", self.skeleton_path_sc = self.__add_region("Open Water skeleton path spirit crystal",
AquariaLocations.locations_skeleton_path_sc) AquariaLocations.locations_skeleton_path_sc)
self.arnassi = self.__add_region("Arnassi Ruins", AquariaLocations.locations_arnassi) self.arnassi = self.__add_region("Arnassi Ruins", AquariaLocations.locations_arnassi)
self.arnassi_path = self.__add_region("Arnassi Ruins, back entrance path", self.arnassi_path = self.__add_region("Arnassi Ruins, back entrance path",
@ -287,20 +287,20 @@ class AquariaRegions:
""" """
Create the `mithalas_city*` and `cathedral_*` regions Create the `mithalas_city*` and `cathedral_*` regions
""" """
self.mithalas_city = self.__add_region("Mithalas city", self.mithalas_city = self.__add_region("Mithalas City",
AquariaLocations.locations_mithalas_city) AquariaLocations.locations_mithalas_city)
self.mithalas_city_fishpass = self.__add_region("Mithalas city fish pass", self.mithalas_city_fishpass = self.__add_region("Mithalas City fish pass",
AquariaLocations.locations_mithalas_city_fishpass) AquariaLocations.locations_mithalas_city_fishpass)
self.mithalas_city_top_path = self.__add_region("Mithalas city top path", self.mithalas_city_top_path = self.__add_region("Mithalas City top path",
AquariaLocations.locations_mithalas_city_top_path) AquariaLocations.locations_mithalas_city_top_path)
self.cathedral_l = self.__add_region("Mithalas castle", AquariaLocations.locations_cathedral_l) self.cathedral_l = self.__add_region("Mithalas castle", AquariaLocations.locations_cathedral_l)
self.cathedral_l_tube = self.__add_region("Mithalas castle, plant tube entrance", self.cathedral_l_tube = self.__add_region("Mithalas castle, plant tube entrance",
AquariaLocations.locations_cathedral_l_tube) AquariaLocations.locations_cathedral_l_tube)
self.cathedral_l_sc = self.__add_region("Mithalas castle spirit cristal", self.cathedral_l_sc = self.__add_region("Mithalas castle spirit crystal",
AquariaLocations.locations_cathedral_l_sc) AquariaLocations.locations_cathedral_l_sc)
self.cathedral_r = self.__add_region("Mithalas Cathedral", self.cathedral_r = self.__add_region("Mithalas Cathedral",
AquariaLocations.locations_cathedral_r) AquariaLocations.locations_cathedral_r)
self.cathedral_underground = self.__add_region("Mithalas Cathedral underground area", self.cathedral_underground = self.__add_region("Mithalas Cathedral Underground area",
AquariaLocations.locations_cathedral_underground) AquariaLocations.locations_cathedral_underground)
self.cathedral_boss_r = self.__add_region("Mithalas Cathedral, Mithalan God room", self.cathedral_boss_r = self.__add_region("Mithalas Cathedral, Mithalan God room",
AquariaLocations.locations_cathedral_boss) AquariaLocations.locations_cathedral_boss)
@ -310,73 +310,73 @@ class AquariaRegions:
""" """
Create the `forest_*` dans `mermog_cave` regions Create the `forest_*` dans `mermog_cave` regions
""" """
self.forest_tl = self.__add_region("Kelp forest top left area", self.forest_tl = self.__add_region("Kelp Forest top left area",
AquariaLocations.locations_forest_tl) AquariaLocations.locations_forest_tl)
self.forest_tl_fp = self.__add_region("Kelp forest top left area fish pass", self.forest_tl_fp = self.__add_region("Kelp Forest top left area fish pass",
AquariaLocations.locations_forest_tl_fp) AquariaLocations.locations_forest_tl_fp)
self.forest_tr = self.__add_region("Kelp forest top right area", self.forest_tr = self.__add_region("Kelp Forest top right area",
AquariaLocations.locations_forest_tr) AquariaLocations.locations_forest_tr)
self.forest_tr_fp = self.__add_region("Kelp forest top right area fish pass", self.forest_tr_fp = self.__add_region("Kelp Forest top right area fish pass",
AquariaLocations.locations_forest_tr_fp) AquariaLocations.locations_forest_tr_fp)
self.forest_bl = self.__add_region("Kelp forest bottom left area", self.forest_bl = self.__add_region("Kelp Forest bottom left area",
AquariaLocations.locations_forest_bl) AquariaLocations.locations_forest_bl)
self.forest_br = self.__add_region("Kelp forest bottom right area", self.forest_br = self.__add_region("Kelp Forest bottom right area",
AquariaLocations.locations_forest_br) AquariaLocations.locations_forest_br)
self.forest_sprite_cave = self.__add_region("Kelp forest spirit cave", self.forest_sprite_cave = self.__add_region("Kelp Forest spirit cave",
AquariaLocations.locations_forest_sprite_cave) AquariaLocations.locations_forest_sprite_cave)
self.forest_sprite_cave_tube = self.__add_region("Kelp forest spirit cave after the plant tube", self.forest_sprite_cave_tube = self.__add_region("Kelp Forest spirit cave after the plant tube",
AquariaLocations.locations_forest_sprite_cave_tube) AquariaLocations.locations_forest_sprite_cave_tube)
self.forest_boss = self.__add_region("Kelp forest Drunian God room", self.forest_boss = self.__add_region("Kelp Forest Drunian God room",
AquariaLocations.locations_forest_boss) AquariaLocations.locations_forest_boss)
self.forest_boss_entrance = self.__add_region("Kelp forest Drunian God room entrance", self.forest_boss_entrance = self.__add_region("Kelp Forest Drunian God room entrance",
AquariaLocations.locations_forest_boss_entrance) AquariaLocations.locations_forest_boss_entrance)
self.mermog_cave = self.__add_region("Kelp forest Mermog cave", self.mermog_cave = self.__add_region("Kelp Forest Mermog cave",
AquariaLocations.locations_mermog_cave) AquariaLocations.locations_mermog_cave)
self.mermog_boss = self.__add_region("Kelp forest Mermog cave boss", self.mermog_boss = self.__add_region("Kelp Forest Mermog cave boss",
AquariaLocations.locations_mermog_boss) AquariaLocations.locations_mermog_boss)
self.forest_fish_cave = self.__add_region("Kelp forest fish cave", self.forest_fish_cave = self.__add_region("Kelp Forest fish cave",
AquariaLocations.locations_forest_fish_cave) AquariaLocations.locations_forest_fish_cave)
self.simon = self.__add_region("Kelp forest, Simon's room", AquariaLocations.locations_simon) self.simon = self.__add_region("Kelp Forest, Simon's room", AquariaLocations.locations_simon)
def __create_veil(self) -> None: def __create_veil(self) -> None:
""" """
Create the `veil_*`, `octo_cave` and `turtle_cave` regions Create the `veil_*`, `octo_cave` and `turtle_cave` regions
""" """
self.veil_tl = self.__add_region("The veil top left area", AquariaLocations.locations_veil_tl) self.veil_tl = self.__add_region("The Veil top left area", AquariaLocations.locations_veil_tl)
self.veil_tl_fp = self.__add_region("The veil top left area fish pass", self.veil_tl_fp = self.__add_region("The Veil top left area fish pass",
AquariaLocations.locations_veil_tl_fp) AquariaLocations.locations_veil_tl_fp)
self.turtle_cave = self.__add_region("The veil top left area, turtle cave", self.turtle_cave = self.__add_region("The Veil top left area, turtle cave",
AquariaLocations.locations_turtle_cave) AquariaLocations.locations_turtle_cave)
self.turtle_cave_bubble = self.__add_region("The veil top left area, turtle cave bubble cliff", self.turtle_cave_bubble = self.__add_region("The Veil top left area, turtle cave Bubble Cliff",
AquariaLocations.locations_turtle_cave_bubble) AquariaLocations.locations_turtle_cave_bubble)
self.veil_tr_l = self.__add_region("The veil top right area, left of temple", self.veil_tr_l = self.__add_region("The Veil top right area, left of temple",
AquariaLocations.locations_veil_tr_l) AquariaLocations.locations_veil_tr_l)
self.veil_tr_r = self.__add_region("The veil top right area, right of temple", self.veil_tr_r = self.__add_region("The Veil top right area, right of temple",
AquariaLocations.locations_veil_tr_r) AquariaLocations.locations_veil_tr_r)
self.octo_cave_t = self.__add_region("Octopus cave top entrance", self.octo_cave_t = self.__add_region("Octopus Cave top entrance",
AquariaLocations.locations_octo_cave_t) AquariaLocations.locations_octo_cave_t)
self.octo_cave_b = self.__add_region("Octopus cave bottom entrance", self.octo_cave_b = self.__add_region("Octopus Cave bottom entrance",
AquariaLocations.locations_octo_cave_b) AquariaLocations.locations_octo_cave_b)
self.veil_bl = self.__add_region("The veil bottom left area", self.veil_bl = self.__add_region("The Veil bottom left area",
AquariaLocations.locations_veil_bl) AquariaLocations.locations_veil_bl)
self.veil_b_sc = self.__add_region("The veil bottom spirit cristal area", self.veil_b_sc = self.__add_region("The Veil bottom spirit crystal area",
AquariaLocations.locations_veil_b_sc) AquariaLocations.locations_veil_b_sc)
self.veil_bl_fp = self.__add_region("The veil bottom left area, in the sunken ship", self.veil_bl_fp = self.__add_region("The Veil bottom left area, in the sunken ship",
AquariaLocations.locations_veil_bl_fp) AquariaLocations.locations_veil_bl_fp)
self.veil_br = self.__add_region("The veil bottom right area", self.veil_br = self.__add_region("The Veil bottom right area",
AquariaLocations.locations_veil_br) AquariaLocations.locations_veil_br)
def __create_sun_temple(self) -> None: def __create_sun_temple(self) -> None:
""" """
Create the `sun_temple*` regions Create the `sun_temple*` regions
""" """
self.sun_temple_l = self.__add_region("Sun temple left area", self.sun_temple_l = self.__add_region("Sun Temple left area",
AquariaLocations.locations_sun_temple_l) AquariaLocations.locations_sun_temple_l)
self.sun_temple_r = self.__add_region("Sun temple right area", self.sun_temple_r = self.__add_region("Sun Temple right area",
AquariaLocations.locations_sun_temple_r) AquariaLocations.locations_sun_temple_r)
self.sun_temple_boss_path = self.__add_region("Sun temple before boss area", self.sun_temple_boss_path = self.__add_region("Sun Temple before boss area",
AquariaLocations.locations_sun_temple_boss_path) AquariaLocations.locations_sun_temple_boss_path)
self.sun_temple_boss = self.__add_region("Sun temple boss area", self.sun_temple_boss = self.__add_region("Sun Temple boss area",
AquariaLocations.locations_sun_temple_boss) AquariaLocations.locations_sun_temple_boss)
def __create_abyss(self) -> None: def __create_abyss(self) -> None:
@ -388,9 +388,9 @@ class AquariaRegions:
AquariaLocations.locations_abyss_l) AquariaLocations.locations_abyss_l)
self.abyss_lb = self.__add_region("Abyss left bottom area", AquariaLocations.locations_abyss_lb) self.abyss_lb = self.__add_region("Abyss left bottom area", AquariaLocations.locations_abyss_lb)
self.abyss_r = self.__add_region("Abyss right area", AquariaLocations.locations_abyss_r) self.abyss_r = self.__add_region("Abyss right area", AquariaLocations.locations_abyss_r)
self.ice_cave = self.__add_region("Ice cave", AquariaLocations.locations_ice_cave) self.ice_cave = self.__add_region("Ice Cave", AquariaLocations.locations_ice_cave)
self.bubble_cave = self.__add_region("Bubble cave", AquariaLocations.locations_bubble_cave) self.bubble_cave = self.__add_region("Bubble Cave", AquariaLocations.locations_bubble_cave)
self.bubble_cave_boss = self.__add_region("Bubble cave boss area", AquariaLocations.locations_bubble_cave_boss) self.bubble_cave_boss = self.__add_region("Bubble Cave boss area", AquariaLocations.locations_bubble_cave_boss)
self.king_jellyfish_cave = self.__add_region("Abyss left area, King jellyfish cave", self.king_jellyfish_cave = self.__add_region("Abyss left area, King jellyfish cave",
AquariaLocations.locations_king_jellyfish_cave) AquariaLocations.locations_king_jellyfish_cave)
self.whale = self.__add_region("Inside the whale", AquariaLocations.locations_whale) self.whale = self.__add_region("Inside the whale", AquariaLocations.locations_whale)
@ -400,35 +400,35 @@ class AquariaRegions:
""" """
Create the `sunken_city_*` regions Create the `sunken_city_*` regions
""" """
self.sunken_city_l = self.__add_region("Sunken city left area", self.sunken_city_l = self.__add_region("Sunken City left area",
AquariaLocations.locations_sunken_city_l) AquariaLocations.locations_sunken_city_l)
self.sunken_city_l_bedroom = self.__add_region("Sunken city left area, bedroom", self.sunken_city_l_bedroom = self.__add_region("Sunken City left area, bedroom",
AquariaLocations.locations_sunken_city_l_bedroom) AquariaLocations.locations_sunken_city_l_bedroom)
self.sunken_city_r = self.__add_region("Sunken city right area", self.sunken_city_r = self.__add_region("Sunken City right area",
AquariaLocations.locations_sunken_city_r) AquariaLocations.locations_sunken_city_r)
self.sunken_city_boss = self.__add_region("Sunken city boss area", self.sunken_city_boss = self.__add_region("Sunken City boss area",
AquariaLocations.locations_sunken_city_boss) AquariaLocations.locations_sunken_city_boss)
def __create_body(self) -> None: def __create_body(self) -> None:
""" """
Create the `body_*` and `final_boss* regions Create the `body_*` and `final_boss* regions
""" """
self.body_c = self.__add_region("The body center area", self.body_c = self.__add_region("The Body center area",
AquariaLocations.locations_body_c) AquariaLocations.locations_body_c)
self.body_l = self.__add_region("The body left area", self.body_l = self.__add_region("The Body left area",
AquariaLocations.locations_body_l) AquariaLocations.locations_body_l)
self.body_rt = self.__add_region("The body right area, top path", self.body_rt = self.__add_region("The Body right area, top path",
AquariaLocations.locations_body_rt) AquariaLocations.locations_body_rt)
self.body_rb = self.__add_region("The body right area, bottom path", self.body_rb = self.__add_region("The Body right area, bottom path",
AquariaLocations.locations_body_rb) AquariaLocations.locations_body_rb)
self.body_b = self.__add_region("The body bottom area", self.body_b = self.__add_region("The Body bottom area",
AquariaLocations.locations_body_b) AquariaLocations.locations_body_b)
self.final_boss_loby = self.__add_region("The body, before final boss", None) self.final_boss_loby = self.__add_region("The Body, before final boss", None)
self.final_boss_tube = self.__add_region("The body, final boss area turtle room", self.final_boss_tube = self.__add_region("The Body, final boss area turtle room",
AquariaLocations.locations_final_boss_tube) AquariaLocations.locations_final_boss_tube)
self.final_boss = self.__add_region("The body, final boss", self.final_boss = self.__add_region("The Body, final boss",
AquariaLocations.locations_final_boss) AquariaLocations.locations_final_boss)
self.final_boss_end = self.__add_region("The body, final boss area", None) self.final_boss_end = self.__add_region("The Body, final boss area", None)
def __connect_one_way_regions(self, source_name: str, destination_name: str, def __connect_one_way_regions(self, source_name: str, destination_name: str,
source_region: Region, source_region: Region,
@ -455,99 +455,99 @@ class AquariaRegions:
""" """
Connect entrances of the different regions around `home_water` Connect entrances of the different regions around `home_water`
""" """
self.__connect_regions("Menu", "Verse cave right area", self.__connect_regions("Menu", "Verse Cave right area",
self.menu, self.verse_cave_r) self.menu, self.verse_cave_r)
self.__connect_regions("Verse cave left area", "Verse cave right area", self.__connect_regions("Verse Cave left area", "Verse Cave right area",
self.verse_cave_l, self.verse_cave_r) self.verse_cave_l, self.verse_cave_r)
self.__connect_regions("Verse cave", "Home water", self.verse_cave_l, self.home_water) self.__connect_regions("Verse Cave", "Home Water", self.verse_cave_l, self.home_water)
self.__connect_regions("Home Water", "Haija's home", self.home_water, self.naija_home) self.__connect_regions("Home Water", "Haija's home", self.home_water, self.naija_home)
self.__connect_regions("Home Water", "Song cave", self.home_water, self.song_cave) self.__connect_regions("Home Water", "Song Cave", self.home_water, self.song_cave)
self.__connect_regions("Home Water", "Home water, nautilus nest", self.__connect_regions("Home Water", "Home Water, nautilus nest",
self.home_water, self.home_water_nautilus, self.home_water, self.home_water_nautilus,
lambda state: _has_energy_form(state, self.player) and _has_bind_song(state, self.player)) lambda state: _has_energy_form(state, self.player) and _has_bind_song(state, self.player))
self.__connect_regions("Home Water", "Home water transturtle room", self.__connect_regions("Home Water", "Home Water transturtle room",
self.home_water, self.home_water_transturtle) self.home_water, self.home_water_transturtle)
self.__connect_regions("Home Water", "Energy temple first area", self.__connect_regions("Home Water", "Energy Temple first area",
self.home_water, self.energy_temple_1, self.home_water, self.energy_temple_1,
lambda state: _has_bind_song(state, self.player)) lambda state: _has_bind_song(state, self.player))
self.__connect_regions("Home Water", "Energy temple_altar", self.__connect_regions("Home Water", "Energy Temple_altar",
self.home_water, self.energy_temple_altar, self.home_water, self.energy_temple_altar,
lambda state: _has_energy_form(state, self.player) and lambda state: _has_energy_form(state, self.player) and
_has_bind_song(state, self.player)) _has_bind_song(state, self.player))
self.__connect_regions("Energy temple first area", "Energy temple second area", self.__connect_regions("Energy Temple first area", "Energy Temple second area",
self.energy_temple_1, self.energy_temple_2, self.energy_temple_1, self.energy_temple_2,
lambda state: _has_energy_form(state, self.player)) lambda state: _has_energy_form(state, self.player))
self.__connect_regions("Energy temple first area", "Energy temple idol room", self.__connect_regions("Energy Temple first area", "Energy Temple idol room",
self.energy_temple_1, self.energy_temple_idol, self.energy_temple_1, self.energy_temple_idol,
lambda state: _has_fish_form(state, self.player)) lambda state: _has_fish_form(state, self.player))
self.__connect_regions("Energy temple idol room", "Energy temple boss area", self.__connect_regions("Energy Temple idol room", "Energy Temple boss area",
self.energy_temple_idol, self.energy_temple_boss, self.energy_temple_idol, self.energy_temple_boss,
lambda state: _has_energy_form(state, self.player)) lambda state: _has_energy_form(state, self.player))
self.__connect_one_way_regions("Energy temple first area", "Energy temple boss area", self.__connect_one_way_regions("Energy Temple first area", "Energy Temple boss area",
self.energy_temple_1, self.energy_temple_boss, self.energy_temple_1, self.energy_temple_boss,
lambda state: _has_beast_form(state, self.player) and lambda state: _has_beast_form(state, self.player) and
_has_energy_form(state, self.player)) _has_energy_form(state, self.player))
self.__connect_one_way_regions("Energy temple boss area", "Energy temple first area", self.__connect_one_way_regions("Energy Temple boss area", "Energy Temple first area",
self.energy_temple_boss, self.energy_temple_1, self.energy_temple_boss, self.energy_temple_1,
lambda state: _has_energy_form(state, self.player)) lambda state: _has_energy_form(state, self.player))
self.__connect_regions("Energy temple second area", "Energy temple third area", self.__connect_regions("Energy Temple second area", "Energy Temple third area",
self.energy_temple_2, self.energy_temple_3, self.energy_temple_2, self.energy_temple_3,
lambda state: _has_bind_song(state, self.player) and lambda state: _has_bind_song(state, self.player) and
_has_energy_form(state, self.player)) _has_energy_form(state, self.player))
self.__connect_regions("Energy temple boss area", "Energy temple blaster room", self.__connect_regions("Energy Temple boss area", "Energy Temple blaster room",
self.energy_temple_boss, self.energy_temple_blaster_room, self.energy_temple_boss, self.energy_temple_blaster_room,
lambda state: _has_nature_form(state, self.player) and lambda state: _has_nature_form(state, self.player) and
_has_bind_song(state, self.player) and _has_bind_song(state, self.player) and
_has_energy_form(state, self.player)) _has_energy_form(state, self.player))
self.__connect_regions("Energy temple first area", "Energy temple blaster room", self.__connect_regions("Energy Temple first area", "Energy Temple blaster room",
self.energy_temple_1, self.energy_temple_blaster_room, self.energy_temple_1, self.energy_temple_blaster_room,
lambda state: _has_nature_form(state, self.player) and lambda state: _has_nature_form(state, self.player) and
_has_bind_song(state, self.player) and _has_bind_song(state, self.player) and
_has_energy_form(state, self.player) and _has_energy_form(state, self.player) and
_has_beast_form(state, self.player)) _has_beast_form(state, self.player))
self.__connect_regions("Home Water", "Open water top left area", self.__connect_regions("Home Water", "Open Water top left area",
self.home_water, self.openwater_tl) self.home_water, self.openwater_tl)
def __connect_open_water_regions(self) -> None: def __connect_open_water_regions(self) -> None:
""" """
Connect entrances of the different regions around open water Connect entrances of the different regions around open water
""" """
self.__connect_regions("Open water top left area", "Open water top right area", self.__connect_regions("Open Water top left area", "Open Water top right area",
self.openwater_tl, self.openwater_tr) self.openwater_tl, self.openwater_tr)
self.__connect_regions("Open water top left area", "Open water bottom left area", self.__connect_regions("Open Water top left area", "Open Water bottom left area",
self.openwater_tl, self.openwater_bl) self.openwater_tl, self.openwater_bl)
self.__connect_regions("Open water top left area", "forest bottom right area", self.__connect_regions("Open Water top left area", "forest bottom right area",
self.openwater_tl, self.forest_br) self.openwater_tl, self.forest_br)
self.__connect_regions("Open water top right area", "Open water top right area, turtle room", self.__connect_regions("Open Water top right area", "Open Water top right area, turtle room",
self.openwater_tr, self.openwater_tr_turtle, self.openwater_tr, self.openwater_tr_turtle,
lambda state: _has_beast_form(state, self.player)) lambda state: _has_beast_form(state, self.player))
self.__connect_regions("Open water top right area", "Open water bottom right area", self.__connect_regions("Open Water top right area", "Open Water bottom right area",
self.openwater_tr, self.openwater_br) self.openwater_tr, self.openwater_br)
self.__connect_regions("Open water top right area", "Mithalas city", self.__connect_regions("Open Water top right area", "Mithalas City",
self.openwater_tr, self.mithalas_city) self.openwater_tr, self.mithalas_city)
self.__connect_regions("Open water top right area", "Veil bottom left area", self.__connect_regions("Open Water top right area", "Veil bottom left area",
self.openwater_tr, self.veil_bl) self.openwater_tr, self.veil_bl)
self.__connect_one_way_regions("Open water top right area", "Veil bottom right", self.__connect_one_way_regions("Open Water top right area", "Veil bottom right",
self.openwater_tr, self.veil_br, self.openwater_tr, self.veil_br,
lambda state: _has_beast_form(state, self.player)) lambda state: _has_beast_form(state, self.player))
self.__connect_one_way_regions("Veil bottom right", "Open water top right area", self.__connect_one_way_regions("Veil bottom right", "Open Water top right area",
self.veil_br, self.openwater_tr, self.veil_br, self.openwater_tr,
lambda state: _has_beast_form(state, self.player)) lambda state: _has_beast_form(state, self.player))
self.__connect_regions("Open water bottom left area", "Open water bottom right area", self.__connect_regions("Open Water bottom left area", "Open Water bottom right area",
self.openwater_bl, self.openwater_br) self.openwater_bl, self.openwater_br)
self.__connect_regions("Open water bottom left area", "Skeleton path", self.__connect_regions("Open Water bottom left area", "Skeleton path",
self.openwater_bl, self.skeleton_path) self.openwater_bl, self.skeleton_path)
self.__connect_regions("Abyss left area", "Open water bottom left area", self.__connect_regions("Abyss left area", "Open Water bottom left area",
self.abyss_l, self.openwater_bl) self.abyss_l, self.openwater_bl)
self.__connect_regions("Skeleton path", "skeleton_path_sc", self.__connect_regions("Skeleton path", "skeleton_path_sc",
self.skeleton_path, self.skeleton_path_sc, self.skeleton_path, self.skeleton_path_sc,
lambda state: _has_spirit_form(state, self.player)) lambda state: _has_spirit_form(state, self.player))
self.__connect_regions("Abyss right area", "Open water bottom right area", self.__connect_regions("Abyss right area", "Open Water bottom right area",
self.abyss_r, self.openwater_br) self.abyss_r, self.openwater_br)
self.__connect_one_way_regions("Open water bottom right area", "Arnassi", self.__connect_one_way_regions("Open Water bottom right area", "Arnassi",
self.openwater_br, self.arnassi, self.openwater_br, self.arnassi,
lambda state: _has_beast_form(state, self.player)) lambda state: _has_beast_form(state, self.player))
self.__connect_one_way_regions("Arnassi", "Open water bottom right area", self.__connect_one_way_regions("Arnassi", "Open Water bottom right area",
self.arnassi, self.openwater_br) self.arnassi, self.openwater_br)
self.__connect_regions("Arnassi", "Arnassi path", self.__connect_regions("Arnassi", "Arnassi path",
self.arnassi, self.arnassi_path) self.arnassi, self.arnassi_path)
@ -562,23 +562,23 @@ class AquariaRegions:
""" """
Connect entrances of the different regions around Mithalas Connect entrances of the different regions around Mithalas
""" """
self.__connect_one_way_regions("Mithalas city", "Mithalas city top path", self.__connect_one_way_regions("Mithalas City", "Mithalas City top path",
self.mithalas_city, self.mithalas_city_top_path, self.mithalas_city, self.mithalas_city_top_path,
lambda state: _has_beast_form(state, self.player)) lambda state: _has_beast_form(state, self.player))
self.__connect_one_way_regions("Mithalas city_top_path", "Mithalas city", self.__connect_one_way_regions("Mithalas City_top_path", "Mithalas City",
self.mithalas_city_top_path, self.mithalas_city) self.mithalas_city_top_path, self.mithalas_city)
self.__connect_regions("Mithalas city", "Mithalas city home with fishpass", self.__connect_regions("Mithalas City", "Mithalas City home with fishpass",
self.mithalas_city, self.mithalas_city_fishpass, self.mithalas_city, self.mithalas_city_fishpass,
lambda state: _has_fish_form(state, self.player)) lambda state: _has_fish_form(state, self.player))
self.__connect_regions("Mithalas city", "Mithalas castle", self.__connect_regions("Mithalas City", "Mithalas castle",
self.mithalas_city, self.cathedral_l, self.mithalas_city, self.cathedral_l,
lambda state: _has_fish_form(state, self.player)) lambda state: _has_fish_form(state, self.player))
self.__connect_one_way_regions("Mithalas city top path", "Mithalas castle, flower tube", self.__connect_one_way_regions("Mithalas City top path", "Mithalas castle, flower tube",
self.mithalas_city_top_path, self.mithalas_city_top_path,
self.cathedral_l_tube, self.cathedral_l_tube,
lambda state: _has_nature_form(state, self.player) and lambda state: _has_nature_form(state, self.player) and
_has_energy_form(state, self.player)) _has_energy_form(state, self.player))
self.__connect_one_way_regions("Mithalas castle, flower tube area", "Mithalas city top path", self.__connect_one_way_regions("Mithalas castle, flower tube area", "Mithalas City top path",
self.cathedral_l_tube, self.cathedral_l_tube,
self.mithalas_city_top_path, self.mithalas_city_top_path,
lambda state: _has_beast_form(state, self.player) and lambda state: _has_beast_form(state, self.player) and
@ -690,22 +690,22 @@ class AquariaRegions:
self.veil_tl, self.veil_tr_r) self.veil_tl, self.veil_tr_r)
self.__connect_regions("Veil top left area", "Turtle cave", self.__connect_regions("Veil top left area", "Turtle cave",
self.veil_tl, self.turtle_cave) self.veil_tl, self.turtle_cave)
self.__connect_regions("Turtle cave", "Turtle cave bubble cliff", self.__connect_regions("Turtle cave", "Turtle cave Bubble Cliff",
self.turtle_cave, self.turtle_cave_bubble, self.turtle_cave, self.turtle_cave_bubble,
lambda state: _has_beast_form(state, self.player)) lambda state: _has_beast_form(state, self.player))
self.__connect_regions("Veil right of sun temple", "Sun temple right area", self.__connect_regions("Veil right of sun temple", "Sun Temple right area",
self.veil_tr_r, self.sun_temple_r) self.veil_tr_r, self.sun_temple_r)
self.__connect_regions("Sun temple right area", "Sun temple left area", self.__connect_regions("Sun Temple right area", "Sun Temple left area",
self.sun_temple_r, self.sun_temple_l, self.sun_temple_r, self.sun_temple_l,
lambda state: _has_bind_song(state, self.player)) lambda state: _has_bind_song(state, self.player))
self.__connect_regions("Sun temple left area", "Veil left of sun temple", self.__connect_regions("Sun Temple left area", "Veil left of sun temple",
self.sun_temple_l, self.veil_tr_l) self.sun_temple_l, self.veil_tr_l)
self.__connect_regions("Sun temple left area", "Sun temple before boss area", self.__connect_regions("Sun Temple left area", "Sun Temple before boss area",
self.sun_temple_l, self.sun_temple_boss_path) self.sun_temple_l, self.sun_temple_boss_path)
self.__connect_regions("Sun temple before boss area", "Sun temple boss area", self.__connect_regions("Sun Temple before boss area", "Sun Temple boss area",
self.sun_temple_boss_path, self.sun_temple_boss, self.sun_temple_boss_path, self.sun_temple_boss,
lambda state: _has_energy_form(state, self.player)) lambda state: _has_energy_form(state, self.player))
self.__connect_one_way_regions("Sun temple boss area", "Veil left of sun temple", self.__connect_one_way_regions("Sun Temple boss area", "Veil left of sun temple",
self.sun_temple_boss, self.veil_tr_l) self.sun_temple_boss, self.veil_tr_l)
self.__connect_regions("Veil left of sun temple", "Octo cave top path", self.__connect_regions("Veil left of sun temple", "Octo cave top path",
self.veil_tr_l, self.octo_cave_t, self.veil_tr_l, self.octo_cave_t,
@ -724,7 +724,7 @@ class AquariaRegions:
self.__connect_regions("Abyss left area", "Abyss bottom of left area", self.__connect_regions("Abyss left area", "Abyss bottom of left area",
self.abyss_l, self.abyss_lb, self.abyss_l, self.abyss_lb,
lambda state: _has_nature_form(state, self.player)) lambda state: _has_nature_form(state, self.player))
self.__connect_regions("Abyss left bottom area", "Sunken city right area", self.__connect_regions("Abyss left bottom area", "Sunken City right area",
self.abyss_lb, self.sunken_city_r, self.abyss_lb, self.sunken_city_r,
lambda state: _has_li(state, self.player)) lambda state: _has_li(state, self.player))
self.__connect_one_way_regions("Abyss left bottom area", "Body center area", self.__connect_one_way_regions("Abyss left bottom area", "Body center area",
@ -748,13 +748,13 @@ class AquariaRegions:
_has_sun_form(state, self.player) and _has_sun_form(state, self.player) and
_has_bind_song(state, self.player) and _has_bind_song(state, self.player) and
_has_energy_form(state, self.player)) _has_energy_form(state, self.player))
self.__connect_regions("Abyss right area", "Ice cave", self.__connect_regions("Abyss right area", "Ice Cave",
self.abyss_r, self.ice_cave, self.abyss_r, self.ice_cave,
lambda state: _has_spirit_form(state, self.player)) lambda state: _has_spirit_form(state, self.player))
self.__connect_regions("Abyss right area", "Bubble cave", self.__connect_regions("Abyss right area", "Bubble Cave",
self.ice_cave, self.bubble_cave, self.ice_cave, self.bubble_cave,
lambda state: _has_beast_form(state, self.player)) lambda state: _has_beast_form(state, self.player))
self.__connect_regions("Bubble cave boss area", "Bubble cave", self.__connect_regions("Bubble Cave boss area", "Bubble Cave",
self.bubble_cave, self.bubble_cave_boss, self.bubble_cave, self.bubble_cave_boss,
lambda state: _has_nature_form(state, self.player) and _has_bind_song(state, self.player) lambda state: _has_nature_form(state, self.player) and _has_bind_song(state, self.player)
) )
@ -763,12 +763,12 @@ class AquariaRegions:
""" """
Connect entrances of the different regions around The Sunken City Connect entrances of the different regions around The Sunken City
""" """
self.__connect_regions("Sunken city right area", "Sunken city left area", self.__connect_regions("Sunken City right area", "Sunken City left area",
self.sunken_city_r, self.sunken_city_l) self.sunken_city_r, self.sunken_city_l)
self.__connect_regions("Sunken city left area", "Sunken city bedroom", self.__connect_regions("Sunken City left area", "Sunken City bedroom",
self.sunken_city_l, self.sunken_city_l_bedroom, self.sunken_city_l, self.sunken_city_l_bedroom,
lambda state: _has_spirit_form(state, self.player)) lambda state: _has_spirit_form(state, self.player))
self.__connect_regions("Sunken city left area", "Sunken city boss area", self.__connect_regions("Sunken City left area", "Sunken City boss area",
self.sunken_city_l, self.sunken_city_boss, self.sunken_city_l, self.sunken_city_boss,
lambda state: _has_beast_form(state, self.player) and lambda state: _has_beast_form(state, self.player) and
_has_energy_form(state, self.player) and _has_energy_form(state, self.player) and
@ -776,7 +776,7 @@ class AquariaRegions:
def __connect_body_regions(self) -> None: def __connect_body_regions(self) -> None:
""" """
Connect entrances of the different regions around The body Connect entrances of the different regions around The Body
""" """
self.__connect_regions("Body center area", "Body left area", self.__connect_regions("Body center area", "Body left area",
self.body_c, self.body_l) self.body_c, self.body_l)
@ -787,13 +787,13 @@ class AquariaRegions:
self.__connect_regions("Body center area", "Body bottom area", self.__connect_regions("Body center area", "Body bottom area",
self.body_c, self.body_b, self.body_c, self.body_b,
lambda state: _has_dual_form(state, self.player)) lambda state: _has_dual_form(state, self.player))
self.__connect_regions("Body bottom area", "Final boss area", self.__connect_regions("Body bottom area", "Final Boss area",
self.body_b, self.final_boss_loby, self.body_b, self.final_boss_loby,
lambda state: _has_dual_form(state, self.player)) lambda state: _has_dual_form(state, self.player))
self.__connect_regions("Before Final boss", "Final boss tube", self.__connect_regions("Before Final Boss", "Final Boss tube",
self.final_boss_loby, self.final_boss_tube, self.final_boss_loby, self.final_boss_tube,
lambda state: _has_nature_form(state, self.player)) lambda state: _has_nature_form(state, self.player))
self.__connect_one_way_regions("Before Final boss", "Final boss", self.__connect_one_way_regions("Before Final Boss", "Final Boss",
self.final_boss_loby, self.final_boss, self.final_boss_loby, self.final_boss,
lambda state: _has_energy_form(state, self.player) and lambda state: _has_energy_form(state, self.player) and
_has_dual_form(state, self.player) and _has_dual_form(state, self.player) and
@ -814,7 +814,7 @@ class AquariaRegions:
def __connect_arnassi_path_transturtle(self, item_source: str, item_target: str, region_source: Region, def __connect_arnassi_path_transturtle(self, item_source: str, item_target: str, region_source: Region,
region_target: Region) -> None: region_target: Region) -> None:
"""Connect the Arnassi ruins transturtle to another one""" """Connect the Arnassi Ruins transturtle to another one"""
self.__connect_one_way_regions(item_source, item_target, region_source, region_target, self.__connect_one_way_regions(item_source, item_target, region_source, region_target,
lambda state: state.has(item_target, self.player) and lambda state: state.has(item_target, self.player) and
_has_fish_form(state, self.player)) _has_fish_form(state, self.player))
@ -825,25 +825,25 @@ class AquariaRegions:
self.__connect_transturtle(item, "Transturtle Veil top right", region, self.veil_tr_l) self.__connect_transturtle(item, "Transturtle Veil top right", region, self.veil_tr_l)
self.__connect_transturtle(item, "Transturtle Open Water top right", region, self.openwater_tr_turtle) self.__connect_transturtle(item, "Transturtle Open Water top right", region, self.openwater_tr_turtle)
self.__connect_transturtle(item, "Transturtle Forest bottom left", region, self.forest_bl) self.__connect_transturtle(item, "Transturtle Forest bottom left", region, self.forest_bl)
self.__connect_transturtle(item, "Transturtle Home water", region, self.home_water_transturtle) self.__connect_transturtle(item, "Transturtle Home Water", region, self.home_water_transturtle)
self.__connect_transturtle(item, "Transturtle Abyss right", region, self.abyss_r) self.__connect_transturtle(item, "Transturtle Abyss right", region, self.abyss_r)
self.__connect_transturtle(item, "Transturtle Final Boss", region, self.final_boss_tube) self.__connect_transturtle(item, "Transturtle Final Boss", region, self.final_boss_tube)
self.__connect_transturtle(item, "Transturtle Simon says", region, self.simon) self.__connect_transturtle(item, "Transturtle Simon Says", region, self.simon)
self.__connect_transturtle(item, "Transturtle Arnassi ruins", region, self.arnassi_path, self.__connect_transturtle(item, "Transturtle Arnassi Ruins", region, self.arnassi_path,
lambda state: state.has("Transturtle Arnassi ruins", self.player) and lambda state: state.has("Transturtle Arnassi Ruins", self.player) and
_has_fish_form(state, self.player)) _has_fish_form(state, self.player))
def _connect_arnassi_path_transturtle_to_other(self, item: str, region: Region) -> None: def _connect_arnassi_path_transturtle_to_other(self, item: str, region: Region) -> None:
"""Connect the Arnassi ruins transturtle to all others""" """Connect the Arnassi Ruins transturtle to all others"""
self.__connect_arnassi_path_transturtle(item, "Transturtle Veil top left", region, self.veil_tl) self.__connect_arnassi_path_transturtle(item, "Transturtle Veil top left", region, self.veil_tl)
self.__connect_arnassi_path_transturtle(item, "Transturtle Veil top right", region, self.veil_tr_l) self.__connect_arnassi_path_transturtle(item, "Transturtle Veil top right", region, self.veil_tr_l)
self.__connect_arnassi_path_transturtle(item, "Transturtle Open Water top right", region, self.__connect_arnassi_path_transturtle(item, "Transturtle Open Water top right", region,
self.openwater_tr_turtle) self.openwater_tr_turtle)
self.__connect_arnassi_path_transturtle(item, "Transturtle Forest bottom left", region, self.forest_bl) self.__connect_arnassi_path_transturtle(item, "Transturtle Forest bottom left", region, self.forest_bl)
self.__connect_arnassi_path_transturtle(item, "Transturtle Home water", region, self.home_water_transturtle) self.__connect_arnassi_path_transturtle(item, "Transturtle Home Water", region, self.home_water_transturtle)
self.__connect_arnassi_path_transturtle(item, "Transturtle Abyss right", region, self.abyss_r) self.__connect_arnassi_path_transturtle(item, "Transturtle Abyss right", region, self.abyss_r)
self.__connect_arnassi_path_transturtle(item, "Transturtle Final Boss", region, self.final_boss_tube) self.__connect_arnassi_path_transturtle(item, "Transturtle Final Boss", region, self.final_boss_tube)
self.__connect_arnassi_path_transturtle(item, "Transturtle Simon says", region, self.simon) self.__connect_arnassi_path_transturtle(item, "Transturtle Simon Says", region, self.simon)
def __connect_transturtles(self) -> None: def __connect_transturtles(self) -> None:
"""Connect every transturtle with others""" """Connect every transturtle with others"""
@ -851,11 +851,11 @@ class AquariaRegions:
self._connect_transturtle_to_other("Transturtle Veil top right", self.veil_tr_l) self._connect_transturtle_to_other("Transturtle Veil top right", self.veil_tr_l)
self._connect_transturtle_to_other("Transturtle Open Water top right", self.openwater_tr_turtle) self._connect_transturtle_to_other("Transturtle Open Water top right", self.openwater_tr_turtle)
self._connect_transturtle_to_other("Transturtle Forest bottom left", self.forest_bl) self._connect_transturtle_to_other("Transturtle Forest bottom left", self.forest_bl)
self._connect_transturtle_to_other("Transturtle Home water", self.home_water_transturtle) self._connect_transturtle_to_other("Transturtle Home Water", self.home_water_transturtle)
self._connect_transturtle_to_other("Transturtle Abyss right", self.abyss_r) self._connect_transturtle_to_other("Transturtle Abyss right", self.abyss_r)
self._connect_transturtle_to_other("Transturtle Final Boss", self.final_boss_tube) self._connect_transturtle_to_other("Transturtle Final Boss", self.final_boss_tube)
self._connect_transturtle_to_other("Transturtle Simon says", self.simon) self._connect_transturtle_to_other("Transturtle Simon Says", self.simon)
self._connect_arnassi_path_transturtle_to_other("Transturtle Arnassi ruins", self.arnassi_path) self._connect_arnassi_path_transturtle_to_other("Transturtle Arnassi Ruins", self.arnassi_path)
def connect_regions(self) -> None: def connect_regions(self) -> None:
""" """
@ -907,7 +907,7 @@ class AquariaRegions:
def __add_event_mini_bosses(self) -> None: def __add_event_mini_bosses(self) -> None:
""" """
Add every mini bosses (excluding Energy statue and Simon says) Add every mini bosses (excluding Energy Statue and Simon Says)
events to the `world` events to the `world`
""" """
self.__add_event_location(self.home_water_nautilus, self.__add_event_location(self.home_water_nautilus,
@ -967,100 +967,100 @@ class AquariaRegions:
def __adjusting_urns_rules(self) -> None: def __adjusting_urns_rules(self) -> None:
"""Since Urns need to be broken, add a damaging item to rules""" """Since Urns need to be broken, add a damaging item to rules"""
add_rule(self.multiworld.get_location("Open water top right area, first urn in the Mithalas exit", self.player), add_rule(self.multiworld.get_location("Open Water top right area, first urn in the Mithalas exit", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Open water top right area, second urn in the Mithalas exit", self.player), add_rule(self.multiworld.get_location("Open Water top right area, second urn in the Mithalas exit", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Open water top right area, third urn in the Mithalas exit", self.player), add_rule(self.multiworld.get_location("Open Water top right area, third urn in the Mithalas exit", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city, first urn in one of the homes", self.player), add_rule(self.multiworld.get_location("Mithalas City, first urn in one of the homes", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city, second urn in one of the homes", self.player), add_rule(self.multiworld.get_location("Mithalas City, second urn in one of the homes", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city, first urn in the city reserve", self.player), add_rule(self.multiworld.get_location("Mithalas City, first urn in the city reserve", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city, second urn in the city reserve", self.player), add_rule(self.multiworld.get_location("Mithalas City, second urn in the city reserve", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city, third urn in the city reserve", self.player), add_rule(self.multiworld.get_location("Mithalas City, third urn in the city reserve", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city, urn in the cathedral flower tube entrance", self.player), add_rule(self.multiworld.get_location("Mithalas City, urn in the Cathedral flower tube entrance", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city castle, urn in the bedroom", self.player), add_rule(self.multiworld.get_location("Mithalas City Castle, urn in the bedroom", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city castle, first urn of the single lamp path", self.player), add_rule(self.multiworld.get_location("Mithalas City Castle, first urn of the single lamp path", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city castle, second urn of the single lamp path", self.player), add_rule(self.multiworld.get_location("Mithalas City Castle, second urn of the single lamp path", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city castle, urn in the bottom room", self.player), add_rule(self.multiworld.get_location("Mithalas City Castle, urn in the bottom room", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city castle, first urn on the entrance path", self.player), add_rule(self.multiworld.get_location("Mithalas City Castle, first urn on the entrance path", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city castle, second urn on the entrance path", self.player), add_rule(self.multiworld.get_location("Mithalas City Castle, second urn on the entrance path", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Mithalas city, urn inside a home fish pass", self.player), add_rule(self.multiworld.get_location("Mithalas City, urn inside a home fish pass", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
def __adjusting_crates_rules(self) -> None: def __adjusting_crates_rules(self) -> None:
"""Since Crate need to be broken, add a damaging item to rules""" """Since Crate need to be broken, add a damaging item to rules"""
add_rule(self.multiworld.get_location("Sunken city right area, crate close to the save cristal", self.player), add_rule(self.multiworld.get_location("Sunken City right area, crate close to the save crystal", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Sunken city right area, crate in the left bottom room", self.player), add_rule(self.multiworld.get_location("Sunken City right area, crate in the left bottom room", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Sunken city left area, crate in the little pipe room", self.player), add_rule(self.multiworld.get_location("Sunken City left area, crate in the little pipe room", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Sunken city left area, crate close to the save cristal", self.player), add_rule(self.multiworld.get_location("Sunken City left area, crate close to the save crystal", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
add_rule(self.multiworld.get_location("Sunken city left area, crate before the bedroom", self.player), add_rule(self.multiworld.get_location("Sunken City left area, crate before the bedroom", self.player),
lambda state: _has_damaging_item(state, self.player)) lambda state: _has_damaging_item(state, self.player))
def __adjusting_soup_rules(self) -> None: def __adjusting_soup_rules(self) -> None:
""" """
Modify rules for location that need soup Modify rules for location that need soup
""" """
add_rule(self.multiworld.get_location("Turtle cave, Urchin costume", self.player), add_rule(self.multiworld.get_location("Turtle cave, Urchin Costume", self.player),
lambda state: _has_hot_soup(state, self.player) and _has_beast_form(state, self.player)) lambda state: _has_hot_soup(state, self.player) and _has_beast_form(state, self.player))
add_rule(self.multiworld.get_location("Sun Worm path, first cliff bulb", self.player), add_rule(self.multiworld.get_location("Sun Worm path, first cliff bulb", self.player),
lambda state: _has_hot_soup(state, self.player) and _has_beast_form(state, self.player)) lambda state: _has_hot_soup(state, self.player) and _has_beast_form(state, self.player))
add_rule(self.multiworld.get_location("Sun Worm path, second cliff bulb", self.player), add_rule(self.multiworld.get_location("Sun Worm path, second cliff bulb", self.player),
lambda state: _has_hot_soup(state, self.player) and _has_beast_form(state, self.player)) lambda state: _has_hot_soup(state, self.player) and _has_beast_form(state, self.player))
add_rule(self.multiworld.get_location("The veil top right area, bulb in the top of the water fall", self.player), add_rule(self.multiworld.get_location("The Veil top right area, bulb in the top of the waterfall", self.player),
lambda state: _has_hot_soup(state, self.player) and _has_beast_form(state, self.player)) lambda state: _has_hot_soup(state, self.player) and _has_beast_form(state, self.player))
def __adjusting_under_rock_location(self) -> None: def __adjusting_under_rock_location(self) -> None:
""" """
Modify rules implying bind song needed for bulb under rocks Modify rules implying bind song needed for bulb under rocks
""" """
add_rule(self.multiworld.get_location("Home water, bulb under the rock in the left path from the verse cave", add_rule(self.multiworld.get_location("Home Water, bulb under the rock in the left path from the Verse Cave",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Verse cave left area, bulb under the rock at the end of the path", add_rule(self.multiworld.get_location("Verse Cave left area, bulb under the rock at the end of the path",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Naija's home, bulb under the rock at the right of the main path", add_rule(self.multiworld.get_location("Naija's Home, bulb under the rock at the right of the main path",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Song cave, bulb under the rock in the path to the singing statues", add_rule(self.multiworld.get_location("Song Cave, bulb under the rock in the path to the singing statues",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Song cave, bulb under the rock close to the song door", add_rule(self.multiworld.get_location("Song Cave, bulb under the rock close to the song door",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Energy temple second area, bulb under the rock", add_rule(self.multiworld.get_location("Energy Temple second area, bulb under the rock",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Open water top left area, bulb under the rock in the right path", add_rule(self.multiworld.get_location("Open Water top left area, bulb under the rock in the right path",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Open water top left area, bulb under the rock in the left path", add_rule(self.multiworld.get_location("Open Water top left area, bulb under the rock in the left path",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Kelp Forest top right area, bulb under the rock in the right path", add_rule(self.multiworld.get_location("Kelp Forest top right area, bulb under the rock in the right path",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("The veil top left area, bulb under the rock in the top right path", add_rule(self.multiworld.get_location("The Veil top left area, bulb under the rock in the top right path",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Abyss right area, bulb behind the rock in the whale room", add_rule(self.multiworld.get_location("Abyss right area, bulb behind the rock in the whale room",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Abyss right area, bulb in the middle path", add_rule(self.multiworld.get_location("Abyss right area, bulb in the middle path",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("The veil top left area, bulb under the rock in the top right path", add_rule(self.multiworld.get_location("The Veil top left area, bulb under the rock in the top right path",
self.player), lambda state: _has_bind_song(state, self.player)) self.player), lambda state: _has_bind_song(state, self.player))
def __adjusting_light_in_dark_place_rules(self) -> None: def __adjusting_light_in_dark_place_rules(self) -> None:
add_rule(self.multiworld.get_location("Kelp forest top right area, Black pearl", self.player), add_rule(self.multiworld.get_location("Kelp Forest top right area, Black Pearl", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_location("Kelp forest bottom right area, Odd Container", self.player), add_rule(self.multiworld.get_location("Kelp Forest bottom right area, Odd Container", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_entrance("Transturtle Veil top left to Transturtle Abyss right", self.player), add_rule(self.multiworld.get_entrance("Transturtle Veil top left to Transturtle Abyss right", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
@ -1070,103 +1070,103 @@ class AquariaRegions:
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_entrance("Transturtle Forest bottom left to Transturtle Abyss right", self.player), add_rule(self.multiworld.get_entrance("Transturtle Forest bottom left to Transturtle Abyss right", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_entrance("Transturtle Home water to Transturtle Abyss right", self.player), add_rule(self.multiworld.get_entrance("Transturtle Home Water to Transturtle Abyss right", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_entrance("Transturtle Final Boss to Transturtle Abyss right", self.player), add_rule(self.multiworld.get_entrance("Transturtle Final Boss to Transturtle Abyss right", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_entrance("Transturtle Simon says to Transturtle Abyss right", self.player), add_rule(self.multiworld.get_entrance("Transturtle Simon Says to Transturtle Abyss right", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_entrance("Transturtle Arnassi ruins to Transturtle Abyss right", self.player), add_rule(self.multiworld.get_entrance("Transturtle Arnassi Ruins to Transturtle Abyss right", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_entrance("Body center area to Abyss left bottom area", self.player), add_rule(self.multiworld.get_entrance("Body center area to Abyss left bottom area", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_entrance("Veil left of sun temple to Octo cave top path", self.player), add_rule(self.multiworld.get_entrance("Veil left of sun temple to Octo cave top path", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_entrance("Open water bottom right area to Abyss right area", self.player), add_rule(self.multiworld.get_entrance("Open Water bottom right area to Abyss right area", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_entrance("Open water bottom left area to Abyss left area", self.player), add_rule(self.multiworld.get_entrance("Open Water bottom left area to Abyss left area", self.player),
lambda state: _has_light(state, self.player)) lambda state: _has_light(state, self.player))
add_rule(self.multiworld.get_entrance("Sun temple left area to Sun temple right area", self.player), add_rule(self.multiworld.get_entrance("Sun Temple left area to Sun Temple right area", self.player),
lambda state: _has_light(state, self.player) or _has_sun_crystal(state, self.player)) lambda state: _has_light(state, self.player) or _has_sun_crystal(state, self.player))
add_rule(self.multiworld.get_entrance("Sun temple right area to Sun temple left area", self.player), add_rule(self.multiworld.get_entrance("Sun Temple right area to Sun Temple left area", self.player),
lambda state: _has_light(state, self.player) or _has_sun_crystal(state, self.player)) lambda state: _has_light(state, self.player) or _has_sun_crystal(state, self.player))
add_rule(self.multiworld.get_entrance("Veil left of sun temple to Sun temple left area", self.player), add_rule(self.multiworld.get_entrance("Veil left of sun temple to Sun Temple left area", self.player),
lambda state: _has_light(state, self.player) or _has_sun_crystal(state, self.player)) lambda state: _has_light(state, self.player) or _has_sun_crystal(state, self.player))
def __adjusting_manual_rules(self) -> None: def __adjusting_manual_rules(self) -> None:
add_rule(self.multiworld.get_location("Mithalas cathedral, Mithalan Dress", self.player), add_rule(self.multiworld.get_location("Mithalas Cathedral, Mithalan Dress", self.player),
lambda state: _has_beast_form(state, self.player)) lambda state: _has_beast_form(state, self.player))
add_rule(self.multiworld.get_location("Open water bottom left area, bulb inside the lowest fish pass", self.player), add_rule(self.multiworld.get_location("Open Water bottom left area, bulb inside the lowest fish pass", self.player),
lambda state: _has_fish_form(state, self.player)) lambda state: _has_fish_form(state, self.player))
add_rule(self.multiworld.get_location("Kelp forest bottom left area, Walker baby", self.player), add_rule(self.multiworld.get_location("Kelp Forest bottom left area, Walker baby", self.player),
lambda state: _has_spirit_form(state, self.player)) lambda state: _has_spirit_form(state, self.player))
add_rule(self.multiworld.get_location("The veil top left area, bulb hidden behind the blocking rock", self.player), add_rule(self.multiworld.get_location("The Veil top left area, bulb hidden behind the blocking rock", self.player),
lambda state: _has_bind_song(state, self.player)) lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Turtle cave, Turtle Egg", self.player), add_rule(self.multiworld.get_location("Turtle cave, Turtle Egg", self.player),
lambda state: _has_bind_song(state, self.player)) lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Abyss left area, bulb in the bottom fish pass", self.player), add_rule(self.multiworld.get_location("Abyss left area, bulb in the bottom fish pass", self.player),
lambda state: _has_fish_form(state, self.player)) lambda state: _has_fish_form(state, self.player))
add_rule(self.multiworld.get_location("Song cave, Anemone seed", self.player), add_rule(self.multiworld.get_location("Song Cave, Anemone Seed", self.player),
lambda state: _has_nature_form(state, self.player)) lambda state: _has_nature_form(state, self.player))
add_rule(self.multiworld.get_location("Song cave, Verse egg", self.player), add_rule(self.multiworld.get_location("Song Cave, Verse Egg", self.player),
lambda state: _has_bind_song(state, self.player)) lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Verse cave right area, Big Seed", self.player), add_rule(self.multiworld.get_location("Verse Cave right area, Big Seed", self.player),
lambda state: _has_bind_song(state, self.player)) lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Arnassi ruins, Song plant spore on the top of the ruins", self.player), add_rule(self.multiworld.get_location("Arnassi Ruins, Song Plant Spore", self.player),
lambda state: _has_beast_form(state, self.player)) lambda state: _has_beast_form(state, self.player))
add_rule(self.multiworld.get_location("Energy temple first area, bulb in the bottom room blocked by a rock", add_rule(self.multiworld.get_location("Energy Temple first area, bulb in the bottom room blocked by a rock",
self.player), lambda state: _has_energy_form(state, self.player)) self.player), lambda state: _has_energy_form(state, self.player))
add_rule(self.multiworld.get_location("Home water, bulb in the bottom left room", self.player), add_rule(self.multiworld.get_location("Home Water, bulb in the bottom left room", self.player),
lambda state: _has_bind_song(state, self.player)) lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Home water, bulb in the path below Nautilus Prime", self.player), add_rule(self.multiworld.get_location("Home Water, bulb in the path below Nautilus Prime", self.player),
lambda state: _has_bind_song(state, self.player)) lambda state: _has_bind_song(state, self.player))
add_rule(self.multiworld.get_location("Naija's home, bulb after the energy door", self.player), add_rule(self.multiworld.get_location("Naija's Home, bulb after the energy door", self.player),
lambda state: _has_energy_form(state, self.player)) lambda state: _has_energy_form(state, self.player))
add_rule(self.multiworld.get_location("Abyss right area, bulb behind the rock in the whale room", self.player), add_rule(self.multiworld.get_location("Abyss right area, bulb behind the rock in the whale room", self.player),
lambda state: _has_spirit_form(state, self.player) and lambda state: _has_spirit_form(state, self.player) and
_has_sun_form(state, self.player)) _has_sun_form(state, self.player))
add_rule(self.multiworld.get_location("Arnassi ruins, Arnassi Armor", self.player), add_rule(self.multiworld.get_location("Arnassi Ruins, Arnassi Armor", self.player),
lambda state: _has_fish_form(state, self.player) and lambda state: _has_fish_form(state, self.player) and
_has_spirit_form(state, self.player)) _has_spirit_form(state, self.player))
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: item.classification != ItemClassification.progression
self.multiworld.get_location("Cathedral boss area, beating Mithalan God", self.multiworld.get_location("Cathedral boss area, beating Mithalan God",
self.player).item_rule =\ self.player).item_rule =\
lambda item: item.classification != ItemClassification.progression lambda item: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
self.multiworld.get_location("Sunken city, bulb on the top of the boss area (boiler room)", 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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
self.multiworld.get_location("Mithalas 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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
self.multiworld.get_location("Sun Worm path, first cliff bulb", self.multiworld.get_location("Sun Worm path, first cliff bulb",
@ -1175,34 +1175,34 @@ class AquariaRegions:
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: item.classification != ItemClassification.progression
self.multiworld.get_location("The veil top right area, bulb in the top of the water fall", self.multiworld.get_location("The Veil top right area, bulb in the top of the waterfall",
self.player).item_rule =\ self.player).item_rule =\
lambda item: item.classification != ItemClassification.progression lambda item: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
self.multiworld.get_location("Bubble cave, bulb in the right cave wall (behind the ice cristal)", 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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
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: item.classification != ItemClassification.progression
@ -1220,19 +1220,19 @@ class AquariaRegions:
self.__adjusting_under_rock_location() self.__adjusting_under_rock_location()
if options.mini_bosses_to_beat.value > 0: if options.mini_bosses_to_beat.value > 0:
add_rule(self.multiworld.get_entrance("Before Final boss to Final boss", self.player), add_rule(self.multiworld.get_entrance("Before Final Boss to Final Boss", self.player),
lambda state: _has_mini_bosses(state, self.player)) lambda state: _has_mini_bosses(state, self.player))
if options.big_bosses_to_beat.value > 0: if options.big_bosses_to_beat.value > 0:
add_rule(self.multiworld.get_entrance("Before Final boss to Final boss", self.player), add_rule(self.multiworld.get_entrance("Before Final Boss to Final Boss", self.player),
lambda state: _has_big_bosses(state, self.player)) lambda state: _has_big_bosses(state, self.player))
if options.objective.value == 1: if options.objective.value == 1:
add_rule(self.multiworld.get_entrance("Before Final boss to Final boss", self.player), add_rule(self.multiworld.get_entrance("Before Final Boss to Final Boss", self.player),
lambda state: _has_secrets(state, self.player)) lambda state: _has_secrets(state, self.player))
if options.unconfine_home_water.value in [0, 1]: if options.unconfine_home_water.value in [0, 1]:
add_rule(self.multiworld.get_entrance("Home Water to Home water transturtle room", self.player), add_rule(self.multiworld.get_entrance("Home Water to Home Water transturtle room", self.player),
lambda state: _has_bind_song(state, self.player)) lambda state: _has_bind_song(state, self.player))
if options.unconfine_home_water.value in [0, 2]: if options.unconfine_home_water.value in [0, 2]:
add_rule(self.multiworld.get_entrance("Home Water to Open water top left area", self.player), add_rule(self.multiworld.get_entrance("Home Water to Open Water top left area", self.player),
lambda state: _has_bind_song(state, self.player) and _has_energy_form(state, self.player)) lambda state: _has_bind_song(state, self.player) and _has_energy_form(state, self.player))
if options.early_energy_form: if options.early_energy_form:
self.multiworld.early_items[self.player]["Energy form"] = 1 self.multiworld.early_items[self.player]["Energy form"] = 1

22
worlds/aquaria/__init__.py
View File

@ -71,9 +71,9 @@ class AquariaWorld(World):
item_name_groups = { item_name_groups = {
"Damage": {"Energy form", "Nature form", "Beast form", "Damage": {"Energy form", "Nature form", "Beast form",
"Li and Li song", "Baby nautilus", "Baby piranha", "Li and Li song", "Baby Nautilus", "Baby Piranha",
"Baby blaster"}, "Baby Blaster"},
"Light": {"Sun form", "Baby dumbo"} "Light": {"Sun form", "Baby Dumbo"}
} }
"""Grouping item make it easier to find them""" """Grouping item make it easier to find them"""
@ -152,20 +152,20 @@ class AquariaWorld(World):
precollected = [item.name for item in self.multiworld.precollected_items[self.player]] precollected = [item.name for item in self.multiworld.precollected_items[self.player]]
if self.options.turtle_randomizer.value > 0: if self.options.turtle_randomizer.value > 0:
if self.options.turtle_randomizer.value == 2: if self.options.turtle_randomizer.value == 2:
self.__pre_fill_item("Transturtle Final Boss", "Final boss area, Transturtle", precollected) self.__pre_fill_item("Transturtle Final Boss", "Final Boss area, Transturtle", precollected)
else: else:
self.__pre_fill_item("Transturtle Veil top left", "The veil top left area, Transturtle", precollected) self.__pre_fill_item("Transturtle Veil top left", "The Veil top left area, Transturtle", precollected)
self.__pre_fill_item("Transturtle Veil top right", "The veil top right area, Transturtle", precollected) self.__pre_fill_item("Transturtle Veil top right", "The Veil top right area, Transturtle", precollected)
self.__pre_fill_item("Transturtle Open Water top right", "Open water top right area, Transturtle", self.__pre_fill_item("Transturtle Open Water top right", "Open Water top right area, Transturtle",
precollected) precollected)
self.__pre_fill_item("Transturtle Forest bottom left", "Kelp Forest bottom left area, Transturtle", self.__pre_fill_item("Transturtle Forest bottom left", "Kelp Forest bottom left area, Transturtle",
precollected) precollected)
self.__pre_fill_item("Transturtle Home water", "Home water, Transturtle", precollected) self.__pre_fill_item("Transturtle Home Water", "Home Water, Transturtle", precollected)
self.__pre_fill_item("Transturtle Abyss right", "Abyss right area, Transturtle", precollected) self.__pre_fill_item("Transturtle Abyss right", "Abyss right area, Transturtle", precollected)
self.__pre_fill_item("Transturtle Final Boss", "Final boss area, Transturtle", precollected) self.__pre_fill_item("Transturtle Final Boss", "Final Boss area, Transturtle", precollected)
# The last two are inverted because in the original game, they are special turtle that communicate directly # The last two are inverted because in the original game, they are special turtle that communicate directly
self.__pre_fill_item("Transturtle Simon says", "Arnassi Ruins, Transturtle", precollected) self.__pre_fill_item("Transturtle Simon Says", "Arnassi Ruins, Transturtle", precollected)
self.__pre_fill_item("Transturtle Arnassi ruins", "Simon says area, Transturtle", precollected) self.__pre_fill_item("Transturtle Arnassi Ruins", "Simon Says area, Transturtle", precollected)
for name, data in item_table.items(): for name, data in item_table.items():
if name in precollected: if name in precollected:
precollected.remove(name) precollected.remove(name)

6
worlds/aquaria/docs/en_Aquaria.md
View File

@ -15,14 +15,14 @@ The locations in the randomizer are:
- All Mithalas Urns - All Mithalas Urns
- All Sunken City crates - All Sunken City crates
- Collectible treasure locations (including pet eggs and costumes) - Collectible treasure locations (including pet eggs and costumes)
- Beating Simon says - Beating Simon Says
- Li cave - Li cave
- Every Transportation Turtle (also called transturtle) - Every Transportation Turtle (also called transturtle)
- Locations where you get songs: - Locations where you get songs:
* Erulian spirit cristal * Erulian spirit crystal
* Energy status mini-boss * Energy status mini-boss
* Beating Mithalan God boss * Beating Mithalan God boss
* Fish cave puzzle * Fish Cave puzzle
* Beating Drunian God boss * Beating Drunian God boss
* Beating Sun God boss * Beating Sun God boss
* Breaking Li cage in the body * Breaking Li cage in the body

294
worlds/aquaria/test/__init__.py
View File

@ -10,148 +10,148 @@ from test.bases import WorldTestBase
# Every location accessible after the home water. # Every location accessible after the home water.
after_home_water_locations = [ after_home_water_locations = [
"Sun Crystal", "Sun Crystal",
"Home water, Transturtle", "Home Water, Transturtle",
"Open water top left area, bulb under the rock in the right path", "Open Water top left area, bulb under the rock in the right path",
"Open water top left area, bulb under the rock in the left path", "Open Water top left area, bulb under the rock in the left path",
"Open water top left area, bulb to the right of the save cristal", "Open Water top left area, bulb to the right of the save crystal",
"Open water top right area, bulb in the small path before Mithalas", "Open Water top right area, bulb in the small path before Mithalas",
"Open water top right area, bulb in the path from the left entrance", "Open Water top right area, bulb in the path from the left entrance",
"Open water top right area, bulb in the clearing close to the bottom exit", "Open Water top right area, bulb in the clearing close to the bottom exit",
"Open water top right area, bulb in the big clearing close to the save cristal", "Open Water top right area, bulb in the big clearing close to the save crystal",
"Open water top right area, bulb in the big clearing to the top exit", "Open Water top right area, bulb in the big clearing to the top exit",
"Open water top right area, first urn in the Mithalas exit", "Open Water top right area, first urn in the Mithalas exit",
"Open water top right area, second urn in the Mithalas exit", "Open Water top right area, second urn in the Mithalas exit",
"Open water top right area, third urn in the Mithalas exit", "Open Water top right area, third urn in the Mithalas exit",
"Open water top right area, bulb in the turtle room", "Open Water top right area, bulb in the turtle room",
"Open water top right area, Transturtle", "Open Water top right area, Transturtle",
"Open water bottom left area, bulb behind the chomper fish", "Open Water bottom left area, bulb behind the chomper fish",
"Open water bottom left area, bulb inside the lowest fish pass", "Open Water bottom left area, bulb inside the lowest fish pass",
"Open water skeleton path, bulb close to the right exit", "Open Water skeleton path, bulb close to the right exit",
"Open water skeleton path, bulb behind the chomper fish", "Open Water skeleton path, bulb behind the chomper fish",
"Open water skeleton path, King skull", "Open Water skeleton path, King Skull",
"Arnassi Ruins, bulb in the right part", "Arnassi Ruins, bulb in the right part",
"Arnassi Ruins, bulb in the left part", "Arnassi Ruins, bulb in the left part",
"Arnassi Ruins, bulb in the center part", "Arnassi Ruins, bulb in the center part",
"Arnassi ruins, Song plant spore on the top of the ruins", "Arnassi Ruins, Song Plant Spore",
"Arnassi ruins, Arnassi Armor", "Arnassi Ruins, Arnassi Armor",
"Arnassi Ruins, Arnassi statue", "Arnassi Ruins, Arnassi Statue",
"Arnassi Ruins, Transturtle", "Arnassi Ruins, Transturtle",
"Arnassi ruins, Crab armor", "Arnassi Ruins, Crab Armor",
"Simon says area, Transturtle", "Simon Says area, Transturtle",
"Mithalas city, first bulb in the left city part", "Mithalas City, first bulb in the left city part",
"Mithalas city, second bulb in the left city part", "Mithalas City, second bulb in the left city part",
"Mithalas city, bulb in the right part", "Mithalas City, bulb in the right part",
"Mithalas city, bulb at the top of the city", "Mithalas City, bulb at the top of the city",
"Mithalas city, first bulb in a broken home", "Mithalas City, first bulb in a broken home",
"Mithalas city, second bulb in a broken home", "Mithalas City, second bulb in a broken home",
"Mithalas city, bulb in the bottom left part", "Mithalas City, bulb in the bottom left part",
"Mithalas city, first bulb in one of the homes", "Mithalas City, first bulb in one of the homes",
"Mithalas city, second bulb in one of the homes", "Mithalas City, second bulb in one of the homes",
"Mithalas city, first urn in one of the homes", "Mithalas City, first urn in one of the homes",
"Mithalas city, second urn in one of the homes", "Mithalas City, second urn in one of the homes",
"Mithalas city, first urn in the city reserve", "Mithalas City, first urn in the city reserve",
"Mithalas city, second urn in the city reserve", "Mithalas City, second urn in the city reserve",
"Mithalas city, third urn in the city reserve", "Mithalas City, third urn in the city reserve",
"Mithalas city, first bulb at the end of the top path", "Mithalas City, first bulb at the end of the top path",
"Mithalas city, second bulb at the end of the top path", "Mithalas City, second bulb at the end of the top path",
"Mithalas city, bulb in the top path", "Mithalas City, bulb in the top path",
"Mithalas city, Mithalas pot", "Mithalas City, Mithalas Pot",
"Mithalas city, urn in the cathedral flower tube entrance", "Mithalas City, urn in the Cathedral flower tube entrance",
"Mithalas city, Doll", "Mithalas City, Doll",
"Mithalas city, urn inside a home fish pass", "Mithalas City, urn inside a home fish pass",
"Mithalas city castle, bulb in the flesh hole", "Mithalas City Castle, bulb in the flesh hole",
"Mithalas city castle, Blue banner", "Mithalas City Castle, Blue banner",
"Mithalas city castle, urn in the bedroom", "Mithalas City Castle, urn in the bedroom",
"Mithalas city castle, first urn of the single lamp path", "Mithalas City Castle, first urn of the single lamp path",
"Mithalas city castle, second urn of the single lamp path", "Mithalas City Castle, second urn of the single lamp path",
"Mithalas city castle, urn in the bottom room", "Mithalas City Castle, urn in the bottom room",
"Mithalas city castle, first urn on the entrance path", "Mithalas City Castle, first urn on the entrance path",
"Mithalas city castle, second urn on the entrance path", "Mithalas City Castle, second urn on the entrance path",
"Mithalas castle, beating the priests", "Mithalas City Castle, beating the Priests",
"Mithalas city castle, Trident head", "Mithalas City Castle, Trident Head",
"Mithalas cathedral, first urn in the top right room", "Mithalas Cathedral, first urn in the top right room",
"Mithalas cathedral, second urn in the top right room", "Mithalas Cathedral, second urn in the top right room",
"Mithalas cathedral, third urn in the top right room", "Mithalas Cathedral, third urn in the top right room",
"Mithalas cathedral, urn in the flesh room with fleas", "Mithalas Cathedral, urn in the flesh room with fleas",
"Mithalas cathedral, first urn in the bottom right path", "Mithalas Cathedral, first urn in the bottom right path",
"Mithalas cathedral, second urn in the bottom right path", "Mithalas Cathedral, second urn in the bottom right path",
"Mithalas cathedral, urn behind the flesh vein", "Mithalas Cathedral, urn behind the flesh vein",
"Mithalas cathedral, urn in the top left eyes boss room", "Mithalas Cathedral, urn in the top left eyes boss room",
"Mithalas cathedral, first urn in the path behind the flesh vein", "Mithalas Cathedral, first urn in the path behind the flesh vein",
"Mithalas cathedral, second urn in the path behind the flesh vein", "Mithalas Cathedral, second urn in the path behind the flesh vein",
"Mithalas cathedral, third urn in the path behind the flesh vein", "Mithalas Cathedral, third urn in the path behind the flesh vein",
"Mithalas cathedral, one of the urns in the top right room", "Mithalas Cathedral, fourth urn in the top right room",
"Mithalas cathedral, Mithalan Dress", "Mithalas Cathedral, Mithalan Dress",
"Mithalas cathedral right area, urn below the left entrance", "Mithalas Cathedral right area, urn below the left entrance",
"Cathedral underground, bulb in the center part", "Cathedral Underground, bulb in the center part",
"Cathedral underground, first bulb in the top left part", "Cathedral Underground, first bulb in the top left part",
"Cathedral underground, second bulb in the top left part", "Cathedral Underground, second bulb in the top left part",
"Cathedral underground, third bulb in the top left part", "Cathedral Underground, third bulb in the top left part",
"Cathedral underground, bulb close to the save cristal", "Cathedral Underground, bulb close to the save crystal",
"Cathedral underground, bulb in the bottom right path", "Cathedral Underground, bulb in the bottom right path",
"Cathedral boss area, beating Mithalan God", "Cathedral boss area, beating Mithalan God",
"Kelp Forest top left area, bulb in the bottom left clearing", "Kelp Forest top left area, bulb in the bottom left clearing",
"Kelp Forest top left area, bulb in the path down from the top left clearing", "Kelp Forest top left area, bulb in the path down from the top left clearing",
"Kelp Forest top left area, bulb in the top left clearing", "Kelp Forest top left area, bulb in the top left clearing",
"Kelp Forest top left, Jelly Egg", "Kelp Forest top left, Jelly Egg",
"Kelp Forest top left area, bulb close to the Verse egg", "Kelp Forest top left area, bulb close to the Verse Egg",
"Kelp forest top left area, Verse egg", "Kelp Forest top left area, Verse Egg",
"Kelp Forest top right area, bulb under the rock in the right path", "Kelp Forest top right area, bulb under the rock in the right path",
"Kelp Forest top right area, bulb at the left of the center clearing", "Kelp Forest top right area, bulb at the left of the center clearing",
"Kelp Forest top right area, bulb in the left path's big room", "Kelp Forest top right area, bulb in the left path's big room",
"Kelp Forest top right area, bulb in the left path's small room", "Kelp Forest top right area, bulb in the left path's small room",
"Kelp Forest top right area, bulb at the top of the center clearing", "Kelp Forest top right area, bulb at the top of the center clearing",
"Kelp forest top right area, Black pearl", "Kelp Forest top right area, Black Pearl",
"Kelp Forest top right area, bulb in the top fish pass", "Kelp Forest top right area, bulb in the top fish pass",
"Kelp Forest bottom left area, bulb close to the spirit crystals", "Kelp Forest bottom left area, bulb close to the spirit crystals",
"Kelp forest bottom left area, Walker baby", "Kelp Forest bottom left area, Walker baby",
"Kelp Forest bottom left area, Transturtle", "Kelp Forest bottom left area, Transturtle",
"Kelp forest bottom right area, Odd Container", "Kelp Forest bottom right area, Odd Container",
"Kelp forest boss area, beating Drunian God", "Kelp Forest boss area, beating Drunian God",
"Kelp Forest boss room, bulb at the bottom of the area", "Kelp Forest boss room, bulb at the bottom of the area",
"Kelp Forest bottom left area, Fish cave puzzle", "Kelp Forest bottom left area, Fish Cave puzzle",
"Kelp Forest sprite cave, bulb inside the fish pass", "Kelp Forest sprite cave, bulb inside the fish pass",
"Kelp Forest sprite cave, bulb in the second room", "Kelp Forest sprite cave, bulb in the second room",
"Kelp Forest Sprite Cave, Seed bag", "Kelp Forest sprite cave, Seed Bag",
"Mermog cave, bulb in the left part of the cave", "Mermog cave, bulb in the left part of the cave",
"Mermog cave, Piranha Egg", "Mermog cave, Piranha Egg",
"The veil top left area, In the Li cave", "The Veil top left area, In Li's cave",
"The veil top left area, bulb under the rock in the top right path", "The Veil top left area, bulb under the rock in the top right path",
"The veil top left area, bulb hidden behind the blocking rock", "The Veil top left area, bulb hidden behind the blocking rock",
"The veil top left area, Transturtle", "The Veil top left area, Transturtle",
"The veil top left area, bulb inside the fish pass", "The Veil top left area, bulb inside the fish pass",
"Turtle cave, Turtle Egg", "Turtle cave, Turtle Egg",
"Turtle cave, bulb in bubble cliff", "Turtle cave, bulb in Bubble Cliff",
"Turtle cave, Urchin costume", "Turtle cave, Urchin Costume",
"The veil top right area, bulb in the middle of the wall jump cliff", "The Veil top right area, bulb in the middle of the wall jump cliff",
"The veil top right area, golden starfish at the bottom right of the bottom path", "The Veil top right area, Golden Starfish",
"The veil top right area, bulb in the top of the water fall", "The Veil top right area, bulb in the top of the waterfall",
"The veil top right area, Transturtle", "The Veil top right area, Transturtle",
"The veil bottom area, bulb in the left path", "The Veil bottom area, bulb in the left path",
"The veil bottom area, bulb in the spirit path", "The Veil bottom area, bulb in the spirit path",
"The veil bottom area, Verse egg", "The Veil bottom area, Verse Egg",
"The veil bottom area, Stone Head", "The Veil bottom area, Stone Head",
"Octopus cave, Dumbo Egg", "Octopus Cave, Dumbo Egg",
"Octopus cave, bulb in the path below the octopus cave path", "Octopus Cave, bulb in the path below the Octopus Cave path",
"Bubble cave, bulb in the left cave wall", "Bubble Cave, bulb in the left cave wall",
"Bubble cave, bulb in the right cave wall (behind the ice cristal)", "Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
"Bubble cave, Verse egg", "Bubble Cave, Verse Egg",
"Sun temple, bulb in the top left part", "Sun Temple, bulb in the top left part",
"Sun temple, bulb in the top right part", "Sun Temple, bulb in the top right part",
"Sun temple, bulb at the top of the high dark room", "Sun Temple, bulb at the top of the high dark room",
"Sun temple, Golden Gear", "Sun Temple, Golden Gear",
"Sun temple, first bulb of the temple", "Sun Temple, first bulb of the temple",
"Sun temple, bulb on the left part", "Sun Temple, bulb on the left part",
"Sun temple, bulb in the hidden room of the right part", "Sun Temple, bulb in the hidden room of the right part",
"Sun temple, Sun key", "Sun Temple, Sun Key",
"Sun Worm path, first path bulb", "Sun Worm path, first path bulb",
"Sun Worm path, second path bulb", "Sun Worm path, second path bulb",
"Sun Worm path, first cliff bulb", "Sun Worm path, first cliff bulb",
"Sun Worm path, second cliff bulb", "Sun Worm path, second cliff bulb",
"Sun temple boss area, beating Sun God", "Sun Temple boss area, beating Sun God",
"Abyss left area, bulb in hidden path room", "Abyss left area, bulb in hidden path room",
"Abyss left area, bulb in the right part", "Abyss left area, bulb in the right part",
"Abyss left area, Glowing seed", "Abyss left area, Glowing Seed",
"Abyss left area, Glowing Plant", "Abyss left area, Glowing Plant",
"Abyss left area, bulb in the bottom fish pass", "Abyss left area, bulb in the bottom fish pass",
"Abyss right area, bulb behind the rock in the whale room", "Abyss right area, bulb behind the rock in the whale room",
@ -159,40 +159,40 @@ after_home_water_locations = [
"Abyss right area, bulb behind the rock in the middle path", "Abyss right area, bulb behind the rock in the middle path",
"Abyss right area, bulb in the left green room", "Abyss right area, bulb in the left green room",
"Abyss right area, Transturtle", "Abyss right area, Transturtle",
"Ice cave, bulb in the room to the right", "Ice Cave, bulb in the room to the right",
"Ice cave, First bulbs in the top exit room", "Ice Cave, first bulb in the top exit room",
"Ice cave, Second bulbs in the top exit room", "Ice Cave, second bulb in the top exit room",
"Ice cave, third bulbs in the top exit room", "Ice Cave, third bulb in the top exit room",
"Ice cave, bulb in the left room", "Ice Cave, bulb in the left room",
"King Jellyfish cave, bulb in the right path from King Jelly", "King Jellyfish Cave, bulb in the right path from King Jelly",
"King Jellyfish cave, Jellyfish Costume", "King Jellyfish Cave, Jellyfish Costume",
"The whale, Verse egg", "The Whale, Verse Egg",
"Sunken city right area, crate close to the save cristal", "Sunken City right area, crate close to the save crystal",
"Sunken city right area, crate in the left bottom room", "Sunken City right area, crate in the left bottom room",
"Sunken city left area, crate in the little pipe room", "Sunken City left area, crate in the little pipe room",
"Sunken city left area, crate close to the save cristal", "Sunken City left area, crate close to the save crystal",
"Sunken city left area, crate before the bedroom", "Sunken City left area, crate before the bedroom",
"Sunken city left area, Girl Costume", "Sunken City left area, Girl Costume",
"Sunken city, bulb on the top of the boss area (boiler room)", "Sunken City, bulb on top of the boss area",
"The body center area, breaking li cage", "The Body center area, breaking Li's cage",
"The body main area, bulb on the main path blocking tube", "The Body main area, bulb on the main path blocking tube",
"The body left area, first bulb in the top face room", "The Body left area, first bulb in the top face room",
"The body left area, second bulb in the top face room", "The Body left area, second bulb in the top face room",
"The body left area, bulb below the water stream", "The Body left area, bulb below the water stream",
"The body left area, bulb in the top path to the top face room", "The Body left area, bulb in the top path to the top face room",
"The body left area, bulb in the bottom face room", "The Body left area, bulb in the bottom face room",
"The body right area, bulb in the top face room", "The Body right area, bulb in the top face room",
"The body right area, bulb in the top path to the bottom face room", "The Body right area, bulb in the top path to the bottom face room",
"The body right area, bulb in the bottom face room", "The Body right area, bulb in the bottom face room",
"The body bottom area, bulb in the Jelly Zap room", "The Body bottom area, bulb in the Jelly Zap room",
"The body bottom area, bulb in the nautilus room", "The Body bottom area, bulb in the nautilus room",
"The body bottom area, Mutant Costume", "The Body bottom area, Mutant Costume",
"Final boss area, first bulb in the turtle room", "Final Boss area, first bulb in the turtle room",
"Final boss area, second bulbs in the turtle room", "Final Boss area, second bulb in the turtle room",
"Final boss area, third bulbs in the turtle room", "Final Boss area, third bulb in the turtle room",
"Final boss area, Transturtle", "Final Boss area, Transturtle",
"Final boss area, bulb in the boss third form room", "Final Boss area, bulb in the boss third form room",
"Kelp forest, beating Simon says", "Simon Says area, beating Simon Says",
"Beating Fallen God", "Beating Fallen God",
"Beating Mithalan God", "Beating Mithalan God",
"Beating Drunian God", "Beating Drunian God",

38
worlds/aquaria/test/test_beast_form_access.py
View File

@ -13,33 +13,33 @@ class BeastFormAccessTest(AquariaTestBase):
def test_beast_form_location(self) -> None: def test_beast_form_location(self) -> None:
"""Test locations that require beast form""" """Test locations that require beast form"""
locations = [ locations = [
"Mithalas castle, beating the priests", "Mithalas City Castle, beating the Priests",
"Arnassi ruins, Crab armor", "Arnassi Ruins, Crab Armor",
"Arnassi ruins, Song plant spore on the top of the ruins", "Arnassi Ruins, Song Plant Spore",
"Mithalas city, first bulb at the end of the top path", "Mithalas City, first bulb at the end of the top path",
"Mithalas city, second bulb at the end of the top path", "Mithalas City, second bulb at the end of the top path",
"Mithalas city, bulb in the top path", "Mithalas City, bulb in the top path",
"Mithalas city, Mithalas pot", "Mithalas City, Mithalas Pot",
"Mithalas city, urn in the cathedral flower tube entrance", "Mithalas City, urn in the Cathedral flower tube entrance",
"Mermog cave, Piranha Egg", "Mermog cave, Piranha Egg",
"Mithalas cathedral, Mithalan Dress", "Mithalas Cathedral, Mithalan Dress",
"Turtle cave, bulb in bubble cliff", "Turtle cave, bulb in Bubble Cliff",
"Turtle cave, Urchin costume", "Turtle cave, Urchin Costume",
"Sun Worm path, first cliff bulb", "Sun Worm path, first cliff bulb",
"Sun Worm path, second cliff bulb", "Sun Worm path, second cliff bulb",
"The veil top right area, bulb in the top of the water fall", "The Veil top right area, bulb in the top of the waterfall",
"Bubble cave, bulb in the left cave wall", "Bubble Cave, bulb in the left cave wall",
"Bubble cave, bulb in the right cave wall (behind the ice cristal)", "Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
"Bubble cave, Verse egg", "Bubble Cave, Verse Egg",
"Sunken city, bulb on the top of the boss area (boiler room)", "Sunken City, bulb on top of the boss area",
"Octopus cave, Dumbo Egg", "Octopus Cave, Dumbo Egg",
"Beating the Golem", "Beating the Golem",
"Beating Mergog", "Beating Mergog",
"Beating Crabbius Maximus", "Beating Crabbius Maximus",
"Beating Octopus Prime", "Beating Octopus Prime",
"Beating Mantis Shrimp Prime", "Beating Mantis Shrimp Prime",
"King Jellyfish cave, Jellyfish Costume", "King Jellyfish Cave, Jellyfish Costume",
"King Jellyfish cave, bulb in the right path from King Jelly", "King Jellyfish Cave, bulb in the right path from King Jelly",
"Beating King Jellyfish God Prime", "Beating King Jellyfish God Prime",
"Beating Mithalan priests", "Beating Mithalan priests",
"Sunken City cleared" "Sunken City cleared"

26
worlds/aquaria/test/test_bind_song_access.py
View File

@ -17,19 +17,19 @@ class BindSongAccessTest(AquariaTestBase):
def test_bind_song_location(self) -> None: def test_bind_song_location(self) -> None:
"""Test locations that require Bind song""" """Test locations that require Bind song"""
locations = [ locations = [
"Verse cave right area, Big Seed", "Verse Cave right area, Big Seed",
"Home water, bulb in the path below Nautilus Prime", "Home Water, bulb in the path below Nautilus Prime",
"Home water, bulb in the bottom left room", "Home Water, bulb in the bottom left room",
"Home water, Nautilus Egg", "Home Water, Nautilus Egg",
"Song cave, Verse egg", "Song Cave, Verse Egg",
"Energy temple first area, beating the energy statue", "Energy Temple first area, beating the Energy Statue",
"Energy temple first area, bulb in the bottom room blocked by a rock", "Energy Temple first area, bulb in the bottom room blocked by a rock",
"Energy temple first area, Energy Idol", "Energy Temple first area, Energy Idol",
"Energy temple second area, bulb under the rock", "Energy Temple second area, bulb under the rock",
"Energy temple bottom entrance, Krotite armor", "Energy Temple bottom entrance, Krotite Armor",
"Energy temple third area, bulb in the bottom path", "Energy Temple third area, bulb in the bottom path",
"Energy temple boss area, Fallen god tooth", "Energy Temple boss area, Fallen God Tooth",
"Energy temple blaster room, Blaster egg", "Energy Temple blaster room, Blaster Egg",
*after_home_water_locations *after_home_water_locations
] ]
items = [["Bind song"]] items = [["Bind song"]]

36
worlds/aquaria/test/test_bind_song_option_access.py
View File

@ -18,24 +18,24 @@ class BindSongOptionAccessTest(AquariaTestBase):
def test_bind_song_location(self) -> None: def test_bind_song_location(self) -> None:
"""Test locations that require Bind song with the bind song needed option activated""" """Test locations that require Bind song with the bind song needed option activated"""
locations = [ locations = [
"Verse cave right area, Big Seed", "Verse Cave right area, Big Seed",
"Verse cave left area, bulb under the rock at the end of the path", "Verse Cave left area, bulb under the rock at the end of the path",
"Home water, bulb under the rock in the left path from the verse cave", "Home Water, bulb under the rock in the left path from the Verse Cave",
"Song cave, bulb under the rock close to the song door", "Song Cave, bulb under the rock close to the song door",
"Song cave, bulb under the rock in the path to the singing statues", "Song Cave, bulb under the rock in the path to the singing statues",
"Naija's home, bulb under the rock at the right of the main path", "Naija's Home, bulb under the rock at the right of the main path",
"Home water, bulb in the path below Nautilus Prime", "Home Water, bulb in the path below Nautilus Prime",
"Home water, bulb in the bottom left room", "Home Water, bulb in the bottom left room",
"Home water, Nautilus Egg", "Home Water, Nautilus Egg",
"Song cave, Verse egg", "Song Cave, Verse Egg",
"Energy temple first area, beating the energy statue", "Energy Temple first area, beating the Energy Statue",
"Energy temple first area, bulb in the bottom room blocked by a rock", "Energy Temple first area, bulb in the bottom room blocked by a rock",
"Energy temple first area, Energy Idol", "Energy Temple first area, Energy Idol",
"Energy temple second area, bulb under the rock", "Energy Temple second area, bulb under the rock",
"Energy temple bottom entrance, Krotite armor", "Energy Temple bottom entrance, Krotite Armor",
"Energy temple third area, bulb in the bottom path", "Energy Temple third area, bulb in the bottom path",
"Energy temple boss area, Fallen god tooth", "Energy Temple boss area, Fallen God Tooth",
"Energy temple blaster room, Blaster egg", "Energy Temple blaster room, Blaster Egg",
*after_home_water_locations *after_home_water_locations
] ]
items = [["Bind song"]] items = [["Bind song"]]

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

@ -16,5 +16,5 @@ class ConfinedHomeWaterAccessTest(AquariaTestBase):
def test_confine_home_water_location(self) -> None: def test_confine_home_water_location(self) -> None:
"""Test region accessible with confined home water""" """Test region accessible with confined home water"""
self.assertFalse(self.can_reach_region("Open water top left area"), "Can reach Open water top left area") self.assertFalse(self.can_reach_region("Open Water top left area"), "Can reach Open Water top left area")
self.assertFalse(self.can_reach_region("Home Water, turtle room"), "Can reach Home Water, turtle room") self.assertFalse(self.can_reach_region("Home Water, turtle room"), "Can reach Home Water, turtle room")

8
worlds/aquaria/test/test_dual_song_access.py
View File

@ -16,10 +16,10 @@ class LiAccessTest(AquariaTestBase):
def test_li_song_location(self) -> None: def test_li_song_location(self) -> None:
"""Test locations that require the dual song""" """Test locations that require the dual song"""
locations = [ locations = [
"The body bottom area, bulb in the Jelly Zap room", "The Body bottom area, bulb in the Jelly Zap room",
"The body bottom area, bulb in the nautilus room", "The Body bottom area, bulb in the nautilus room",
"The body bottom area, Mutant Costume", "The Body bottom area, Mutant Costume",
"Final boss area, bulb in the boss third form room", "Final Boss area, bulb in the boss third form room",
"Objective complete" "Objective complete"
] ]
items = [["Dual form"]] items = [["Dual form"]]

66
worlds/aquaria/test/test_energy_form_access.py
View File

@ -17,41 +17,41 @@ class EnergyFormAccessTest(AquariaTestBase):
def test_energy_form_location(self) -> None: def test_energy_form_location(self) -> None:
"""Test locations that require Energy form""" """Test locations that require Energy form"""
locations = [ locations = [
"Home water, Nautilus Egg", "Home Water, Nautilus Egg",
"Naija's home, bulb after the energy door", "Naija's Home, bulb after the energy door",
"Energy temple first area, bulb in the bottom room blocked by a rock", "Energy Temple first area, bulb in the bottom room blocked by a rock",
"Energy temple second area, bulb under the rock", "Energy Temple second area, bulb under the rock",
"Energy temple bottom entrance, Krotite armor", "Energy Temple bottom entrance, Krotite Armor",
"Energy temple third area, bulb in the bottom path", "Energy Temple third area, bulb in the bottom path",
"Energy temple boss area, Fallen god tooth", "Energy Temple boss area, Fallen God Tooth",
"Energy temple blaster room, Blaster egg", "Energy Temple blaster room, Blaster Egg",
"Mithalas castle, beating the priests", "Mithalas City Castle, beating the Priests",
"Mithalas cathedral, first urn in the top right room", "Mithalas Cathedral, first urn in the top right room",
"Mithalas cathedral, second urn in the top right room", "Mithalas Cathedral, second urn in the top right room",
"Mithalas cathedral, third urn in the top right room", "Mithalas Cathedral, third urn in the top right room",
"Mithalas cathedral, urn in the flesh room with fleas", "Mithalas Cathedral, urn in the flesh room with fleas",
"Mithalas cathedral, first urn in the bottom right path", "Mithalas Cathedral, first urn in the bottom right path",
"Mithalas cathedral, second urn in the bottom right path", "Mithalas Cathedral, second urn in the bottom right path",
"Mithalas cathedral, urn behind the flesh vein", "Mithalas Cathedral, urn behind the flesh vein",
"Mithalas cathedral, urn in the top left eyes boss room", "Mithalas Cathedral, urn in the top left eyes boss room",
"Mithalas cathedral, first urn in the path behind the flesh vein", "Mithalas Cathedral, first urn in the path behind the flesh vein",
"Mithalas cathedral, second urn in the path behind the flesh vein", "Mithalas Cathedral, second urn in the path behind the flesh vein",
"Mithalas cathedral, third urn in the path behind the flesh vein", "Mithalas Cathedral, third urn in the path behind the flesh vein",
"Mithalas cathedral, one of the urns in the top right room", "Mithalas Cathedral, fourth urn in the top right room",
"Mithalas cathedral, Mithalan Dress", "Mithalas Cathedral, Mithalan Dress",
"Mithalas cathedral right area, urn below the left entrance", "Mithalas Cathedral right area, urn below the left entrance",
"Cathedral boss area, beating Mithalan God", "Cathedral boss area, beating Mithalan God",
"Kelp Forest top left area, bulb close to the Verse egg", "Kelp Forest top left area, bulb close to the Verse Egg",
"Kelp forest top left area, Verse egg", "Kelp Forest top left area, Verse Egg",
"Kelp forest boss area, beating Drunian God", "Kelp Forest boss area, beating Drunian God",
"Mermog cave, Piranha Egg", "Mermog cave, Piranha Egg",
"Octopus cave, Dumbo Egg", "Octopus Cave, Dumbo Egg",
"Sun temple boss area, beating Sun God", "Sun Temple boss area, beating Sun God",
"Arnassi ruins, Crab armor", "Arnassi Ruins, Crab Armor",
"King Jellyfish cave, bulb in the right path from King Jelly", "King Jellyfish Cave, bulb in the right path from King Jelly",
"King Jellyfish cave, Jellyfish Costume", "King Jellyfish Cave, Jellyfish Costume",
"Sunken city, bulb on the top of the boss area (boiler room)", "Sunken City, bulb on top of the boss area",
"Final boss area, bulb in the boss third form room", "Final Boss area, bulb in the boss third form room",
"Beating Fallen God", "Beating Fallen God",
"Beating Mithalan God", "Beating Mithalan God",
"Beating Drunian God", "Beating Drunian God",

20
worlds/aquaria/test/test_fish_form_access.py
View File

@ -16,22 +16,22 @@ class FishFormAccessTest(AquariaTestBase):
def test_fish_form_location(self) -> None: def test_fish_form_location(self) -> None:
"""Test locations that require fish form""" """Test locations that require fish form"""
locations = [ locations = [
"The veil top left area, bulb inside the fish pass", "The Veil top left area, bulb inside the fish pass",
"Mithalas city, Doll", "Mithalas City, Doll",
"Mithalas city, urn inside a home fish pass", "Mithalas City, urn inside a home fish pass",
"Kelp Forest top right area, bulb in the top fish pass", "Kelp Forest top right area, bulb in the top fish pass",
"The veil bottom area, Verse egg", "The Veil bottom area, Verse Egg",
"Open water bottom left area, bulb inside the lowest fish pass", "Open Water bottom left area, bulb inside the lowest fish pass",
"Kelp Forest top left area, bulb close to the Verse egg", "Kelp Forest top left area, bulb close to the Verse Egg",
"Kelp forest top left area, Verse egg", "Kelp Forest top left area, Verse Egg",
"Mermog cave, bulb in the left part of the cave", "Mermog cave, bulb in the left part of the cave",
"Mermog cave, Piranha Egg", "Mermog cave, Piranha Egg",
"Beating Mergog", "Beating Mergog",
"Octopus cave, Dumbo Egg", "Octopus Cave, Dumbo Egg",
"Octopus cave, bulb in the path below the octopus cave path", "Octopus Cave, bulb in the path below the Octopus Cave path",
"Beating Octopus Prime", "Beating Octopus Prime",
"Abyss left area, bulb in the bottom fish pass", "Abyss left area, bulb in the bottom fish pass",
"Arnassi ruins, Arnassi Armor" "Arnassi Ruins, Arnassi Armor"
] ]
items = [["Fish form"]] items = [["Fish form"]]
self.assertAccessDependency(locations, items) self.assertAccessDependency(locations, items)

42
worlds/aquaria/test/test_li_song_access.py
View File

@ -16,27 +16,27 @@ class LiAccessTest(AquariaTestBase):
def test_li_song_location(self) -> None: def test_li_song_location(self) -> None:
"""Test locations that require Li""" """Test locations that require Li"""
locations = [ locations = [
"Sunken city right area, crate close to the save cristal", "Sunken City right area, crate close to the save crystal",
"Sunken city right area, crate in the left bottom room", "Sunken City right area, crate in the left bottom room",
"Sunken city left area, crate in the little pipe room", "Sunken City left area, crate in the little pipe room",
"Sunken city left area, crate close to the save cristal", "Sunken City left area, crate close to the save crystal",
"Sunken city left area, crate before the bedroom", "Sunken City left area, crate before the bedroom",
"Sunken city left area, Girl Costume", "Sunken City left area, Girl Costume",
"Sunken city, bulb on the top of the boss area (boiler room)", "Sunken City, bulb on top of the boss area",
"The body center area, breaking li cage", "The Body center area, breaking Li's cage",
"The body main area, bulb on the main path blocking tube", "The Body main area, bulb on the main path blocking tube",
"The body left area, first bulb in the top face room", "The Body left area, first bulb in the top face room",
"The body left area, second bulb in the top face room", "The Body left area, second bulb in the top face room",
"The body left area, bulb below the water stream", "The Body left area, bulb below the water stream",
"The body left area, bulb in the top path to the top face room", "The Body left area, bulb in the top path to the top face room",
"The body left area, bulb in the bottom face room", "The Body left area, bulb in the bottom face room",
"The body right area, bulb in the top face room", "The Body right area, bulb in the top face room",
"The body right area, bulb in the top path to the bottom face room", "The Body right area, bulb in the top path to the bottom face room",
"The body right area, bulb in the bottom face room", "The Body right area, bulb in the bottom face room",
"The body bottom area, bulb in the Jelly Zap room", "The Body bottom area, bulb in the Jelly Zap room",
"The body bottom area, bulb in the nautilus room", "The Body bottom area, bulb in the nautilus room",
"The body bottom area, Mutant Costume", "The Body bottom area, Mutant Costume",
"Final boss area, bulb in the boss third form room", "Final Boss area, bulb in the boss third form room",
"Beating the Golem", "Beating the Golem",
"Sunken City cleared", "Sunken City cleared",
"Objective complete" "Objective complete"

56
worlds/aquaria/test/test_light_access.py
View File

@ -20,19 +20,19 @@ class LightAccessTest(AquariaTestBase):
# Since the `assertAccessDependency` sweep for events even if I tell it not to, those location cannot be # Since the `assertAccessDependency` sweep for events even if I tell it not to, those location cannot be
# tested. # tested.
# "Third secret", # "Third secret",
# "Sun temple, bulb in the top left part", # "Sun Temple, bulb in the top left part",
# "Sun temple, bulb in the top right part", # "Sun Temple, bulb in the top right part",
# "Sun temple, bulb at the top of the high dark room", # "Sun Temple, bulb at the top of the high dark room",
# "Sun temple, Golden Gear", # "Sun Temple, Golden Gear",
# "Sun Worm path, first path bulb", # "Sun Worm path, first path bulb",
# "Sun Worm path, second path bulb", # "Sun Worm path, second path bulb",
# "Sun Worm path, first cliff bulb", # "Sun Worm path, first cliff bulb",
"Octopus cave, Dumbo Egg", "Octopus Cave, Dumbo Egg",
"Kelp forest bottom right area, Odd Container", "Kelp Forest bottom right area, Odd Container",
"Kelp forest top right area, Black pearl", "Kelp Forest top right area, Black Pearl",
"Abyss left area, bulb in hidden path room", "Abyss left area, bulb in hidden path room",
"Abyss left area, bulb in the right part", "Abyss left area, bulb in the right part",
"Abyss left area, Glowing seed", "Abyss left area, Glowing Seed",
"Abyss left area, Glowing Plant", "Abyss left area, Glowing Plant",
"Abyss left area, bulb in the bottom fish pass", "Abyss left area, bulb in the bottom fish pass",
"Abyss right area, bulb behind the rock in the whale room", "Abyss right area, bulb behind the rock in the whale room",
@ -40,32 +40,32 @@ class LightAccessTest(AquariaTestBase):
"Abyss right area, bulb behind the rock in the middle path", "Abyss right area, bulb behind the rock in the middle path",
"Abyss right area, bulb in the left green room", "Abyss right area, bulb in the left green room",
"Abyss right area, Transturtle", "Abyss right area, Transturtle",
"Ice cave, bulb in the room to the right", "Ice Cave, bulb in the room to the right",
"Ice cave, First bulbs in the top exit room", "Ice Cave, first bulb in the top exit room",
"Ice cave, Second bulbs in the top exit room", "Ice Cave, second bulb in the top exit room",
"Ice cave, third bulbs in the top exit room", "Ice Cave, third bulb in the top exit room",
"Ice cave, bulb in the left room", "Ice Cave, bulb in the left room",
"Bubble cave, bulb in the left cave wall", "Bubble Cave, bulb in the left cave wall",
"Bubble cave, bulb in the right cave wall (behind the ice cristal)", "Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
"Bubble cave, Verse egg", "Bubble Cave, Verse Egg",
"Beating Mantis Shrimp Prime", "Beating Mantis Shrimp Prime",
"King Jellyfish cave, bulb in the right path from King Jelly", "King Jellyfish Cave, bulb in the right path from King Jelly",
"King Jellyfish cave, Jellyfish Costume", "King Jellyfish Cave, Jellyfish Costume",
"Beating King Jellyfish God Prime", "Beating King Jellyfish God Prime",
"The whale, Verse egg", "The Whale, Verse Egg",
"First secret", "First secret",
"Sunken city right area, crate close to the save cristal", "Sunken City right area, crate close to the save crystal",
"Sunken city right area, crate in the left bottom room", "Sunken City right area, crate in the left bottom room",
"Sunken city left area, crate in the little pipe room", "Sunken City left area, crate in the little pipe room",
"Sunken city left area, crate close to the save cristal", "Sunken City left area, crate close to the save crystal",
"Sunken city left area, crate before the bedroom", "Sunken City left area, crate before the bedroom",
"Sunken city left area, Girl Costume", "Sunken City left area, Girl Costume",
"Sunken city, bulb on the top of the boss area (boiler room)", "Sunken City, bulb on top of the boss area",
"Sunken City cleared", "Sunken City cleared",
"Beating the Golem", "Beating the Golem",
"Beating Octopus Prime", "Beating Octopus Prime",
"Final boss area, bulb in the boss third form room", "Final Boss area, bulb in the boss third form room",
"Objective complete", "Objective complete",
] ]
items = [["Sun form", "Baby dumbo", "Has sun crystal"]] items = [["Sun form", "Baby Dumbo", "Has sun crystal"]]
self.assertAccessDependency(locations, items) self.assertAccessDependency(locations, items)

56
worlds/aquaria/test/test_nature_form_access.py
View File

@ -16,41 +16,41 @@ class NatureFormAccessTest(AquariaTestBase):
def test_nature_form_location(self) -> None: def test_nature_form_location(self) -> None:
"""Test locations that require nature form""" """Test locations that require nature form"""
locations = [ locations = [
"Song cave, Anemone seed", "Song Cave, Anemone Seed",
"Energy temple blaster room, Blaster egg", "Energy Temple blaster room, Blaster Egg",
"Beating Blaster Peg Prime", "Beating Blaster Peg Prime",
"Kelp forest top left area, Verse egg", "Kelp Forest top left area, Verse Egg",
"Kelp Forest top left area, bulb close to the Verse egg", "Kelp Forest top left area, bulb close to the Verse Egg",
"Mithalas castle, beating the priests", "Mithalas City Castle, beating the Priests",
"Kelp Forest sprite cave, bulb in the second room", "Kelp Forest sprite cave, bulb in the second room",
"Kelp Forest Sprite Cave, Seed bag", "Kelp Forest sprite cave, Seed Bag",
"Beating Mithalan priests", "Beating Mithalan priests",
"Abyss left area, bulb in the bottom fish pass", "Abyss left area, bulb in the bottom fish pass",
"Bubble cave, Verse egg", "Bubble Cave, Verse Egg",
"Beating Mantis Shrimp Prime", "Beating Mantis Shrimp Prime",
"Sunken city right area, crate close to the save cristal", "Sunken City right area, crate close to the save crystal",
"Sunken city right area, crate in the left bottom room", "Sunken City right area, crate in the left bottom room",
"Sunken city left area, crate in the little pipe room", "Sunken City left area, crate in the little pipe room",
"Sunken city left area, crate close to the save cristal", "Sunken City left area, crate close to the save crystal",
"Sunken city left area, crate before the bedroom", "Sunken City left area, crate before the bedroom",
"Sunken city left area, Girl Costume", "Sunken City left area, Girl Costume",
"Sunken city, bulb on the top of the boss area (boiler room)", "Sunken City, bulb on top of the boss area",
"Beating the Golem", "Beating the Golem",
"Sunken City cleared", "Sunken City cleared",
"The body center area, breaking li cage", "The Body center area, breaking Li's cage",
"The body main area, bulb on the main path blocking tube", "The Body main area, bulb on the main path blocking tube",
"The body left area, first bulb in the top face room", "The Body left area, first bulb in the top face room",
"The body left area, second bulb in the top face room", "The Body left area, second bulb in the top face room",
"The body left area, bulb below the water stream", "The Body left area, bulb below the water stream",
"The body left area, bulb in the top path to the top face room", "The Body left area, bulb in the top path to the top face room",
"The body left area, bulb in the bottom face room", "The Body left area, bulb in the bottom face room",
"The body right area, bulb in the top face room", "The Body right area, bulb in the top face room",
"The body right area, bulb in the top path to the bottom face room", "The Body right area, bulb in the top path to the bottom face room",
"The body right area, bulb in the bottom face room", "The Body right area, bulb in the bottom face room",
"The body bottom area, bulb in the Jelly Zap room", "The Body bottom area, bulb in the Jelly Zap room",
"The body bottom area, bulb in the nautilus room", "The Body bottom area, bulb in the nautilus room",
"The body bottom area, Mutant Costume", "The Body bottom area, Mutant Costume",
"Final boss area, bulb in the boss third form room", "Final Boss area, bulb in the boss third form room",
"Objective complete" "Objective complete"
] ]
items = [["Nature form"]] items = [["Nature form"]]

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

@ -15,31 +15,31 @@ class UNoProgressionHardHiddenTest(AquariaTestBase):
} }
unfillable_locations = [ unfillable_locations = [
"Energy temple boss area, Fallen god tooth", "Energy Temple boss area, Fallen God Tooth",
"Cathedral boss area, beating Mithalan God", "Cathedral boss area, beating Mithalan God",
"Kelp forest boss area, beating Drunian God", "Kelp Forest boss area, beating Drunian God",
"Sun temple boss area, beating Sun God", "Sun Temple boss area, beating Sun God",
"Sunken city, bulb on the top of the boss area (boiler room)", "Sunken City, bulb on top of the boss area",
"Home water, Nautilus Egg", "Home Water, Nautilus Egg",
"Energy temple blaster room, Blaster egg", "Energy Temple blaster room, Blaster Egg",
"Mithalas castle, beating the priests", "Mithalas City Castle, beating the Priests",
"Mermog cave, Piranha Egg", "Mermog cave, Piranha Egg",
"Octopus cave, Dumbo Egg", "Octopus Cave, Dumbo Egg",
"King Jellyfish cave, bulb in the right path from King Jelly", "King Jellyfish Cave, bulb in the right path from King Jelly",
"King Jellyfish cave, Jellyfish Costume", "King Jellyfish Cave, Jellyfish Costume",
"Final boss area, bulb in the boss third form room", "Final Boss area, bulb in the boss third form room",
"Sun Worm path, first cliff bulb", "Sun Worm path, first cliff bulb",
"Sun Worm path, second cliff bulb", "Sun Worm path, second cliff bulb",
"The veil top right area, bulb in the top of the water fall", "The Veil top right area, bulb in the top of the waterfall",
"Bubble cave, bulb in the left cave wall", "Bubble Cave, bulb in the left cave wall",
"Bubble cave, bulb in the right cave wall (behind the ice cristal)", "Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
"Bubble cave, Verse egg", "Bubble Cave, Verse Egg",
"Kelp Forest bottom left area, bulb close to the spirit crystals", "Kelp Forest bottom left area, bulb close to the spirit crystals",
"Kelp forest bottom left area, Walker baby", "Kelp Forest bottom left area, Walker baby",
"Sun temple, Sun key", "Sun Temple, Sun Key",
"The body bottom area, Mutant Costume", "The Body bottom area, Mutant Costume",
"Sun temple, bulb in the hidden room of the right part", "Sun Temple, bulb in the hidden room of the right part",
"Arnassi ruins, Arnassi Armor", "Arnassi Ruins, Arnassi Armor",
] ]
def test_unconfine_home_water_both_location_fillable(self) -> None: def test_unconfine_home_water_both_location_fillable(self) -> None:

40
worlds/aquaria/test/test_progression_hard_hidden_locations.py
View File

@ -15,31 +15,31 @@ class UNoProgressionHardHiddenTest(AquariaTestBase):
} }
unfillable_locations = [ unfillable_locations = [
"Energy temple boss area, Fallen god tooth", "Energy Temple boss area, Fallen God Tooth",
"Cathedral boss area, beating Mithalan God", "Cathedral boss area, beating Mithalan God",
"Kelp forest boss area, beating Drunian God", "Kelp Forest boss area, beating Drunian God",
"Sun temple boss area, beating Sun God", "Sun Temple boss area, beating Sun God",
"Sunken city, bulb on the top of the boss area (boiler room)", "Sunken City, bulb on top of the boss area",
"Home water, Nautilus Egg", "Home Water, Nautilus Egg",
"Energy temple blaster room, Blaster egg", "Energy Temple blaster room, Blaster Egg",
"Mithalas castle, beating the priests", "Mithalas City Castle, beating the Priests",
"Mermog cave, Piranha Egg", "Mermog cave, Piranha Egg",
"Octopus cave, Dumbo Egg", "Octopus Cave, Dumbo Egg",
"King Jellyfish cave, bulb in the right path from King Jelly", "King Jellyfish Cave, bulb in the right path from King Jelly",
"King Jellyfish cave, Jellyfish Costume", "King Jellyfish Cave, Jellyfish Costume",
"Final boss area, bulb in the boss third form room", "Final Boss area, bulb in the boss third form room",
"Sun Worm path, first cliff bulb", "Sun Worm path, first cliff bulb",
"Sun Worm path, second cliff bulb", "Sun Worm path, second cliff bulb",
"The veil top right area, bulb in the top of the water fall", "The Veil top right area, bulb in the top of the waterfall",
"Bubble cave, bulb in the left cave wall", "Bubble Cave, bulb in the left cave wall",
"Bubble cave, bulb in the right cave wall (behind the ice cristal)", "Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
"Bubble cave, Verse egg", "Bubble Cave, Verse Egg",
"Kelp Forest bottom left area, bulb close to the spirit crystals", "Kelp Forest bottom left area, bulb close to the spirit crystals",
"Kelp forest bottom left area, Walker baby", "Kelp Forest bottom left area, Walker baby",
"Sun temple, Sun key", "Sun Temple, Sun Key",
"The body bottom area, Mutant Costume", "The Body bottom area, Mutant Costume",
"Sun temple, bulb in the hidden room of the right part", "Sun Temple, bulb in the hidden room of the right part",
"Arnassi ruins, Arnassi Armor", "Arnassi Ruins, Arnassi Armor",
] ]
def test_unconfine_home_water_both_location_fillable(self) -> None: def test_unconfine_home_water_both_location_fillable(self) -> None:

30
worlds/aquaria/test/test_spirit_form_access.py
View File

@ -13,24 +13,24 @@ class SpiritFormAccessTest(AquariaTestBase):
def test_spirit_form_location(self) -> None: def test_spirit_form_location(self) -> None:
"""Test locations that require spirit form""" """Test locations that require spirit form"""
locations = [ locations = [
"The veil bottom area, bulb in the spirit path", "The Veil bottom area, bulb in the spirit path",
"Mithalas city castle, Trident head", "Mithalas City Castle, Trident Head",
"Open water skeleton path, King skull", "Open Water skeleton path, King Skull",
"Kelp forest bottom left area, Walker baby", "Kelp Forest bottom left area, Walker baby",
"Abyss right area, bulb behind the rock in the whale room", "Abyss right area, bulb behind the rock in the whale room",
"The whale, Verse egg", "The Whale, Verse Egg",
"Ice cave, bulb in the room to the right", "Ice Cave, bulb in the room to the right",
"Ice cave, First bulbs in the top exit room", "Ice Cave, first bulb in the top exit room",
"Ice cave, Second bulbs in the top exit room", "Ice Cave, second bulb in the top exit room",
"Ice cave, third bulbs in the top exit room", "Ice Cave, third bulb in the top exit room",
"Ice cave, bulb in the left room", "Ice Cave, bulb in the left room",
"Bubble cave, bulb in the left cave wall", "Bubble Cave, bulb in the left cave wall",
"Bubble cave, bulb in the right cave wall (behind the ice cristal)", "Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
"Bubble cave, Verse egg", "Bubble Cave, Verse Egg",
"Sunken city left area, Girl Costume", "Sunken City left area, Girl Costume",
"Beating Mantis Shrimp Prime", "Beating Mantis Shrimp Prime",
"First secret", "First secret",
"Arnassi ruins, Arnassi Armor", "Arnassi Ruins, Arnassi Armor",
] ]
items = [["Spirit form"]] items = [["Spirit form"]]
self.assertAccessDependency(locations, items) self.assertAccessDependency(locations, items)

6
worlds/aquaria/test/test_sun_form_access.py
View File

@ -14,11 +14,11 @@ class SunFormAccessTest(AquariaTestBase):
"""Test locations that require sun form""" """Test locations that require sun form"""
locations = [ locations = [
"First secret", "First secret",
"The whale, Verse egg", "The Whale, Verse Egg",
"Abyss right area, bulb behind the rock in the whale room", "Abyss right area, bulb behind the rock in the whale room",
"Octopus cave, Dumbo Egg", "Octopus Cave, Dumbo Egg",
"Beating Octopus Prime", "Beating Octopus Prime",
"Final boss area, bulb in the boss third form room", "Final Boss area, bulb in the boss third form room",
"Objective complete" "Objective complete"
] ]
items = [["Sun form"]] items = [["Sun form"]]

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

@ -17,5 +17,5 @@ class UnconfineHomeWaterBothAccessTest(AquariaTestBase):
def test_unconfine_home_water_both_location(self) -> None: def test_unconfine_home_water_both_location(self) -> None:
"""Test locations accessible with unconfined home water via energy door and transportation turtle""" """Test locations accessible with unconfined home water via energy door and transportation turtle"""
self.assertTrue(self.can_reach_region("Open water top left area"), "Cannot reach Open water top left area") self.assertTrue(self.can_reach_region("Open Water top left area"), "Cannot reach Open Water top left area")
self.assertTrue(self.can_reach_region("Home Water, turtle room"), "Cannot reach Home Water, turtle room") self.assertTrue(self.can_reach_region("Home Water, turtle room"), "Cannot reach Home Water, turtle room")

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

@ -16,5 +16,5 @@ class UnconfineHomeWaterEnergyDoorAccessTest(AquariaTestBase):
def test_unconfine_home_water_energy_door_location(self) -> None: def test_unconfine_home_water_energy_door_location(self) -> None:
"""Test locations accessible with unconfined home water via energy door""" """Test locations accessible with unconfined home water via energy door"""
self.assertTrue(self.can_reach_region("Open water top left area"), "Cannot reach Open water top left area") self.assertTrue(self.can_reach_region("Open Water top left area"), "Cannot reach Open Water top left area")
self.assertFalse(self.can_reach_region("Home Water, turtle room"), "Can reach Home Water, turtle room") self.assertFalse(self.can_reach_region("Home Water, turtle room"), "Can reach Home Water, turtle room")

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

@ -17,4 +17,4 @@ class UnconfineHomeWaterTransturtleAccessTest(AquariaTestBase):
def test_unconfine_home_water_transturtle_location(self) -> None: def test_unconfine_home_water_transturtle_location(self) -> None:
"""Test locations accessible with unconfined home water via transportation turtle""" """Test locations accessible with unconfined home water via transportation turtle"""
self.assertTrue(self.can_reach_region("Home Water, turtle room"), "Cannot reach Home Water, turtle room") self.assertTrue(self.can_reach_region("Home Water, turtle room"), "Cannot reach Home Water, turtle room")
self.assertFalse(self.can_reach_region("Open water top left area"), "Can reach Open water top left area") self.assertFalse(self.can_reach_region("Open Water top left area"), "Can reach Open Water top left area")