diff --git a/addons/discord-sdk-gd/bin/windows/~discord_game_sdk_binding_debug.dll b/addons/discord-sdk-gd/bin/windows/~discord_game_sdk_binding_debug.dll deleted file mode 100644 index 6b7f5f8..0000000 Binary files a/addons/discord-sdk-gd/bin/windows/~discord_game_sdk_binding_debug.dll and /dev/null differ diff --git a/assets/audio/music/theturtlebox_deep-lvl2.wav b/assets/audio/music/theturtlebox_deep-lvl2.wav new file mode 100644 index 0000000..583875c Binary files /dev/null and b/assets/audio/music/theturtlebox_deep-lvl2.wav differ diff --git a/assets/audio/music/theturtlebox_deep-lvl2.wav.import b/assets/audio/music/theturtlebox_deep-lvl2.wav.import new file mode 100644 index 0000000..bf5ff08 --- /dev/null +++ b/assets/audio/music/theturtlebox_deep-lvl2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dclu1gkquydbe" +path="res://.godot/imported/theturtlebox_deep-lvl2.wav-462cb299d630981827cb7047ef493760.sample" + +[deps] + +source_file="res://assets/audio/music/theturtlebox_deep-lvl2.wav" +dest_files=["res://.godot/imported/theturtlebox_deep-lvl2.wav-462cb299d630981827cb7047ef493760.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=2 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/resources/main_theme.tres b/resources/main_theme.tres index 38f12a2..c95545f 100644 --- a/resources/main_theme.tres +++ b/resources/main_theme.tres @@ -1,4 +1,17 @@ -[gd_resource type="Theme" format=3 uid="uid://yba31lyxnmib"] +[gd_resource type="Theme" load_steps=2 format=3 uid="uid://yba31lyxnmib"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2juxv"] +bg_color = Color(0.0352941, 0.0784314, 0.0588235, 1) +border_width_left = 10 +border_width_top = 10 +border_width_right = 10 +border_width_bottom = 10 +border_color = Color(0.941176, 0.215686, 0.564706, 1) +corner_radius_top_left = 25 +corner_radius_top_right = 25 +corner_radius_bottom_right = 25 +corner_radius_bottom_left = 25 [resource] +Panel/styles/panel = SubResource("StyleBoxFlat_2juxv") TooltipLabel/font_sizes/font_size = 32 diff --git a/scenes/autoloads/music_manager.tscn b/scenes/autoloads/music_manager.tscn index 88f3926..cee44d4 100644 --- a/scenes/autoloads/music_manager.tscn +++ b/scenes/autoloads/music_manager.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=8 format=3 uid="uid://d05ijxjrvveav"] +[gd_scene load_steps=10 format=3 uid="uid://d05ijxjrvveav"] [ext_resource type="Script" path="res://scripts/autoloads/music_manager.gd" id="1_y5orj"] [ext_resource type="Script" path="res://scripts/sound_effect.gd" id="2_b3vke"] [ext_resource type="AudioStream" uid="uid://58phpeni4qge" path="res://assets/audio/music/theturtlebox_home-main_menu.wav" id="3_fvdep"] [ext_resource type="Script" path="res://scripts/soundeffect_resource.gd" id="4_g5rbb"] [ext_resource type="AudioStream" uid="uid://c2odo0ydvqrp5" path="res://assets/audio/music/theturtlebox_thought-lvl_1.wav" id="5_nktif"] +[ext_resource type="AudioStream" uid="uid://dclu1gkquydbe" path="res://assets/audio/music/theturtlebox_deep-lvl2.wav" id="6_h3jmm"] [sub_resource type="Resource" id="Resource_6qbpn"] script = ExtResource("4_g5rbb") @@ -16,10 +17,15 @@ script = ExtResource("4_g5rbb") key = "lvl1" audio = ExtResource("5_nktif") +[sub_resource type="Resource" id="Resource_6s8oo"] +script = ExtResource("4_g5rbb") +key = "lvl2" +audio = ExtResource("6_h3jmm") + [node name="MusicManager" type="Node"] script = ExtResource("1_y5orj") [node name="SoundEffect" type="AudioStreamPlayer" parent="."] bus = &"Music" script = ExtResource("2_b3vke") -audio_library = Array[ExtResource("4_g5rbb")]([SubResource("Resource_6qbpn"), SubResource("Resource_k4uy8")]) +audio_library = Array[ExtResource("4_g5rbb")]([SubResource("Resource_6qbpn"), SubResource("Resource_k4uy8"), SubResource("Resource_6s8oo")]) diff --git a/scenes/gui/menus/close_game_confirmation.tscn b/scenes/gui/menus/close_game_confirmation.tscn index 9c50954..92f8f54 100644 --- a/scenes/gui/menus/close_game_confirmation.tscn +++ b/scenes/gui/menus/close_game_confirmation.tscn @@ -3,7 +3,12 @@ [ext_resource type="Script" path="res://scripts/menus/close_game_confirmation.gd" id="1_7dm65"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2juxv"] -bg_color = Color(0, 0, 0, 0.482353) +bg_color = Color(0.0352941, 0.0784314, 0.0588235, 1) +border_width_left = 10 +border_width_top = 10 +border_width_right = 10 +border_width_bottom = 10 +border_color = Color(0.941176, 0.215686, 0.564706, 1) corner_radius_top_left = 25 corner_radius_top_right = 25 corner_radius_bottom_right = 25 diff --git a/scenes/gui/menus/pause_menu.tscn b/scenes/gui/menus/pause_menu.tscn index 4f7430c..5cc4994 100644 --- a/scenes/gui/menus/pause_menu.tscn +++ b/scenes/gui/menus/pause_menu.tscn @@ -30,8 +30,22 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="VBoxContainer" type="VBoxContainer" parent="."] +[node name="Panel" type="Panel" parent="."] +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -336.5 +offset_top = -173.0 +offset_right = 336.5 +offset_bottom = 173.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="VBoxContainer" type="VBoxContainer" parent="Panel"] process_mode = 3 +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -43,28 +57,29 @@ offset_right = 262.0 offset_bottom = 101.5 grow_horizontal = 2 grow_vertical = 2 +theme_override_constants/separation = 30 -[node name="Continue" type="Button" parent="VBoxContainer"] +[node name="Continue" type="Button" parent="Panel/VBoxContainer"] process_mode = 3 layout_mode = 2 focus_mode = 0 theme_override_font_sizes/font_size = 46 text = "Weiter spielen" -[node name="RestartLevel" type="Button" parent="VBoxContainer"] +[node name="RestartLevel" type="Button" parent="Panel/VBoxContainer"] process_mode = 3 layout_mode = 2 focus_mode = 0 theme_override_font_sizes/font_size = 46 text = "Level neu starten" -[node name="CloseLevel" type="Button" parent="VBoxContainer"] +[node name="CloseLevel" type="Button" parent="Panel/VBoxContainer"] process_mode = 3 layout_mode = 2 focus_mode = 0 theme_override_font_sizes/font_size = 46 text = "Beenden" -[connection signal="pressed" from="VBoxContainer/Continue" to="." method="_on_continue_pressed"] -[connection signal="pressed" from="VBoxContainer/RestartLevel" to="." method="_on_restart_level_pressed"] -[connection signal="pressed" from="VBoxContainer/CloseLevel" to="." method="_on_close_level_pressed"] +[connection signal="pressed" from="Panel/VBoxContainer/Continue" to="." method="_on_continue_pressed"] +[connection signal="pressed" from="Panel/VBoxContainer/RestartLevel" to="." method="_on_restart_level_pressed"] +[connection signal="pressed" from="Panel/VBoxContainer/CloseLevel" to="." method="_on_close_level_pressed"] diff --git a/scenes/levels/lvl_2.tscn b/scenes/levels/lvl_2.tscn index 708f969..7885be3 100644 --- a/scenes/levels/lvl_2.tscn +++ b/scenes/levels/lvl_2.tscn @@ -28,7 +28,7 @@ ao_enabled = true ao_texture = ExtResource("5_2hu3x") uv1_scale = Vector3(8.5, 8.5, 8.5) -[node name="LVL1" type="Node3D"] +[node name="LVL2" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] diff --git a/scripts/autoloads/music_manager.gd b/scripts/autoloads/music_manager.gd index a5da9c2..2166514 100644 --- a/scripts/autoloads/music_manager.gd +++ b/scripts/autoloads/music_manager.gd @@ -13,3 +13,5 @@ func _on_level_switched() -> void: soundeffect.play_key("main") "LVL1": soundeffect.play_key("lvl1") + "LVL2": + soundeffect.play_key("lvl2")