From 3f7e7a22ae603cb9e63694c7a0d30e1eb5e787f7 Mon Sep 17 00:00:00 2001 From: GuglioIsStupid Date: Fri, 21 Jun 2024 19:41:02 -0400 Subject: [PATCH] weeks:generatePsychEvents function, fix stage editor for mod folder mods --- src/love/modules/extras.lua | 18 ++++++++++++++++++ src/love/states/debug/stage-debug.lua | 1 + 2 files changed, 19 insertions(+) diff --git a/src/love/modules/extras.lua b/src/love/modules/extras.lua index 104a37f7..5a1fb2ad 100644 --- a/src/love/modules/extras.lua +++ b/src/love/modules/extras.lua @@ -141,6 +141,24 @@ function weeks.legacyGenerateNotes(self, chart) end end +function weeks.generatePsychEvents(self, eventsChart) + modEvents = {} + local eventsChart = getFilePath(eventsChart) + eventsChart = json.decode(love.filesystem.read(eventsChart)).song + + for i, event in ipairs(eventsChart.events) do + local time, eventData = event[1], event[2] + + table.insert(modEvents, { + time = time, + events = eventData + }) + end + + + table.sort(modEvents, function(a, b) return a.time < b.time end) +end + function weeks.cneGenerateNotes(self, chart, metadata) if importMods.inMod then importMods.setupScripts() diff --git a/src/love/states/debug/stage-debug.lua b/src/love/states/debug/stage-debug.lua index 5f947753..fb0bacbc 100644 --- a/src/love/states/debug/stage-debug.lua +++ b/src/love/states/debug/stage-debug.lua @@ -216,6 +216,7 @@ return { else importMods.setCurrentMod(importMods.getModFromStage(fileStr)) curStage = importMods.getStageFileFromName(fileStr)() + importMods.inMod = true end curStage:enter() if not camera.points["enemy"] then camera:addPoint("enemy", -boyfriend.x + 100, -boyfriend.y + 75) end