From fd6a0b547fc0d9925a8cd16ececd44e16b69835f Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Thu, 28 Jul 2022 23:43:35 +0200
Subject: [PATCH] Witness: Fatal logic bug fix (#837)

* Renamed some event items

* Fatal logic bug: Door panels did not check their symbol items
---
 worlds/witness/player_logic.py | 6 +++---
 worlds/witness/rules.py        | 7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py
index eb57f2c6..3639e836 100644
--- a/worlds/witness/player_logic.py
+++ b/worlds/witness/player_logic.py
@@ -319,9 +319,9 @@ class WitnessPlayerLogic:
             "0x00037": "Monastery Branch Panels Activate",
             "0x0A079": "Access to Bunker Laser",
             "0x0A3B5": "Door to Tutorial Discard Opens",
-            "0x00139": "Keep Hedges 2 Turns On",
-            "0x019DC": "Keep Hedges 3 Turns On",
-            "0x019E7": "Keep Hedges 4 Turns On",
+            "0x00139": "Keep Hedges 1 Knowledge",
+            "0x019DC": "Keep Hedges 2 Knowledge",
+            "0x019E7": "Keep Hedges 3 Knowledge",
             "0x01D3F": "Keep Laser Panel (Pressure Plates) Activates",
             "0x09F7F": "Mountain Access",
             "0x0367C": "Quarry Laser Mill Requirement Met",
diff --git a/worlds/witness/rules.py b/worlds/witness/rules.py
index cd1fae12..2b9888b3 100644
--- a/worlds/witness/rules.py
+++ b/worlds/witness/rules.py
@@ -116,12 +116,7 @@ class WitnessLogic(LogicMixin):
             valid_option = True
 
             for panel in option:
-                if panel in player_logic.DOOR_ITEMS_BY_ID:
-                    if all({not self.has(item, player) for item in player_logic.DOOR_ITEMS_BY_ID[panel]}):
-                        valid_option = False
-                        break
-
-                elif not self._witness_can_solve_panel(panel, world, player, player_logic, locat):
+                if not self._witness_can_solve_panel(panel, world, player, player_logic, locat):
                     valid_option = False
                     break