Merge branch 'main' of github.com:RYGhub/the-cold-night

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)
- 
+ 

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

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"
 
 
 

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

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