From f048ec682b746931c99f5bb57bcb3b0001f34a05 Mon Sep 17 00:00:00 2001 From: playinful <82474412+playinful@users.noreply.github.com> Date: Sat, 30 Mar 2024 15:25:15 -0400 Subject: [PATCH] Sorting rework i guess part 2 electric boogaleo (#816) * Freeze Frame Hey, I'm about done with Freeze Frame and I'm just gonna commit the game as it is right now, it's almost done thx -playinful * Freeze Frame - finishing touches before finalized assets Still waiting to implement the upscaled assets and the sound effects. Code-wise this is as much as I can do for now. * i fixed a couple bugs the dim screen is back and no input duplication when switching games. hallelujah * FreezeFrame randomness update hey AJ so i was cleaning my room when i was struck by an idea for how to make the randomization more consistent without seeding. *yes unfortunately* it requires a static variable but i promise u i used it responsibly. * Updated cloud particles * ready to pr i think Fixed Alphabetical Sorting. Fixed Chronological Sorting by adding a sorting value to every minigame. Added Sort By Usage. * i accidentally removed a bunch of work from yall oops this should fix that i think * make it so that it auto sorts by alphabet when you lanuch the editor --- Assets/Scripts/LevelEditor/Editor.cs | 1 + ...oadMinigames.Minigames.MinigameLoaderGenerator.g.cs | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index 48a9d245..4297dc15 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -106,6 +106,7 @@ namespace HeavenStudio.Editor foreach (var minigame in EventCaller.instance.minigames.Values) AddIcon(minigame); + GridGameSelectorRect.GetComponent().Sort("alphabet"); UpdateEditorStatus(true); #if HEAVENSTUDIO_PROD diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs index 253cc305..d32fe955 100644 --- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs +++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs @@ -72,6 +72,16 @@ namespace HeavenStudio { Debug.LogWarning("Game loader RvlBookLoader failed!"); } + + game = NtrFreezeFrameLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader NtrCameraManLoader failed!"); + } game = AgbClapLoader.AddGame(eventCaller); if (game != null)