Skip to content

Commit 7afdd3f

Browse files
committed
Update pause menu and nerf flame orb speed
1 parent ada2eac commit 7afdd3f

File tree

3 files changed

+16
-17
lines changed

3 files changed

+16
-17
lines changed

SourceCode/scenes/enemies/FlameOrb.tscn

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,11 @@ extents = Vector2( 8, 8 )
4040
[node name="Flame" type="Node2D" groups=["enemies"]]
4141
z_index = -1
4242
script = ExtResource( 4 )
43-
speed = 200
4443
starting_angle = 180
4544

4645
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
4746
z_index = 1
4847
frames = SubResource( 7 )
49-
frame = 1
5048
playing = true
5149
offset = Vector2( 0, -2 )
5250

@@ -56,7 +54,6 @@ material = SubResource( 8 )
5654
scale = Vector2( 5, 5 )
5755
z_index = 1
5856
frames = SubResource( 7 )
59-
frame = 1
6057
playing = true
6158
offset = Vector2( 0, -2 )
6259

@@ -66,6 +63,7 @@ material = SubResource( 8 )
6663
scale = Vector2( 2, 2 )
6764
z_index = 1
6865
frames = SubResource( 7 )
66+
frame = 1
6967
playing = true
7068
offset = Vector2( 0, -2 )
7169

@@ -74,7 +72,6 @@ material = SubResource( 8 )
7472
scale = Vector2( 1.02614, 1.02614 )
7573
z_index = 1
7674
frames = SubResource( 7 )
77-
frame = 1
7875
playing = true
7976
offset = Vector2( 0, -2 )
8077

SourceCode/scenes/menus/PauseScreen.gd

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ onready var button_quit = $Control/CenterContainer/VBoxContainer/Quit
3030
var paused = false setget _set_paused
3131

3232
func _ready():
33-
if WorldmapManager.is_level_worldmap or WorldmapManager.worldmap_level == null:
34-
button_continue.text = "Continue"
33+
if WorldmapManager.is_level_worldmap:
3534
button_restart.hide()
3635
button_abort.hide()
3736

37+
if WorldmapManager.worldmap_level == null:
38+
button_abort.hide()
39+
3840
# Make the music mute if we pause the game.
3941
Music.pause_mode = PAUSE_MODE_INHERIT
4042
menu.hide()

SourceCode/scenes/menus/PauseScreen.tscn

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,33 +59,33 @@ margin_right = 260.0
5959
margin_bottom = 122.0
6060
rect_min_size = Vector2( 260, 0 )
6161
focus_neighbour_top = NodePath("../Quit")
62-
focus_neighbour_bottom = NodePath("../Restart")
63-
text = "Continue Level"
62+
focus_neighbour_bottom = NodePath("../Options")
63+
text = "Continue"
6464

65-
[node name="Restart" type="Button" parent="Control/CenterContainer/VBoxContainer"]
65+
[node name="Options" type="Button" parent="Control/CenterContainer/VBoxContainer"]
6666
margin_top = 137.0
6767
margin_right = 260.0
6868
margin_bottom = 167.0
6969
rect_min_size = Vector2( 260, 0 )
7070
focus_neighbour_top = NodePath("../Continue")
71-
focus_neighbour_bottom = NodePath("../Options")
72-
text = "Restart Level"
71+
focus_neighbour_bottom = NodePath("../Restart")
72+
text = "Options"
7373

74-
[node name="Options" type="Button" parent="Control/CenterContainer/VBoxContainer"]
74+
[node name="Restart" type="Button" parent="Control/CenterContainer/VBoxContainer"]
7575
margin_top = 182.0
7676
margin_right = 260.0
7777
margin_bottom = 212.0
7878
rect_min_size = Vector2( 260, 0 )
79-
focus_neighbour_top = NodePath("../Restart")
79+
focus_neighbour_top = NodePath("../Options")
8080
focus_neighbour_bottom = NodePath("../Abort")
81-
text = "Options"
81+
text = "Restart Level"
8282

8383
[node name="Abort" type="Button" parent="Control/CenterContainer/VBoxContainer"]
8484
margin_top = 227.0
8585
margin_right = 260.0
8686
margin_bottom = 257.0
8787
rect_min_size = Vector2( 260, 0 )
88-
focus_neighbour_top = NodePath("../Options")
88+
focus_neighbour_top = NodePath("../Restart")
8989
focus_neighbour_bottom = NodePath("../Quit")
9090
text = "Abort Level"
9191

@@ -103,10 +103,10 @@ text = "Save and Quit"
103103
[connection signal="visibility_changed" from="Control" to="." method="_on_Control_visibility_changed"]
104104
[connection signal="mouse_entered" from="Control/CenterContainer/VBoxContainer/Continue" to="." method="_on_Continue_mouse_entered"]
105105
[connection signal="pressed" from="Control/CenterContainer/VBoxContainer/Continue" to="." method="_on_Continue_pressed"]
106-
[connection signal="mouse_entered" from="Control/CenterContainer/VBoxContainer/Restart" to="." method="_on_Restart_mouse_entered"]
107-
[connection signal="pressed" from="Control/CenterContainer/VBoxContainer/Restart" to="." method="_on_Restart_pressed"]
108106
[connection signal="mouse_entered" from="Control/CenterContainer/VBoxContainer/Options" to="." method="_on_Options_mouse_entered"]
109107
[connection signal="pressed" from="Control/CenterContainer/VBoxContainer/Options" to="." method="_on_Options_pressed"]
108+
[connection signal="mouse_entered" from="Control/CenterContainer/VBoxContainer/Restart" to="." method="_on_Restart_mouse_entered"]
109+
[connection signal="pressed" from="Control/CenterContainer/VBoxContainer/Restart" to="." method="_on_Restart_pressed"]
110110
[connection signal="mouse_entered" from="Control/CenterContainer/VBoxContainer/Abort" to="." method="_on_Abort_mouse_entered"]
111111
[connection signal="pressed" from="Control/CenterContainer/VBoxContainer/Abort" to="." method="_on_Abort_pressed"]
112112
[connection signal="mouse_entered" from="Control/CenterContainer/VBoxContainer/Quit" to="." method="_on_Quit_mouse_entered"]

0 commit comments

Comments
 (0)