From 6ae57ea4e8411511d5a92a6c02d5a19116643b9b Mon Sep 17 00:00:00 2001
From: Tom Beckmann <tomjonabc@gmail.com>
Date: Sun, 27 Sep 2020 20:09:48 +0200
Subject: [PATCH] fix intro melody

---
 scenes/newgame.gd             |  6 ++++--
 scenes/newgame.tscn           | 11 ++++-------
 sounds/intro_start.wav.import |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/scenes/newgame.gd b/scenes/newgame.gd
index 4f7ecc4..8ad761f 100644
--- a/scenes/newgame.gd
+++ b/scenes/newgame.gd
@@ -14,9 +14,11 @@ func _ready():
 	$FourColorsCheckBox.pressed = Global.useFourColors
 	$AutoCritCheckBox.pressed = Global.useAutoCrits
 	get_current_highscore()
-	
+	$Music/StartPlayer.connect("finished", $Music/LoopPlayer, "play")
+
 func _process(delta):
-	fade_music_if_needed(delta)
+	# fade_music_if_needed(delta)
+	pass
 
 func get_current_highscore():
 	var http_request = HTTPRequest.new()
diff --git a/scenes/newgame.tscn b/scenes/newgame.tscn
index 1a4f4f0..36f45bc 100644
--- a/scenes/newgame.tscn
+++ b/scenes/newgame.tscn
@@ -4,8 +4,8 @@
 [ext_resource path="res://scenes/newgame.gd" type="Script" id=2]
 [ext_resource path="res://fonts/audiowide-large.tres" type="DynamicFont" id=3]
 [ext_resource path="res://fonts/audiowide.tres" type="DynamicFont" id=4]
-[ext_resource path="res://sounds/intro_loop.wav" type="AudioStream" id=5]
-[ext_resource path="res://sounds/intro_start.wav" type="AudioStream" id=6]
+[ext_resource path="res://sounds/intro_start.wav" type="AudioStream" id=5]
+[ext_resource path="res://sounds/intro_loop.wav" type="AudioStream" id=6]
 
 [node name="newgame" type="Node2D"]
 script = ExtResource( 2 )
@@ -86,11 +86,8 @@ __meta__ = {
 [node name="Music" type="Node" parent="."]
 
 [node name="StartPlayer" type="AudioStreamPlayer" parent="Music"]
-stream = ExtResource( 6 )
+stream = ExtResource( 5 )
 autoplay = true
-bus = "Music"
 
 [node name="LoopPlayer" type="AudioStreamPlayer" parent="Music"]
-stream = ExtResource( 5 )
-volume_db = -80.0
-bus = "Music"
+stream = ExtResource( 6 )
diff --git a/sounds/intro_start.wav.import b/sounds/intro_start.wav.import
index fbe6257..84f44e6 100644
--- a/sounds/intro_start.wav.import
+++ b/sounds/intro_start.wav.import
@@ -17,5 +17,5 @@ force/max_rate=false
 force/max_rate_hz=44100
 edit/trim=false
 edit/normalize=false
-edit/loop=true
+edit/loop=false
 compress/mode=0