From 7f3eda4623edbc5854bebf3aadf703ca12f6b907 Mon Sep 17 00:00:00 2001 From: recklesscoder <57289227+recklesscoder@users.noreply.github.com> Date: Thu, 3 Nov 2022 03:05:58 +0100 Subject: [PATCH] Subnautica: Fix `creature_scan_logic: removed` allowing Cuddlefish. --- worlds/subnautica/Creatures.py | 4 ++-- worlds/subnautica/Options.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/worlds/subnautica/Creatures.py b/worlds/subnautica/Creatures.py index cb34f261..953c7940 100644 --- a/worlds/subnautica/Creatures.py +++ b/worlds/subnautica/Creatures.py @@ -118,8 +118,8 @@ class Definitions: return [name for name in self.all_creatures_presorted if name not in aggressive or name in hatchable] @functools.cached_property - def all_creatures_presorted_without_aggressive(self) -> List[str]: - return [name for name in self.all_creatures_presorted if name not in aggressive] + def all_creatures_presorted_without_aggressive_and_containment(self) -> List[str]: + return [name for name in self.all_creatures_presorted if name not in aggressive and name not in containment] # only singleton needed Definitions: Definitions = Definitions() diff --git a/worlds/subnautica/Options.py b/worlds/subnautica/Options.py index 57bd23fd..f5f05d43 100644 --- a/worlds/subnautica/Options.py +++ b/worlds/subnautica/Options.py @@ -60,7 +60,7 @@ class AggressiveScanLogic(Choice): def get_pool(self) -> typing.List[str]: if self == self.option_removed: - return Definitions.all_creatures_presorted_without_aggressive + return Definitions.all_creatures_presorted_without_aggressive_and_containment elif self == self.option_stasis: return Definitions.all_creatures_presorted_without_containment elif self == self.option_containment: