diff --git a/audio/effects/noch_einen_schatz_finden.mp3 b/audio/effects/noch_einen_schatz_finden.mp3 index 15ed069..701f1d5 100644 Binary files a/audio/effects/noch_einen_schatz_finden.mp3 and b/audio/effects/noch_einen_schatz_finden.mp3 differ diff --git a/audio/music/edit_looperman-l-2648038-0125430-imthewizzy-adventure.mp3 b/audio/music/edit_looperman-l-2648038-0125430-imthewizzy-adventure.mp3 new file mode 100644 index 0000000..9feb357 Binary files /dev/null and b/audio/music/edit_looperman-l-2648038-0125430-imthewizzy-adventure.mp3 differ diff --git a/audio/music/edit_looperman-l-2648038-0125430-imthewizzy-adventure.mp3.import b/audio/music/edit_looperman-l-2648038-0125430-imthewizzy-adventure.mp3.import new file mode 100644 index 0000000..b380974 --- /dev/null +++ b/audio/music/edit_looperman-l-2648038-0125430-imthewizzy-adventure.mp3.import @@ -0,0 +1,15 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +path="res://.import/edit_looperman-l-2648038-0125430-imthewizzy-adventure.mp3-1363ee75480ffb98ae755b44793a39f0.mp3str" + +[deps] + +source_file="res://audio/music/edit_looperman-l-2648038-0125430-imthewizzy-adventure.mp3" +dest_files=[ "res://.import/edit_looperman-l-2648038-0125430-imthewizzy-adventure.mp3-1363ee75480ffb98ae755b44793a39f0.mp3str" ] + +[params] + +loop=true +loop_offset=0 diff --git a/audio/music/edit_looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3 b/audio/music/edit_looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3 new file mode 100644 index 0000000..620ef3a Binary files /dev/null and b/audio/music/edit_looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3 differ diff --git a/audio/music/edit_looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3.import b/audio/music/edit_looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3.import new file mode 100644 index 0000000..18f90cc --- /dev/null +++ b/audio/music/edit_looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3.import @@ -0,0 +1,15 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +path="res://.import/edit_looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3-802695d814b0f6c9de975b0d72ef71fb.mp3str" + +[deps] + +source_file="res://audio/music/edit_looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3" +dest_files=[ "res://.import/edit_looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3-802695d814b0f6c9de975b0d72ef71fb.mp3str" ] + +[params] + +loop=true +loop_offset=0 diff --git a/audio/music/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.mp3 b/audio/music/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.mp3 deleted file mode 100644 index 14f255c..0000000 Binary files a/audio/music/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.mp3 and /dev/null differ diff --git a/audio/music/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.mp3.import b/audio/music/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.mp3.import deleted file mode 100644 index 74e45de..0000000 --- a/audio/music/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.mp3-addf6a44c60d5349e357a73df59d2f6e.mp3str" - -[deps] - -source_file="res://audio/music/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.mp3" -dest_files=[ "res://.import/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.mp3-addf6a44c60d5349e357a73df59d2f6e.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/audio/music/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.wav.import b/audio/music/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.wav.import deleted file mode 100644 index f657797..0000000 --- a/audio/music/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.wav.import +++ /dev/null @@ -1,21 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.wav-1db12a8cec1c474148650c1bddcc1e91.sample" - -[deps] - -source_file="res://audio/music/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.wav" -dest_files=[ "res://.import/looperman-l-2353443-0126764-yungkimchi-adventure-synthwave-arp.wav-1db12a8cec1c474148650c1bddcc1e91.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=false -compress/mode=0 diff --git a/audio/music/looperman-l-2550509-0151182-goin-on-an-adventure.mp3.import b/audio/music/looperman-l-2550509-0151182-goin-on-an-adventure.mp3.import deleted file mode 100644 index 11e7c42..0000000 --- a/audio/music/looperman-l-2550509-0151182-goin-on-an-adventure.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/looperman-l-2550509-0151182-goin-on-an-adventure.mp3-98542903c1b049edcff8ef66a7b3e7c4.mp3str" - -[deps] - -source_file="res://audio/music/looperman-l-2550509-0151182-goin-on-an-adventure.mp3" -dest_files=[ "res://.import/looperman-l-2550509-0151182-goin-on-an-adventure.mp3-98542903c1b049edcff8ef66a7b3e7c4.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/audio/music/looperman-l-2550509-0151182-goin-on-an-adventure.wav.import b/audio/music/looperman-l-2550509-0151182-goin-on-an-adventure.wav.import deleted file mode 100644 index c5f1603..0000000 --- a/audio/music/looperman-l-2550509-0151182-goin-on-an-adventure.wav.import +++ /dev/null @@ -1,21 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/looperman-l-2550509-0151182-goin-on-an-adventure.wav-164c13a935cb6b863bc6166c4afdf271.sample" - -[deps] - -source_file="res://audio/music/looperman-l-2550509-0151182-goin-on-an-adventure.wav" -dest_files=[ "res://.import/looperman-l-2550509-0151182-goin-on-an-adventure.wav-164c13a935cb6b863bc6166c4afdf271.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=false -compress/mode=0 diff --git a/audio/music/looperman-l-2648038-0125430-imthewizzy-adventure.mp3 b/audio/music/looperman-l-2648038-0125430-imthewizzy-adventure.mp3 deleted file mode 100644 index 4b701b0..0000000 Binary files a/audio/music/looperman-l-2648038-0125430-imthewizzy-adventure.mp3 and /dev/null differ diff --git a/audio/music/looperman-l-2648038-0125430-imthewizzy-adventure.mp3.import b/audio/music/looperman-l-2648038-0125430-imthewizzy-adventure.mp3.import deleted file mode 100644 index d883db1..0000000 --- a/audio/music/looperman-l-2648038-0125430-imthewizzy-adventure.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/looperman-l-2648038-0125430-imthewizzy-adventure.mp3-77d12c5a8191e0995c347435d5a08d32.mp3str" - -[deps] - -source_file="res://audio/music/looperman-l-2648038-0125430-imthewizzy-adventure.mp3" -dest_files=[ "res://.import/looperman-l-2648038-0125430-imthewizzy-adventure.mp3-77d12c5a8191e0995c347435d5a08d32.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/audio/music/looperman-l-2648038-0125430-imthewizzy-adventure.wav.import b/audio/music/looperman-l-2648038-0125430-imthewizzy-adventure.wav.import deleted file mode 100644 index fbf87af..0000000 --- a/audio/music/looperman-l-2648038-0125430-imthewizzy-adventure.wav.import +++ /dev/null @@ -1,21 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/looperman-l-2648038-0125430-imthewizzy-adventure.wav-fbe07fb77581d1abb3ea8845407840ec.sample" - -[deps] - -source_file="res://audio/music/looperman-l-2648038-0125430-imthewizzy-adventure.wav" -dest_files=[ "res://.import/looperman-l-2648038-0125430-imthewizzy-adventure.wav-fbe07fb77581d1abb3ea8845407840ec.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=false -compress/mode=0 diff --git a/audio/music/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3 b/audio/music/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3 deleted file mode 100644 index 921d4b0..0000000 Binary files a/audio/music/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3 and /dev/null differ diff --git a/audio/music/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3.import b/audio/music/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3.import deleted file mode 100644 index a562fe4..0000000 --- a/audio/music/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3-d7c5438cde05bb54b09e12f548c7cc30.mp3str" - -[deps] - -source_file="res://audio/music/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3" -dest_files=[ "res://.import/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3-d7c5438cde05bb54b09e12f548c7cc30.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/audio/music/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.wav.import b/audio/music/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.wav.import deleted file mode 100644 index 3ab017a..0000000 --- a/audio/music/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.wav.import +++ /dev/null @@ -1,21 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.wav-5d849cbafd3780327785fa958a2c3be9.sample" - -[deps] - -source_file="res://audio/music/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.wav" -dest_files=[ "res://.import/looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.wav-5d849cbafd3780327785fa958a2c3be9.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=false -compress/mode=0 diff --git a/audio/music/looperman-l-2550509-0151182-goin-on-an-adventure.mp3 b/audio/music/yas_looperman-l-2550509-0151182-goin-on-an-adventure.mp3 similarity index 100% rename from audio/music/looperman-l-2550509-0151182-goin-on-an-adventure.mp3 rename to audio/music/yas_looperman-l-2550509-0151182-goin-on-an-adventure.mp3 diff --git a/audio/music/yas_looperman-l-2550509-0151182-goin-on-an-adventure.mp3.import b/audio/music/yas_looperman-l-2550509-0151182-goin-on-an-adventure.mp3.import new file mode 100644 index 0000000..69201d7 --- /dev/null +++ b/audio/music/yas_looperman-l-2550509-0151182-goin-on-an-adventure.mp3.import @@ -0,0 +1,15 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +path="res://.import/yas_looperman-l-2550509-0151182-goin-on-an-adventure.mp3-194b6aa07feec7f9d767e13b34b1abf8.mp3str" + +[deps] + +source_file="res://audio/music/yas_looperman-l-2550509-0151182-goin-on-an-adventure.mp3" +dest_files=[ "res://.import/yas_looperman-l-2550509-0151182-goin-on-an-adventure.mp3-194b6aa07feec7f9d767e13b34b1abf8.mp3str" ] + +[params] + +loop=true +loop_offset=0 diff --git a/scenes/Game.tscn b/scenes/Game.tscn index c709fb7..5a1de73 100644 --- a/scenes/Game.tscn +++ b/scenes/Game.tscn @@ -11,8 +11,8 @@ [ext_resource path="res://assets/boat.svg" type="Texture" id=9] [ext_resource path="res://assets/shovel.svg" type="Texture" id=10] [ext_resource path="res://assets/Yeah.png" type="Texture" id=11] -[ext_resource path="res://audio/music/looperman-l-2550509-0151182-goin-on-an-adventure.mp3" type="AudioStream" id=12] [ext_resource path="res://scenes/SoundEffectsPlayer.gd" type="Script" id=13] +[ext_resource path="res://scenes/MusicPlayer.gd" type="Script" id=14] [sub_resource type="DynamicFont" id=1] size = 27 @@ -28,6 +28,14 @@ resource_name = "TileTypeGroup" [node name="GameRoot" type="Node"] +[node name="MusicPlayer" type="AudioStreamPlayer" parent="."] +volume_db = -16.124 +autoplay = true +script = ExtResource( 14 ) + +[node name="SoundEffectsPlayer" type="AudioStreamPlayer" parent="."] +script = ExtResource( 13 ) + [node name="Editor" type="Node2D" parent="."] script = ExtResource( 7 ) @@ -387,20 +395,13 @@ render_target_update_mode = 1 [node name="Camera2D" type="Camera2D" parent="IslandMapRenderer"] -[node name="MusicPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 12 ) -volume_db = -16.124 -autoplay = true - -[node name="SoundEffectsPlayer" type="AudioStreamPlayer" parent="."] -script = ExtResource( 13 ) - [connection signal="value_changed" from="Editor/UI/Editor/IslandIndex" to="Editor" method="_on_IslandIndex_value_changed"] [connection signal="pressed" from="Editor/UI/Editor/ClearWorldButton" to="Editor" method="_on_ClearWorldButton_pressed"] [connection signal="pressed" from="Editor/UI/Editor/LoadWorldButton" to="Editor" method="_on_LoadWorldButton_pressed"] [connection signal="pressed" from="Editor/UI/Editor/SaveWorldButton" to="Editor" method="_on_SaveWorldButton_pressed"] [connection signal="bird_flight_start" from="World" to="SoundEffectsPlayer" method="_on_World_bird_flight_start"] [connection signal="digging_started" from="World" to="SoundEffectsPlayer" method="_on_World_digging_started"] +[connection signal="level_started" from="World" to="MusicPlayer" method="_on_World_level_started"] [connection signal="map_opened" from="World" to="SoundEffectsPlayer" method="_on_World_map_opened"] [connection signal="treasure_found" from="World" to="SoundEffectsPlayer" method="_on_World_treasure_found"] [connection signal="world_generation_triggered" from="World" to="SoundEffectsPlayer" method="_on_World_world_generation_triggered"] diff --git a/scenes/MusicPlayer.gd b/scenes/MusicPlayer.gd new file mode 100644 index 0000000..7c5cc50 --- /dev/null +++ b/scenes/MusicPlayer.gd @@ -0,0 +1,22 @@ +extends AudioStreamPlayer + +onready var songs = [ + preload("res://audio/music/edit_looperman-l-2648038-0125430-imthewizzy-adventure.mp3"), + preload("res://audio/music/edit_looperman-l-2762820-0244446-nick-mira-type-8bit-adventure.mp3"), + preload("res://audio/music/yas_looperman-l-2550509-0151182-goin-on-an-adventure.mp3") + ] + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass + + +func _on_World_level_started(): + if songs == null: + return + + stop() + var rng = RandomNumberGenerator.new() + rng.randomize() + stream = songs[rng.randi() % len(songs)] + play() diff --git a/scenes/World.gd b/scenes/World.gd index b195c61..9df8a11 100644 --- a/scenes/World.gd +++ b/scenes/World.gd @@ -66,6 +66,7 @@ signal bird_flight_start signal bird_flight_end signal map_opened signal map_closed +signal level_started # # Godot Functions @@ -88,6 +89,9 @@ func _ready(): self.connect("map_opened", self, "on_map_opened") self.connect("map_closed", self, "on_map_closed") + + # We're starting on the water + DigButton.disabled = true func _process(delta): if is_editor_active(): @@ -322,6 +326,7 @@ func generate(): populate_ocean_nav_grid() + emit_signal("level_started") # # Navigation @@ -387,6 +392,8 @@ func on_enter_island(island): populate_island_nav_grid() island.update() + DigButton.disabled = false + if Globals.debug_nav: update() @@ -398,6 +405,8 @@ func on_leave_island(island): island.landing_site_local_coord = null island.update() + DigButton.disabled = true + if Globals.debug_nav: update() @@ -424,23 +433,19 @@ func on_treasure_found(): func on_map_opened(): BirdyButton.disabled = true - DigButton.disabled = true func on_map_closed(): BirdyButton.disabled = false - DigButton.disabled = false func on_bird_flight_started(): print ("flight started") - DigButton.disabled = true MapButton.disabled = true func on_bird_flight_ended(): print ("flight ended") - DigButton.disabled = false MapButton.disabled = false