Skip to content

Fray's End: Replace generic NPC with Arun #2277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manuq merged 1 commit into from
Jun 3, 2026
Merged

Fray's End: Replace generic NPC with Arun #2277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion scenes/world_map/components/tutorial_npc.dialogue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0
~ start
Villager: Welcome, traveler. Fray's End is just across the bridge.
if not GameState.quest:
# Player is not on a quest ⇒ they finished the tutorial!
% Arun: It's so good to be in Fray's End again!
% Arun: Thank you for traveling here with me.
# TODO: Use an object at the root of the scene rather than hardcoding this path?
else:
if GameState.quest.quest_path == "res://scenes/quests/lore_quests/quest_000/quest.tres":
Arun: We made it, StoryWeaver! Fray's End is just across the bridge.
Arun: Take the threads you've collected to the Eternal Loom.
=> END
36 changes: 4 additions & 32 deletions scenes/world_map/frays_end.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
[ext_resource type="PackedScene" uid="uid://7vg52qj6ude" path="res://scenes/world_map/components/retelling_townie.tscn" id="42_qgpx3"]
[ext_resource type="PackedScene" uid="uid://vb5o7hh5an8j" path="res://scenes/game_elements/characters/npcs/elder/template_elder.tscn" id="43_ppslc"]
[ext_resource type="PackedScene" uid="uid://c0104ickpm3ru" path="res://scenes/game_elements/props/decoration/flower/flower.tscn" id="45_cjmkx"]
[ext_resource type="PackedScene" uid="uid://b2mj4jggli0ci" path="res://scenes/quests/lore_quests/quest_000/tutorial_npc/tutorial_npc.tscn" id="50_qgpx3"]
[ext_resource type="PackedScene" uid="uid://cr65lmm5b0ueo" path="res://scenes/game_elements/characters/npcs/cat/cat.tscn" id="52_ppslc"]
[ext_resource type="PackedScene" uid="uid://0ull24fvmhwk" path="res://scenes/game_elements/props/teleporter/teleporter.tscn" id="53_2vvub"]
[ext_resource type="PackedScene" uid="uid://dgrrudegturnw" path="res://scenes/game_elements/characters/npcs/townie.tscn" id="54_duxxr"]
Expand Down Expand Up @@ -99,9 +100,6 @@ _data = {
}
point_count = 4

[sub_resource type="RectangleShape2D" id="RectangleShape2D_2vvub"]
size = Vector2(52, 61)

[sub_resource type="RectangleShape2D" id="RectangleShape2D_ulm71"]
size = Vector2(128, 128)

Expand Down Expand Up @@ -1144,35 +1142,11 @@ position = Vector2(1578, 1469)
[node name="WaterRock4" parent="OnTheGround/WaterRocks" unique_id=1688358840 instance=ExtResource("38_jqkod")]
position = Vector2(1689, 1686)

[node name="Tutorial" type="Node2D" parent="OnTheGround" unique_id=1760774148]
y_sort_enabled = true

[node name="TutorialGuy" parent="OnTheGround/Tutorial" unique_id=618221375 instance=ExtResource("54_duxxr")]
position = Vector2(514, 1605)
[node name="TutorialNPC" parent="OnTheGround" unique_id=1227664548 instance=ExtResource("50_qgpx3")]
position = Vector2(513, 1605)
scale = Vector2(-1, 1)
character_seed = 2433932515
look_at_side = 1

[node name="InteractArea" type="Area2D" parent="OnTheGround/Tutorial/TutorialGuy" unique_id=226800588 node_paths=PackedStringArray("marker")]
collision_layer = 32
collision_mask = 0
script = ExtResource("37_f3823")
marker = NodePath("Marker")
metadata/_custom_type_script = "uid://du8wfijr35r35"

[node name="CollisionShape2D" type="CollisionShape2D" parent="OnTheGround/Tutorial/TutorialGuy/InteractArea" unique_id=1652917244]
position = Vector2(0, -23.5)
shape = SubResource("RectangleShape2D_2vvub")
debug_color = Color(0.600391, 0.54335, 0, 0.42)

[node name="Marker" type="Marker2D" parent="OnTheGround/Tutorial/TutorialGuy/InteractArea" unique_id=1432505873]
position = Vector2(0, -100)

[node name="TalkBehavior" type="Node" parent="OnTheGround/Tutorial/TutorialGuy" unique_id=283277394 node_paths=PackedStringArray("interact_area")]
script = ExtResource("56_ojao8")
dialogue = ExtResource("32_djq26")
interact_area = NodePath("../InteractArea")
metadata/_custom_type_script = "uid://edcifob4jc4s"
look_at_side = 1

[node name="WestPath" type="Node2D" parent="OnTheGround" unique_id=2042146768]
y_sort_enabled = true
Expand Down Expand Up @@ -1216,5 +1190,3 @@ position = Vector2(62, 1747)
[connection signal="interaction_started" from="OnTheGround/NPCs/Farmer/InteractArea" to="OnTheGround/NPCs/Farmer" method="_on_interact_area_interaction_started"]
[connection signal="interaction_ended" from="OnTheGround/NPCs/GardenerA/InteractArea" to="OnTheGround/NPCs/GardenerA" method="_on_interact_area_interaction_ended"]
[connection signal="interaction_started" from="OnTheGround/NPCs/GardenerA/InteractArea" to="OnTheGround/NPCs/GardenerA" method="_on_interact_area_interaction_started"]
[connection signal="interaction_ended" from="OnTheGround/Tutorial/TutorialGuy/InteractArea" to="OnTheGround/Tutorial/TutorialGuy" method="_on_interact_area_interaction_ended"]
[connection signal="interaction_started" from="OnTheGround/Tutorial/TutorialGuy/InteractArea" to="OnTheGround/Tutorial/TutorialGuy" method="_on_interact_area_interaction_started"]