From c6fa99bf003da781ab9f2e6ae96a6351fa1f6e78 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Fri, 5 Jul 2024 09:53:41 -0700 Subject: [PATCH] runlevels fix --- global.gd | 2 +- levels/ui/gameplay.gd | 12 ++++++------ levels/ui/pause.gd | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/global.gd b/global.gd index 2625752..7daebbb 100644 --- a/global.gd +++ b/global.gd @@ -49,7 +49,7 @@ var firstrun const musictracks = ["res://music/midorinoakuma.wav", "res://music/seahorse.wav", "res://music/chinesegoat.wav", "res://music/doyoufeelold.wav", "res://music/doyiuneedahealer.wav", "res://music/adayatceres.wav", "res://music/twintroublemakers.wav", "res://music/easyquiz.wav", "res://music/neowave.wav", "res://music/multivectorsubmarines.wav", "res://music/halfgeniegirls.wav", "res://music/rusianmaverickfairy.wav", "res://music/blacksmithofdestruction.wav", "res://music/shininglikefireworks.wav", "res://music/sadtrashcan.wav", "res://music/akikoletter.wav", "res://music/asadcat.wav", "res://music/lilydesire.wav", "res://music/scholartrip.wav", "res://music/quantumice.wav", "res://music/unreeeal.wav", "res://music/alsa.wav", "res://music/silverblue.wav"] const sfxtracks = ["res://sfx/braindamage.wav", "res://sfx/gaugefill.wav", "res://sfx/boomboombakudan.wav"] var debug = false -const release = "R0.1.9-alpha" +const release = "R0.1.9-dev" var sk = false var xm = 0 var ym = 0 diff --git a/levels/ui/gameplay.gd b/levels/ui/gameplay.gd index 28e6d88..74d591e 100644 --- a/levels/ui/gameplay.gd +++ b/levels/ui/gameplay.gd @@ -49,7 +49,7 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): var velocity = Vector2.ZERO - if Global.exitgame: + if Global.live == 6: _exit() #velocity = (Vector2.RIGHT.rotated(rotation) * -100 * Global.xm * delta)-Vector2.UP.rotated(rotation) * -100 * Global.ym * delta @@ -139,11 +139,11 @@ func _exit(): ishud = false Global.bossready = false Global.cboss = [null, null, null] - if Global.live == 4: - get_tree().root.remove_child(pmenu) - else: - get_tree().root.remove_child(thud) - get_tree().root.remove_child(bhud) + #if Global.live == 4: + get_tree().root.remove_child(pmenu) + #else: + # get_tree().root.remove_child(thud) + # get_tree().root.remove_child(bhud) #get_tree().root.remove_child(player) get_tree().root.remove_child(level) Global.live = 0 diff --git a/levels/ui/pause.gd b/levels/ui/pause.gd index 4a80d36..0e0d5a3 100644 --- a/levels/ui/pause.gd +++ b/levels/ui/pause.gd @@ -36,5 +36,5 @@ func _fetchdata(): func _on_exit_pressed(): - Global.exitgame = true + Global.live = 6 #pass # Replace with function body.