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

Aquaria: Renaming some locations for consistency (#3533) 

* Change 'The Body main area' by 'The Body center area' for consistency

* Renaming some locations for consistency

* Adding a line for standard

* Replacing Cathedral by Mithalas Cathedral and addin Blind goal option

* Client option renaming for consistency

* Fix death link not working

* Removing death link from the option to put it client side

* Changing Left to Right
This commit is contained in:
Louis M 2024-07-05 16:40:26 -04:00 committed by GitHub
parent ca76628813
commit 4054a9f15f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
worlds/aquaria/Locations.py
View File

@ -30,7 +30,7 @@ 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 right of the skeleton room": 698108,
"Verse Cave right area, Big Seed": 698175, "Verse Cave right area, Big Seed": 698175,
} }
@ -122,6 +122,7 @@ class AquariaLocations:
"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,
@ -195,7 +196,7 @@ class AquariaLocations:
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,
@ -226,7 +227,7 @@ class AquariaLocations:
"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, fourth urn 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, urn below the left entrance": 698198,
} }
locations_cathedral_underground = { locations_cathedral_underground = {
@ -239,7 +240,7 @@ class AquariaLocations:
} }
locations_cathedral_boss = { locations_cathedral_boss = {
"Cathedral boss area, beating Mithalan God": 698202, "Mithalas boss area, beating Mithalan God": 698202,
} }
locations_forest_tl = { locations_forest_tl = {
@ -269,7 +270,7 @@ 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,
} }
@ -451,7 +452,7 @@ class AquariaLocations:
locations_body_c = { locations_body_c = {
"The Body center area, breaking Li's 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 center area, bulb on the main path blocking tube": 698097,
} }
locations_body_l = { locations_body_l = {

12
worlds/aquaria/Options.py
View File

@ -5,7 +5,7 @@ Description: Manage options in the Aquaria game multiworld randomizer
""" """
from dataclasses import dataclass from dataclasses import dataclass
from Options import Toggle, Choice, Range, DeathLink, PerGameCommonOptions, DefaultOnToggle, StartInventoryPool from Options import Toggle, Choice, Range, PerGameCommonOptions, DefaultOnToggle, StartInventoryPool
class IngredientRandomizer(Choice): class IngredientRandomizer(Choice):
@ -111,6 +111,14 @@ class BindSongNeededToGetUnderRockBulb(Toggle):
display_name = "Bind song needed to get sing bulbs under rocks" display_name = "Bind song needed to get sing bulbs under rocks"
class BlindGoal(Toggle):
"""
Hide the goal's requirements from the help page so that you have to go to the last boss door to know
what is needed to access the boss.
"""
display_name = "Hide the goal's requirements"
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.
@ -142,4 +150,4 @@ class AquariaOptions(PerGameCommonOptions):
dish_randomizer: DishRandomizer dish_randomizer: DishRandomizer
aquarian_translation: AquarianTranslation aquarian_translation: AquarianTranslation
skip_first_vision: SkipFirstVision skip_first_vision: SkipFirstVision
death_link: DeathLink blind_goal: BlindGoal

18
worlds/aquaria/Regions.py
View File

@ -300,7 +300,7 @@ class AquariaRegions:
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",
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)
@ -597,22 +597,22 @@ class AquariaRegions:
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
_has_bind_song(state, self.player)) _has_bind_song(state, self.player))
self.__connect_regions("Mithalas castle", "Cathedral underground", self.__connect_regions("Mithalas castle", "Mithalas Cathedral underground",
self.cathedral_l, self.cathedral_underground, self.cathedral_l, self.cathedral_underground,
lambda state: _has_beast_form(state, self.player) and lambda state: _has_beast_form(state, self.player) and
_has_bind_song(state, self.player)) _has_bind_song(state, self.player))
self.__connect_regions("Mithalas castle", "Cathedral right area", self.__connect_regions("Mithalas castle", "Mithalas Cathedral",
self.cathedral_l, self.cathedral_r, self.cathedral_l, self.cathedral_r,
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("Cathedral right area", "Cathedral underground", self.__connect_regions("Mithalas Cathedral", "Mithalas Cathedral underground",
self.cathedral_r, self.cathedral_underground, self.cathedral_r, self.cathedral_underground,
lambda state: _has_energy_form(state, self.player)) lambda state: _has_energy_form(state, self.player))
self.__connect_one_way_regions("Cathedral underground", "Cathedral boss left area", self.__connect_one_way_regions("Mithalas Cathedral underground", "Cathedral boss left area",
self.cathedral_underground, self.cathedral_boss_r, self.cathedral_underground, self.cathedral_boss_r,
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_one_way_regions("Cathedral boss left area", "Cathedral underground", self.__connect_one_way_regions("Cathedral boss left area", "Mithalas Cathedral underground",
self.cathedral_boss_r, self.cathedral_underground, self.cathedral_boss_r, self.cathedral_underground,
lambda state: _has_beast_form(state, self.player)) lambda state: _has_beast_form(state, self.player))
self.__connect_regions("Cathedral boss right area", "Cathedral boss left area", self.__connect_regions("Cathedral boss right area", "Cathedral boss left area",
@ -1099,7 +1099,7 @@ class AquariaRegions:
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))
@ -1134,7 +1134,7 @@ class AquariaRegions:
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("Mithalas 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",
@ -1191,7 +1191,7 @@ class AquariaRegions:
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",

3
worlds/aquaria/__init__.py
View File

@ -204,7 +204,8 @@ class AquariaWorld(World):
def fill_slot_data(self) -> Dict[str, Any]: def fill_slot_data(self) -> Dict[str, Any]:
return {"ingredientReplacement": self.ingredients_substitution, return {"ingredientReplacement": self.ingredients_substitution,
"aquarianTranslate": bool(self.options.aquarian_translation.value), "aquarian_translate": bool(self.options.aquarian_translation.value),
"blind_goal": bool(self.options.blind_goal.value),
"secret_needed": self.options.objective.value > 0, "secret_needed": self.options.objective.value > 0,
"minibosses_to_kill": self.options.mini_bosses_to_beat.value, "minibosses_to_kill": self.options.mini_bosses_to_beat.value,
"bigbosses_to_kill": self.options.big_bosses_to_beat.value, "bigbosses_to_kill": self.options.big_bosses_to_beat.value,

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

@ -60,7 +60,7 @@ after_home_water_locations = [
"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",
@ -82,14 +82,14 @@ after_home_water_locations = [
"Mithalas Cathedral, third urn in the path behind the flesh vein", "Mithalas Cathedral, third urn in the path behind the flesh vein",
"Mithalas Cathedral, fourth urn 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, 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 crystal", "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", "Mithalas 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",
@ -104,7 +104,7 @@ after_home_water_locations = [
"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",
@ -175,7 +175,7 @@ after_home_water_locations = [
"Sunken City left area, Girl Costume", "Sunken City left area, Girl Costume",
"Sunken City, bulb on top of the boss area", "Sunken City, bulb on top of the boss area",
"The Body center area, breaking Li's cage", "The Body center area, breaking Li's cage",
"The Body main area, bulb on the main path blocking tube", "The Body center 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",

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

@ -39,8 +39,8 @@ class EnergyFormAccessTest(AquariaTestBase):
"Mithalas Cathedral, third urn in the path behind the flesh vein", "Mithalas Cathedral, third urn in the path behind the flesh vein",
"Mithalas Cathedral, fourth urn 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, urn below the left entrance",
"Cathedral boss area, beating Mithalan God", "Mithalas 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",

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

@ -24,7 +24,7 @@ class LiAccessTest(AquariaTestBase):
"Sunken City left area, Girl Costume", "Sunken City left area, Girl Costume",
"Sunken City, bulb on top of the boss area", "Sunken City, bulb on top of the boss area",
"The Body center area, breaking Li's cage", "The Body center area, breaking Li's cage",
"The Body main area, bulb on the main path blocking tube", "The Body center 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",

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

@ -38,7 +38,7 @@ class NatureFormAccessTest(AquariaTestBase):
"Beating the Golem", "Beating the Golem",
"Sunken City cleared", "Sunken City cleared",
"The Body center area, breaking Li's cage", "The Body center area, breaking Li's cage",
"The Body main area, bulb on the main path blocking tube", "The Body center 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",

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

@ -16,7 +16,7 @@ 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", "Mithalas 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 top of the boss area", "Sunken City, bulb on top of the boss area",
@ -35,7 +35,7 @@ class UNoProgressionHardHiddenTest(AquariaTestBase):
"Bubble Cave, bulb in the right cave wall (behind the ice crystal)", "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",

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

@ -15,7 +15,7 @@ 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", "Mithalas 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 top of the boss area", "Sunken City, bulb on top of the boss area",
@ -34,7 +34,7 @@ class UNoProgressionHardHiddenTest(AquariaTestBase):
"Bubble Cave, bulb in the right cave wall (behind the ice crystal)", "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",

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

@ -16,7 +16,7 @@ class SpiritFormAccessTest(AquariaTestBase):
"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",