diff --git a/Level_Core.tscn b/Level_Core.tscn index 4e3a745..2c6ea00 100644 --- a/Level_Core.tscn +++ b/Level_Core.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=3 uid="uid://bn20cqfwvm2oe"] +[gd_scene load_steps=36 format=3 uid="uid://bn20cqfwvm2oe"] [ext_resource type="Script" uid="uid://bpj62lqejp32d" path="res://main.gd" id="1_fwt2i"] [ext_resource type="PackedScene" uid="uid://bs6yq6gy7k2sb" path="res://player.tscn" id="1_lsi31"] @@ -72,7 +72,7 @@ albedo_texture = ExtResource("5_r3eyv") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_boye7"] -[sub_resource type="LabelSettings" id="LabelSettings_qbfpe"] +[sub_resource type="LabelSettings" id="LabelSettings_27422"] font = ExtResource("10_o66vw") font_size = 75 font_color = Color(0.941176, 0.788235, 0.996078, 1) @@ -81,18 +81,24 @@ outline_color = Color(0, 0, 0, 1) shadow_size = 16 shadow_color = Color(0.180005, 0.180005, 0.180005, 0.647059) -[sub_resource type="LabelSettings" id="LabelSettings_27422"] +[sub_resource type="LabelSettings" id="LabelSettings_7rthl"] font = ExtResource("12_2uy0w") font_size = 22 outline_size = 4 outline_color = Color(0, 0, 0, 1) -[sub_resource type="LabelSettings" id="LabelSettings_2uy0w"] +[sub_resource type="LabelSettings" id="LabelSettings_jt4pe"] font = ExtResource("12_2uy0w") font_size = 38 outline_size = 4 outline_color = Color(0, 0, 0, 1) +[sub_resource type="LabelSettings" id="LabelSettings_5l3ux"] +font = ExtResource("2_fq2vn") +font_size = 28 +outline_size = 4 +outline_color = Color(0, 0, 0, 1) + [node name="LevelCore" type="Node3D"] script = ExtResource("1_fwt2i") @@ -2727,52 +2733,6 @@ outline_modulate = Color(0.00803253, 9.36218e-06, 0.0382829, 1) text = "To unlock/free the cursor, press Shift+Enter" font = ExtResource("2_fq2vn") -[node name="HUD" type="MarginContainer" parent="."] -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_constants/margin_left = 50 -theme_override_constants/margin_top = 50 -theme_override_constants/margin_right = 50 -theme_override_constants/margin_bottom = 50 - -[node name="HBoxContainer" type="HBoxContainer" parent="HUD"] -layout_mode = 2 - -[node name="VBoxContainer" type="VBoxContainer" parent="HUD/HBoxContainer"] -layout_mode = 2 - -[node name="Label_Station" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] -layout_mode = 2 -text = "ERROR LOADING" -label_settings = SubResource("LabelSettings_qbfpe") - -[node name="Label_Controls" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] -layout_mode = 2 -size_flags_vertical = 1 -text = "esc - pause -shift+r - back to checkpoint -f5 - restart level" -label_settings = SubResource("LabelSettings_27422") - -[node name="Label_Controls2" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] -layout_mode = 2 -text = "if you see this, the game failed to load the code correctly. -in this case, please restart the game" -label_settings = SubResource("LabelSettings_27422") - -[node name="HBoxContainer2" type="HBoxContainer" parent="HUD"] -layout_mode = 2 - -[node name="Label_Health" type="Label" parent="HUD/HBoxContainer2"] -layout_mode = 2 -size_flags_vertical = 8 -text = "[||||||||||]" -label_settings = SubResource("LabelSettings_2uy0w") -vertical_alignment = 2 - [node name="PauseMenu" parent="." instance=ExtResource("3_i8tni")] visible = false @@ -2800,3 +2760,61 @@ skeleton = NodePath("../MeshInstance3D") [node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D12/StaticBody3D"] transform = Transform3D(1, -1.77636e-15, 0, 3.04932e-20, 1, 7.76473e-21, 1.77636e-15, -9.70589e-24, 1, 0, 0, 0) shape = ExtResource("2_7sds5") + +[node name="HUD" type="MarginContainer" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_constants/margin_left = 50 +theme_override_constants/margin_top = 50 +theme_override_constants/margin_right = 50 +theme_override_constants/margin_bottom = 50 + +[node name="HBoxContainer" type="HBoxContainer" parent="HUD"] +layout_mode = 2 + +[node name="VBoxContainer" type="VBoxContainer" parent="HUD/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 2 + +[node name="Label_Station" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] +layout_mode = 2 +text = "ERROR LOADING" +label_settings = SubResource("LabelSettings_27422") + +[node name="Label_Controls" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 1 +text = "esc - pause +shift+r - back to checkpoint +f5 - restart level" +label_settings = SubResource("LabelSettings_7rthl") + +[node name="Label_Controls2" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] +layout_mode = 2 +text = "if you see this, the game failed to load the code correctly. +in this case, please restart the game" +label_settings = SubResource("LabelSettings_7rthl") + +[node name="Label_Health" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 10 +text = "[||||||||||]" +label_settings = SubResource("LabelSettings_jt4pe") +vertical_alignment = 2 + +[node name="HBoxContainer2" type="HBoxContainer" parent="HUD"] +layout_mode = 2 + +[node name="VBoxContainer2" type="VBoxContainer" parent="HUD/HBoxContainer2"] +layout_mode = 2 +size_flags_horizontal = 6 + +[node name="Label" type="Label" parent="HUD/HBoxContainer2/VBoxContainer2"] +layout_mode = 2 +size_flags_horizontal = 8 +size_flags_vertical = 10 +text = "Narration belongs here" +label_settings = SubResource("LabelSettings_5l3ux") diff --git a/Level_Example.tscn b/Level_Example.tscn index 370d985..30c9639 100644 --- a/Level_Example.tscn +++ b/Level_Example.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=16 format=3 uid="uid://uolufy8ucws4"] +[gd_scene load_steps=18 format=3 uid="uid://uolufy8ucws4"] [ext_resource type="Script" uid="uid://bpj62lqejp32d" path="res://main.gd" id="1_l3h3d"] [ext_resource type="Shape3D" uid="uid://ck3ryefc358gp" path="res://wall_ncwt.tres" id="4_agw2m"] [ext_resource type="Texture2D" uid="uid://d15530ei26qvv" path="res://addons/kenney_prototype_textures/purple/texture_02.png" id="6_wh1he"] [ext_resource type="PackedScene" uid="uid://bs6yq6gy7k2sb" path="res://player.tscn" id="8_cr84h"] +[ext_resource type="FontFile" uid="uid://cfk3fgwuhngcw" path="res://InstrumentSans-VariableFont_wdth,wght.ttf" id="8_ulki5"] [ext_resource type="FontFile" uid="uid://csg0b0d5pmx2m" path="res://InstrumentSerif-Italic.ttf" id="11_h6ypg"] [ext_resource type="FontFile" uid="uid://dsgbhej3kmxkm" path="res://InstrumentSans-Italic-VariableFont_wdth,wght.ttf" id="12_wa7vp"] [ext_resource type="PackedScene" uid="uid://daoyebc0vm7sd" path="res://pause_menu.tscn" id="13_sbrf7"] @@ -22,7 +23,13 @@ sky = SubResource("Sky_lsi31") tonemap_mode = 2 glow_enabled = true -[sub_resource type="LabelSettings" id="LabelSettings_qbfpe"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qyexb"] +albedo_texture = ExtResource("6_wh1he") + +[sub_resource type="PlaneMesh" id="PlaneMesh_ulki5"] +size = Vector2(10, 10) + +[sub_resource type="LabelSettings" id="LabelSettings_02d5g"] font = ExtResource("11_h6ypg") font_size = 75 font_color = Color(0.941176, 0.788235, 0.996078, 1) @@ -31,23 +38,23 @@ outline_color = Color(0, 0, 0, 1) shadow_size = 16 shadow_color = Color(0.180005, 0.180005, 0.180005, 0.647059) -[sub_resource type="LabelSettings" id="LabelSettings_27422"] +[sub_resource type="LabelSettings" id="LabelSettings_hgv7a"] font = ExtResource("12_wa7vp") font_size = 22 outline_size = 4 outline_color = Color(0, 0, 0, 1) -[sub_resource type="LabelSettings" id="LabelSettings_2uy0w"] +[sub_resource type="LabelSettings" id="LabelSettings_gemuh"] font = ExtResource("12_wa7vp") font_size = 38 outline_size = 4 outline_color = Color(0, 0, 0, 1) -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qyexb"] -albedo_texture = ExtResource("6_wh1he") - -[sub_resource type="PlaneMesh" id="PlaneMesh_ulki5"] -size = Vector2(10, 10) +[sub_resource type="LabelSettings" id="LabelSettings_8iaaw"] +font = ExtResource("8_ulki5") +font_size = 28 +outline_size = 4 +outline_color = Color(0, 0, 0, 1) [node name="LevelCore" type="Node3D"] script = ExtResource("1_l3h3d") @@ -65,6 +72,18 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) top_level = true linear_damp = 3.0 +[node name="PauseMenu" parent="." instance=ExtResource("13_sbrf7")] +visible = false + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +material_override = SubResource("StandardMaterial3D_qyexb") +mesh = SubResource("PlaneMesh_ulki5") + +[node name="StaticBody3D" type="StaticBody3D" parent="MeshInstance3D"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D/StaticBody3D"] +shape = ExtResource("4_agw2m") + [node name="HUD" type="MarginContainer" parent="."] anchors_preset = 15 anchor_right = 1.0 @@ -81,11 +100,12 @@ layout_mode = 2 [node name="VBoxContainer" type="VBoxContainer" parent="HUD/HBoxContainer"] layout_mode = 2 +size_flags_horizontal = 2 [node name="Label_Station" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] layout_mode = 2 text = "ERROR LOADING" -label_settings = SubResource("LabelSettings_qbfpe") +label_settings = SubResource("LabelSettings_02d5g") [node name="Label_Controls" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] layout_mode = 2 @@ -93,32 +113,31 @@ size_flags_vertical = 1 text = "esc - pause shift+r - back to checkpoint f5 - restart level" -label_settings = SubResource("LabelSettings_27422") +label_settings = SubResource("LabelSettings_hgv7a") [node name="Label_Controls2" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] layout_mode = 2 text = "if you see this, the game failed to load the code correctly. in this case, please restart the game" -label_settings = SubResource("LabelSettings_27422") +label_settings = SubResource("LabelSettings_hgv7a") + +[node name="Label_Health" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 10 +text = "[||||||||||]" +label_settings = SubResource("LabelSettings_gemuh") +vertical_alignment = 2 [node name="HBoxContainer2" type="HBoxContainer" parent="HUD"] layout_mode = 2 -[node name="Label_Health" type="Label" parent="HUD/HBoxContainer2"] +[node name="VBoxContainer2" type="VBoxContainer" parent="HUD/HBoxContainer2"] layout_mode = 2 -size_flags_vertical = 8 -text = "[||||||||||]" -label_settings = SubResource("LabelSettings_2uy0w") -vertical_alignment = 2 +size_flags_horizontal = 6 -[node name="PauseMenu" parent="." instance=ExtResource("13_sbrf7")] -visible = false - -[node name="MeshInstance3D" type="MeshInstance3D" parent="."] -material_override = SubResource("StandardMaterial3D_qyexb") -mesh = SubResource("PlaneMesh_ulki5") - -[node name="StaticBody3D" type="StaticBody3D" parent="MeshInstance3D"] - -[node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D/StaticBody3D"] -shape = ExtResource("4_agw2m") +[node name="Label" type="Label" parent="HUD/HBoxContainer2/VBoxContainer2"] +layout_mode = 2 +size_flags_horizontal = 8 +size_flags_vertical = 10 +text = "Narration belongs here" +label_settings = SubResource("LabelSettings_8iaaw") diff --git a/Level_Labyrinth.tscn b/Level_Labyrinth.tscn index ea1a20a..de460c5 100644 --- a/Level_Labyrinth.tscn +++ b/Level_Labyrinth.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=16 format=3 uid="uid://vx8amdj4s586"] +[gd_scene load_steps=18 format=3 uid="uid://vx8amdj4s586"] [ext_resource type="Script" uid="uid://cb2ob5t0phqot" path="res://main_l2.gd" id="1_4fas2"] [ext_resource type="PackedScene" uid="uid://bs6yq6gy7k2sb" path="res://player.tscn" id="2_r0elk"] [ext_resource type="FontFile" uid="uid://csg0b0d5pmx2m" path="res://InstrumentSerif-Italic.ttf" id="3_nngep"] [ext_resource type="FontFile" uid="uid://dsgbhej3kmxkm" path="res://InstrumentSans-Italic-VariableFont_wdth,wght.ttf" id="4_758px"] [ext_resource type="PackedScene" uid="uid://daoyebc0vm7sd" path="res://pause_menu.tscn" id="5_mnf3s"] +[ext_resource type="FontFile" uid="uid://cfk3fgwuhngcw" path="res://InstrumentSans-VariableFont_wdth,wght.ttf" id="5_r0elk"] [ext_resource type="Texture2D" uid="uid://d15530ei26qvv" path="res://addons/kenney_prototype_textures/purple/texture_02.png" id="6_3xop5"] [ext_resource type="Shape3D" uid="uid://ck3ryefc358gp" path="res://wall_ncwt.tres" id="7_tb2wo"] @@ -43,6 +44,12 @@ font_size = 38 outline_size = 4 outline_color = Color(0, 0, 0, 1) +[sub_resource type="LabelSettings" id="LabelSettings_nngep"] +font = ExtResource("5_r0elk") +font_size = 28 +outline_size = 4 +outline_color = Color(0, 0, 0, 1) + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qyexb"] albedo_texture = ExtResource("6_3xop5") @@ -81,6 +88,7 @@ layout_mode = 2 [node name="VBoxContainer" type="VBoxContainer" parent="HUD/HBoxContainer"] layout_mode = 2 +size_flags_horizontal = 2 [node name="Label_Station" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] layout_mode = 2 @@ -101,16 +109,27 @@ text = "if you see this, the game failed to load the code correctly. in this case, please restart the game" label_settings = SubResource("LabelSettings_27422") -[node name="HBoxContainer2" type="HBoxContainer" parent="HUD"] +[node name="Label_Health" type="Label" parent="HUD/HBoxContainer/VBoxContainer"] layout_mode = 2 - -[node name="Label_Health" type="Label" parent="HUD/HBoxContainer2"] -layout_mode = 2 -size_flags_vertical = 8 +size_flags_vertical = 10 text = "[||||||||||]" label_settings = SubResource("LabelSettings_2uy0w") vertical_alignment = 2 +[node name="HBoxContainer2" type="HBoxContainer" parent="HUD"] +layout_mode = 2 + +[node name="VBoxContainer2" type="VBoxContainer" parent="HUD/HBoxContainer2"] +layout_mode = 2 +size_flags_horizontal = 6 + +[node name="Label" type="Label" parent="HUD/HBoxContainer2/VBoxContainer2"] +layout_mode = 2 +size_flags_horizontal = 8 +size_flags_vertical = 10 +text = "Narration belongs here" +label_settings = SubResource("LabelSettings_nngep") + [node name="PauseMenu" parent="." instance=ExtResource("5_mnf3s")] visible = false @@ -122,3 +141,13 @@ mesh = SubResource("PlaneMesh_ulki5") [node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D/StaticBody3D"] shape = ExtResource("7_tb2wo") + +[node name="MeshInstance3D2" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.5, 0) +material_override = SubResource("StandardMaterial3D_qyexb") +mesh = SubResource("PlaneMesh_ulki5") + +[node name="StaticBody3D" type="StaticBody3D" parent="MeshInstance3D2"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D2/StaticBody3D"] +shape = ExtResource("7_tb2wo") diff --git a/discord_krisp.log b/discord_krisp.log index 8fa1212..1528ee7 100644 --- a/discord_krisp.log +++ b/discord_krisp.log @@ -8,3 +8,15 @@ [2025-May-04 19:32:10.481 +02:00][102245:102245][info ] Krisp SDK initialized [2025-May-04 22:16:26.906 +02:00][102245:102290][info ] KrispVADSetup: sampleRate = 48000, duration = 10 [2025-May-04 22:16:33.338 +02:00][102245:102283][info ] KrispVADReset +[2025-May-26 17:39:31.037 +02:00][994728:994728][info ] Logging initialized +[2025-May-26 17:39:31.037 +02:00][994728:994728][info ] Initializing krisp SDK... +[2025-May-26 17:39:31.037 +02:00][994728:994728][info ] DoKrispInitialize +[2025-May-26 17:39:31.328 +02:00][994728:994728][info ] LoadDynamicKrisp +[2025-May-26 17:39:31.328 +02:00][994728:994728][info ] Did not find KRISP_DYLIB_PATH, skipping dynamic loading +[2025-May-26 17:39:31.328 +02:00][994728:994728][info ] Initializing Krisp SDK in PID 994728, addr 0x7bad66390d10 +[2025-May-26 17:39:31.482 +02:00][994728:994728][info ] Initialized Krisp SDK successfully +[2025-May-26 17:39:31.482 +02:00][994728:994728][info ] Krisp SDK initialized +[2025-May-26 18:23:27.111 +02:00][994728:994812][info ] KrispVADSetup: sampleRate = 48000, duration = 10 +[2025-May-26 18:23:31.104 +02:00][994728:994804][info ] KrispVADReset +[2025-May-26 19:52:30.388 +02:00][994728:994812][info ] KrispVADSetup: sampleRate = 48000, duration = 10 +[2025-May-26 19:52:43.339 +02:00][994728:994804][info ] KrispVADReset diff --git a/discord_utils.log b/discord_utils.log index 62219ce..87fc9a8 100644 --- a/discord_utils.log +++ b/discord_utils.log @@ -1 +1,2 @@ [2025-May-04 19:32:09.264 +02:00][102245:102245][info ] Logging initialized +[2025-May-26 17:39:30.527 +02:00][994728:994728][info ] Logging initialized diff --git a/level_labyrinth.gd b/level_labyrinth.gd new file mode 100644 index 0000000..67e954f --- /dev/null +++ b/level_labyrinth.gd @@ -0,0 +1 @@ +extends Node3D diff --git a/level_labyrinth.gd.uid b/level_labyrinth.gd.uid new file mode 100644 index 0000000..30552da --- /dev/null +++ b/level_labyrinth.gd.uid @@ -0,0 +1 @@ +uid://pvjq0m2ks4tb diff --git a/main.gd b/main.gd index 3c7016d..8fdc52b 100644 --- a/main.gd +++ b/main.gd @@ -5,8 +5,9 @@ extends Node3D var paused = false @onready var pause_menu = $PauseMenu var checkpoint = checkpoint0 -@onready var healthtext = $HUD/HBoxContainer2/Label_Health +@onready var healthtext = $HUD/HBoxContainer/VBoxContainer/Label_Health @onready var checkpointtext = $HUD/HBoxContainer/VBoxContainer/Label_Station +@onready var narrationtext = $HUD/HBoxContainer2/VBoxContainer2/Label @onready var player = get_node("Player") var time_accum = 0.0 # Timer accumulator var elapsed_time := 0.0 @@ -22,6 +23,7 @@ var terminus = Vector3(-8, -8.5, 9.5) #region DO NOT TOUCH func _ready() -> void: # var player = get_node("%Player") + narrationtext.hide() checkpointtext.text = "station 0" # checkpointtext.text = startmenu.stringing # while true: diff --git a/main_l2.gd b/main_l2.gd index dce7ce9..f584395 100644 --- a/main_l2.gd +++ b/main_l2.gd @@ -4,8 +4,9 @@ extends Node3D var paused = false @onready var pause_menu = $PauseMenu var checkpoint = checkpoint0 -@onready var healthtext = $HUD/HBoxContainer2/Label_Health +@onready var healthtext = $HUD/HBoxContainer/VBoxContainer/Label_Health @onready var checkpointtext = $HUD/HBoxContainer/VBoxContainer/Label_Station +@onready var narrationtext = $HUD/HBoxContainer2/VBoxContainer2/Label @onready var player = get_node("Player") var time_accum = 0.0 # Timer accumulator var elapsed_time := 0.0 @@ -17,9 +18,23 @@ var checkpoint2 = Vector3(0, 22, 1.374) var checkpoint3 = Vector3(-50, 25, -5) var terminus = Vector3(-8, -8.5, 9.5) +func wait(specifiedsecond: float): + await get_tree().create_timer(specifiedsecond).timeout + func _ready() -> void: # var player = get_node("%Player") + narrationtext.hide() + narrationtext.show() checkpointtext.text = "station 0" + narrationtext.text = "Hi." + wait(2) + narrationtext.text = "You probably have no idea who I could be." + wait(6) + narrationtext.text = "But I've been watching you." + wait(3) + narrationtext.text = "Closely." + wait(1) +# narrationtext.hide() # while true: # wait(5) # print(player.checkpoint) @@ -33,8 +48,6 @@ func _ready() -> void: # print("Checkpoint:", player.checkpoint) # time_accum = 0.0 -func wait(seconds: float) -> void: - await get_tree().create_timer(seconds).timeout func _process(delta: float): elapsed_time += delta