Skip to content

Tutorial: Refactor NPC (Arun) to shared scene #2229

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
May 20, 2026
Merged

Tutorial: Refactor NPC (Arun) to shared scene #2229

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
0 ...ined_village/components/ruined_house.tscn → ...s/props/buildings/house/ruined_house.tscn
View file
Open in desktop
File renamed without changes.
16 changes: 0 additions & 16 deletions ...s/quests/lore_quests/quest_000/1_ruined_village/components/ruined_village.dialogue.import
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions scenes/quests/lore_quests/quest_000/1_ruined_village/components/ruined_village.gd
View file
Open in desktop

This file was deleted.

0 ...illage/components/ruined_village.dialogue → ...mponents/tutorial_ruined_village.dialogue
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions ...lore_quests/quest_000/1_ruined_village/components/tutorial_ruined_village.dialogue.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[remap]

importer="dialogue_manager"
importer_version=15
type="Resource"
uid="uid://c1s10t3ts8or2"
path="res://.godot/imported/tutorial_ruined_village.dialogue-e5db5164b2141c2901b39985e0350062.tres"

[deps]

source_file="res://scenes/quests/lore_quests/quest_000/1_ruined_village/components/tutorial_ruined_village.dialogue"
dest_files=["res://.godot/imported/tutorial_ruined_village.dialogue-e5db5164b2141c2901b39985e0350062.tres"]

[params]

defaults=true
14 changes: 14 additions & 0 deletions scenes/quests/lore_quests/quest_000/1_ruined_village/components/tutorial_ruined_village.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0
extends Node2D
# Variables/methods in this file are accessed from dialogue.

@onready var tutorial_npc: CharacterBody2D = %TutorialNPC
@onready var bridge_blocker: StaticBody2D = %BridgeBlocker


func start_townie_walking() -> void:
# Allow the player to cross the bridge
bridge_blocker.collision_layer = 0

tutorial_npc.walk_path()
0 ..._village/components/ruined_village.gd.uid → ...components/tutorial_ruined_village.gd.uid
View file
Open in desktop
File renamed without changes.
61 changes: 9 additions & 52 deletions ..._000/1_ruined_village/ruined_village.tscn → ...ined_village/tutorial_ruined_village.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene format=4 uid="uid://ck22vke6i1jyq"]

[ext_resource type="Script" uid="uid://c2nnjybwiickt" path="res://scenes/quests/lore_quests/quest_000/1_ruined_village/components/ruined_village.gd" id="1_3xp2p"]
[ext_resource type="Script" uid="uid://c2nnjybwiickt" path="res://scenes/quests/lore_quests/quest_000/1_ruined_village/components/tutorial_ruined_village.gd" id="1_3xp2p"]
[ext_resource type="TileSet" uid="uid://oynx002hv8tl" path="res://tiles/water.tres" id="1_r4ihb"]
[ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="2_16kft"]
[ext_resource type="TileSet" uid="uid://b8qnr0owsbhhn" path="res://tiles/exterior_floors.tres" id="2_i2jms"]
Expand All @@ -12,19 +12,15 @@
[ext_resource type="Script" uid="uid://c8405c212rbn6" path="res://scenes/game_elements/props/background_music/components/background_music.gd" id="7_teve8"]
[ext_resource type="PackedScene" uid="uid://bp20cjimwi8l0" path="res://scenes/game_elements/props/buildings/house/house_2.tscn" id="8_23cxv"]
[ext_resource type="AudioStream" uid="uid://dk10o5q87xbct" path="res://assets/first_party/music/Threadbare Loop_Main_Bridge_01.ogg" id="8_j73a3"]
[ext_resource type="PackedScene" uid="uid://b31v66516y4lg" path="res://scenes/quests/lore_quests/quest_000/1_ruined_village/components/ruined_house.tscn" id="9_4gmak"]
[ext_resource type="PackedScene" uid="uid://b31v66516y4lg" path="res://scenes/game_elements/props/buildings/house/ruined_house.tscn" id="9_4gmak"]
[ext_resource type="Script" uid="uid://bdhjixygupit1" path="res://scenes/game_elements/props/area_filler/area_filler.gd" id="11_4gmak"]
[ext_resource type="Script" uid="uid://du8wfijr35r35" path="res://scenes/game_elements/props/interact_area/interact_area.gd" id="11_ebxxp"]
[ext_resource type="PackedScene" uid="uid://7873qa54birk" path="res://scenes/game_elements/props/tree/tree.tscn" id="12_0g3ol"]
[ext_resource type="Texture2D" uid="uid://0xceungm1p8a" path="res://scenes/game_elements/props/buildings/house/components/House_Wool_Red_Stage2.png" id="12_4gmak"]
[ext_resource type="Script" uid="uid://edcifob4jc4s" path="res://scenes/game_logic/talk_behavior.gd" id="12_75rxs"]
[ext_resource type="SpriteFrames" uid="uid://djwymcffy83" path="res://scenes/game_elements/props/tree/components/tree_spriteframes_red.tres" id="13_ebxxp"]
[ext_resource type="Texture2D" uid="uid://lylpujgq8e4v" path="res://scenes/game_elements/props/buildings/house/components/House_Patches_Red_Stage1.png" id="15_ebxxp"]
[ext_resource type="Script" uid="uid://x1mxt6bmei2o" path="res://scenes/ui_elements/cinematic/cinematic.gd" id="16_75rxs"]
[ext_resource type="Resource" uid="uid://c1s10t3ts8or2" path="res://scenes/quests/lore_quests/quest_000/1_ruined_village/components/ruined_village.dialogue" id="17_sxarn"]
[ext_resource type="PackedScene" uid="uid://dgrrudegturnw" path="res://scenes/game_elements/characters/npcs/townie.tscn" id="19_75rxs"]
[ext_resource type="Script" uid="uid://id28maao3vdy" path="res://scenes/game_logic/walk_behaviors/path_walk_behavior.gd" id="19_iy1ja"]
[ext_resource type="Script" uid="uid://csev4hv57utxv" path="res://scenes/game_logic/walk_behaviors/character_speeds.gd" id="20_8bo2y"]
[ext_resource type="Resource" uid="uid://c1s10t3ts8or2" path="res://scenes/quests/lore_quests/quest_000/1_ruined_village/components/tutorial_ruined_village.dialogue" id="17_sxarn"]
[ext_resource type="PackedScene" uid="uid://b2mj4jggli0ci" path="res://scenes/quests/lore_quests/quest_000/tutorial_npc/tutorial_npc.tscn" id="19_75rxs"]
[ext_resource type="PackedScene" uid="uid://dttyvh6kyru5y" path="res://scenes/game_elements/props/decoration/butterfly/butterfly.tscn" id="23_iy1ja"]
[ext_resource type="Texture2D" uid="uid://cfkb8gpxylplg" path="res://scenes/game_elements/props/buildings/house/components/House_Patches_Red_Stage3.png" id="25_i7hju"]
[ext_resource type="SpriteFrames" uid="uid://b81ibkdhsfthe" path="res://scenes/game_elements/props/decoration/butterfly/components/butterfly_flower_loop_1_red.tres" id="25_jpujn"]
Expand All @@ -33,15 +29,6 @@
[ext_resource type="PackedScene" uid="uid://crqjcicx0vdu" path="res://scenes/game_elements/props/decoration/bush/bush.tscn" id="26_jpujn"]
[ext_resource type="SpriteFrames" uid="uid://bgckvdkxuxrgh" path="res://scenes/game_elements/props/decoration/bush/components/bush_spriteframes_red_large.tres" id="27_tweot"]

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

[sub_resource type="Resource" id="Resource_3knxh"]
script = ExtResource("20_8bo2y")
walk_speed = 200.0
run_speed = 200.0
metadata/_custom_type_script = "uid://csev4hv57utxv"

[sub_resource type="RectangleShape2D" id="RectangleShape2D_sxarn"]
size = Vector2(64, 64)

Expand All @@ -54,7 +41,7 @@ point_count = 2
[sub_resource type="RectangleShape2D" id="RectangleShape2D_iy1ja"]
size = Vector2(64, 64)

[node name="RuinedVillage" type="Node2D" unique_id=1305901330]
[node name="TutorialRuinedVillage" type="Node2D" unique_id=1305901330]
editor_description = "Introduces moving around the world and interacting with things.

TimeAndWeather is set to dawn and a very slow timescale as a crude way to manually progress the time of day through this tutorial quest."
Expand Down Expand Up @@ -119,39 +106,12 @@ texture = ExtResource("12_4gmak")
position = Vector2(2209, 68)
texture = ExtResource("15_ebxxp")

[node name="Townie" parent="OnTheGround" unique_id=1098678013 instance=ExtResource("19_75rxs")]
position = Vector2(2519, 166)
character_seed = 3222241206

[node name="InteractArea" type="Area2D" parent="OnTheGround/Townie" unique_id=1767129886]
[node name="TutorialNPC" parent="OnTheGround" unique_id=1098678013 node_paths=PackedStringArray("path") instance=ExtResource("19_75rxs")]
unique_name_in_owner = true
collision_layer = 32
collision_mask = 0
script = ExtResource("11_ebxxp")
metadata/_custom_type_script = "uid://du8wfijr35r35"

[node name="CollisionShape2D" type="CollisionShape2D" parent="OnTheGround/Townie/InteractArea" unique_id=1657788279]
visible = false
position = Vector2(0, -23.5)
shape = SubResource("RectangleShape2D_i7hju")
debug_color = Color(0.600391, 0.54335, 0, 0.42)

[node name="TalkBehavior" type="Node" parent="OnTheGround/Townie" unique_id=659174580 node_paths=PackedStringArray("interact_area")]
script = ExtResource("12_75rxs")
position = Vector2(2553, 164)
dialogue = ExtResource("17_sxarn")
title = "townie"
interact_area = NodePath("../InteractArea")
metadata/_custom_type_script = "uid://edcifob4jc4s"

[node name="PathWalkBehavior" type="Node2D" parent="OnTheGround/Townie" unique_id=1511185082 node_paths=PackedStringArray("walking_path", "character")]
unique_name_in_owner = true
process_mode = 4
script = ExtResource("19_iy1ja")
speeds = SubResource("Resource_3knxh")
walking_path = NodePath("../../../TownieBridgePath")
turn_around = false
character = NodePath("..")
metadata/_custom_type_script = "uid://id28maao3vdy"
dialogue_title = &"townie"
path = NodePath("../../TownieBridgePath")

[node name="Trees" type="Area2D" parent="OnTheGround" unique_id=1749010606]
y_sort_enabled = true
Expand Down Expand Up @@ -343,6 +303,3 @@ metadata/_custom_type_script = "uid://hqdquinbimce"

[node name="CollisionShape2D" type="CollisionShape2D" parent="Teleporter" unique_id=72600342]
shape = SubResource("RectangleShape2D_iy1ja")

[connection signal="interaction_ended" from="OnTheGround/Townie/InteractArea" to="OnTheGround/Townie" method="_on_interact_area_interaction_ended"]
[connection signal="interaction_started" from="OnTheGround/Townie/InteractArea" to="OnTheGround/Townie" method="_on_interact_area_interaction_started"]
0 ...alth/components/tutorial_stealth.dialogue → ...alth/components/tutorial_stealth.dialogue
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions scenes/quests/lore_quests/quest_000/2_stealth/components/tutorial_stealth.dialogue.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[remap]

importer="dialogue_manager"
importer_version=15
type="Resource"
uid="uid://bvxfbfjv2oleg"
path="res://.godot/imported/tutorial_stealth.dialogue-b5ac57e7bde53e65d1c1ad5fb0edd423.tres"

[deps]

source_file="res://scenes/quests/lore_quests/quest_000/2_stealth/components/tutorial_stealth.dialogue"
dest_files=["res://.godot/imported/tutorial_stealth.dialogue-b5ac57e7bde53e65d1c1ad5fb0edd423.tres"]

[params]

defaults=true
0 .../quest_000/2a_stealth/tutorial_stealth.gd → .../2_stealth/components/tutorial_stealth.gd
View file
Open in desktop
File renamed without changes.
0 ...st_000/2a_stealth/tutorial_stealth.gd.uid → ...tealth/components/tutorial_stealth.gd.uid
View file
Open in desktop
File renamed without changes.
62 changes: 8 additions & 54 deletions ...uest_000/2a_stealth/tutorial_stealth.tscn → ...quest_000/2_stealth/tutorial_stealth.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene format=4 uid="uid://durvgybueqayn"]

[ext_resource type="Script" uid="uid://dnp0tjloec2d7" path="res://scenes/game_logic/stealth_game_logic.gd" id="1_7bw2l"]
[ext_resource type="Script" uid="uid://t43ctefgmwif" path="res://scenes/quests/lore_quests/quest_000/2a_stealth/tutorial_stealth.gd" id="1_q2v54"]
[ext_resource type="Script" uid="uid://t43ctefgmwif" path="res://scenes/quests/lore_quests/quest_000/2_stealth/components/tutorial_stealth.gd" id="1_q2v54"]
[ext_resource type="TileSet" uid="uid://b8qnr0owsbhhn" path="res://tiles/exterior_floors.tres" id="2_pbkqu"]
[ext_resource type="TileSet" uid="uid://oynx002hv8tl" path="res://tiles/water.tres" id="2_wcwd1"]
[ext_resource type="TileSet" uid="uid://do0ffypatd77h" path="res://tiles/bridges.tres" id="3_lx70h"]
Expand All @@ -14,11 +14,9 @@
[ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="7_pbknt"]
[ext_resource type="TileSet" uid="uid://ciq5guijvlyb0" path="res://tiles/void_chromakey.tres" id="8_nil71"]
[ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="8_xu4jl"]
[ext_resource type="PackedScene" uid="uid://dgrrudegturnw" path="res://scenes/game_elements/characters/npcs/townie.tscn" id="9_be8bo"]
[ext_resource type="Script" uid="uid://du8wfijr35r35" path="res://scenes/game_elements/props/interact_area/interact_area.gd" id="10_kjr36"]
[ext_resource type="PackedScene" uid="uid://b2mj4jggli0ci" path="res://scenes/quests/lore_quests/quest_000/tutorial_npc/tutorial_npc.tscn" id="9_be8bo"]
[ext_resource type="PackedScene" uid="uid://fuhl3l6gxq5k" path="res://scenes/game_elements/props/collectible_item/collectible_item.tscn" id="10_pbknt"]
[ext_resource type="Script" uid="uid://edcifob4jc4s" path="res://scenes/game_logic/talk_behavior.gd" id="11_6a0j2"]
[ext_resource type="Resource" uid="uid://bvxfbfjv2oleg" path="res://scenes/quests/lore_quests/quest_000/2a_stealth/components/tutorial_stealth.dialogue" id="11_hiptn"]
[ext_resource type="Resource" uid="uid://bvxfbfjv2oleg" path="res://scenes/quests/lore_quests/quest_000/2_stealth/components/tutorial_stealth.dialogue" id="11_hiptn"]
[ext_resource type="Script" uid="uid://bgmwplmj3bfls" path="res://scenes/globals/game_state/inventory/inventory_item.gd" id="11_nil71"]
[ext_resource type="PackedScene" uid="uid://dv4f232y8w8dv" path="res://scenes/game_elements/props/decoration/water_rock/water_rock.tscn" id="12_es244"]
[ext_resource type="Script" uid="uid://x1mxt6bmei2o" path="res://scenes/ui_elements/cinematic/cinematic.gd" id="13_qj7hh"]
Expand All @@ -39,9 +37,6 @@
[ext_resource type="SpriteFrames" uid="uid://br4k784ht8hh0" path="res://scenes/game_elements/props/decoration/bush/components/bush_spriteframes_yellow_large.tres" id="33_p5ken"]
[ext_resource type="SpriteFrames" uid="uid://dfthhmtn4x3t8" path="res://scenes/game_elements/props/decoration/bush/components/bush_spriteframes_yellow_small.tres" id="34_s0dut"]

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

[sub_resource type="Curve2D" id="Curve2D_6a0j2"]
_data = {
"points": PackedVector2Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 576, 0)
Expand Down Expand Up @@ -197,54 +192,17 @@ limit_bottom = 1312
position_smoothing_enabled = true
editor_draw_limits = true

[node name="Townie" parent="OnTheGround" unique_id=1098678013 instance=ExtResource("9_be8bo")]
[node name="TutorialNPC" parent="OnTheGround" unique_id=1098678013 instance=ExtResource("9_be8bo")]
position = Vector2(101, 1192)
character_seed = 3222241206

[node name="InteractArea" type="Area2D" parent="OnTheGround/Townie" unique_id=513111428]
unique_name_in_owner = true
collision_layer = 32
collision_mask = 0
script = ExtResource("10_kjr36")
metadata/_custom_type_script = "uid://du8wfijr35r35"

[node name="CollisionShape2D" type="CollisionShape2D" parent="OnTheGround/Townie/InteractArea" unique_id=1862208709]
visible = false
position = Vector2(0, -23.5)
shape = SubResource("RectangleShape2D_tfxnn")
debug_color = Color(0.600391, 0.54335, 0, 0.42)

[node name="TalkBehavior" type="Node" parent="OnTheGround/Townie" unique_id=1808600192 node_paths=PackedStringArray("interact_area")]
script = ExtResource("11_6a0j2")
dialogue = ExtResource("11_hiptn")
title = "walk_through"
interact_area = NodePath("../InteractArea")
metadata/_custom_type_script = "uid://edcifob4jc4s"
dialogue_title = &"walk_through"

[node name="Townie2" parent="OnTheGround" unique_id=1905290874 instance=ExtResource("9_be8bo")]
[node name="TutorialNPC2" parent="OnTheGround" unique_id=1905290874 instance=ExtResource("9_be8bo")]
position = Vector2(3037, 232)
scale = Vector2(-1, 1)
character_seed = 3222241206
look_at_side = 1

[node name="InteractArea" type="Area2D" parent="OnTheGround/Townie2" unique_id=1850835966]
collision_layer = 32
collision_mask = 0
script = ExtResource("10_kjr36")
metadata/_custom_type_script = "uid://du8wfijr35r35"

[node name="CollisionShape2D" type="CollisionShape2D" parent="OnTheGround/Townie2/InteractArea" unique_id=1063348811]
visible = false
position = Vector2(0, -23.5)
shape = SubResource("RectangleShape2D_tfxnn")
debug_color = Color(0.600391, 0.54335, 0, 0.42)

[node name="TalkBehavior" type="Node" parent="OnTheGround/Townie2" unique_id=704236578 node_paths=PackedStringArray("interact_area")]
script = ExtResource("11_6a0j2")
dialogue = ExtResource("11_hiptn")
title = "well_done"
interact_area = NodePath("../InteractArea")
metadata/_custom_type_script = "uid://edcifob4jc4s"
dialogue_title = &"well_done"
look_at_side = 1

[node name="EnemyGuards" type="Node2D" parent="OnTheGround" unique_id=1997239040]
y_sort_enabled = true
Expand Down Expand Up @@ -370,9 +328,5 @@ metadata/_edit_lock_ = true
[node name="HUD" parent="." unique_id=1426591993 instance=ExtResource("33_j2uqn")]
unique_name_in_owner = true

[connection signal="interaction_ended" from="OnTheGround/Townie/InteractArea" to="OnTheGround/Townie" method="_on_interact_area_interaction_ended"]
[connection signal="interaction_started" from="OnTheGround/Townie/InteractArea" to="OnTheGround/Townie" method="_on_interact_area_interaction_started"]
[connection signal="interaction_ended" from="OnTheGround/Townie2/InteractArea" to="OnTheGround/Townie2" method="_on_interact_area_interaction_ended"]
[connection signal="interaction_started" from="OnTheGround/Townie2/InteractArea" to="OnTheGround/Townie2" method="_on_interact_area_interaction_started"]
[connection signal="body_entered" from="CaveLighting" to="." method="_on_cave_lighting_body_entered"]
[connection signal="body_exited" from="CaveLighting" to="." method="_on_cave_lighting_body_exited"]
16 changes: 0 additions & 16 deletions scenes/quests/lore_quests/quest_000/2a_stealth/components/tutorial_stealth.dialogue.import
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions scenes/quests/lore_quests/quest_000/3_sequence_puzzle/components/townie_behaviors.gd
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion scenes/quests/lore_quests/quest_000/3_sequence_puzzle/components/townie_behaviors.gd.uid
View file
Open in desktop

This file was deleted.

11 changes: 10 additions & 1 deletion scenes/quests/lore_quests/quest_000/3_sequence_puzzle/components/tutorial_sequence_puzzle.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,13 @@
# SPDX-License-Identifier: MPL-2.0
extends Node2D

@export var puzzle: SequencePuzzle
@onready var cinematic: Cinematic = %Cinematic
@onready var tutorial_npc: CharacterBody2D = %TutorialNPC
@onready var puzzle: SequencePuzzle = %SequencePuzzle


func _ready() -> void:
if not GameState.intro_dialogue_shown:
await cinematic.cinematic_finished

tutorial_npc.walk_path()
Loading
Loading