From 40b7e78178ef3d221d2b52d23004526a1a96b417 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Thu, 20 Oct 2022 05:05:36 +0200
Subject: [PATCH] The Witness: More Puzzle Skips, Softlock Fix (#1117)

* Softlock fix: 'Swamp Maze Controls' item also locks maze control other side now

* Increase default & max amount of Puzzle Skips (in response to client side changes to how they work)

* Logically require shortbox lasers to start the elevator
---
 worlds/witness/Options.py             | 4 ++--
 worlds/witness/WitnessItems.txt       | 2 +-
 worlds/witness/WitnessLogic.txt       | 2 +-
 worlds/witness/WitnessLogicExpert.txt | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/worlds/witness/Options.py b/worlds/witness/Options.py
index b858eb19..ef3c9fdf 100644
--- a/worlds/witness/Options.py
+++ b/worlds/witness/Options.py
@@ -112,8 +112,8 @@ class PuzzleSkipAmount(Range):
     Works on most panels in the game - The only big exception is The Challenge."""
     display_name = "Puzzle Skips"
     range_start = 0
-    range_end = 20
-    default = 5
+    range_end = 30
+    default = 10
 
 
 class HintAmount(Range):
diff --git a/worlds/witness/WitnessItems.txt b/worlds/witness/WitnessItems.txt
index d58edab0..98e0038b 100644
--- a/worlds/witness/WitnessItems.txt
+++ b/worlds/witness/WitnessItems.txt
@@ -58,7 +58,7 @@ Doors:
 1190 - Swamp Entry (Panel) - 0x0056E
 1192 - Swamp Sliding Bridge (Panel) - 0x00609,0x18488
 1195 - Swamp Rotating Bridge (Panel) - 0x181F5
-1197 - Swamp Maze Control (Panel) - 0x17C0A
+1197 - Swamp Maze Control (Panel) - 0x17C0A,0x17E07
 1310 - Boat - 0x17CDF,0x17CC8,0x17CA6,0x09DB8,0x17C95,0x0A054
 
 1400 - Caves Mountain Shortcut (Door) - 0x2D73F
diff --git a/worlds/witness/WitnessLogic.txt b/worlds/witness/WitnessLogic.txt
index 236d2207..d9fb9503 100644
--- a/worlds/witness/WitnessLogic.txt
+++ b/worlds/witness/WitnessLogic.txt
@@ -927,6 +927,6 @@ Elevator (Mountain Final Room):
 158533 - 0x3C114 (Elevator Entry Right) - 0x3D9A6 | 0x3D9A7 - True
 158534 - 0x3D9AA (Back Wall Left) - 0x3D9A6 | 0x3D9A7 - True
 158535 - 0x3D9A8 (Back Wall Right) - 0x3D9A6 | 0x3D9A7 - True
-158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA | 0x3D9A8 - True
+158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA & 7 Lasers | 0x3D9A8 & 7 Lasers - True
 
 Boat (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Treehouse Entry Area - TrueOneWay - Quarry Boathouse Behind Staircase - TrueOneWay - Inside Glass Factory Behind Back Wall - TrueOneWay:
diff --git a/worlds/witness/WitnessLogicExpert.txt b/worlds/witness/WitnessLogicExpert.txt
index 3c440060..96c7fdc0 100644
--- a/worlds/witness/WitnessLogicExpert.txt
+++ b/worlds/witness/WitnessLogicExpert.txt
@@ -927,6 +927,6 @@ Elevator (Mountain Final Room):
 158533 - 0x3C114 (Elevator Entry Right) - 0x3D9A6 | 0x3D9A7 - True
 158534 - 0x3D9AA (Back Wall Left) - 0x3D9A6 | 0x3D9A7 - True
 158535 - 0x3D9A8 (Back Wall Right) - 0x3D9A6 | 0x3D9A7 - True
-158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA | 0x3D9A8 - True
+158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA & 7 Lasers | 0x3D9A8 & 7 Lasers - True
 
 Boat (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Treehouse Entry Area - TrueOneWay - Quarry Boathouse Behind Staircase - TrueOneWay - Inside Glass Factory Behind Back Wall - TrueOneWay: