From f7618fe2c1c5cb959de0ed6dc949ceb7eccfb249 Mon Sep 17 00:00:00 2001 From: entar Date: Tue, 8 Jul 2025 19:50:22 +0700 Subject: [PATCH] Changed IDKs icon and fixed saves --- images/credits/idk.png | Bin 14302 -> 8529 bytes states/creditsstate.lua | 5 ++++- states/freeplaystate.lua | 5 ++++- states/menustate.lua | 24 ++++++++++++++++++++++++ states/optionsstate.lua | 17 +++++------------ states/playstate.lua | 24 ++++++++++++++---------- states/weekstate.lua | 2 ++ 7 files changed, 53 insertions(+), 24 deletions(-) diff --git a/images/credits/idk.png b/images/credits/idk.png index 2baea583bf98c1d9e3069f88fa087290a23bb8cd..108de6c43e4ec2f264011a347338e90c562baf06 100644 GIT binary patch literal 8529 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 literal 14302 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 M07*qoM6N<$f-ZK*t^fc4 diff --git a/states/creditsstate.lua b/states/creditsstate.lua index d558418..7a4d90c 100644 --- a/states/creditsstate.lua +++ b/states/creditsstate.lua @@ -51,10 +51,11 @@ return function() end function state.load() + love.window.setTitle("TaggedEngine: Credits") + local bg = Image("images/menuBG.png") bg.layer = -5 - for index, credit in next, credits do local icon = credit.icon if not icon then goto continue end @@ -71,6 +72,8 @@ return function() function state.keypressed(key) if key == "down" then currentOne = currentOne + 1 > #credits and 1 or currentOne + 1 + elseif key == "escape" then + state.changeState("menustate") end end diff --git a/states/freeplaystate.lua b/states/freeplaystate.lua index 32253aa..f6b9a7a 100644 --- a/states/freeplaystate.lua +++ b/states/freeplaystate.lua @@ -21,6 +21,7 @@ return function() local unparsedData = files.read_file(dataFolder .. "/Data.json") local data = unparsedData and json.parse(unparsedData) or { songs = { bf = {} } } + print(unparsedData, data) local icons = {} @@ -82,6 +83,8 @@ return function() local arrow local function setup() + love.window.setTitle("TaggedEngine: Freeplay") + if not freaky:isPlaying() then freaky:play() end @@ -145,7 +148,7 @@ return function() local gettingKey - local settings = json.parse(files.read_file("settings.json")) + local settings = json.parse(files.read_file(dataFolder.."/Settings.json")) local keybinds = settings.Keybinds local scroll = love.audio.newSource("sounds/ui/scrollMenu.ogg", "static") local confirm = love.audio.newSource("sounds/ui/confirmMenu.ogg", "static") diff --git a/states/menustate.lua b/states/menustate.lua index fb1b0e2..ef7dc66 100644 --- a/states/menustate.lua +++ b/states/menustate.lua @@ -1,4 +1,15 @@ local logging = require "modules.logging" +local files = require "modules.files" +local json = require "modules.json" +local defaultSettings = { -- The way its in the JSON + Downscroll = false, + Keybinds = { + "a", + "b", + "up", + "right" + } +} return function() ---@class StateClass local state = {} @@ -21,6 +32,19 @@ return function() local moving = false function state.load() + love.window.setTitle("TaggedEngine: Main Menu") + + local data = love.filesystem.getSaveDirectory() + print(data) + local settings = files.read_file(data.."/Settings.json") + print(settings) + + if not settings then + os.execute("mkdir "..data) + files.write_file(data.."/Settings.json", json.stringify(defaultSettings)) + print("Written") + end + if not freaky then freaky = love.audio.newSource("sounds/freakyMenu.ogg", "stream") freaky:setVolume(0.25) diff --git a/states/optionsstate.lua b/states/optionsstate.lua index 390d0cc..cfe88eb 100644 --- a/states/optionsstate.lua +++ b/states/optionsstate.lua @@ -2,17 +2,8 @@ local logging = require("modules.logging") local json = require("modules.json") local files= require("modules.files") -local defaultSettings = { -- The way its in the JSON - Downscroll = false, - Keybinds = { - "a", - "b", - "up", - "right" - } -} - local font = love.graphics.newFont("fonts/FridayNightFunkin-Regular.ttf", 60) +local data = love.filesystem.getSaveDirectory() local settingList = { -- Path for the positions in JSON Left = "Keybinds.1", @@ -59,7 +50,7 @@ return function() local currentSetting = 1 local evilCurrentSetting = 1 - local settings = json.parse(files.read_file("settings.json")) or defaultSettings + local settings = json.parse(files.read_file(data.."/Settings.json")) local function getSettingPath(setting) local pathString = settingList[setting]:split(".") @@ -103,13 +94,15 @@ return function() settingPath[settingLast] = not settingPath[settingLast] end elseif key == "escape" then - files.write_file("settings.json", json.stringify(settings)) + files.write_file(data.."/Settings.json", json.stringify(settings)) state.changeState("menustate") end end function state.load() + love.window.setTitle("TaggedEngine: Options") + local bg = Image("images/menuBG.png") bg.layer = -5 end diff --git a/states/playstate.lua b/states/playstate.lua index 0763407..03c0338 100644 --- a/states/playstate.lua +++ b/states/playstate.lua @@ -72,6 +72,8 @@ local function state(songName, songDifficulty, show) local characters = {} local icons = {} + + local data = love.filesystem.getSaveDirectory() local ui = { timebar = true, @@ -245,19 +247,18 @@ local function state(songName, songDifficulty, show) end if save then - local data = love.filesystem.getSaveDirectory() local oldSave = files.read_file(data.."/Data.json") if not oldSave then - oldSave = {} + oldSave = {songs = {}} else oldSave = json.parse(oldSave) end - if not oldSave[curChar] then - oldSave[curChar] = {} + if not oldSave.songs[curChar] then + oldSave.songs[curChar] = {} end - if not oldSave[curChar][songName] then - oldSave[curChar][songName] = {} + if not oldSave.songs[curChar][songName] then + oldSave.songs[curChar][songName] = {} end local rankingWindows = { { @@ -277,14 +278,14 @@ local function state(songName, songDifficulty, show) window = 100 }, } - if oldSave[curChar][songName][songDifficulty] and oldSave[curChar][songName][songDifficulty].score < score or not oldSave[curChar][songName][songDifficulty] then + if oldSave.songs[curChar][songName][songDifficulty] and oldSave.songs[curChar][songName][songDifficulty].score < score or not oldSave.songs[curChar][songName][songDifficulty] then local rank = "Ass" for index, newRank in next, rankingWindows do if accuracy >= newRank.window then rank = newRank.name end end - oldSave[curChar][songName][songDifficulty] = { + oldSave.songs[curChar][songName][songDifficulty] = { accuracy = tostring(accuracy):sub(1, 5), score = score, rank = rank @@ -294,7 +295,8 @@ local function state(songName, songDifficulty, show) end if gameMode == "storymode" then - state.changeState(save and songOrder[currentSong + 1] and "playstate" or "weekstate", songOrder[currentSong + 1], songDifficulty) + currentSong = currentSong + 1 + state.changeState(save and songOrder[currentSong] and "playstate" or "weekstate", songOrder[currentSong], songDifficulty) else state.changeState(save and "resultsstate" or "freeplaystate", score, accuracy, ratings, combo) end @@ -771,7 +773,9 @@ local function state(songName, songDifficulty, show) end function state.load() - settings = json.parse(files.read_file("settings.json")) + love.window.setTitle("TaggedEngine") + + settings = json.parse(files.read_file(data.."/Settings.json")) if not settings then error("Failed to load settings") end diff --git a/states/weekstate.lua b/states/weekstate.lua index 4aedb5c..39227a4 100644 --- a/states/weekstate.lua +++ b/states/weekstate.lua @@ -139,6 +139,8 @@ return function() end function state.load() + love.window.setTitle("TaggedEngine: Week Menu") + if love.graphics:getHeight() ~= 720 then love.window.setMode(1280, 720) end