From fe3bc8d6be2d260f83910f8539f912b974775d4f Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Tue, 16 Jan 2024 13:14:38 +0100
Subject: [PATCH] The Witness: Add Obelisk Side locations to always and
 priority hints (#2665)

---
 worlds/witness/hints.py | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py
index d238aa4a..68fc6894 100644
--- a/worlds/witness/hints.py
+++ b/worlds/witness/hints.py
@@ -187,8 +187,8 @@ def get_always_hint_items(world: "WitnessWorld") -> List[str]:
     return always
 
 
-def get_always_hint_locations(_: "WitnessWorld") -> List[str]:
-    return [
+def get_always_hint_locations(world: "WitnessWorld") -> List[str]:
+    always = [
         "Challenge Vault Box",
         "Mountain Bottom Floor Discard",
         "Theater Eclipse EP",
@@ -196,6 +196,16 @@ def get_always_hint_locations(_: "WitnessWorld") -> List[str]:
         "Mountainside Cloud Cycle EP",
     ]
 
+    # Add Obelisk Sides that contain EPs that are meant to be hinted, if they are necessary to complete the Obelisk Side
+    if world.options.EP_difficulty == "eclipse":
+        always.append("Town Obelisk Side 6")  # Eclipse EP
+
+    if world.options.EP_difficulty != "normal":
+        always.append("Treehouse Obelisk Side 4")  # Couch EP
+        always.append("River Obelisk Side 1")  # Cloud Cycle EP. Needs to be changed to "Mountainside Obelisk" soon
+
+    return always
+
 
 def get_priority_hint_items(world: "WitnessWorld") -> List[str]:
     priority = {
@@ -249,8 +259,8 @@ def get_priority_hint_items(world: "WitnessWorld") -> List[str]:
     return sorted(priority)
 
 
-def get_priority_hint_locations(_: "WitnessWorld") -> List[str]:
-    return [
+def get_priority_hint_locations(world: "WitnessWorld") -> List[str]:
+    priority = [
         "Swamp Purple Underwater",
         "Shipwreck Vault Box",
         "Town RGB Room Left",
@@ -265,6 +275,13 @@ def get_priority_hint_locations(_: "WitnessWorld") -> List[str]:
         "Boat Shipwreck Green EP",
         "Quarry Stoneworks Control Room Left",
     ]
+    
+    # Add Obelisk Sides that contain EPs that are meant to be hinted, if they are necessary to complete the Obelisk Side
+    if world.options.EP_difficulty != "normal":
+        priority.append("Town Obelisk Side 6")  # Theater Flowers EP
+        priority.append("Treehouse Obelisk Side 4")  # Shipwreck Green EP
+
+    return priority
 
 
 def make_hint_from_item(world: "WitnessWorld", item_name: str, own_itempool: List[Item]):