From f3f2e46ddc4bec267475bc347472642831743607 Mon Sep 17 00:00:00 2001 From: Louis M Date: Mon, 22 Jul 2024 19:15:56 -0400 Subject: [PATCH] King Jelly can be beaten easily with only the Dual Form --- worlds/aquaria/Regions.py | 5 +++-- worlds/aquaria/test/test_beast_form_access.py | 3 --- .../aquaria/test/test_beast_form_or_arnassi_armor_access.py | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/worlds/aquaria/Regions.py b/worlds/aquaria/Regions.py index e7e7c69984..ca0575a292 100755 --- a/worlds/aquaria/Regions.py +++ b/worlds/aquaria/Regions.py @@ -762,8 +762,9 @@ class AquariaRegions: self.body_c, self.abyss_lb) self.__connect_regions("Abyss left area", "King jellyfish cave", self.abyss_l, self.king_jellyfish_cave, - lambda state: _has_energy_attack_item(state, self.player) and - _has_beast_form(state, self.player)) + lambda state: (_has_energy_form(state, self.player) and + _has_beast_form(state, self.player)) or + _has_dual_form(state, self.player)) self.__connect_regions("Abyss left area", "Abyss right area", self.abyss_l, self.abyss_r) self.__connect_one_way_regions("Abyss right area", "Abyss right area, transturtle", diff --git a/worlds/aquaria/test/test_beast_form_access.py b/worlds/aquaria/test/test_beast_form_access.py index 9459c11f42..a4951dffff 100644 --- a/worlds/aquaria/test/test_beast_form_access.py +++ b/worlds/aquaria/test/test_beast_form_access.py @@ -23,9 +23,6 @@ class BeastFormAccessTest(AquariaTestBase): "Beating the Golem", "Beating Mergog", "Beating Octopus Prime", - "King Jellyfish Cave, Jellyfish Costume", - "King Jellyfish Cave, bulb in the right path from King Jelly", - "Beating King Jellyfish God Prime", "Sunken City cleared", ] items = [["Beast form"]] diff --git a/worlds/aquaria/test/test_beast_form_or_arnassi_armor_access.py b/worlds/aquaria/test/test_beast_form_or_arnassi_armor_access.py index 5d3dd1c331..27d767567b 100644 --- a/worlds/aquaria/test/test_beast_form_or_arnassi_armor_access.py +++ b/worlds/aquaria/test/test_beast_form_or_arnassi_armor_access.py @@ -33,9 +33,6 @@ class BeastForArnassiArmormAccessTest(AquariaTestBase): "Beating Mergog", "Beating Crabbius Maximus", "Beating Octopus Prime", - "King Jellyfish Cave, Jellyfish Costume", - "King Jellyfish Cave, bulb in the right path from King Jelly", - "Beating King Jellyfish God Prime", "Beating Mithalan priests", "Sunken City cleared" ]