From 30a03c1989eda1ed0ee8077f880b42051119f684 Mon Sep 17 00:00:00 2001 From: Cookie-CHR Date: Mon, 4 Apr 2022 22:35:51 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9D=93=20Not=20sure=20if=20it=20works?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/fire/Fire.gd | 2 +- src/levels/Game.tscn | 14 +++++++++++++- src/levels/Music.gd | 2 ++ src/sounds/FireCrackle.mp3 | 3 +++ src/sounds/FireCrackle.mp3.import | 15 +++++++++++++++ src/sounds/Wind.mp3 | 3 +++ src/sounds/Wind.mp3.import | 15 +++++++++++++++ 7 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 src/sounds/FireCrackle.mp3 create mode 100644 src/sounds/FireCrackle.mp3.import create mode 100644 src/sounds/Wind.mp3 create mode 100644 src/sounds/Wind.mp3.import diff --git a/src/entities/fire/Fire.gd b/src/entities/fire/Fire.gd index 01c4dab..ce1ef33 100644 --- a/src/entities/fire/Fire.gd +++ b/src/entities/fire/Fire.gd @@ -11,4 +11,4 @@ func _on_Flame_body_entered(body): func _on_Damageable_health_changed(origin, value): var scale = smoothstep(origin.min_health, origin.max_health, value) * 2 $Flame.scale = Vector2(scale, scale) - \ No newline at end of file + diff --git a/src/levels/Game.tscn b/src/levels/Game.tscn index ae14516..5fe1e98 100644 --- a/src/levels/Game.tscn +++ b/src/levels/Game.tscn @@ -1,5 +1,7 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=11 format=2] +[ext_resource path="res://src/sounds/FireCrackle.mp3" type="AudioStream" id=1] +[ext_resource path="res://src/sounds/Wind.mp3" type="AudioStream" id=2] [ext_resource path="res://src/music/BossDrum.mp3" type="AudioStream" id=3] [ext_resource path="res://src/mechanics/RNG.tscn" type="PackedScene" id=5] [ext_resource path="res://src/levels/Game.gd" type="Script" id=6] @@ -41,3 +43,13 @@ autoplay = true stream = ExtResource( 7 ) volume_db = -80.0 autoplay = true + +[node name="FireCrackle" type="AudioStreamPlayer" parent="Music"] +stream = ExtResource( 1 ) +volume_db = -80.0 +autoplay = true + +[node name="Wind" type="AudioStreamPlayer" parent="Music"] +stream = ExtResource( 2 ) +volume_db = -80.0 +autoplay = true diff --git a/src/levels/Music.gd b/src/levels/Music.gd index 858699a..e494e45 100644 --- a/src/levels/Music.gd +++ b/src/levels/Music.gd @@ -30,6 +30,8 @@ func update_state(): $Drum.bus = "Master" if $Drum.volume_db > -60 else "Mute" $BossDrum.bus = "Master" if $BossDrum.volume_db > -60 else "Mute" $BossGuitar.bus = "Master" if $BossGuitar.volume_db > -60 else "Mute" + $Wind.bus = "Master" if $Wind.volume_db > -60 else "Mute" + $FireCrackle.bus = "Master" if $FireCrackle.volume_db > -60 else "Mute" diff --git a/src/sounds/FireCrackle.mp3 b/src/sounds/FireCrackle.mp3 new file mode 100644 index 0000000..f3bd0bc --- /dev/null +++ b/src/sounds/FireCrackle.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8af62b045d1a0aa7d3119ad06c70dda26bbe13ae3611da11d4e709287ca272bf +size 960514 diff --git a/src/sounds/FireCrackle.mp3.import b/src/sounds/FireCrackle.mp3.import new file mode 100644 index 0000000..f22bf88 --- /dev/null +++ b/src/sounds/FireCrackle.mp3.import @@ -0,0 +1,15 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +path="res://.import/FireCrackle.mp3-6c3841eacf77f749f5209b7b948241aa.mp3str" + +[deps] + +source_file="res://src/sounds/FireCrackle.mp3" +dest_files=[ "res://.import/FireCrackle.mp3-6c3841eacf77f749f5209b7b948241aa.mp3str" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/sounds/Wind.mp3 b/src/sounds/Wind.mp3 new file mode 100644 index 0000000..fb30aa4 --- /dev/null +++ b/src/sounds/Wind.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc4d25a7468909d7f03587a42b7a070737a483235bd6308122be612dd43f8ca0 +size 687815 diff --git a/src/sounds/Wind.mp3.import b/src/sounds/Wind.mp3.import new file mode 100644 index 0000000..3d6032d --- /dev/null +++ b/src/sounds/Wind.mp3.import @@ -0,0 +1,15 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +path="res://.import/Wind.mp3-f3831bd9075b9c29cda2bdbea8a5f831.mp3str" + +[deps] + +source_file="res://src/sounds/Wind.mp3" +dest_files=[ "res://.import/Wind.mp3-f3831bd9075b9c29cda2bdbea8a5f831.mp3str" ] + +[params] + +loop=true +loop_offset=0