Merge remote-tracking branch 'origin/main'

UI/dialogue/dialogue.gd

@@ -6,6 +6,10 @@ class_name Dialogue
 @export var llm_output: RichTextLabel
 @export var llm_input: TextEdit
 @onready var character_texture: TextureRect = $Character
+@onready var send_button: Button = $HBoxContainer/send_button
+@onready var close_button: Button = $HBoxContainer/close_button
+
+
 var npc_data_cur = null
 var npc = null
 
@@ -38,7 +42,8 @@ func _process(_delta: float) -> void:
 			npc_data_cur = npc.data
 			#llm_input.grab_focus()
 
-
+	send_button.disabled = LLM.talking
+	close_button.disabled = LLM.talking
 
 	pass
 
@@ -64,6 +69,7 @@ func set_focus_input():
 		llm_input.grab_focus()
 
 func close():
+	if LLM.talking: return
 	WorldState.PLAYER.can_move = true
 	npc_data_cur = null
 	visible = false
@@ -72,6 +78,7 @@ func close():
 	clear()
 
 func talk():
+	if LLM.talking: return
 	var text = LLM.Dialog.llm_input.text
 	if text.strip_edges() != "":
 		LLM.talk_npc(LLM.Dialog.llm_input.text)

UI/dialogue/dialogue.tscn

@@ -92,14 +92,14 @@ caret_multiple = false
 script = ExtResource("6_b8ddn")
 metadata/_edit_use_anchors_ = true
 
-[node name="Button" type="Button" parent="HBoxContainer"]
+[node name="send_button" type="Button" parent="HBoxContainer"]
 custom_minimum_size = Vector2(64, 0)
 layout_mode = 2
 size_flags_horizontal = 4
 theme = ExtResource("3_l0jdm")
 text = "Send"
 
-[node name="Button2" type="Button" parent="HBoxContainer"]
+[node name="close_button" type="Button" parent="HBoxContainer"]
 custom_minimum_size = Vector2(64, 0)
 layout_mode = 2
 size_flags_horizontal = 4
@@ -109,5 +109,5 @@ theme_override_styles/hover = ExtResource("5_c31cj")
 theme_override_styles/normal = ExtResource("5_c31cj")
 text = "Close"
 
-[connection signal="pressed" from="HBoxContainer/Button" to="." method="_on_button_pressed"]
-[connection signal="pressed" from="HBoxContainer/Button2" to="." method="_on_button_2_pressed"]
+[connection signal="pressed" from="HBoxContainer/send_button" to="." method="_on_button_pressed"]
+[connection signal="pressed" from="HBoxContainer/close_button" to="." method="_on_button_2_pressed"]

assets/audio/SFX/mixkit-epic-orchestra-transition-2290.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dhods4dx6bsd3"
+path="res://.godot/imported/mixkit-epic-orchestra-transition-2290.mp3-6994639ab5db94f3546483067508ee63.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/SFX/mixkit-epic-orchestra-transition-2290.mp3"
+dest_files=["res://.godot/imported/mixkit-epic-orchestra-transition-2290.mp3-6994639ab5db94f3546483067508ee63.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/SFX/mixkit-futuristic-door-opening-906.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://boqytf0wki112"
+path="res://.godot/imported/mixkit-futuristic-door-opening-906.mp3-059a1b5d87662a1c9fb5857c533104f1.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/SFX/mixkit-futuristic-door-opening-906.mp3"
+dest_files=["res://.godot/imported/mixkit-futuristic-door-opening-906.mp3-059a1b5d87662a1c9fb5857c533104f1.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/SFX/mixkit-technological-futuristic-hum-2133.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://c22tr4ys4m1cy"
+path="res://.godot/imported/mixkit-technological-futuristic-hum-2133.wav-834dc3109ce277c2c3052422681df8ae.sample"
+
+[deps]
+
+source_file="res://assets/audio/SFX/mixkit-technological-futuristic-hum-2133.wav"
+dest_files=["res://.godot/imported/mixkit-technological-futuristic-hum-2133.wav-834dc3109ce277c2c3052422681df8ae.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

assets/audio/SFX/mixkit-wrong-answer-mech-styled-3159.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://s6d233vj0nv8"
+path="res://.godot/imported/mixkit-wrong-answer-mech-styled-3159.wav-444d73d9ed4f22d4f1bc71886713c5a8.sample"
+
+[deps]
+
+source_file="res://assets/audio/SFX/mixkit-wrong-answer-mech-styled-3159.wav"
+dest_files=["res://.godot/imported/mixkit-wrong-answer-mech-styled-3159.wav-444d73d9ed4f22d4f1bc71886713c5a8.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

assets/audio/SFX/zapsplat_science_fiction_door_code_unlock_accept_001_61688.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://cvk7x4ohkic4e"
+path="res://.godot/imported/zapsplat_science_fiction_door_code_unlock_accept_001_61688.mp3-92b89c7ed8e13216c4055f053c681d76.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/SFX/zapsplat_science_fiction_door_code_unlock_accept_001_61688.mp3"
+dest_files=["res://.godot/imported/zapsplat_science_fiction_door_code_unlock_accept_001_61688.mp3-92b89c7ed8e13216c4055f053c681d76.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/SFX/zapsplat_science_fiction_door_open_slide_001_63411.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dvq8lk63ox6lu"
+path="res://.godot/imported/zapsplat_science_fiction_door_open_slide_001_63411.mp3-868461c182dff27b3d2d81a203397cd0.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/SFX/zapsplat_science_fiction_door_open_slide_001_63411.mp3"
+dest_files=["res://.godot/imported/zapsplat_science_fiction_door_open_slide_001_63411.mp3-868461c182dff27b3d2d81a203397cd0.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/SFX/zapsplat_science_fiction_door_open_slide_002_63412.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://jl3a8in5khj2"
+path="res://.godot/imported/zapsplat_science_fiction_door_open_slide_002_63412.mp3-bf08d97e01b3864d49aa2f6e23bc2826.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/SFX/zapsplat_science_fiction_door_open_slide_002_63412.mp3"
+dest_files=["res://.godot/imported/zapsplat_science_fiction_door_open_slide_002_63412.mp3-bf08d97e01b3864d49aa2f6e23bc2826.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/soundtrack/mixkit-melodical-flute-music-notification-2310.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cksvva2c8jgus"
+path="res://.godot/imported/mixkit-melodical-flute-music-notification-2310.wav-f83191eddac69be4e9b4848e5b1732a3.sample"
+
+[deps]
+
+source_file="res://assets/audio/soundtrack/mixkit-melodical-flute-music-notification-2310.wav"
+dest_files=["res://.godot/imported/mixkit-melodical-flute-music-notification-2310.wav-f83191eddac69be4e9b4848e5b1732a3.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

assets/audio/soundtrack/zapsplat_science_fiction_door_open_slide_002_63412.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://k0rpg8r4fxpw"
+path="res://.godot/imported/zapsplat_science_fiction_door_open_slide_002_63412.mp3-aa48d6be25d88de97c29ec1bb85b9471.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/soundtrack/zapsplat_science_fiction_door_open_slide_002_63412.mp3"
+dest_files=["res://.godot/imported/zapsplat_science_fiction_door_open_slide_002_63412.mp3-aa48d6be25d88de97c29ec1bb85b9471.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/shaders/ColAdjustement.gdshader

@@ -13,7 +13,7 @@ float luminance(vec3 color) {
 
 void fragment() {
     vec4 color = texture(TEXTURE, UV);
-    
+
     // Adjust brightness
     color.rgb += brightness;
 

elements/doors/DoorMedVert.tscn

@@ -1,8 +1,20 @@
-[gd_scene load_steps=7 format=3 uid="uid://b4iaaacfaffpx"]
+[gd_scene load_steps=11 format=3 uid="uid://b4iaaacfaffpx"]
 
 [ext_resource type="Script" path="res://elements/doors/door.gd" id="1_sbqg6"]
 [ext_resource type="Texture2D" uid="uid://chuwqxcpxuv1q" path="res://assets/bitmaps/tilesets/SpcStationObjcts.png" id="1_wf3gn"]
 
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_i5pvj"]
+size = Vector2(16, 96)
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_doodw"]
+size = Vector2(32, 128)
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_gm7oq"]
+size = Vector2(96, 40)
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_5sw3t"]
+size = Vector2(96, 56)
+
 [sub_resource type="AtlasTexture" id="AtlasTexture_h36ac"]
 atlas = ExtResource("1_wf3gn")
 region = Rect2(128, 64, 32, 96)
@@ -11,34 +23,71 @@ region = Rect2(128, 64, 32, 96)
 atlas = ExtResource("1_wf3gn")
 region = Rect2(160, 64, 32, 96)
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_i5pvj"]
-size = Vector2(16, 96)
+[sub_resource type="AtlasTexture" id="AtlasTexture_1v6qy"]
+atlas = ExtResource("1_wf3gn")
+region = Rect2(80, 16, 96, 48)
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_doodw"]
-size = Vector2(32, 128)
+[sub_resource type="AtlasTexture" id="AtlasTexture_dnrum"]
+atlas = ExtResource("1_wf3gn")
+region = Rect2(192, 16, 96, 48)
 
 [node name="Door" type="Node2D"]
 script = ExtResource("1_sbqg6")
 
-[node name="open" type="TextureRect" parent="."]
+[node name="VertMedClose_area" type="StaticBody2D" parent="."]
+
+[node name="close_shape" type="CollisionShape2D" parent="VertMedClose_area"]
+position = Vector2(16, -48)
+shape = SubResource("RectangleShape2D_i5pvj")
+disabled = true
+
+[node name="VertMedInteraction_area" type="Area2D" parent="."]
+position = Vector2(0, -64)
+
+[node name="interaction_shape" type="CollisionShape2D" parent="VertMedInteraction_area"]
+position = Vector2(16, 0)
+shape = SubResource("RectangleShape2D_doodw")
+disabled = true
+
+[node name="HorMedClose_area" type="StaticBody2D" parent="."]
+
+[node name="close_shape" type="CollisionShape2D" parent="HorMedClose_area"]
+position = Vector2(56, -20)
+shape = SubResource("RectangleShape2D_gm7oq")
+disabled = true
+
+[node name="HorMedInteraction_area" type="Area2D" parent="."]
+position = Vector2(0, -64)
+
+[node name="interaction_shape" type="CollisionShape2D" parent="HorMedInteraction_area"]
+position = Vector2(56, 44)
+shape = SubResource("RectangleShape2D_5sw3t")
+disabled = true
+
+[node name="VertMedOpen" type="TextureRect" parent="."]
+visible = false
 offset_top = -96.0
 offset_right = 40.0
 texture = SubResource("AtlasTexture_h36ac")
 
-[node name="close" type="TextureRect" parent="."]
+[node name="VertMedClose" type="TextureRect" parent="."]
+visible = false
 offset_top = -96.0
 offset_right = 40.0
 texture = SubResource("AtlasTexture_xyol6")
 
-[node name="close_area" type="StaticBody2D" parent="."]
-
-[node name="close_shape" type="CollisionShape2D" parent="close_area"]
-position = Vector2(16, -48)
-shape = SubResource("RectangleShape2D_i5pvj")
-
-[node name="interaction_area" type="Area2D" parent="."]
-position = Vector2(0, -64)
+[node name="HortMedOpen" type="TextureRect" parent="."]
+visible = false
+offset_left = 8.0
+offset_top = -48.0
+offset_right = 104.0
+texture = SubResource("AtlasTexture_1v6qy")
+stretch_mode = 2
 
-[node name="interaction_shape" type="CollisionShape2D" parent="interaction_area"]
-position = Vector2(16, 0)
-shape = SubResource("RectangleShape2D_doodw")
+[node name="HorMedClose" type="TextureRect" parent="."]
+visible = false
+offset_left = 8.0
+offset_top = -48.0
+offset_right = 104.0
+texture = SubResource("AtlasTexture_dnrum")
+stretch_mode = 2