From 0817305d5bd5151bd264c9586370a5506967502a Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Fri, 3 Feb 2023 19:38:54 +0100 Subject: [PATCH] Witness: Added an option tooltip for "Environmental Puzzles Difficulty" option (+ another bugfix) (#1431) * Added an option tooltip * Fixed eclipse being on in EP difficulty normal --- worlds/witness/Options.py | 7 +++++++ worlds/witness/settings/EP_Shuffle/EP_Easy.txt | 1 + 2 files changed, 8 insertions(+) diff --git a/worlds/witness/Options.py b/worlds/witness/Options.py index 1b539f6f..e4e7e33f 100644 --- a/worlds/witness/Options.py +++ b/worlds/witness/Options.py @@ -63,6 +63,7 @@ class ShuffleEnvironmentalPuzzles(Choice): Add Environmental/Obelisk Puzzles into the location pool. In "individual", every Environmental Puzzle sends an item. In "obelisk_sides", completing every puzzle on one side of an Obelisk sends an item. + Note: In Obelisk Sides, any EPs excluded through another setting will be counted as pre-completed on their Obelisk. """ display_name = "Shuffle Environmental Puzzles" option_off = 0 @@ -77,6 +78,12 @@ class ShuffleDog(Toggle): class EnvironmentalPuzzlesDifficulty(Choice): + """ + When "Shuffle Environmental Puzzles" is on, this setting governs which EPs are eligible for the location pool. + On "eclipse", every EP in the game is eligible, including the 1-hour-long "Theater Eclipse EP". + On "tedious", Theater Eclipse EP is excluded from the location pool. + On "normal", several other difficult or long EPs are excluded as well. + """ display_name = "Environmental Puzzles Difficulty" option_normal = 0 option_tedious = 1 diff --git a/worlds/witness/settings/EP_Shuffle/EP_Easy.txt b/worlds/witness/settings/EP_Shuffle/EP_Easy.txt index 10127438..3e168b58 100644 --- a/worlds/witness/settings/EP_Shuffle/EP_Easy.txt +++ b/worlds/witness/settings/EP_Shuffle/EP_Easy.txt @@ -1,4 +1,5 @@ Precompleted Locations: +0x339B6 0x335AE 0x3388F 0x33A20