From c381057229c29ecec3fca4189fb2bc2a58f72bcb Mon Sep 17 00:00:00 2001 From: GuglioIsStupid Date: Mon, 22 Apr 2024 14:27:51 -0400 Subject: [PATCH] fix tutorial --- src/love/data/tutorial/{tutorial => }/tutorial-easy.json | 0 src/love/data/tutorial/{tutorial => }/tutorial-hard.json | 0 src/love/data/tutorial/{tutorial => }/tutorial.json | 0 src/love/states/weeks.lua | 4 +++- 4 files changed, 3 insertions(+), 1 deletion(-) rename src/love/data/tutorial/{tutorial => }/tutorial-easy.json (100%) rename src/love/data/tutorial/{tutorial => }/tutorial-hard.json (100%) rename src/love/data/tutorial/{tutorial => }/tutorial.json (100%) diff --git a/src/love/data/tutorial/tutorial/tutorial-easy.json b/src/love/data/tutorial/tutorial-easy.json similarity index 100% rename from src/love/data/tutorial/tutorial/tutorial-easy.json rename to src/love/data/tutorial/tutorial-easy.json diff --git a/src/love/data/tutorial/tutorial/tutorial-hard.json b/src/love/data/tutorial/tutorial-hard.json similarity index 100% rename from src/love/data/tutorial/tutorial/tutorial-hard.json rename to src/love/data/tutorial/tutorial-hard.json diff --git a/src/love/data/tutorial/tutorial/tutorial.json b/src/love/data/tutorial/tutorial.json similarity index 100% rename from src/love/data/tutorial/tutorial/tutorial.json rename to src/love/data/tutorial/tutorial.json diff --git a/src/love/states/weeks.lua b/src/love/states/weeks.lua index b7f118f2..9daadc74 100644 --- a/src/love/states/weeks.lua +++ b/src/love/states/weeks.lua @@ -315,7 +315,9 @@ return { end, checkSongOver = function(self) - if not (countingDown or graphics.isFading()) and not (inst:isPlaying()) and not paused and not inCutscene then + --if not (countingDown or graphics.isFading()) and not (inst and inst:isPlaying()) and not paused and not inCutscene then + -- use inst, if inst doesn't exist, use voices, else dont use anything + if not (countingDown or graphics.isFading()) and not ((inst and inst:isPlaying()) or (voices and voices:isPlaying())) and not paused and not inCutscene then if storyMode and song < #weekMeta[weekNum][2] then self:saveData() song = song + 1