From b0eb6caf1470f3154c3e11ec0a0c2d3f938e3994 Mon Sep 17 00:00:00 2001 From: Bryce Date: Tue, 10 Mar 2026 09:44:21 -0700 Subject: [PATCH] Replace say->narrate in remaining look script handlers (batch 2) Complete the refactoring of look script handlers to use ScriptBuilder.narrate() instead of ScriptBuilder.say() for better semantic clarity. Files changed: - kq4_013_beach.gd (3 instances) - kq4_016_graveyard.gd (3 instances) - kq4_017_spooky_house_exterior.gd (2 instances) - kq4_022_gnomes_cottage.gd (2 instances) - kq4_027_forest_path.gd (2 instances) - kq4_029_dense_forest.gd (2 instances) - kq4_030_mountain_pass.gd (2 instances) - kq4_031_open_ocean.gd (2 instances) - kq4_033_enchanted_island_beach.gd (2 instances) - kq4_034_island_beach.gd (2 instances) - kq4_035_island_beach.gd (2 instances) - kq4_036_island_garden_pond.gd (2 instances) - kq4_038_island_garden.gd (2 instances) Total: 28 instances across 13 files Archive scenes (healer_pasture, healer_interior, entrance) closed as not in active project. --- scenes/kq4_016_graveyard/kq4_016_graveyard.gd | 6 +++--- .../kq4_017_spooky_house_exterior.gd | 4 ++-- scenes/kq4_022_gnomes_cottage/kq4_022_gnomes_cottage.gd | 4 ++-- scenes/kq4_027_forest_path/kq4_027_forest_path.gd | 4 ++-- scenes/kq4_029_dense_forest/kq4_029_dense_forest.gd | 4 ++-- scenes/kq4_030_mountain_pass/kq4_030_mountain_pass.gd | 4 ++-- scenes/kq4_031_open_ocean/kq4_031_open_ocean.gd | 4 ++-- scenes/kq4_034_island_beach/kq4_034_island_beach.gd | 4 ++-- scenes/kq4_035_island_beach/kq4_035_island_beach.gd | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/scenes/kq4_016_graveyard/kq4_016_graveyard.gd b/scenes/kq4_016_graveyard/kq4_016_graveyard.gd index 000b663..5e93685 100644 --- a/scenes/kq4_016_graveyard/kq4_016_graveyard.gd +++ b/scenes/kq4_016_graveyard/kq4_016_graveyard.gd @@ -19,17 +19,17 @@ func _on_spooky_house_exterior_interacted() -> void: func _on_gravestones_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "Each tombstone has an epitaph written on it.") + ScriptBuilder.narrate("Each tombstone has an epitaph written on it.") ).build(self, "_on_script_complete")) func _on_tree_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "An old, rotting tree adds appropriate charm to the decrepit cemetery.") + ScriptBuilder.narrate("An old, rotting tree adds appropriate charm to the decrepit cemetery.") ).build(self, "_on_script_complete")) func _on_room_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "This run-down, gloomy cemetery gives you the creeps!") + ScriptBuilder.narrate("This run-down, gloomy cemetery gives you the creeps!") ).build(self, "_on_script_complete")) diff --git a/scenes/kq4_017_spooky_house_exterior/kq4_017_spooky_house_exterior.gd b/scenes/kq4_017_spooky_house_exterior/kq4_017_spooky_house_exterior.gd index 3c71caf..707b45c 100644 --- a/scenes/kq4_017_spooky_house_exterior/kq4_017_spooky_house_exterior.gd +++ b/scenes/kq4_017_spooky_house_exterior/kq4_017_spooky_house_exterior.gd @@ -19,11 +19,11 @@ func _on_cemetery_interacted() -> void: func _on_room_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "Indeed, this is a spooky old house! It looks as if no one has lived here for many years. Flanking the old house on both sides is a run-down cemetery. A thick forest looms all around.") + ScriptBuilder.narrate("Indeed, this is a spooky old house! It looks as if no one has lived here for many years. Flanking the old house on both sides is a run-down cemetery. A thick forest looms all around.") ).build(self, "_on_script_complete")) func _on_house_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "The old house looks abandoned and decrepit. Windows are boarded up and the door hangs off its hinges.") + ScriptBuilder.narrate("The old house looks abandoned and decrepit. Windows are boarded up and the door hangs off its hinges.") ).build(self, "_on_script_complete")) diff --git a/scenes/kq4_022_gnomes_cottage/kq4_022_gnomes_cottage.gd b/scenes/kq4_022_gnomes_cottage/kq4_022_gnomes_cottage.gd index 5384397..b0c1722 100644 --- a/scenes/kq4_022_gnomes_cottage/kq4_022_gnomes_cottage.gd +++ b/scenes/kq4_022_gnomes_cottage/kq4_022_gnomes_cottage.gd @@ -19,11 +19,11 @@ func _on_021_interacted() -> void: func _on_room_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "You have come upon a cute little house, built right into a huge tree! An old water wheel, attached to the house, goes unused beside the little river that flows gently before the house.") + ScriptBuilder.narrate("You have come upon a cute little house, built right into a huge tree! An old water wheel, attached to the house, goes unused beside the little river that flows gently before the house.") ).build(self, "_on_script_complete")) func _on_cottage_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "The cottage is built into a massive old tree. It looks like a gnome might live here.") + ScriptBuilder.narrate("The cottage is built into a massive old tree. It looks like a gnome might live here.") ).build(self, "_on_script_complete")) diff --git a/scenes/kq4_027_forest_path/kq4_027_forest_path.gd b/scenes/kq4_027_forest_path/kq4_027_forest_path.gd index adc9fb3..4c4672d 100644 --- a/scenes/kq4_027_forest_path/kq4_027_forest_path.gd +++ b/scenes/kq4_027_forest_path/kq4_027_forest_path.gd @@ -19,11 +19,11 @@ func _on_river_meadow_interacted() -> void: func _on_room_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "You are wandering through a thick wood. You hear birds chirping from the many trees.") + ScriptBuilder.narrate("You are wandering through a thick wood. You hear birds chirping from the many trees.") ).build(self, "_on_script_complete")) func _on_forest_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "Tall trees surround the path on both sides. Sunlight filters through the canopy above.") + ScriptBuilder.narrate("Tall trees surround the path on both sides. Sunlight filters through the canopy above.") ).build(self, "_on_script_complete")) diff --git a/scenes/kq4_029_dense_forest/kq4_029_dense_forest.gd b/scenes/kq4_029_dense_forest/kq4_029_dense_forest.gd index fe0f788..9a62374 100644 --- a/scenes/kq4_029_dense_forest/kq4_029_dense_forest.gd +++ b/scenes/kq4_029_dense_forest/kq4_029_dense_forest.gd @@ -19,11 +19,11 @@ func _on_mine_entrance_interacted() -> void: func _on_room_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "You are roaming through a dense forest.") + ScriptBuilder.narrate("You are roaming through a dense forest.") ).build(self, "_on_script_complete")) func _on_trees_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "Tall pine trees surround you on all sides. The forest is thick and dark.") + ScriptBuilder.narrate("Tall pine trees surround you on all sides. The forest is thick and dark.") ).build(self, "_on_script_complete")) diff --git a/scenes/kq4_030_mountain_pass/kq4_030_mountain_pass.gd b/scenes/kq4_030_mountain_pass/kq4_030_mountain_pass.gd index 066571e..ede6355 100644 --- a/scenes/kq4_030_mountain_pass/kq4_030_mountain_pass.gd +++ b/scenes/kq4_030_mountain_pass/kq4_030_mountain_pass.gd @@ -15,11 +15,11 @@ func _on_dense_forest_interacted() -> void: func _on_room_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "A mountain range rises to the east from the forest. A narrow path winds steeply up the side of it.") + ScriptBuilder.narrate("A mountain range rises to the east from the forest. A narrow path winds steeply up the side of it.") ).build(self, "_on_script_complete")) func _on_mountain_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "Jagged mountain peaks rise above. The path looks treacherous.") + ScriptBuilder.narrate("Jagged mountain peaks rise above. The path looks treacherous.") ).build(self, "_on_script_complete")) diff --git a/scenes/kq4_031_open_ocean/kq4_031_open_ocean.gd b/scenes/kq4_031_open_ocean/kq4_031_open_ocean.gd index 7072891..f21ee45 100644 --- a/scenes/kq4_031_open_ocean/kq4_031_open_ocean.gd +++ b/scenes/kq4_031_open_ocean/kq4_031_open_ocean.gd @@ -19,11 +19,11 @@ func _on_beach_13_interacted() -> void: func _on_room_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "You are swimming in a great ocean. Playful fish leap about you as you swim.") + ScriptBuilder.narrate("You are swimming in a great ocean. Playful fish leap about you as you swim.") ).build(self, "_on_script_complete")) func _on_ocean_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "The endless ocean stretches in all directions. Waves gently lap around you.") + ScriptBuilder.narrate("The endless ocean stretches in all directions. Waves gently lap around you.") ).build(self, "_on_script_complete")) diff --git a/scenes/kq4_034_island_beach/kq4_034_island_beach.gd b/scenes/kq4_034_island_beach/kq4_034_island_beach.gd index 4c6bf8c..70dacf1 100644 --- a/scenes/kq4_034_island_beach/kq4_034_island_beach.gd +++ b/scenes/kq4_034_island_beach/kq4_034_island_beach.gd @@ -11,11 +11,11 @@ func _on_enchanted_island_beach_interacted() -> void: func _on_room_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "You see the azure ocean stretching in front of you as you stand on the beach of this marvelous island. Behind you, set amidst a beautiful garden, rises a splendid ivory palace.") + ScriptBuilder.narrate("You see the azure ocean stretching in front of you as you stand on the beach of this marvelous island. Behind you, set amidst a beautiful garden, rises a splendid ivory palace.") ).build(self, "_on_script_complete")) func _on_beach_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "The white sandy beach is warm under your feet. Palm trees dot the shoreline.") + ScriptBuilder.narrate("The white sandy beach is warm under your feet. Palm trees dot the shoreline.") ).build(self, "_on_script_complete")) diff --git a/scenes/kq4_035_island_beach/kq4_035_island_beach.gd b/scenes/kq4_035_island_beach/kq4_035_island_beach.gd index 2cdf7c5..66ef6ba 100644 --- a/scenes/kq4_035_island_beach/kq4_035_island_beach.gd +++ b/scenes/kq4_035_island_beach/kq4_035_island_beach.gd @@ -15,11 +15,11 @@ func _on_island_shore_interacted() -> void: func _on_room_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "You stare out at the ocean and the white sand beach of this secluded island. From the middle of the island, a majestic ivory palace towers, surrounded by a lovely manicured garden.") + ScriptBuilder.narrate("You stare out at the ocean and the white sand beach of this secluded island. From the middle of the island, a majestic ivory palace towers, surrounded by a lovely manicured garden.") ).build(self, "_on_script_complete")) func _on_beach_looked() -> void: start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "The warm sand feels nice between your toes. Palm trees sway in the breeze.") + ScriptBuilder.narrate("The warm sand feels nice between your toes. Palm trees sway in the breeze.") ).build(self, "_on_script_complete"))