From d80069385dc6166c2333d2c2360d47861a138d87 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Thu, 5 Dec 2024 06:03:16 -0500
Subject: [PATCH] LADX: tweak in-game hints (#3920)

* dont show local player name in hint

* add option to disable hints

---------

Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
---
 worlds/ladx/LADXR/generator.py | 4 +++-
 worlds/ladx/Options.py         | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py
index 504dfc78..046b5181 100644
--- a/worlds/ladx/LADXR/generator.py
+++ b/worlds/ladx/LADXR/generator.py
@@ -266,6 +266,8 @@ def generateRom(args, world: "LinksAwakeningWorld"):
     our_useful_items = [item for item in our_items if ItemClassification.progression in item.classification]
 
     def gen_hint():
+        if not world.options.in_game_hints:
+            return 'Hints are disabled!'
         chance = world.random.uniform(0, 1)
         if chance < JUNK_HINT:
             return None
@@ -286,7 +288,7 @@ def generateRom(args, world: "LinksAwakeningWorld"):
         else:
             location_name = location.name
 
-        hint = f"{name} {location.item} is at {location_name}"
+        hint = f"{name} {location.item.name} is at {location_name}"
         if location.player != world.player:
             # filter out { and } since they cause issues with string.format later on
             player_name = world.multiworld.player_name[location.player].replace("{", "").replace("}", "")
diff --git a/worlds/ladx/Options.py b/worlds/ladx/Options.py
index 863e80fd..9414a7e3 100644
--- a/worlds/ladx/Options.py
+++ b/worlds/ladx/Options.py
@@ -498,6 +498,13 @@ class Warps(Choice):
     default = option_vanilla
 
 
+class InGameHints(DefaultOnToggle):
+    """
+    When enabled, owl statues and library books may indicate the location of your items in the multiworld.
+    """
+    display_name = "In-game Hints"
+
+
 ladx_option_groups = [
     OptionGroup("Goal Options", [
         Goal,
@@ -518,6 +525,7 @@ ladx_option_groups = [
         TradeQuest,
         Rooster,
         TrendyGame,
+        InGameHints,
         NagMessages,
         BootsControls
     ]),
@@ -574,6 +582,7 @@ class LinksAwakeningOptions(PerGameCommonOptions):
     nag_messages: NagMessages
     ap_title_screen: APTitleScreen
     boots_controls: BootsControls
+    in_game_hints: InGameHints
 
     warp_improvements: Removed
     additional_warp_points: Removed