Skip to content

The Witness: Allow Mountain Lasers to go up to 11 instead of 7. #2618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 16, 2024
Merged

The Witness: Allow Mountain Lasers to go up to 11 instead of 7. #2618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7f2ef1
11 mountain lasers support
NewSoupVi Dec 18, 2023
e07f9a1
tooltip
NewSoupVi Dec 18, 2023
8bfcded
tooltip
NewSoupVi Dec 18, 2023
c88c336
We can just do this lol
NewSoupVi Dec 18, 2023
c22fd92
Better tooltip
NewSoupVi Dec 18, 2023
b24fba6
Correct comment
NewSoupVi Dec 18, 2023
4f3e5e5
Disambiguate comment
NewSoupVi Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions worlds/witness/Options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,13 @@ class PuzzleRandomization(Choice):


class MountainLasers(Range):
"""Sets the amount of beams required to enter the final area."""
"""Sets the amount of lasers required to enter the Mountain.
If set to a higher amount than 7, the mountaintop box will be slightly rotated to make it possible to solve without
the hatch being opened.
This change will also be applied logically to the long solution ("Challenge Lasers" setting)."""
display_name = "Required Lasers for Mountain Entry"
range_start = 1
range_end = 7
range_end = 11
default = 7


Expand Down
5 changes: 4 additions & 1 deletion worlds/witness/player_logic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,10 @@ def make_options_adjustments(self, world: "WitnessWorld"):
elif victory == 3:
self.VICTORY_LOCATION = "0xFFF00"

if chal_lasers <= 7:
# Long box can usually only be solved by opening Mountain Entry. However, if it requires 7 lasers or less
# (challenge_lasers <= 7), you can now solve it without opening Mountain Entry first.
# Furthermore, if the user sets mountain_lasers > 7, the box is rotated to not require Mountain Entry either.
if chal_lasers <= 7 or mnt_lasers > 7:
adjustment_linesets_in_order.append([
"Requirement Changes:",
"0xFFF00 - 11 Lasers - True",
Expand Down