diff --git a/assets/musics/mod118.ogg.import b/assets/musics/mod118.ogg.import new file mode 100644 index 0000000..4090356 --- /dev/null +++ b/assets/musics/mod118.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bpmc2amg1kbfn" +path="res://.godot/imported/mod118.ogg-227f261feb0690e0a8437a6b7afc3fd3.oggvorbisstr" + +[deps] + +source_file="res://assets/musics/mod118.ogg" +dest_files=["res://.godot/imported/mod118.ogg-227f261feb0690e0a8437a6b7afc3fd3.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/musics/mod147-medley.mp3 b/assets/musics/mod147-medley.mp3 new file mode 100755 index 0000000..6b840f7 Binary files /dev/null and b/assets/musics/mod147-medley.mp3 differ diff --git a/assets/musics/mod147-medley.mp3.import b/assets/musics/mod147-medley.mp3.import new file mode 100644 index 0000000..546b684 --- /dev/null +++ b/assets/musics/mod147-medley.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bknhw0jfylh6n" +path="res://.godot/imported/mod147-medley.mp3-a64644be0457748ff3a2c3e975df9f1d.mp3str" + +[deps] + +source_file="res://assets/musics/mod147-medley.mp3" +dest_files=["res://.godot/imported/mod147-medley.mp3-a64644be0457748ff3a2c3e975df9f1d.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/musics/mod170-toomanyfuckingdoors.ogg b/assets/musics/mod170-toomanyfuckingdoors.ogg new file mode 100755 index 0000000..09df58f Binary files /dev/null and b/assets/musics/mod170-toomanyfuckingdoors.ogg differ diff --git a/assets/musics/mod170-toomanyfuckingdoors.ogg.import b/assets/musics/mod170-toomanyfuckingdoors.ogg.import new file mode 100644 index 0000000..5ff558c --- /dev/null +++ b/assets/musics/mod170-toomanyfuckingdoors.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cgv0sm3h1cttu" +path="res://.godot/imported/mod170-toomanyfuckingdoors.ogg-c8c00bb4ac61939e013e8ce6fcf5df96.oggvorbisstr" + +[deps] + +source_file="res://assets/musics/mod170-toomanyfuckingdoors.ogg" +dest_files=["res://.godot/imported/mod170-toomanyfuckingdoors.ogg-c8c00bb4ac61939e013e8ce6fcf5df96.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/musics/sho.ogg b/assets/musics/sho.ogg new file mode 100755 index 0000000..ee5444e Binary files /dev/null and b/assets/musics/sho.ogg differ diff --git a/assets/musics/sho.ogg.import b/assets/musics/sho.ogg.import new file mode 100644 index 0000000..a14cffc --- /dev/null +++ b/assets/musics/sho.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bxlatcfn5q4ty" +path="res://.godot/imported/sho.ogg-b66af2140d9acc6f3e75264b00966446.oggvorbisstr" + +[deps] + +source_file="res://assets/musics/sho.ogg" +dest_files=["res://.godot/imported/sho.ogg-b66af2140d9acc6f3e75264b00966446.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/src/ingame/ingame.gd b/src/ingame/ingame.gd index 5197d71..0c1da0f 100644 --- a/src/ingame/ingame.gd +++ b/src/ingame/ingame.gd @@ -40,7 +40,21 @@ func _ready() -> void: _add_player.call_deferred(1) if not "--join" in OS.get_cmdline_args(): - $Soundtrack.play() + $Soundtrack.finished.connect(_play_new_track) + _play_new_track() + +# TODO: sync what's played for peers, server controlled +# TODO: keep a list of what wasn't yet played, so that we repeat less +func _play_new_track(): + $Soundtrack.stream = load( + [ + "res://assets/musics/mod118.ogg", + "res://assets/musics/mod147-medley.mp3", + "res://assets/musics/mod170-toomanyfuckingdoors.ogg", + "res://assets/musics/sho.ogg", + ].pick_random() + ) + $Soundtrack.play() func _exit_tree() -> void: diff --git a/src/ingame/ingame.tscn b/src/ingame/ingame.tscn index cec9a72..34b3da1 100644 --- a/src/ingame/ingame.tscn +++ b/src/ingame/ingame.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=14 format=3 uid="uid://oyvhcwq60v2"] +[gd_scene load_steps=13 format=3 uid="uid://oyvhcwq60v2"] [ext_resource type="Script" path="res://src/ingame/ingame.gd" id="1_akuuj"] [ext_resource type="PackedScene" uid="uid://cs8c570bxh6u" path="res://src/ingame/player.tscn" id="2_w1gjc"] [ext_resource type="PackedScene" uid="uid://bysgtksvovyur" path="res://src/ingame/sprout.tscn" id="3_2xvqq"] -[ext_resource type="AudioStream" uid="uid://bpmc2amg1kbfn" path="res://assets/musics/mod118.ogg" id="3_34hvs"] [ext_resource type="Script" path="res://src/ingame/ui.gd" id="3_p340v"] [ext_resource type="PackedScene" uid="uid://enukqx63dh2l" path="res://src/ingame/pipe.tscn" id="4_mltw3"] @@ -46,8 +45,6 @@ _chat_history_inactive = NodePath("UI/ChatPanelInactive/ChatHistoryScroll/ChatHi _chat_history_scroll_inactive = NodePath("UI/ChatPanelInactive/ChatHistoryScroll") [node name="Soundtrack" type="AudioStreamPlayer" parent="."] -stream = ExtResource("3_34hvs") -parameters/looping = true [node name="UI" type="CanvasLayer" parent="." node_paths=PackedStringArray("_combo_timer")] script = ExtResource("3_p340v")