Merge 'Fix for TEXT ID ERROR!' (#2431)

fenhl · fenhl · commit 2e5d6815c64b · 2025-06-09T02:22:19.000Z
diff --git a/Hints.py b/Hints.py
@@ -1843,7 +1843,7 @@ def build_misc_location_hints(world: World, messages: list[Message]) -> None:
                     text = data['location_text'].format(
                         item=get_hint(get_item_generic_name(item), world.settings.clearer_hints).text,
                     )
-                update_message_by_id(messages, data['id'], str(GossipText(text, ['Green'], prefix='')), data['text_style'])
+            update_message_by_id(messages, data['id'], str(GossipText(text, ['Green'], prefix='')), data['text_style'])
 
 
 def build_misc_dual_hints(world: World, messages: list[Message]) -> None:
@@ -1866,8 +1866,6 @@ def build_misc_dual_hints(world: World, messages: list[Message]) -> None:
                     item=get_hint(get_item_generic_name(item_2), world.settings.clearer_hints).text,
                 )
             else:
-                if hint_type1 not in world.settings.misc_hints and hint_type2 not in world.settings.misc_hints:
-                    return
                 text = data['location_fallback']
     update_message_by_id(messages, data['id'], str(GossipText(text, ['Green'], prefix='')), data['text_style'])
 
diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '8.3.15'
+__version__ = '8.3.16'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0

Original file line number	Diff line number	Diff line change
`@@ -1843,7 +1843,7 @@ def build_misc_location_hints(world: World, messages: list[Message]) -> None:`
`1843`	`1843`	`text = data['location_text'].format(`
`1844`	`1844`	`item=get_hint(get_item_generic_name(item), world.settings.clearer_hints).text,`
`1845`	`1845`	`)`
`1846`		`- update_message_by_id(messages, data['id'], str(GossipText(text, ['Green'], prefix='')), data['text_style'])`
	`1846`	`+ update_message_by_id(messages, data['id'], str(GossipText(text, ['Green'], prefix='')), data['text_style'])`
`1847`	`1847`
`1848`	`1848`
`1849`	`1849`	`def build_misc_dual_hints(world: World, messages: list[Message]) -> None:`
`@@ -1866,8 +1866,6 @@ def build_misc_dual_hints(world: World, messages: list[Message]) -> None:`
`1866`	`1866`	`item=get_hint(get_item_generic_name(item_2), world.settings.clearer_hints).text,`
`1867`	`1867`	`)`
`1868`	`1868`	`else:`
`1869`		`- if hint_type1 not in world.settings.misc_hints and hint_type2 not in world.settings.misc_hints:`
`1870`		`- return`
`1871`	`1869`	`text = data['location_fallback']`
`1872`	`1870`	`update_message_by_id(messages, data['id'], str(GossipText(text, ['Green'], prefix='')), data['text_style'])`
`1873`	`1871`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = '8.3.15'`
	`1`	`+__version__ = '8.3.16'`
`2`	`2`
`3`	`3`	`# This is a supplemental version number for branches based off of main dev.`
`4`	`4`	`supplementary_version = 0`