Skip to content

Commit

Permalink
1.0.1 - First Patch
Browse files Browse the repository at this point in the history
This just makes it so songs without cutscenes can end correctly

Also added a "Open Mods Folder" button to the mods menu
  • Loading branch information
swordcube committed Apr 17, 2023
1 parent 58a8760 commit 1cd0689
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
2 changes: 1 addition & 1 deletion TODO.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
chart editor
make mods menu look better
make wiki/documentation
make wiki/documentation
3 changes: 3 additions & 0 deletions scenes/ModsMenu.gd
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,6 @@ func _on_show_item_pressed(name:String):
"Show Contributors":
$Contributors.visible = !$Contributors.visible
$"FumnyStrip/Show Contributors".text = "Hide Contributors" if $Contributors.visible else "Show Contributors"

"Open Mods Folder":
OS.shell_open(ProjectSettings.globalize_path(ModManager.MOD_FOLDER))
9 changes: 9 additions & 0 deletions scenes/ModsMenu.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ offset_right = 355.0
offset_bottom = 47.0
text = "Show Contributors"

[node name="Open Mods Folder" type="Button" parent="FumnyStrip"]
layout_mode = 0
offset_left = 1102.0
offset_top = 10.0
offset_right = 1267.0
offset_bottom = 47.0
text = "Open Mods Folder"

[node name="Description" type="Panel" parent="."]
visible = false
offset_left = 206.5
Expand Down Expand Up @@ -123,3 +131,4 @@ text_overrun_behavior = 3

[connection signal="pressed" from="FumnyStrip/Show Description" to="." method="_on_show_item_pressed" binds= ["Show Description"]]
[connection signal="pressed" from="FumnyStrip/Show Contributors" to="." method="_on_show_item_pressed" binds= ["Show Contributors"]]
[connection signal="pressed" from="FumnyStrip/Open Mods Folder" to="." method="_on_show_item_pressed" binds= ["Open Mods Folder"]]
9 changes: 6 additions & 3 deletions scenes/gameplay/Gameplay.gd
Original file line number Diff line number Diff line change
Expand Up @@ -253,12 +253,16 @@ func _ready() -> void:

stage.callv("_ready_post", [])
script_group.call_func("_ready_post", [])

func start_cutscene(postfix:String = "-start"):
var cutscene_path = "res://scenes/gameplay/cutscenes/" + SONG.name.to_lower() + postfix + ".tscn"
if ResourceLoader.exists(cutscene_path):
in_cutscene = true
hud.add_child(load(cutscene_path).instantiate())
get_tree().paused = true
return true

return false

# yo thanks srt for doing it for me i think i was boutta
# forgor anyway :skoil: ~swordcube
Expand Down Expand Up @@ -332,9 +336,8 @@ func start_song():
func end_song():
if not ending_song:
ending_song = true
start_cutscene("-end")
return
ending_song = true
if start_cutscene("-end"):
return

stage.callv("on_end_song", [])
var ret:Variant = script_group.call_func("on_end_song", [])
Expand Down

0 comments on commit 1cd0689

Please sign in to comment.