forked from team-sg/hero-mark-2
music doesnt restart after death or restart
This commit is contained in:
parent
7f60cf2278
commit
cf0c7848bd
2 changed files with 11 additions and 4 deletions
13
game.gd
13
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
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue