From cf0c7848bd8ff72ca0dac1aff7cc525bc2b78b8e Mon Sep 17 00:00:00 2001
From: pennyrigate <pennyrigate@cybergal.com>
Date: Mon, 20 Feb 2023 23:21:04 -0500
Subject: [PATCH] music doesnt restart after death or restart

---
 game.gd     | 13 ++++++++++---
 maps/map.gd |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/game.gd b/game.gd
index 4394e12..ed203e2 100644
--- a/game.gd
+++ b/game.gd
@@ -23,6 +23,7 @@ onready var ac_climb = $ClimbSound
 onready var ac_die = $DieSound
 onready var ac_music = $Music
 onready var ac_cheat = $CodeEntrySound
+onready var ac_boss = $BossSound
 #Sounds
 const a_gold = preload("res://audio/sounds/gold.wav")
 const a_arrow = preload("res://audio/sounds/a_egg_collect.ogg")
@@ -116,11 +117,11 @@ func timeify(input):
 		var minutes = str(floor(input / 60))
 		var seconds = floor(fmod(input,60))
 		var milliseconds := floor(fmod(input, 1) * 100)
-		return minutes + ":" + ("%02d" % seconds) + ":" + ("%02d" % milliseconds)
+		return minutes + ":" + ("%02d" % seconds) + "." + ("%02d" % milliseconds)
 	elif input == INF:
-		return "-:--:--"
+		return "-:--.--"
 	else:
-		return "9:59:99"
+		return "9:59.99"
 
 #Restart level
 func restart_level():
@@ -137,6 +138,7 @@ func restart_level():
 	for tween in get_tree().get_processed_tweens():
 		tween.kill()
 	Game.change_map(load(Game.get_map().filename))
+	ac_music.stream_paused = false
 
 #Freeze frame
 func freeze_frame(time):
@@ -149,6 +151,11 @@ func freeze_frame(time):
 func has_collection_bonus():
 	return Game.shards == 5 && Game.golds == 50
 
+#Play music, if same track is already playing do nothing
+func play_music(song):
+	if Game.ac_music.stream != song or Game.ac_music.playing == false:
+		play_sound(song,ac_music)
+
 func _process(delta):
 	if Debug.entry == false:
 		#CRT FILTER
diff --git a/maps/map.gd b/maps/map.gd
index 08f671c..25d64e2 100644
--- a/maps/map.gd
+++ b/maps/map.gd
@@ -9,7 +9,7 @@ var life_bonus = true
 var collectible_bonus = false
 
 func _ready():
-	Game.play_sound(music,Game.ac_music)
+	Game.play_music(music)
 
 func _physics_process(delta):
 	if Game.golds == 50 && Game.shards == 5: