Merge pull request 'Adding simple dialog system' (#8) from dialog into main

Reviewed-on: #8

game/project.godot

@@ -26,6 +26,7 @@ MenuSfx="*res://scenes/UI/menu_sfx.tscn"
 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"
 
 [dotnet]
 

game/scenes/Characters/repo_bot.tscn

@@ -1,6 +1,7 @@
 [gd_scene load_steps=14 format=3]
 
 [ext_resource type="Script" path="res://scenes/Characters/repo_bot.gd" id="1_repo_bot"]
+[ext_resource type="Script" path="res://scenes/Interaction/dialog_trigger_area.gd" id="2_dialog"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_body"]
 albedo_color = Color(0.78, 0.8, 0.82, 1)
@@ -54,6 +55,9 @@ material = SubResource("StandardMaterial3D_accent")
 radius = 0.3
 height = 1.1
 
+[sub_resource type="SphereShape3D" id="SphereShape3D_interact"]
+radius = 1.7
+
 [node name="RepoBot" type="Node3D"]
 script = ExtResource("1_repo_bot")
 
@@ -114,3 +118,14 @@ mesh = SubResource("CylinderMesh_limb")
 [node name="Backpack" type="MeshInstance3D" parent="Body"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0.22)
 mesh = SubResource("BoxMesh_pack")
+
+[node name="InteractArea" type="Area3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 0)
+script = ExtResource("2_dialog")
+collision_layer = 2
+collision_mask = 1
+prompt_text = "Press E to talk"
+dialog_text = "Repo Bot: Welcome to Promiscuity.\n\nPress E again to close this dialog."
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="InteractArea"]
+shape = SubResource("SphereShape3D_interact")

game/scenes/Interaction/dialog_trigger_area.gd

@@ -0,0 +1,49 @@
+extends Area3D
+
+@export var target_group: StringName = &"player"
+@export var prompt_text := "Press E to talk"
+@export_multiline var dialog_text := ""
+@export var auto_popup := false
+@export_enum("Every Entry", "Once") var auto_popup_mode := 0
+
+var _has_triggered := false
+
+func _ready() -> void:
+	collision_layer = 2
+	collision_mask = 1
+	body_entered.connect(_on_body_entered)
+	body_exited.connect(_on_body_exited)
+
+
+func _exit_tree() -> void:
+	if not auto_popup and DialogSystem:
+		DialogSystem.unregister_interactable(self)
+
+
+func _on_body_entered(body: Node) -> void:
+	if not (target_group == StringName() or body.is_in_group(target_group)):
+		return
+	if auto_popup:
+		if auto_popup_mode == 1 and _has_triggered:
+			return
+		_has_triggered = true
+		if DialogSystem and DialogSystem.has_method("show_text"):
+			DialogSystem.show_text(dialog_text)
+		return
+	if DialogSystem:
+		DialogSystem.register_interactable(self)
+
+
+func _on_body_exited(body: Node) -> void:
+	if auto_popup:
+		return
+	if target_group == StringName() or body.is_in_group(target_group):
+		DialogSystem.unregister_interactable(self)
+
+
+func get_dialog_prompt() -> String:
+	return prompt_text
+
+
+func get_dialog_text() -> String:
+	return dialog_text

game/scenes/Interaction/dialog_trigger_area.gd.uid

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

game/scenes/Levels/level.gd

@@ -2,12 +2,24 @@ extends Node3D
 
 @export var day_length := 120.0 # seconds for full rotation
 @export var start_light_angle := -90.0
+@export var show_spawn_dialog := true
+@export_multiline var spawn_dialog_text := "Welcome to Promiscuity.\n\nPress E to close this message."
+@export var spawn_dialog_auto_close_seconds := 4.0
 var end_light_angle = start_light_angle + 360.0
 var start_radians = start_light_angle * PI / 180
 var time := 0.0
 
 @onready var sun := $DirectionalLight3D
 
+func _ready() -> void:
+	if show_spawn_dialog and DialogSystem and DialogSystem.has_method("show_text"):
+		await get_tree().process_frame
+		DialogSystem.show_text(spawn_dialog_text)
+		if spawn_dialog_auto_close_seconds > 0.0:
+			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)
+
 func _process(delta):
 	time = fmod((time + delta), day_length)
 	var t = time / day_length

game/scenes/Levels/level.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=3 uid="uid://dchj6g2i8ebph"]
+[gd_scene load_steps=23 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"]
@@ -6,8 +6,9 @@
 [ext_resource type="PackedScene" uid="uid://c5of6aaxop1hl" path="res://scenes/block.tscn" id="2_tc7dm"]
 [ext_resource type="Script" uid="uid://b7fopt7sx74g8" path="res://scenes/Levels/menu.gd" id="3_tc7dm"]
 [ext_resource type="PackedScene" path="res://scenes/Characters/repo_bot.tscn" id="4_repo"]
-[ext_resource type="PackedScene" uid="uid://bnqaqbgynoyys" path="res://assets/models/TestCharAnimated.glb" id="5_fi66n"]
 [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"]
 
 [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_2q6dc"]
 bounce = 0.5
@@ -21,6 +22,20 @@ bounce = 0.5
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_mx8sn"]
 
+[sub_resource type="SphereShape3D" id="SphereShape3D_dialog_zone"]
+radius = 2.5
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dialog_zone"]
+transparency = 1
+cull_mode = 2
+shading_mode = 0
+albedo_color = Color(0.2, 0.8, 0.35, 0.18)
+
+[sub_resource type="SphereMesh" id="SphereMesh_dialog_zone"]
+material = SubResource("StandardMaterial3D_dialog_zone")
+radius = 2.5
+height = 5.0
+
 [sub_resource type="BoxShape3D" id="BoxShape3D_2q6dc"]
 size = Vector3(1080, 2, 1080)
 
@@ -62,6 +77,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 mesh = SubResource("SphereMesh_w7c3h")
 
 [node name="Player" type="RigidBody3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.6563287, 0, 0)
 physics_material_override = SubResource("PhysicsMaterial_w8frs")
 script = ExtResource("1_muv8p")
 camera_path = NodePath("Camera3D")
@@ -71,27 +87,27 @@ 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.0026170756, -0.0012418391, -0.98996276)
-bones/0/rotation = Quaternion(-0.7278173, -0.05346041, 0.012412205, 0.6835714)
+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.031655744, 0.011362745, 0.022744056, 0.9991754)
+bones/1/rotation = Quaternion(-0.03163086, 0.011397719, 0.022761386, 0.9991754)
 bones/2/position = Vector3(-2.2989244e-10, 0.117319785, 2.9730852e-08)
-bones/2/rotation = Quaternion(0.010291794, 0.001169461, 0.013815534, 0.9998509)
+bones/2/rotation = Quaternion(0.0102874795, 0.0011603195, 0.013812066, 0.99985105)
 bones/3/position = Vector3(-2.3358266e-09, 0.13458829, -1.382244e-08)
-bones/3/rotation = Quaternion(0.067557335, 0.0021622085, 0.013776206, 0.99761796)
+bones/3/rotation = Quaternion(0.06755522, 0.0021543663, 0.013774819, 0.99761814)
 bones/4/position = Vector3(2.508626e-07, 0.15027755, 0.008779066)
-bones/4/rotation = Quaternion(0.051882792, -0.00090027065, 0.0039363643, 0.998645)
+bones/4/rotation = Quaternion(0.051899955, -0.00089839776, 0.0039267424, 0.9986442)
 bones/5/position = Vector3(2.152588e-08, 0.103218146, 0.03142428)
-bones/5/rotation = Quaternion(-0.06595954, 0.011917545, -0.0014885183, 0.99775004)
+bones/5/rotation = Quaternion(-0.06595736, 0.011938445, -0.0014933152, 0.9977499)
 bones/6/position = Vector3(1.5477327e-06, 0.18474667, 0.06636399)
 bones/7/position = Vector3(0.061058242, 0.09106279, 0.0075706206)
-bones/7/rotation = Quaternion(-0.5982132, -0.43452233, 0.50765175, -0.4422909)
+bones/7/rotation = Quaternion(-0.598225, -0.43451372, 0.5076822, -0.44224826)
 bones/8/position = Vector3(1.1842036e-08, 0.12922287, 5.2578955e-08)
-bones/8/rotation = Quaternion(0.5434686, 0.18407291, 0.20301422, 0.7934383)
+bones/8/rotation = Quaternion(0.543452, 0.18399428, 0.20302251, 0.79346573)
 bones/9/position = Vector3(1.5054144e-07, 0.2740467, 2.2048344e-08)
-bones/9/rotation = Quaternion(-5.192343e-09, -1.1239315e-06, 0.01273731, 0.99991894)
+bones/9/rotation = Quaternion(-5.2907154e-09, -1.1239725e-06, 0.012734968, 0.999919)
 bones/10/position = Vector3(1.9432857e-08, 0.27614468, 9.6609995e-08)
-bones/10/rotation = Quaternion(0.048323337, -0.28487536, 0.026756868, 0.9569718)
+bones/10/rotation = Quaternion(0.04830448, -0.2848921, 0.026799988, 0.9569665)
 bones/11/position = Vector3(-0.030029751, 0.037888147, 0.021671427)
 bones/11/rotation = Quaternion(0.2098604, -0.059559863, 0.20750383, 0.9536002)
 bones/12/position = Vector3(-3.3527822e-08, 0.0474497, -1.48403245e-08)
@@ -128,13 +144,13 @@ bones/29/position = Vector3(1.195453e-08, 0.02594832, 1.5542597e-08)
 bones/29/rotation = Quaternion(0.14350323, 3.322942e-05, -0.014478063, 0.98954403)
 bones/30/position = Vector3(-2.4944999e-08, 0.029238665, 6.2325825e-08)
 bones/31/position = Vector3(-0.06105696, 0.09106397, 0.007570758)
-bones/31/rotation = Quaternion(0.60009927, -0.4346891, 0.52418536, 0.4197095)
+bones/31/rotation = Quaternion(0.60012215, -0.43466684, 0.5242142, 0.41966385)
 bones/32/position = Vector3(2.116817e-08, 0.12922288, 7.016769e-08)
-bones/32/rotation = Quaternion(0.46432823, -0.26300937, -0.23269261, 0.813068)
+bones/32/rotation = Quaternion(0.46436408, -0.26298717, -0.23268588, 0.8130566)
 bones/33/position = Vector3(-2.350565e-08, 0.27404687, 1.5161348e-08)
-bones/33/rotation = Quaternion(7.667138e-08, -5.0620065e-06, -0.058376648, 0.99829465)
+bones/33/rotation = Quaternion(7.69042e-08, -5.0622584e-06, -0.058380682, 0.9982944)
 bones/34/position = Vector3(1.3629875e-07, 0.27614468, -9.158248e-09)
-bones/34/rotation = Quaternion(0.059040155, 0.17509013, -0.005968382, 0.9827626)
+bones/34/rotation = Quaternion(0.059025347, 0.17513894, -0.005969527, 0.9827547)
 bones/35/position = Vector3(0.030029776, 0.03788806, 0.021671649)
 bones/35/rotation = Quaternion(0.21378386, 0.065372065, -0.22564878, 0.94821185)
 bones/36/position = Vector3(-2.7939748e-09, 0.04744962, -1.7240383e-08)
@@ -171,23 +187,24 @@ bones/53/position = Vector3(1.4340932e-08, 0.025948457, 3.3946527e-08)
 bones/53/rotation = Quaternion(0.14377311, 5.8452275e-07, 0.011701506, 0.98954153)
 bones/54/position = Vector3(4.750415e-09, 0.029238641, -1.2388978e-09)
 bones/55/position = Vector3(0.09123873, -0.06657194, -0.0005540352)
-bones/55/rotation = Quaternion(0.13601132, 0.07838244, 0.9844897, -0.07834015)
+bones/55/rotation = Quaternion(0.136, 0.07837879, 0.98449296, -0.07832257)
 bones/56/position = Vector3(-1.3288446e-09, 0.40599436, 1.0443015e-08)
-bones/56/rotation = Quaternion(-0.13252214, -0.014519276, 0.03215593, 0.99055195)
+bones/56/rotation = Quaternion(-0.1325433, -0.014470397, 0.03215335, 0.9905499)
 bones/57/position = Vector3(5.707578e-09, 0.42099008, -1.5425995e-08)
-bones/57/rotation = Quaternion(0.5344839, -0.021701135, -0.027458949, 0.8444537)
+bones/57/rotation = Quaternion(0.5344709, -0.021695312, -0.027452054, 0.8444624)
 bones/58/position = Vector3(-6.5650525e-09, 0.15721555, -2.6694579e-08)
 bones/58/rotation = Quaternion(0.2693438, -0.032380052, -0.014592491, 0.96238893)
 bones/59/position = Vector3(2.4854705e-08, 0.09999996, -3.1755625e-09)
 bones/60/position = Vector3(-0.091250315, -0.066556, -0.0005535231)
-bones/60/rotation = Quaternion(-0.09026457, -0.016758345, 0.9954146, -0.026857648)
+bones/60/rotation = Quaternion(-0.09026675, -0.016730117, 0.9954149, -0.026855767)
 bones/61/position = Vector3(1.3129254e-08, 0.40599442, 3.8557886e-09)
-bones/61/rotation = Quaternion(-0.07401098, 0.084030755, -0.024547135, 0.99340767)
+bones/61/rotation = Quaternion(-0.07409451, 0.08402694, -0.024555309, 0.9934016)
 bones/62/position = Vector3(-7.3885964e-10, 0.42099023, -5.226429e-09)
-bones/62/rotation = Quaternion(0.56540585, 0.011310213, -0.008501466, 0.8246915)
+bones/62/rotation = Quaternion(0.5654398, 0.01134551, -0.008516049, 0.8246677)
 bones/63/position = Vector3(7.93632e-09, 0.1572156, -2.6982683e-10)
-bones/63/rotation = Quaternion(0.28907102, 0.031904068, 0.014082117, 0.9566723)
+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="CollisionShape3D" type="CollisionShape3D" parent="Player"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
 shape = SubResource("SphereShape3D_mx8sn")
@@ -201,6 +218,32 @@ fov = 49.0
 
 [node name="Car" parent="." instance=ExtResource("5_car")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6, 0, -3)
+
+[node name="DialogZone" type="Area3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 0, -2.5)
+script = ExtResource("6_dialog")
+prompt_text = "Press E to inspect area"
+dialog_text = "Dialog trigger area"
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogZone"]
+shape = SubResource("SphereShape3D_dialog_zone")
+
+[node name="Visual" type="MeshInstance3D" parent="DialogZone"]
+mesh = SubResource("SphereMesh_dialog_zone")
+
+[node name="AutoDialogZone" type="Area3D" parent="."]
+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
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="AutoDialogZone"]
+shape = SubResource("SphereShape3D_dialog_zone")
+
+[node name="Visual" type="MeshInstance3D" parent="AutoDialogZone"]
+transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0)
+mesh = SubResource("SphereMesh_dialog_zone")
+
 [node name="Ground" type="StaticBody3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
 

game/scenes/UI/dialog_system.gd

@@ -0,0 +1,146 @@
+extends CanvasLayer
+
+var _interactables: Array[Node] = []
+var _active_interactable: Node = null
+var _dialog_visible := false
+
+var _prompt_label: Label
+var _dialog_panel: PanelContainer
+var _dialog_label: RichTextLabel
+
+func _ready() -> void:
+	layer = 50
+	process_mode = Node.PROCESS_MODE_ALWAYS
+	_setup_ui()
+	_set_dialog_visible(false)
+	_update_prompt_visibility()
+
+
+func _process(_delta: float) -> void:
+	if Input.is_action_just_pressed("interact"):
+		if _dialog_visible:
+			_set_dialog_visible(false)
+			return
+		if _active_interactable != null:
+			_open_dialog_for(_active_interactable)
+
+
+func register_interactable(interactable: Node) -> void:
+	if interactable == null:
+		return
+	if _interactables.has(interactable):
+		return
+	_interactables.append(interactable)
+	_refresh_active_interactable()
+
+
+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()
+
+
+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)
+	_set_dialog_visible(true)
+
+
+func show_text(text: String) -> void:
+	if _dialog_label:
+		_dialog_label.text = text
+	_set_dialog_visible(true)
+
+
+func close_if_text(expected_text: String) -> void:
+	if not _dialog_visible:
+		return
+	if _dialog_label == null:
+		return
+	if _dialog_label.text != expected_text:
+		return
+	_set_dialog_visible(false)
+
+
+func _set_dialog_visible(dialog_open: bool) -> void:
+	_dialog_visible = dialog_open
+	if _dialog_panel:
+		_dialog_panel.visible = _dialog_visible
+	_update_prompt_visibility()
+
+
+func _update_prompt_visibility() -> void:
+	if _prompt_label == null:
+		return
+	var has_active := _active_interactable != null
+	_prompt_label.visible = has_active and not _dialog_visible
+	if _prompt_label.visible:
+		_prompt_label.text = _get_prompt_text(_active_interactable)
+
+
+func _get_prompt_text(interactable: Node) -> String:
+	if interactable == null:
+		return ""
+	if interactable.has_method("get_dialog_prompt"):
+		return String(interactable.call("get_dialog_prompt"))
+	return "Press E to interact"
+
+
+func _get_dialog_text(interactable: Node) -> String:
+	if interactable == null:
+		return ""
+	if interactable.has_method("get_dialog_text"):
+		return String(interactable.call("get_dialog_text"))
+	return "..."
+
+
+func _setup_ui() -> void:
+	var root := Control.new()
+	root.name = "DialogRoot"
+	root.set_anchors_preset(Control.PRESET_FULL_RECT)
+	root.mouse_filter = Control.MOUSE_FILTER_IGNORE
+	add_child(root)
+
+	_prompt_label = Label.new()
+	_prompt_label.name = "PromptLabel"
+	_prompt_label.set_anchors_preset(Control.PRESET_CENTER_BOTTOM)
+	_prompt_label.offset_left = -140.0
+	_prompt_label.offset_top = -64.0
+	_prompt_label.offset_right = 140.0
+	_prompt_label.offset_bottom = -36.0
+	_prompt_label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
+	_prompt_label.mouse_filter = Control.MOUSE_FILTER_IGNORE
+	_prompt_label.text = "Press E to interact"
+	root.add_child(_prompt_label)
+
+	_dialog_panel = PanelContainer.new()
+	_dialog_panel.name = "DialogPanel"
+	_dialog_panel.visible = false
+	_dialog_panel.set_anchors_preset(Control.PRESET_CENTER_BOTTOM)
+	_dialog_panel.offset_left = -300.0
+	_dialog_panel.offset_top = -220.0
+	_dialog_panel.offset_right = 300.0
+	_dialog_panel.offset_bottom = -80.0
+	_dialog_panel.mouse_filter = Control.MOUSE_FILTER_IGNORE
+	root.add_child(_dialog_panel)
+
+	_dialog_label = RichTextLabel.new()
+	_dialog_label.name = "DialogText"
+	_dialog_label.custom_minimum_size = Vector2(560.0, 120.0)
+	_dialog_label.fit_content = true
+	_dialog_label.scroll_active = false
+	_dialog_label.bbcode_enabled = true
+	_dialog_label.text = ""
+	_dialog_panel.add_child(_dialog_label)

game/scenes/UI/dialog_system.gd.uid

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

game/scenes/player.gd

@@ -51,6 +51,7 @@ var audio_player = AudioStreamPlayer.new()
 var phone_visible := false
 
 func _ready() -> void:
+	add_to_group("player")
 	axis_lock_angular_x = true
 	axis_lock_angular_z = true
 	angular_damp = 6.0