Merge pull request #732 from Poobslag/new-tunes-20201122

New songs: Acid Reflux, Extra Sprinkles, Nomnambulism
Poobslag · Nov 22, 2020 · 203ee5c · 203ee5c
2 parents 3fe9769 + 2339450
commit 203ee5c
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 4 deletions.
diff --git a/project/assets/main/music/acid-reflux.ogg b/project/assets/main/music/acid-reflux.ogg
diff --git a/project/assets/main/music/acid-reflux.ogg.import b/project/assets/main/music/acid-reflux.ogg.import
@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/acid-reflux.ogg-11f9c09fdde9ed28306f2afaec4be9a0.oggstr"
+
+[deps]
+
+source_file="res://assets/main/music/acid-reflux.ogg"
+dest_files=[ "res://.import/acid-reflux.ogg-11f9c09fdde9ed28306f2afaec4be9a0.oggstr" ]
+
+[params]
+
+loop=true
+loop_offset=0
diff --git a/project/assets/main/music/extra-sprinkles.ogg b/project/assets/main/music/extra-sprinkles.ogg
diff --git a/project/assets/main/music/extra-sprinkles.ogg.import b/project/assets/main/music/extra-sprinkles.ogg.import
@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/extra-sprinkles.ogg-fa214cac9c4fd50b323bb358a76cbcd6.oggstr"
+
+[deps]
+
+source_file="res://assets/main/music/extra-sprinkles.ogg"
+dest_files=[ "res://.import/extra-sprinkles.ogg-fa214cac9c4fd50b323bb358a76cbcd6.oggstr" ]
+
+[params]
+
+loop=true
+loop_offset=0
diff --git a/project/assets/main/music/nomnambulism.ogg b/project/assets/main/music/nomnambulism.ogg
diff --git a/project/assets/main/music/nomnambulism.ogg.import b/project/assets/main/music/nomnambulism.ogg.import
@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/nomnambulism.ogg-9ea0fb709b991f7cf740837c6d49dfb3.oggstr"
+
+[deps]
+
+source_file="res://assets/main/music/nomnambulism.ogg"
+dest_files=[ "res://.import/nomnambulism.ogg-9ea0fb709b991f7cf740837c6d49dfb3.oggstr" ]
+
+[params]
+
+loop=true
+loop_offset=0
diff --git a/project/src/main/music/MusicPlayer.tscn b/project/src/main/music/MusicPlayer.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=2]
+[gd_scene load_steps=21 format=2]
 
 [ext_resource path="res://src/main/music/music-player.gd" type="Script" id=1]
 [ext_resource path="res://src/main/music/CheckpointSong.tscn" type="PackedScene" id=2]
@@ -17,6 +17,9 @@
 [ext_resource path="res://assets/main/music/chub-n-bass.ogg" type="AudioStream" id=15]
 [ext_resource path="res://assets/main/music/harder-butter.ogg" type="AudioStream" id=16]
 [ext_resource path="res://assets/main/music/dessert-course.ogg" type="AudioStream" id=17]
+[ext_resource path="res://assets/main/music/acid-reflux.ogg" type="AudioStream" id=18]
+[ext_resource path="res://assets/main/music/nomnambulism.ogg" type="AudioStream" id=19]
+[ext_resource path="res://assets/main/music/extra-sprinkles.ogg" type="AudioStream" id=20]
 
 [node name="MusicPlayer" type="Node"]
 pause_mode = 2
@@ -99,7 +102,7 @@ song_color = Color( 0.988235, 0.588235, 0.929412, 1 )
 stream = ExtResource( 15 )
 checkpoints = [ 0.0, 22.575, 101.642 ]
 song_title = "Chub 'n Bass"
-song_color = Color( 0.352941, 0.666667, 0.301961, 1 )
+song_color = Color( 0.24, 0.75, 0.3675, 1 )
 
 [node name="MyFatnessPal" parent="." instance=ExtResource( 2 )]
 stream = ExtResource( 11 )
@@ -108,6 +111,25 @@ checkpoints = [ 0.0, 25.098, 50.196, 74.681 ]
 song_title = "My Fatness Pal"
 song_color = Color( 0.709804, 0.486275, 0.917647, 1 )
 
+[node name="Nomnambulism" parent="." instance=ExtResource( 2 )]
+stream = ExtResource( 19 )
+checkpoints = [ 0.0, 20.206, 101.058 ]
+song_title = "Nomnambulism"
+song_color = Color( 0.538333, 0.3825, 0.85, 1 )
+
+[node name="AcidReflux" parent="." instance=ExtResource( 2 )]
+stream = ExtResource( 18 )
+checkpoints = [ 0.0, 32.912, 65.827, 87.771, 120.686 ]
+song_title = "Acid Reflux"
+song_color = Color( 0.3245, 0.55, 0.22, 1 )
+
+[node name="ExtraSprinkles" parent="." instance=ExtResource( 2 )]
+stream = ExtResource( 20 )
+volume_db = -3.0
+checkpoints = [ 0.0 ]
+song_title = "Extra Sprinkles"
+song_color = Color( 1, 0.74902, 0.34902, 1 )
+
 [node name="MusicTween" type="Tween" parent="."]
 script = ExtResource( 4 )
 [connection signal="tween_completed" from="MusicTween" to="MusicTween" method="_on_tween_completed"]
diff --git a/project/src/main/music/music-player.gd b/project/src/main/music/music-player.gd
@@ -25,9 +25,11 @@ var _max_volume_db_by_bgm := {}
 var all_bgms
 
 # newest track(s) play twice as often
-onready var _chill_bgms := [$ChubHub, $DessertCourse, $HarderButter, $HotFunkSundae, $LoFiChill]
+onready var _chill_bgms := [$ChubHub, $DessertCourse, $HarderButter, $HotFunkSundae, $LoFiChill,
+		$Nomnambulism, $Nomnambulism]
 onready var _upbeat_bgms := [$ChubNBass, $ChunkyObake, $DooDooDoo, $JuicerMixerGrinder, $MysticMuffin,
-		$PressureCooker, $SugarCrash, $TripleThiccShake]
+		$PressureCooker, $SugarCrash, $TripleThiccShake,
+		$AcidReflux, $AcidReflux, $ExtraSprinkles, $ExtraSprinkles]
 onready var _tutorial_bgms := [$MyFatnessPal]
 
 func _ready() -> void: