diff --git a/Levels/StartingRoom.tscn b/Levels/StartingRoom.tscn index ce6e933..89f0541 100644 --- a/Levels/StartingRoom.tscn +++ b/Levels/StartingRoom.tscn @@ -225,6 +225,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5, 1, -3.5) [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource("12_bm4h4") +bus = &"SoundFX" [node name="PlayerStartPos" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) @@ -281,9 +282,11 @@ sign_text = "Back to Menu" stream = ExtResource("15_a0olp") volume_db = -30.0 pitch_scale = 1.2 +bus = &"SoundFX" [node name="fail_sound_player" type="AudioStreamPlayer" parent="."] stream = ExtResource("16_tm6cb") +bus = &"SoundFX" [node name="Wire" type="Node3D" parent="."] diff --git a/Music/Aspecty - Amb_01_Dark.mp3 b/Music/Aspecty - Amb_01_Dark.mp3 new file mode 100644 index 0000000..9ba98e0 Binary files /dev/null and b/Music/Aspecty - Amb_01_Dark.mp3 differ diff --git a/Music/Aspecty - Amb_01_Dark.mp3.import b/Music/Aspecty - Amb_01_Dark.mp3.import new file mode 100644 index 0000000..7c6ee69 --- /dev/null +++ b/Music/Aspecty - Amb_01_Dark.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bnuvjexc67wx0" +path="res://.godot/imported/Aspecty - Amb_01_Dark.mp3-98eb8afe080419570509f982cb762c3e.mp3str" + +[deps] + +source_file="res://Music/Aspecty - Amb_01_Dark.mp3" +dest_files=["res://.godot/imported/Aspecty - Amb_01_Dark.mp3-98eb8afe080419570509f982cb762c3e.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Music/Dark Loop.mp3 b/Music/Dark Loop.mp3 new file mode 100644 index 0000000..0e253b5 Binary files /dev/null and b/Music/Dark Loop.mp3 differ diff --git a/Music/Dark Loop.mp3.import b/Music/Dark Loop.mp3.import new file mode 100644 index 0000000..040a75b --- /dev/null +++ b/Music/Dark Loop.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://b4fqj3641cakh" +path="res://.godot/imported/Dark Loop.mp3-2874f94ce1a37aadafa3f2184640c541.mp3str" + +[deps] + +source_file="res://Music/Dark Loop.mp3" +dest_files=["res://.godot/imported/Dark Loop.mp3-2874f94ce1a37aadafa3f2184640c541.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Music/Factory.ogg b/Music/Factory.ogg new file mode 100644 index 0000000..d1c812e Binary files /dev/null and b/Music/Factory.ogg differ diff --git a/Music/Factory.ogg.import b/Music/Factory.ogg.import new file mode 100644 index 0000000..724d895 --- /dev/null +++ b/Music/Factory.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://clb67g8fj0gok" +path="res://.godot/imported/Factory.ogg-fe0b77569ecfd6d867b8c8c74c8349a1.oggvorbisstr" + +[deps] + +source_file="res://Music/Factory.ogg" +dest_files=["res://.godot/imported/Factory.ogg-fe0b77569ecfd6d867b8c8c74c8349a1.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Music/Forest_Ambience.mp3 b/Music/Forest_Ambience.mp3 new file mode 100644 index 0000000..a64ad63 Binary files /dev/null and b/Music/Forest_Ambience.mp3 differ diff --git a/Music/Forest_Ambience.mp3.import b/Music/Forest_Ambience.mp3.import new file mode 100644 index 0000000..61e14c5 --- /dev/null +++ b/Music/Forest_Ambience.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://cdaxf1ewngahm" +path="res://.godot/imported/Forest_Ambience.mp3-8f01237f5fef52a8994415dc8e0ee895.mp3str" + +[deps] + +source_file="res://Music/Forest_Ambience.mp3" +dest_files=["res://.godot/imported/Forest_Ambience.mp3-8f01237f5fef52a8994415dc8e0ee895.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Music/MusicManager.tscn b/Music/MusicManager.tscn new file mode 100644 index 0000000..8255963 --- /dev/null +++ b/Music/MusicManager.tscn @@ -0,0 +1,25 @@ +[gd_scene load_steps=6 format=3 uid="uid://prs2odgoyxpq"] + +[ext_resource type="Script" uid="uid://dyo4uhb0xygjw" path="res://Music/music_manager.gd" id="1_xucj2"] +[ext_resource type="AudioStream" uid="uid://cqeavji0kubj6" path="res://Music/audiomass-output.mp3" id="2_nyl5h"] +[ext_resource type="AudioStream" uid="uid://bnuvjexc67wx0" path="res://Music/Aspecty - Amb_01_Dark.mp3" id="3_ojnly"] +[ext_resource type="AudioStream" uid="uid://b4fqj3641cakh" path="res://Music/Dark Loop.mp3" id="4_yqniv"] +[ext_resource type="AudioStream" uid="uid://cdaxf1ewngahm" path="res://Music/Forest_Ambience.mp3" id="5_gtgq8"] + +[node name="MusicManager" type="Node" node_paths=PackedStringArray("player", "timer")] +script = ExtResource("1_xucj2") +tracks = Array[AudioStream]([ExtResource("2_nyl5h"), ExtResource("3_ojnly"), ExtResource("4_yqniv"), ExtResource("5_gtgq8")]) +player = NodePath("AudioStreamPlayer") +timer = NodePath("Timer") + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_nyl5h") +volume_db = -14.416 +autoplay = true +bus = &"Music" + +[node name="Timer" type="Timer" parent="."] +one_shot = true + +[connection signal="finished" from="AudioStreamPlayer" to="." method="_on_audio_stream_player_finished"] +[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"] diff --git a/Music/audiomass-output.mp3 b/Music/audiomass-output.mp3 new file mode 100644 index 0000000..26e8b58 Binary files /dev/null and b/Music/audiomass-output.mp3 differ diff --git a/Music/audiomass-output.mp3.import b/Music/audiomass-output.mp3.import new file mode 100644 index 0000000..6801601 --- /dev/null +++ b/Music/audiomass-output.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://cqeavji0kubj6" +path="res://.godot/imported/audiomass-output.mp3-b179e0fdc26ee53747e38f07af2a05c8.mp3str" + +[deps] + +source_file="res://Music/audiomass-output.mp3" +dest_files=["res://.godot/imported/audiomass-output.mp3-b179e0fdc26ee53747e38f07af2a05c8.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Music/music_manager.gd b/Music/music_manager.gd new file mode 100644 index 0000000..c2ca099 --- /dev/null +++ b/Music/music_manager.gd @@ -0,0 +1,29 @@ +extends Node + +@export var tracks : Array[AudioStream] +@export var player : AudioStreamPlayer +@export var timer : Timer +var last_played : int = 0 + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pass + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + #print(player.get_playback_position()) + pass + + +func _on_audio_stream_player_finished() -> void: + var new_track : int + while new_track == last_played: + new_track = randi_range(0,tracks.size()-1) + player.stream = tracks[new_track] + last_played = new_track + timer.start(randf_range(5,15)) + + +func _on_timer_timeout() -> void: + + player.play() diff --git a/Music/music_manager.gd.uid b/Music/music_manager.gd.uid new file mode 100644 index 0000000..3fc4fcc --- /dev/null +++ b/Music/music_manager.gd.uid @@ -0,0 +1 @@ +uid://dyo4uhb0xygjw diff --git a/Scripts/gui.gd b/Scripts/gui.gd index e96a916..c225665 100644 --- a/Scripts/gui.gd +++ b/Scripts/gui.gd @@ -9,16 +9,19 @@ extends Control @export var clock_progress : TextureProgressBar @export var clock_label : Label @export var volume_slider : HSlider +@export var music_slider : HSlider @export var level_name : Label @export var pause_menu : MarginContainer var title_fade : float = 2.5 -var sound = AudioServer.get_bus_index("Master") +var sound = AudioServer.get_bus_index("SoundFX") +var music = AudioServer.get_bus_index("Music") # Called when the node enters the scene tree for the first time. func _ready(): lose_panel.visible = false volume_slider.value = db_to_linear(AudioServer.get_bus_volume_db(sound)) + music_slider.value = db_to_linear(AudioServer.get_bus_volume_db(music)) pass # Replace with function body. @@ -68,3 +71,7 @@ func goto_menu(): func _on_h_slider_value_changed(value: float) -> void: AudioServer.set_bus_volume_db(sound, linear_to_db(value)) + + +func _on_music_slider_value_changed(value: float) -> void: + AudioServer.set_bus_volume_db(music, linear_to_db(value)) diff --git a/Scripts/menu.gd b/Scripts/menu.gd index 291f48b..fbe08c4 100644 --- a/Scripts/menu.gd +++ b/Scripts/menu.gd @@ -2,11 +2,13 @@ extends Control var credits_shown : bool = false +@export var show_smash : bool = false @export var level_node : Control @export var credits_node : Control @export var credits_button : Button @export var levels_vbox : VBoxContainer @export var exit_button : Button +@export var smash_con_panel : PanelContainer # Called when the node enters the scene tree for the first time. func _ready(): @@ -24,6 +26,7 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): + smash_con_panel.visible = show_smash if credits_shown: credits_node.visible = true level_node.visible = false diff --git a/Smash/cat.png b/Smash/cat.png new file mode 100644 index 0000000..23d6018 Binary files /dev/null and b/Smash/cat.png differ diff --git a/Smash/cat.png.import b/Smash/cat.png.import new file mode 100644 index 0000000..c86894f --- /dev/null +++ b/Smash/cat.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bgojtb4eypeid" +path="res://.godot/imported/cat.png-00adace37c1d319ffbacf5f2e5750a7c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Smash/cat.png" +dest_files=["res://.godot/imported/cat.png-00adace37c1d319ffbacf5f2e5750a7c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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 diff --git a/Smash/smashLogo.pdn b/Smash/smashLogo.pdn new file mode 100644 index 0000000..401a2db Binary files /dev/null and b/Smash/smashLogo.pdn differ diff --git a/Smash/smashLogo.png b/Smash/smashLogo.png new file mode 100644 index 0000000..7464514 Binary files /dev/null and b/Smash/smashLogo.png differ diff --git a/Smash/smashLogo.png.import b/Smash/smashLogo.png.import new file mode 100644 index 0000000..27cc8a4 --- /dev/null +++ b/Smash/smashLogo.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ct6dqvn15u3wu" +path="res://.godot/imported/smashLogo.png-f2d73ef434f566649f2c6e73da5ea2ff.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Smash/smashLogo.png" +dest_files=["res://.godot/imported/smashLogo.png-f2d73ef434f566649f2c6e73da5ea2ff.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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 diff --git a/Smash/smol100kitten.png b/Smash/smol100kitten.png new file mode 100644 index 0000000..fe7546c Binary files /dev/null and b/Smash/smol100kitten.png differ diff --git a/Smash/smol100kitten.png.import b/Smash/smol100kitten.png.import new file mode 100644 index 0000000..4942411 --- /dev/null +++ b/Smash/smol100kitten.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://7o1onoai3ho5" +path="res://.godot/imported/smol100kitten.png-4c21d40a0116e4a247faa3a673ca92a1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Smash/smol100kitten.png" +dest_files=["res://.godot/imported/smol100kitten.png-4c21d40a0116e4a247faa3a673ca92a1.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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 diff --git a/Smash/tabbycatdev.png b/Smash/tabbycatdev.png new file mode 100644 index 0000000..f9effb2 Binary files /dev/null and b/Smash/tabbycatdev.png differ diff --git a/Smash/tabbycatdev.png.import b/Smash/tabbycatdev.png.import new file mode 100644 index 0000000..38673bb --- /dev/null +++ b/Smash/tabbycatdev.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dkl0ir2ygx6w7" +path="res://.godot/imported/tabbycatdev.png-7d3a36e9f069b75fe68dc4a4c90a937b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Smash/tabbycatdev.png" +dest_files=["res://.godot/imported/tabbycatdev.png-7d3a36e9f069b75fe68dc4a4c90a937b.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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 diff --git a/default_bus_layout.tres b/default_bus_layout.tres new file mode 100644 index 0000000..647dc70 --- /dev/null +++ b/default_bus_layout.tres @@ -0,0 +1,15 @@ +[gd_resource type="AudioBusLayout" format=3 uid="uid://c1auqraysvepu"] + +[resource] +bus/1/name = &"SoundFX" +bus/1/solo = false +bus/1/mute = false +bus/1/bypass_fx = false +bus/1/volume_db = 0.0 +bus/1/send = &"Master" +bus/2/name = &"Music" +bus/2/solo = false +bus/2/mute = false +bus/2/bypass_fx = false +bus/2/volume_db = 0.0 +bus/2/send = &"Master" diff --git a/gui.tscn b/gui.tscn index ad0ba54..47cf8c6 100644 --- a/gui.tscn +++ b/gui.tscn @@ -27,7 +27,7 @@ font_size = 61 [sub_resource type="LabelSettings" id="LabelSettings_jf511"] font_size = 26 -[node name="Gui" type="Control" node_paths=PackedStringArray("lose_panel", "lose_label", "reset_label", "start_level", "level_title", "clock_progress", "clock_label", "volume_slider", "level_name", "pause_menu")] +[node name="Gui" type="Control" node_paths=PackedStringArray("lose_panel", "lose_label", "reset_label", "start_level", "level_title", "clock_progress", "clock_label", "volume_slider", "music_slider", "level_name", "pause_menu")] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -43,6 +43,7 @@ level_title = NodePath("starting and game over/StartPanel/VBoxContainer/LevelTit clock_progress = NodePath("ClockProgress") clock_label = NodePath("ClockProgress/CenterContainer/Label") volume_slider = NodePath("PauseMenu/PanelContainer/VBoxContainer/HBoxContainer/HSlider") +music_slider = NodePath("PauseMenu/PanelContainer/VBoxContainer/HBoxContainer3/HSlider") level_name = NodePath("PauseMenu/PanelContainer/VBoxContainer/Level Name") pause_menu = NodePath("PauseMenu") @@ -64,7 +65,7 @@ grow_vertical = 2 [node name="TextureRect" type="TextureRect" parent="Crosshair"] modulate = Color(1, 1, 1, 0.721569) -custom_minimum_size = Vector2(20, 20) +custom_minimum_size = Vector2(10, 10) layout_mode = 2 texture = ExtResource("1_mpwvh") expand_mode = 1 @@ -175,7 +176,7 @@ layout_mode = 2 [node name="Label" type="Label" parent="PauseMenu/PanelContainer/VBoxContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 -text = "Volume" +text = "Sound Volume" label_settings = SubResource("LabelSettings_jf511") horizontal_alignment = 1 @@ -186,6 +187,23 @@ size_flags_vertical = 1 max_value = 2.0 step = 0.0 +[node name="HBoxContainer3" type="HBoxContainer" parent="PauseMenu/PanelContainer/VBoxContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="PauseMenu/PanelContainer/VBoxContainer/HBoxContainer3"] +layout_mode = 2 +size_flags_horizontal = 3 +text = "Music Volume" +label_settings = SubResource("LabelSettings_jf511") +horizontal_alignment = 1 + +[node name="HSlider" type="HSlider" parent="PauseMenu/PanelContainer/VBoxContainer/HBoxContainer3"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 1 +max_value = 2.0 +step = 0.0 + [node name="HBoxContainer2" type="HBoxContainer" parent="PauseMenu/PanelContainer/VBoxContainer"] layout_mode = 2 @@ -204,5 +222,6 @@ theme_override_font_sizes/font_size = 26 text = "Resume" [connection signal="value_changed" from="PauseMenu/PanelContainer/VBoxContainer/HBoxContainer/HSlider" to="." method="_on_h_slider_value_changed"] +[connection signal="value_changed" from="PauseMenu/PanelContainer/VBoxContainer/HBoxContainer3/HSlider" to="." method="_on_music_slider_value_changed"] [connection signal="pressed" from="PauseMenu/PanelContainer/VBoxContainer/HBoxContainer2/MenuButton" to="." method="goto_menu"] [connection signal="pressed" from="PauseMenu/PanelContainer/VBoxContainer/HBoxContainer2/ResumeButton" to="." method="close_pause"] diff --git a/kill_block.tscn b/kill_block.tscn index 45b8c3a..e1ef91f 100644 --- a/kill_block.tscn +++ b/kill_block.tscn @@ -3,10 +3,10 @@ [ext_resource type="Material" uid="uid://br3erknm4b1i0" path="res://Assets/Materials/kill.tres" id="1_2ed3b"] [ext_resource type="Script" uid="uid://be60wmno6fjr6" path="res://Scripts/kill_block.gd" id="1_pvkd4"] -[sub_resource type="BoxMesh" id="BoxMesh_x546n"] +[sub_resource type="BoxMesh" id="BoxMesh_a1ns5"] material = ExtResource("1_2ed3b") -[sub_resource type="BoxShape3D" id="BoxShape3D_m47l7"] +[sub_resource type="BoxShape3D" id="BoxShape3D_v71wv"] [node name="KillBlock" type="Area3D" node_paths=PackedStringArray("mesh", "collider")] script = ExtResource("1_pvkd4") @@ -14,7 +14,7 @@ mesh = NodePath("MeshInstance3D") collider = NodePath("CollisionShape3D") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] -mesh = SubResource("BoxMesh_x546n") +mesh = SubResource("BoxMesh_a1ns5") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -shape = SubResource("BoxShape3D_m47l7") +shape = SubResource("BoxShape3D_v71wv") diff --git a/menu.tscn b/menu.tscn index 764034d..22dfd77 100644 --- a/menu.tscn +++ b/menu.tscn @@ -1,6 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://dggn70v8xqwgy"] +[gd_scene load_steps=7 format=3 uid="uid://dggn70v8xqwgy"] [ext_resource type="Script" uid="uid://b8hwd1cx5kvbc" path="res://Scripts/menu.gd" id="1_igukb"] +[ext_resource type="Texture2D" uid="uid://ct6dqvn15u3wu" path="res://Smash/smashLogo.png" id="2_mae5d"] +[ext_resource type="Texture2D" uid="uid://7o1onoai3ho5" path="res://Smash/smol100kitten.png" id="3_4hy44"] +[ext_resource type="Texture2D" uid="uid://dkl0ir2ygx6w7" path="res://Smash/tabbycatdev.png" id="4_4hy44"] [sub_resource type="LabelSettings" id="LabelSettings_d2xlr"] font_size = 56 @@ -11,7 +14,7 @@ outline_color = Color(1, 0.446282, 0.988369, 1) [sub_resource type="LabelSettings" id="LabelSettings_lti8b"] font_color = Color(0, 0, 0, 1) -[node name="Menu" type="Control" node_paths=PackedStringArray("level_node", "credits_node", "credits_button", "levels_vbox", "exit_button")] +[node name="Menu" type="Control" node_paths=PackedStringArray("level_node", "credits_node", "credits_button", "levels_vbox", "exit_button", "smash_con_panel")] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -19,11 +22,13 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_igukb") -level_node = NodePath("MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer") -credits_node = NodePath("MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/MarginContainer/CreditsPage") -credits_button = NodePath("MarginContainer/VBoxContainer/HBoxContainer/CreditsButton") -levels_vbox = NodePath("MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer") -exit_button = NodePath("MarginContainer/VBoxContainer/HBoxContainer/ExitButton") +show_smash = true +level_node = NodePath("MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer") +credits_node = NodePath("MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/MarginContainer/CreditsPage") +credits_button = NodePath("MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer/CreditsButton") +levels_vbox = NodePath("MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer") +exit_button = NodePath("MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer/ExitButton") +smash_con_panel = NodePath("MarginContainer/HBoxContainer/SmashConPanel") [node name="MarginContainer" type="MarginContainer" parent="."] layout_mode = 1 @@ -32,37 +37,42 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -theme_override_constants/margin_left = 200 +theme_override_constants/margin_left = 100 theme_override_constants/margin_top = 100 -theme_override_constants/margin_right = 200 +theme_override_constants/margin_right = 100 theme_override_constants/margin_bottom = 100 -[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer"] +layout_mode = 2 +alignment = 1 + +[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/HBoxContainer"] +custom_minimum_size = Vector2(700, 0) layout_mode = 2 -[node name="PanelContainer" type="PanelContainer" parent="MarginContainer/VBoxContainer"] +[node name="PanelContainer" type="PanelContainer" parent="MarginContainer/HBoxContainer/VBoxContainer"] layout_mode = 2 size_flags_vertical = 3 -[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/PanelContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer"] layout_mode = 2 -[node name="Title" type="Label" parent="MarginContainer/VBoxContainer/PanelContainer/VBoxContainer"] +[node name="Title" type="Label" parent="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer"] layout_mode = 2 text = "Chrono Chamber" label_settings = SubResource("LabelSettings_d2xlr") horizontal_alignment = 1 -[node name="Credit" type="Label" parent="MarginContainer/VBoxContainer/PanelContainer/VBoxContainer"] +[node name="Credit" type="Label" parent="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer"] layout_mode = 2 text = "by Tabby :3" horizontal_alignment = 1 -[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/VBoxContainer/PanelContainer/VBoxContainer"] +[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer"] layout_mode = 2 size_flags_vertical = 3 -[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer"] +[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -71,58 +81,104 @@ theme_override_constants/margin_top = 10 theme_override_constants/margin_right = 10 theme_override_constants/margin_bottom = 10 -[node name="CreditsPage" type="RichTextLabel" parent="MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/MarginContainer"] +[node name="CreditsPage" type="RichTextLabel" parent="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/MarginContainer"] visible = false layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 bbcode_enabled = true -text = "Programming and Game Design: [url=https://clevertop.dev]Tom Howarth[/url] +text = "Programming and Game Design: [url=https://tabbycat.dev]Tabby[/url] Created for the [url=https://itch.io/jam/playmakers-august-game-jam]August 2024 Game Jam[/url] hosted by Playmakers! - Themes: 3D, Puzzle Textures: [url=https://opengameart.org/content/dungeon-crawl-32x32-tiles]Dungeon Crawl Stone Soup[/url] Command Chime Sounds: [url=https://freesound.org/people/radian/sounds/62986/]Chime 0011.wav by radian[/url] Door Open Sound: [url=https://freesound.org/people/primeval_polypod/sounds/156507/]door_open_close by primeval polypod[/url] Interact Sounds: [url=https://opengameart.org/content/51-ui-sound-effects-buttons-switches-and-clicks]UI SFX set by Kenny[/url] -Lose Sound: [url=https://freesound.org/people/hawkbe/sounds/511505/]Fuzzy powerdown by hawkbe[/url]" +Lose Sound: [url=https://freesound.org/people/hawkbe/sounds/511505/]Fuzzy powerdown by hawkbe[/url] -[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer"] +[b]Ambient Music[/b] +[url=https://opengameart.org/content/factory-ambiance]Factory ambiance by yd[/url] +[url=https://opengameart.org/content/forest-ambience]Forest Ambience by TinyWorlds[/url] +[url=https://opengameart.org/content/dark-ambience]Dark Ambience by Aspectry[/url] +[url=https://opengameart.org/content/crypt]Crypt by Machine[/url]" + +[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer"] layout_mode = 2 size_flags_horizontal = 3 -[node name="Button" type="Button" parent="MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] +[node name="Button" type="Button" parent="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] visible = false layout_mode = 2 text = "Level 1 - Name" -[node name="Button2" type="Button" parent="MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] +[node name="Button2" type="Button" parent="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] visible = false layout_mode = 2 text = "Level 1 - Name" -[node name="Button3" type="Button" parent="MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] +[node name="Button3" type="Button" parent="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] visible = false layout_mode = 2 text = "Level 1 - Name" -[node name="Button4" type="Button" parent="MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] +[node name="Button4" type="Button" parent="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] visible = false layout_mode = 2 text = "Level 1 - Name" -[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/HBoxContainer/VBoxContainer"] layout_mode = 2 -[node name="CreditsButton" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer"] +[node name="CreditsButton" type="Button" parent="MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 text = "Credits" -[node name="ExitButton" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer"] +[node name="ExitButton" type="Button" parent="MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 text = "Exit Game" +[node name="SmashConPanel" type="PanelContainer" parent="MarginContainer/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/HBoxContainer/SmashConPanel"] +layout_mode = 2 +alignment = 1 + +[node name="TextureRect" type="TextureRect" parent="MarginContainer/HBoxContainer/SmashConPanel/VBoxContainer"] +visible = false +layout_mode = 2 +texture = ExtResource("2_mae5d") +expand_mode = 5 + +[node name="TextureRect2" type="TextureRect" parent="MarginContainer/HBoxContainer/SmashConPanel/VBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 4 +texture = ExtResource("3_4hy44") + +[node name="Label" type="Label" parent="MarginContainer/HBoxContainer/SmashConPanel/VBoxContainer"] +layout_mode = 2 +text = "Made by Tabby for the Playmakers August Gamejam!" +horizontal_alignment = 1 +autowrap_mode = 2 + +[node name="HSeparator" type="HSeparator" parent="MarginContainer/HBoxContainer/SmashConPanel/VBoxContainer"] +layout_mode = 2 + +[node name="Label2" type="Label" parent="MarginContainer/HBoxContainer/SmashConPanel/VBoxContainer"] +layout_mode = 2 +text = "Check out my website here:" +horizontal_alignment = 1 +autowrap_mode = 2 + +[node name="TextureRect3" type="TextureRect" parent="MarginContainer/HBoxContainer/SmashConPanel/VBoxContainer"] +modulate = Color(1, 0.811765, 1, 1) +layout_mode = 2 +texture = ExtResource("4_4hy44") +expand_mode = 5 + [node name="Label" type="Label" parent="."] layout_mode = 1 anchors_preset = 3 @@ -134,9 +190,9 @@ offset_left = -1.0 offset_top = -23.0 grow_horizontal = 0 grow_vertical = 0 -text = "v1.1" +text = "v1.2" label_settings = SubResource("LabelSettings_lti8b") -[connection signal="meta_clicked" from="MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/MarginContainer/CreditsPage" to="." method="_on_credits_page_meta_clicked"] -[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/CreditsButton" to="." method="_on_credits_button_pressed"] -[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/ExitButton" to="." method="_on_exit_button_pressed"] +[connection signal="meta_clicked" from="MarginContainer/HBoxContainer/VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/MarginContainer/CreditsPage" to="." method="_on_credits_page_meta_clicked"] +[connection signal="pressed" from="MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer/CreditsButton" to="." method="_on_credits_button_pressed"] +[connection signal="pressed" from="MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer/ExitButton" to="." method="_on_exit_button_pressed"] diff --git a/player.tscn b/player.tscn index cbe2284..7886efe 100644 --- a/player.tscn +++ b/player.tscn @@ -29,6 +29,7 @@ skeleton = NodePath("../..") [node name="Camera3D" type="Camera3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.621505, 0) +fov = 90.0 [node name="RayCast3D" type="RayCast3D" parent="Camera3D"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0) @@ -52,3 +53,4 @@ shape = SubResource("CapsuleShape3D_cfrhy") [node name="interactSound" type="AudioStreamPlayer" parent="."] stream = ExtResource("2_u5wue") volume_db = -10.0 +bus = &"SoundFX" diff --git a/project.godot b/project.godot index 62fde72..259896b 100644 --- a/project.godot +++ b/project.godot @@ -19,6 +19,11 @@ config/icon="res://Assets/Textures/cobalt_stone_4.png" [autoload] GameManager="*res://game_manager.tscn" +MusicManager="*res://Music/MusicManager.tscn" + +[display] + +window/stretch/mode="canvas_items" [editor]