Fix walk run animation loop snap

Reviewed-on: #8

README.md

@@ -15,6 +15,7 @@
 ## Controls
 - Move: WASD
 - Jump: Space
+- Sprint: Shift
 - Interact (enter/exit car): E
 - Flashlight: F
 - Phone: Tab

game/assets/images/card.webp.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bstshxshmlfiq"
+path="res://.godot/imported/card.webp-99b23fadea1c063dd14bdfc3719125c0.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/images/card.webp"
+dest_files=["res://.godot/imported/card.webp-99b23fadea1c063dd14bdfc3719125c0.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

game/project.godot

@@ -27,6 +27,7 @@ AuthState="*res://scenes/UI/auth_state.gd"
 CharacterService="*res://scenes/UI/character_service.gd"
 SelectedCharacter="*res://scenes/UI/selected_character.gd"
 DialogSystem="*res://scenes/UI/dialog_system.gd"
+QuestManager="*res://scenes/Quests/quest_manager.gd"
 
 [dotnet]
 

game/scenes/CardGame/card.gd

@@ -0,0 +1,14 @@
+extends Node2D
+
+@export var card_name: String
+@export var card_text: String
+@export var card_cost: int
+
+@onready var card_name_node := $CardName
+@onready var card_text_node := $CardText
+@onready var card_cost_node := $CardCost
+
+func _ready():
+	card_name_node.text = card_name
+	card_text_node.text = card_text
+	card_cost_node.text = str(card_cost)

game/scenes/CardGame/card.gd.uid

@@ -0,0 +1 @@
+uid://chk06witxlje

game/scenes/CardGame/card.tscn

@@ -0,0 +1,39 @@
+[gd_scene load_steps=3 format=3 uid="uid://cqumma8ibtbsx"]
+
+[ext_resource type="Script" uid="uid://chk06witxlje" path="res://scenes/CardGame/card.gd" id="1_qu2n3"]
+[ext_resource type="Texture2D" uid="uid://bstshxshmlfiq" path="res://assets/images/card.webp" id="2_xgndj"]
+
+[node name="Card" type="Node2D"]
+script = ExtResource("1_qu2n3")
+
+[node name="CardBackbround" type="Sprite2D" parent="."]
+scale = Vector2(0.25, 0.25)
+texture = ExtResource("2_xgndj")
+
+[node name="CardName" type="Label" parent="."]
+offset_left = -44.0
+offset_top = 22.0
+offset_right = 47.0
+offset_bottom = 45.0
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="CardText" type="RichTextLabel" parent="."]
+offset_left = -75.0
+offset_top = 64.0
+offset_right = 75.0
+offset_bottom = 115.0
+text = "Test Text"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="CardCost" type="Label" parent="."]
+offset_left = -80.0
+offset_top = -125.0
+offset_right = -45.0
+offset_bottom = -89.0
+text = "2"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="CardImage" type="Sprite2D" parent="."]

game/scenes/CardGame/cards.gd

@@ -0,0 +1,22 @@
+extends Node2D
+
+var card_scene = preload("uid://cqumma8ibtbsx")
+
+func _ready():
+	var size = get_viewport().get_visible_rect().size
+	
+	var card1 = card_scene.instantiate()
+	card1.card_text = "Test Card 1"
+	card1.card_name = "Card 1"
+	card1.card_cost = 1
+	card1.position = Vector2(size.x / 2 - 100, size.y / 2)
+	add_child(card1)
+	
+	var card2 = card_scene.instantiate()
+	card2.card_text = "Test Card 2"
+	card2.card_name = "Card 2"
+	card2.card_cost = 2
+	card2.position = Vector2(size.x / 2 + 100, size.y / 2)
+	add_child(card2)
+	
+	

game/scenes/CardGame/cards.gd.uid

@@ -0,0 +1 @@
+uid://btx5q72aali0g

game/scenes/CardGame/cards.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://q4abhlwqdvay"]
+
+[ext_resource type="Script" uid="uid://btx5q72aali0g" path="res://scenes/CardGame/cards.gd" id="1_l08q2"]
+
+[node name="Node2D" type="Node2D"]
+script = ExtResource("1_l08q2")

game/scenes/Interaction/dialog_trigger_area.gd

@@ -5,6 +5,7 @@ extends Area3D
 @export_multiline var dialog_text := ""
 @export var auto_popup := false
 @export_enum("Every Entry", "Once") var auto_popup_mode := 0
+@export var auto_popup_close_on_exit := false
 
 var _has_triggered := false
 
@@ -24,9 +25,15 @@ func _on_body_entered(body: Node) -> void:
 	if not (target_group == StringName() or body.is_in_group(target_group)):
 		return
 	if auto_popup:
+		if DialogSystem and DialogSystem.has_method("is_dialog_open") and DialogSystem.is_dialog_open():
+			if not (DialogSystem.has_method("is_dialog_open_from") and DialogSystem.is_dialog_open_from(self)):
+				return
 		if auto_popup_mode == 1 and _has_triggered:
 			return
 		_has_triggered = true
+		if DialogSystem and auto_popup_close_on_exit and DialogSystem.has_method("show_text_from"):
+			DialogSystem.show_text_from(self, dialog_text)
+			return
 		if DialogSystem and DialogSystem.has_method("show_text"):
 			DialogSystem.show_text(dialog_text)
 		return
@@ -35,7 +42,15 @@ func _on_body_entered(body: Node) -> void:
 
 
 func _on_body_exited(body: Node) -> void:
+	if not (target_group == StringName() or body.is_in_group(target_group)):
+		return
 	if auto_popup:
+		if auto_popup_close_on_exit and DialogSystem:
+			if DialogSystem.has_method("close_if_source"):
+				DialogSystem.close_if_source(self)
+			elif DialogSystem.has_method("close_if_text"):
+				DialogSystem.close_if_text(dialog_text)
+			return
 		return
 	if target_group == StringName() or body.is_in_group(target_group):
 		DialogSystem.unregister_interactable(self)

game/scenes/Levels/level.gd

@@ -10,8 +10,30 @@ var start_radians = start_light_angle * PI / 180
 var time := 0.0
 
 @onready var sun := $DirectionalLight3D
+@onready var _player: Node = $Player
+@onready var _quest_text: RichTextLabel = $PhoneUI/Control/PhoneFrame/QuestText
+
+const FIRST_QUEST_ID := "first_drive"
+const FIRST_QUEST := {
+	"id": FIRST_QUEST_ID,
+	"title": "RepoBot's First Task",
+	"description": "Get familiar with movement and vehicles.",
+	"steps": [
+		{
+			"id": "enter_vehicle",
+			"text": "Get in the car (E).",
+			"complete_event": "entered_vehicle",
+		},
+		{
+			"id": "reach_checkpoint",
+			"text": "Drive the car into the checkpoint marker.",
+			"complete_event": "reach_checkpoint",
+		},
+	],
+}
 
 func _ready() -> void:
+	_setup_quests()
 	if show_spawn_dialog and DialogSystem and DialogSystem.has_method("show_text"):
 		await get_tree().process_frame
 		DialogSystem.show_text(spawn_dialog_text)
@@ -19,6 +41,7 @@ func _ready() -> void:
 			await get_tree().create_timer(spawn_dialog_auto_close_seconds).timeout
 			if DialogSystem and DialogSystem.has_method("close_if_text"):
 				DialogSystem.close_if_text(spawn_dialog_text)
+	_show_quest_intro_dialog()
 
 func _process(delta):
 	time = fmod((time + delta), day_length)
@@ -32,3 +55,53 @@ func _process(delta):
 	var curSin = -sin((t * TAU) + start_radians)
 	var energy = clamp((curSin * 1.0) + 0.2, 0.0, 1.2)
 	sun.light_energy = energy
+
+
+func _setup_quests() -> void:
+	if QuestManager == null:
+		return
+	if not QuestManager.has_quest(FIRST_QUEST_ID):
+		QuestManager.register_quest(FIRST_QUEST)
+	if not QuestManager.is_active_quest(FIRST_QUEST_ID) and not QuestManager.is_quest_completed(FIRST_QUEST_ID):
+		QuestManager.start_quest(FIRST_QUEST_ID)
+	if not QuestManager.is_connected("quest_state_changed", Callable(self, "_refresh_quest_ui")):
+		QuestManager.quest_state_changed.connect(_refresh_quest_ui)
+	if _player and _player.has_signal("vehicle_entered"):
+		if not _player.is_connected("vehicle_entered", Callable(self, "_on_player_vehicle_entered")):
+			_player.vehicle_entered.connect(_on_player_vehicle_entered)
+	_refresh_quest_ui()
+
+
+func _on_player_vehicle_entered(_vehicle: Node) -> void:
+	if QuestManager:
+		QuestManager.emit_event(&"entered_vehicle")
+
+
+func _refresh_quest_ui() -> void:
+	if _quest_text == null or QuestManager == null:
+		return
+	var state: Dictionary = QuestManager.get_active_quest_state()
+	if not bool(state.get("active", false)):
+		_quest_text.text = "No active quest."
+		return
+	var title := String(state.get("title", "Quest"))
+	if bool(state.get("completed", false)):
+		_quest_text.text = "[b]%s[/b]\nComplete." % title
+		return
+	var step_index: int = int(state.get("current_step_index", 0))
+	var total_steps: int = int(state.get("total_steps", 0))
+	var step_text := String(state.get("current_step_text", ""))
+	_quest_text.text = "[b]%s[/b]\nStep %d/%d\n%s" % [title, step_index + 1, total_steps, step_text]
+
+
+func _show_quest_intro_dialog() -> void:
+	if QuestManager == null:
+		return
+	var state: Dictionary = QuestManager.get_active_quest_state()
+	if not bool(state.get("active", false)) or bool(state.get("completed", false)):
+		return
+	var step_text := String(state.get("current_step_text", ""))
+	if step_text.is_empty():
+		return
+	if DialogSystem and DialogSystem.has_method("show_text"):
+		DialogSystem.show_text("RepoBot: New task assigned.\n\n%s" % step_text)

game/scenes/Levels/level.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=23 format=3 uid="uid://dchj6g2i8ebph"]
+[gd_scene load_steps=81 format=3 uid="uid://dchj6g2i8ebph"]
 
 [ext_resource type="Script" uid="uid://brgmxhhhtakja" path="res://scenes/Levels/level.gd" id="1_a4mo8"]
 [ext_resource type="PackedScene" uid="uid://bb6hj6l23043x" path="res://assets/models/human.blend" id="1_eg4yq"]
@@ -9,6 +9,7 @@
 [ext_resource type="PackedScene" path="res://scenes/Vehicles/car.tscn" id="5_car"]
 [ext_resource type="PackedScene" uid="uid://bnqaqbgynoyys" path="res://assets/models/TestCharAnimated.glb" id="5_fi66n"]
 [ext_resource type="Script" uid="uid://bk53njt7i3kmv" path="res://scenes/Interaction/dialog_trigger_area.gd" id="6_dialog"]
+[ext_resource type="Script" uid="uid://cshtdpjp4xy2f" path="res://scenes/Quests/quest_trigger_area.gd" id="7_qtrigger"]
 
 [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_2q6dc"]
 bounce = 0.5
@@ -22,6 +23,224 @@ bounce = 0.5
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_mx8sn"]
 
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_he7fi"]
+animation = &"Idle"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_42npc"]
+animation = &"Idle"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_neck2"]
+animation = &"Idle"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_bg4jh"]
+animation = &"Idle"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_43ksg"]
+animation = &"Jump"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_5qdlo"]
+animation = &"Jump"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_hwpvo"]
+animation = &"Jump"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_loupo"]
+animation = &"Jump"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_1meta"]
+animation = &"LStrafe"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_i35yb"]
+animation = &"LStrafeWalk"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_18iqp"]
+animation = &"LTurn"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_px5jg"]
+animation = &"LTurn90"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_f2oql"]
+animation = &"RStrafe"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_8hdhy"]
+animation = &"RStrafe"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_8ydj0"]
+animation = &"RStrafeWalk"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ol8dr"]
+animation = &"RTurn"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_eorea"]
+animation = &"RTurn90"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_mwo3k"]
+animation = &"Run"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_2jvac"]
+animation = &"Run"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_m443h"]
+animation = &"Run"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_j43p6"]
+animation = &"Run"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_7qd4n"]
+animation = &"Walk"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_5wdrc"]
+animation = &"Walk"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_k13o0"]
+animation = &"Walk"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ccri0"]
+animation = &"Walk"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_aqwus"]
+animation = &"Walk"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_pqisa"]
+animation = &"Walk"
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_5qdlo"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_hwpvo"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_2jvac"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_m443h"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ccri0"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_aqwus"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_tknc3"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ygago"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_koxac"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_0pp6t"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_3xa5y"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_8m234"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_jnqa2"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_vwq6c"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_e2sp2"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_r45s2"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_p7els"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_elh2a"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_bwsrl"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_dykvg"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_8m8y3"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_64kfc"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_xdbgi"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_60p50"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_jmoxn"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_cvjxp"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_bwsrl"]
+states/End/position = Vector2(664, 130)
+states/Idle/node = SubResource("AnimationNodeAnimation_bg4jh")
+states/Idle/position = Vector2(318, 57)
+"states/Idle 2/node" = SubResource("AnimationNodeAnimation_he7fi")
+"states/Idle 2/position" = Vector2(397, 105)
+"states/Idle 3/node" = SubResource("AnimationNodeAnimation_42npc")
+"states/Idle 3/position" = Vector2(312, 279)
+"states/Idle 4/node" = SubResource("AnimationNodeAnimation_neck2")
+"states/Idle 4/position" = Vector2(437, 356)
+states/Jump/node = SubResource("AnimationNodeAnimation_loupo")
+states/Jump/position = Vector2(282, 356)
+"states/Jump 2/node" = SubResource("AnimationNodeAnimation_43ksg")
+"states/Jump 2/position" = Vector2(421, 287)
+"states/Jump 3/node" = SubResource("AnimationNodeAnimation_5qdlo")
+"states/Jump 3/position" = Vector2(397, 410)
+"states/Jump 4/node" = SubResource("AnimationNodeAnimation_hwpvo")
+"states/Jump 4/position" = Vector2(397, 469)
+states/LStrafe/node = SubResource("AnimationNodeAnimation_1meta")
+states/LStrafe/position = Vector2(1401, 100)
+states/LStrafeWalk/node = SubResource("AnimationNodeAnimation_i35yb")
+states/LStrafeWalk/position = Vector2(1346, 175)
+states/LTurn/node = SubResource("AnimationNodeAnimation_18iqp")
+states/LTurn/position = Vector2(1516, 83)
+states/LTurn90/node = SubResource("AnimationNodeAnimation_px5jg")
+states/LTurn90/position = Vector2(1550, 208)
+states/RStrafe/node = SubResource("AnimationNodeAnimation_8hdhy")
+states/RStrafe/position = Vector2(856, 161)
+"states/RStrafe 2/node" = SubResource("AnimationNodeAnimation_f2oql")
+"states/RStrafe 2/position" = Vector2(956, 208)
+states/RStrafeWalk/node = SubResource("AnimationNodeAnimation_8ydj0")
+states/RStrafeWalk/position = Vector2(1181, 155)
+states/RTurn/node = SubResource("AnimationNodeAnimation_ol8dr")
+states/RTurn/position = Vector2(1065, 162)
+states/RTurn90/node = SubResource("AnimationNodeAnimation_eorea")
+states/RTurn90/position = Vector2(1218, 92)
+states/Run/node = SubResource("AnimationNodeAnimation_j43p6")
+states/Run/position = Vector2(293, 225)
+"states/Run 2/node" = SubResource("AnimationNodeAnimation_mwo3k")
+"states/Run 2/position" = Vector2(421, 161)
+"states/Run 3/node" = SubResource("AnimationNodeAnimation_2jvac")
+"states/Run 3/position" = Vector2(287, 469)
+"states/Run 4/node" = SubResource("AnimationNodeAnimation_m443h")
+"states/Run 4/position" = Vector2(538, 469)
+states/Start/position = Vector2(82, 162)
+states/Walk/node = SubResource("AnimationNodeAnimation_pqisa")
+states/Walk/position = Vector2(414, 57)
+"states/Walk 2/node" = SubResource("AnimationNodeAnimation_7qd4n")
+"states/Walk 2/position" = Vector2(303, 111)
+"states/Walk 3/node" = SubResource("AnimationNodeAnimation_5wdrc")
+"states/Walk 3/position" = Vector2(312, 175)
+"states/Walk 4/node" = SubResource("AnimationNodeAnimation_k13o0")
+"states/Walk 4/position" = Vector2(421, 219)
+"states/Walk 5/node" = SubResource("AnimationNodeAnimation_ccri0")
+"states/Walk 5/position" = Vector2(303, 410)
+"states/Walk 6/node" = SubResource("AnimationNodeAnimation_aqwus")
+"states/Walk 6/position" = Vector2(516, 402)
+transitions = ["Idle", "Walk", SubResource("AnimationNodeStateMachineTransition_5qdlo"), "Walk 2", "Idle 2", SubResource("AnimationNodeStateMachineTransition_hwpvo"), "Walk 3", "Run 2", SubResource("AnimationNodeStateMachineTransition_2jvac"), "Run", "Walk 4", SubResource("AnimationNodeStateMachineTransition_m443h"), "Start", "Idle", SubResource("AnimationNodeStateMachineTransition_ccri0"), "Start", "Walk 2", SubResource("AnimationNodeStateMachineTransition_aqwus"), "Start", "Walk 3", SubResource("AnimationNodeStateMachineTransition_tknc3"), "Start", "Run", SubResource("AnimationNodeStateMachineTransition_ygago"), "Idle 3", "Jump 2", SubResource("AnimationNodeStateMachineTransition_koxac"), "Jump", "Idle 4", SubResource("AnimationNodeStateMachineTransition_0pp6t"), "Start", "Jump", SubResource("AnimationNodeStateMachineTransition_3xa5y"), "Start", "Idle 3", SubResource("AnimationNodeStateMachineTransition_8m234"), "Walk", "End", SubResource("AnimationNodeStateMachineTransition_jnqa2"), "Idle 2", "End", SubResource("AnimationNodeStateMachineTransition_vwq6c"), "Run 2", "End", SubResource("AnimationNodeStateMachineTransition_e2sp2"), "Walk 4", "End", SubResource("AnimationNodeStateMachineTransition_r45s2"), "Jump 2", "End", SubResource("AnimationNodeStateMachineTransition_p7els"), "Idle 4", "End", SubResource("AnimationNodeStateMachineTransition_elh2a"), "Start", "Walk 5", SubResource("AnimationNodeStateMachineTransition_bwsrl"), "Walk 5", "Jump 3", SubResource("AnimationNodeStateMachineTransition_dykvg"), "Jump 3", "Walk 6", SubResource("AnimationNodeStateMachineTransition_8m8y3"), "Walk 6", "End", SubResource("AnimationNodeStateMachineTransition_64kfc"), "Start", "Run 3", SubResource("AnimationNodeStateMachineTransition_xdbgi"), "Run 3", "Jump 4", SubResource("AnimationNodeStateMachineTransition_60p50"), "Jump 4", "Run 4", SubResource("AnimationNodeStateMachineTransition_jmoxn"), "Run 4", "End", SubResource("AnimationNodeStateMachineTransition_cvjxp")]
+
 [sub_resource type="SphereShape3D" id="SphereShape3D_dialog_zone"]
 radius = 2.5
 
@@ -36,6 +255,20 @@ material = SubResource("StandardMaterial3D_dialog_zone")
 radius = 2.5
 height = 5.0
 
+[sub_resource type="SphereShape3D" id="SphereShape3D_checkpoint"]
+radius = 3.0
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_checkpoint"]
+transparency = 1
+cull_mode = 2
+shading_mode = 0
+albedo_color = Color(1, 0.804, 0.204, 0.2)
+
+[sub_resource type="SphereMesh" id="SphereMesh_checkpoint"]
+material = SubResource("StandardMaterial3D_checkpoint")
+radius = 3.0
+height = 6.0
+
 [sub_resource type="BoxShape3D" id="BoxShape3D_2q6dc"]
 size = Vector3(1080, 2, 1080)
 
@@ -87,8 +320,6 @@ phone_path = NodePath("../PhoneUI")
 transform = Transform3D(-0.9998549, 0, 0.01703362, 0, 1, 0, -0.01703362, 0, -0.9998549, 0, 0, 0)
 
 [node name="Skeleton3D" parent="Player/TestCharAnimated/Armature" index="0"]
-bones/0/position = Vector3(0.002616825, -0.0012634661, -0.98995954)
-bones/0/rotation = Quaternion(-0.7278332, -0.05342924, 0.012382713, 0.6835575)
 bones/1/position = Vector3(8.593209e-06, 0.09923458, -0.012273359)
 bones/1/rotation = Quaternion(-0.03163086, 0.011397719, 0.022761386, 0.9991754)
 bones/2/position = Vector3(-2.2989244e-10, 0.117319785, 2.9730852e-08)
@@ -205,6 +436,9 @@ bones/63/position = Vector3(7.93632e-09, 0.1572156, -2.6982683e-10)
 bones/63/rotation = Quaternion(0.2890854, 0.031904142, 0.014081784, 0.9566679)
 bones/64/position = Vector3(7.567915e-10, 0.099999994, -3.2595668e-09)
 
+[node name="AnimationPlayer" parent="Player/TestCharAnimated" index="1"]
+root_motion_track = NodePath("Armature/Skeleton3D:mixamorig_Hips")
+
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Player"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
 shape = SubResource("SphereShape3D_mx8sn")
@@ -216,6 +450,12 @@ fov = 49.0
 
 [node name="SpotLight3D" type="SpotLight3D" parent="Player"]
 
+[node name="AnimationTree" type="AnimationTree" parent="Player"]
+root_node = NodePath("../TestCharAnimated")
+root_motion_track = NodePath("Armature/Skeleton3D:mixamorig_Hips")
+tree_root = SubResource("AnimationNodeStateMachine_bwsrl")
+anim_player = NodePath("../TestCharAnimated/AnimationPlayer")
+
 [node name="Car" parent="." instance=ExtResource("5_car")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6, 0, -3)
 
@@ -236,6 +476,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 0, -6.5)
 script = ExtResource("6_dialog")
 dialog_text = "Auto dialog trigger"
 auto_popup = true
+auto_popup_close_on_exit = true
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="AutoDialogZone"]
 shape = SubResource("SphereShape3D_dialog_zone")
@@ -244,6 +485,19 @@ shape = SubResource("SphereShape3D_dialog_zone")
 transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0)
 mesh = SubResource("SphereMesh_dialog_zone")
 
+[node name="QuestCheckpoint" type="Area3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9, 0, -10)
+script = ExtResource("7_qtrigger")
+event_name = &"reach_checkpoint"
+target_group = &"vehicle"
+quest_id_filter = "first_drive"
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="QuestCheckpoint"]
+shape = SubResource("SphereShape3D_checkpoint")
+
+[node name="Visual" type="MeshInstance3D" parent="QuestCheckpoint"]
+mesh = SubResource("SphereMesh_checkpoint")
+
 [node name="Ground" type="StaticBody3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
 
@@ -334,6 +588,24 @@ grow_horizontal = 2
 grow_vertical = 2
 color = Color(0.08, 0.08, 0.1, 1)
 
+[node name="QuestTitle" type="Label" parent="PhoneUI/Control/PhoneFrame"]
+layout_mode = 0
+offset_left = 18.0
+offset_top = 18.0
+offset_right = 150.0
+offset_bottom = 41.0
+text = "Quest Log"
+
+[node name="QuestText" type="RichTextLabel" parent="PhoneUI/Control/PhoneFrame"]
+layout_mode = 0
+offset_left = 18.0
+offset_top = 52.0
+offset_right = 344.0
+offset_bottom = 613.0
+bbcode_enabled = true
+text = "No active quest."
+scroll_active = false
+
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_a4mo8")
 

game/scenes/Quests/quest_manager.gd

@@ -0,0 +1,158 @@
+extends Node
+
+signal quest_registered(quest_id: StringName)
+signal quest_started(quest_id: StringName)
+signal quest_step_advanced(quest_id: StringName, step_index: int, step_text: String)
+signal quest_completed(quest_id: StringName)
+signal quest_state_changed
+
+var _quests: Dictionary = {}
+var _active_quest_id: StringName = &""
+var _active_step_index: int = -1
+var _completed_quests: Dictionary = {}
+
+
+func register_quest(definition: Dictionary) -> bool:
+	var raw_id := String(definition.get("id", "")).strip_edges()
+	if raw_id.is_empty():
+		push_warning("Quest definition is missing an id.")
+		return false
+	var quest_id: StringName = StringName(raw_id)
+	if _quests.has(quest_id):
+		return true
+
+	var raw_steps: Variant = definition.get("steps", [])
+	if typeof(raw_steps) != TYPE_ARRAY:
+		push_warning("Quest '%s' has invalid steps." % raw_id)
+		return false
+	var normalized_steps: Array[Dictionary] = []
+	var idx := 0
+	for raw_step in raw_steps:
+		if typeof(raw_step) != TYPE_DICTIONARY:
+			continue
+		var step_dict: Dictionary = raw_step
+		var step := step_dict.duplicate(true)
+		step["id"] = String(step.get("id", "step_%d" % idx)).strip_edges()
+		step["text"] = String(step.get("text", "")).strip_edges()
+		step["complete_event"] = StringName(String(step.get("complete_event", "")).strip_edges())
+		normalized_steps.append(step)
+		idx += 1
+
+	if normalized_steps.is_empty():
+		push_warning("Quest '%s' has no usable steps." % raw_id)
+		return false
+
+	var quest := definition.duplicate(true)
+	quest["id"] = raw_id
+	quest["title"] = String(definition.get("title", raw_id))
+	quest["description"] = String(definition.get("description", ""))
+	quest["steps"] = normalized_steps
+	_quests[quest_id] = quest
+	quest_registered.emit(quest_id)
+	quest_state_changed.emit()
+	return true
+
+
+func has_quest(quest_id: String) -> bool:
+	return _quests.has(StringName(quest_id))
+
+
+func start_quest(quest_id: String) -> bool:
+	var id := StringName(quest_id)
+	if not _quests.has(id):
+		push_warning("Cannot start missing quest '%s'." % quest_id)
+		return false
+	_active_quest_id = id
+	_active_step_index = 0
+	quest_started.emit(_active_quest_id)
+	var step := _get_active_step()
+	if not step.is_empty():
+		quest_step_advanced.emit(_active_quest_id, _active_step_index, String(step.get("text", "")))
+	quest_state_changed.emit()
+	return true
+
+
+func emit_event(event_name: StringName, payload: Dictionary = {}) -> void:
+	if event_name == StringName():
+		return
+	if _active_quest_id == StringName():
+		return
+	if is_quest_completed(String(_active_quest_id)):
+		return
+
+	var active_step := _get_active_step()
+	if active_step.is_empty():
+		return
+	var expected: StringName = active_step.get("complete_event", StringName())
+	if expected != event_name:
+		return
+	_advance_active_step(payload)
+
+
+func is_quest_completed(quest_id: String) -> bool:
+	return bool(_completed_quests.get(StringName(quest_id), false))
+
+
+func is_active_quest(quest_id: String) -> bool:
+	return _active_quest_id == StringName(quest_id)
+
+
+func get_active_quest_id() -> StringName:
+	return _active_quest_id
+
+
+func get_active_quest_state() -> Dictionary:
+	if _active_quest_id == StringName() or not _quests.has(_active_quest_id):
+		return {
+			"active": false,
+		}
+
+	var quest: Dictionary = _quests[_active_quest_id]
+	var steps: Array = quest.get("steps", [])
+	var completed: bool = is_quest_completed(String(_active_quest_id))
+	var step_text := ""
+	var step_id := ""
+	if not completed and _active_step_index >= 0 and _active_step_index < steps.size():
+		var step: Dictionary = steps[_active_step_index]
+		step_text = String(step.get("text", ""))
+		step_id = String(step.get("id", ""))
+
+	return {
+		"active": true,
+		"quest_id": String(_active_quest_id),
+		"title": String(quest.get("title", "")),
+		"description": String(quest.get("description", "")),
+		"current_step_index": _active_step_index,
+		"total_steps": steps.size(),
+		"current_step_id": step_id,
+		"current_step_text": step_text,
+		"completed": completed,
+	}
+
+
+func _get_active_step() -> Dictionary:
+	if _active_quest_id == StringName():
+		return {}
+	if not _quests.has(_active_quest_id):
+		return {}
+	var quest: Dictionary = _quests[_active_quest_id]
+	var steps: Array = quest.get("steps", [])
+	if _active_step_index < 0 or _active_step_index >= steps.size():
+		return {}
+	return steps[_active_step_index]
+
+
+func _advance_active_step(_payload: Dictionary) -> void:
+	if _active_quest_id == StringName():
+		return
+	var quest: Dictionary = _quests.get(_active_quest_id, {})
+	var steps: Array = quest.get("steps", [])
+	_active_step_index += 1
+	if _active_step_index >= steps.size():
+		_completed_quests[_active_quest_id] = true
+		quest_completed.emit(_active_quest_id)
+		quest_state_changed.emit()
+		return
+	var step: Dictionary = steps[_active_step_index]
+	quest_step_advanced.emit(_active_quest_id, _active_step_index, String(step.get("text", "")))
+	quest_state_changed.emit()

game/scenes/Quests/quest_manager.gd.uid

@@ -0,0 +1 @@
+uid://b80hb20j8plpj

game/scenes/Quests/quest_trigger_area.gd

@@ -0,0 +1,37 @@
+extends Area3D
+
+@export var event_name: StringName = &""
+@export var target_group: StringName = &"player"
+@export var quest_id_filter: String = ""
+@export var one_shot: bool = true
+
+var _triggered := false
+
+
+func _ready() -> void:
+	body_entered.connect(_on_body_entered)
+
+
+func reset_trigger() -> void:
+	_triggered = false
+	set_deferred("monitoring", true)
+
+
+func _on_body_entered(body: Node) -> void:
+	if one_shot and _triggered:
+		return
+	if target_group != StringName() and not body.is_in_group(target_group):
+		return
+	if event_name == StringName():
+		return
+	if quest_id_filter.strip_edges() != "":
+		if QuestManager == null or QuestManager.get_active_quest_id() != StringName(quest_id_filter):
+			return
+	if QuestManager:
+		QuestManager.emit_event(event_name, {
+			"body": body,
+			"source": self,
+		})
+	if one_shot:
+		_triggered = true
+		set_deferred("monitoring", false)

game/scenes/Quests/quest_trigger_area.gd.uid

@@ -0,0 +1 @@
+uid://cshtdpjp4xy2f

game/scenes/UI/dialog_system.gd

@@ -3,6 +3,7 @@ extends CanvasLayer
 var _interactables: Array[Node] = []
 var _active_interactable: Node = null
 var _dialog_visible := false
+var _dialog_source: Node = null
 
 var _prompt_label: Label
 var _dialog_panel: PanelContainer
@@ -38,8 +39,6 @@ func unregister_interactable(interactable: Node) -> void:
 	if interactable == null:
 		return
 	_interactables.erase(interactable)
-	if _active_interactable == interactable and _dialog_visible:
-		_set_dialog_visible(false)
 	_refresh_active_interactable()
 
 
@@ -47,20 +46,27 @@ func _refresh_active_interactable() -> void:
 	while _interactables.size() > 0 and not is_instance_valid(_interactables[_interactables.size() - 1]):
 		_interactables.pop_back()
 	_active_interactable = _interactables[_interactables.size() - 1] if _interactables.size() > 0 else null
-	if _dialog_visible and _active_interactable != null:
-		_dialog_label.text = _get_dialog_text(_active_interactable)
 	_update_prompt_visibility()
 
 
 func _open_dialog_for(interactable: Node) -> void:
 	if _dialog_label:
 		_dialog_label.text = _get_dialog_text(interactable)
+	_dialog_source = interactable
 	_set_dialog_visible(true)
 
 
 func show_text(text: String) -> void:
 	if _dialog_label:
 		_dialog_label.text = text
+	_dialog_source = null
+	_set_dialog_visible(true)
+
+
+func show_text_from(source: Node, text: String) -> void:
+	if _dialog_label:
+		_dialog_label.text = text
+	_dialog_source = source
 	_set_dialog_visible(true)
 
 
@@ -74,8 +80,26 @@ func close_if_text(expected_text: String) -> void:
 	_set_dialog_visible(false)
 
 
+func is_dialog_open() -> bool:
+	return _dialog_visible
+
+
+func is_dialog_open_from(source: Node) -> bool:
+	return _dialog_visible and _dialog_source == source
+
+
+func close_if_source(source: Node) -> void:
+	if not _dialog_visible:
+		return
+	if _dialog_source != source:
+		return
+	_set_dialog_visible(false)
+
+
 func _set_dialog_visible(dialog_open: bool) -> void:
 	_dialog_visible = dialog_open
+	if not _dialog_visible:
+		_dialog_source = null
 	if _dialog_panel:
 		_dialog_panel.visible = _dialog_visible
 	_update_prompt_visibility()

game/scenes/UI/start_screen.gd

@@ -64,3 +64,6 @@ func _update_login_button() -> void:
 		_login_button.text = "LOG OUT"
 	else:
 		_login_button.text = "LOG IN"
+
+func _on_secret_button_pressed():
+	get_tree().change_scene_to_file("uid://q4abhlwqdvay")

game/scenes/UI/start_screen.tscn

@@ -90,6 +90,14 @@ size_flags_vertical = 4
 theme = ExtResource("1_tx5wa")
 text = "QUIT"
 
+[node name="SecretButton" type="Button" parent="."]
+show_behind_parent = true
+layout_mode = 0
+offset_left = 840.0
+offset_top = 142.0
+offset_right = 856.0
+offset_bottom = 159.0
+
 [node name="LogoutRequest" type="HTTPRequest" parent="."]
 unique_name_in_owner = true
 
@@ -97,4 +105,5 @@ unique_name_in_owner = true
 [connection signal="pressed" from="MarginContainer/CenterContainer/ContentVBox/VBoxContainer/StartButton" to="." method="_on_start_button_pressed"]
 [connection signal="pressed" from="MarginContainer/CenterContainer/ContentVBox/VBoxContainer/SettingsButton" to="." method="_on_settings_button_pressed"]
 [connection signal="pressed" from="MarginContainer/CenterContainer/ContentVBox/VBoxContainer/QuitButton" to="." method="_on_quit_button_pressed"]
+[connection signal="pressed" from="SecretButton" to="." method="_on_secret_button_pressed"]
 [connection signal="request_completed" from="LogoutRequest" to="." method="_on_logout_request_completed"]

game/scenes/Vehicles/car.gd

@@ -22,6 +22,7 @@ var _nearby_driver: Node = null
 var _driver: Node = null
 
 func _ready() -> void:
+	add_to_group("vehicle")
 	if interact_area:
 		interact_area.collision_layer = 2
 		interact_area.collision_mask = 1

game/scenes/player.gd

@@ -2,6 +2,8 @@ extends RigidBody3D
 # Initially I used a CharacterBody3D, however, I wanted the player to bounce off
 # other objects in the environment and that would have required manual handling
 # of collisions. So that's why we're using a RigidBody3D instead.
+signal vehicle_entered(vehicle: Node)
+signal vehicle_exited(vehicle: Node)
 
 const MOVE_SPEED := 8.0
 const SPRINT_MOVE_SPEED :=13
@@ -31,6 +33,7 @@ var _light_was_on := false
 var _jump_triggered := false
 @onready var _flashlight: SpotLight3D = $SpotLight3D
 @onready var _anim_player: AnimationPlayer = find_child("AnimationPlayer", true, false) as AnimationPlayer
+@onready var _anim_tree: AnimationTree = find_child("AnimationTree", true, false) as AnimationTree
 @onready var _model_root: Node3D = find_child("TestCharAnimated", true, false) as Node3D
 
 @export var camera_follow_speed := 10.0
@@ -52,6 +55,8 @@ var phone_visible := false
 
 func _ready() -> void:
 	add_to_group("player")
+	if _anim_tree:
+		_anim_tree.active = false
 	axis_lock_angular_x = true
 	axis_lock_angular_z = true
 	angular_damp = 6.0
@@ -94,11 +99,6 @@ func _integrate_forces(state):
 	# Input as 2D vector
 	var input2v := Input.get_vector("ui_left", "ui_right", "ui_up", "ui_down")
 
-	if Input.is_action_just_pressed("player_phone"):
-		phone_visible = !phone_visible
-		if phone:
-			phone.visible = phone_visible
-	
 	# Camera based movement
 	var forward := Vector3.FORWARD * -1.0
 	var right := Vector3.RIGHT
@@ -157,6 +157,12 @@ func _integrate_forces(state):
 	_jump_triggered = false
 
 func _input(event):
+	if event.is_action_pressed("player_phone"):
+		phone_visible = !phone_visible
+		if phone:
+			phone.visible = phone_visible
+		return
+
 	if _in_vehicle:
 		return
 	if event is InputEventMouseButton:
@@ -197,8 +203,8 @@ func _update_animation(on_floor: bool, velocity: Vector3) -> void:
 			_anim_player.play(anim_jump_name)
 		return
 	if on_floor and horizontal_speed > anim_sprint_speed_threshold and _anim_player.has_animation(anim_run_name):
-		if _anim_player.current_animation != anim_walk_name:
+		if _anim_player.current_animation != anim_run_name:
-			_anim_player.play(anim_walk_name)
+			_anim_player.play(anim_run_name)
 		return
 	if horizontal_speed > anim_walk_speed_threshold and _anim_player.has_animation(anim_walk_name):
 		if _anim_player.current_animation != anim_walk_name:
@@ -226,6 +232,7 @@ func enter_vehicle(_vehicle: Node, seat: Node3D, vehicle_camera: Camera3D) -> vo
 		cam.current = false
 	if vehicle_camera:
 		vehicle_camera.current = true
+	vehicle_entered.emit(_vehicle)
 
 func exit_vehicle(exit_point: Node3D, vehicle_camera: Camera3D) -> void:
 	_in_vehicle = false
@@ -245,3 +252,4 @@ func exit_vehicle(exit_point: Node3D, vehicle_camera: Camera3D) -> void:
 		vehicle_camera.current = false
 	if cam:
 		cam.current = true
+	vehicle_exited.emit(null)