From b2fa97fce3b5ae9556d4088a9ebeaee2fb05930f Mon Sep 17 00:00:00 2001 From: threeandthreee Date: Wed, 11 Sep 2024 14:03:23 -0400 Subject: [PATCH 1/2] dont show local player name in hint --- worlds/ladx/LADXR/generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py index 69e856f3541b..edde92f1e99a 100644 --- a/worlds/ladx/LADXR/generator.py +++ b/worlds/ladx/LADXR/generator.py @@ -288,7 +288,7 @@ def gen_hint(): 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("}", "") From 14f696c850944b7870767bdb62b2e75530e02f9a Mon Sep 17 00:00:00 2001 From: threeandthreee Date: Wed, 11 Sep 2024 15:19:30 -0400 Subject: [PATCH 2/2] add option to disable hints --- worlds/ladx/LADXR/generator.py | 2 ++ worlds/ladx/Options.py | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py index edde92f1e99a..abd1dd370893 100644 --- a/worlds/ladx/LADXR/generator.py +++ b/worlds/ladx/LADXR/generator.py @@ -268,6 +268,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 diff --git a/worlds/ladx/Options.py b/worlds/ladx/Options.py index c5dcc080537c..7b1413caebc0 100644 --- a/worlds/ladx/Options.py +++ b/worlds/ladx/Options.py @@ -501,6 +501,13 @@ class AdditionalWarpPoints(DefaultOffToggle): """ display_name = "Additional Warp Points" +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, @@ -522,6 +529,7 @@ class AdditionalWarpPoints(DefaultOffToggle): TradeQuest, Rooster, TrendyGame, + InGameHints, NagMessages, BootsControls ]), @@ -579,3 +587,4 @@ class LinksAwakeningOptions(PerGameCommonOptions): nag_messages: NagMessages ap_title_screen: APTitleScreen boots_controls: BootsControls + in_game_hints: InGameHints