From 2b2fbae5aa9dc8d265ae9e4af1f78125073b448a Mon Sep 17 00:00:00 2001
From: ArfieCat <73672820+ArfieCat@users.noreply.github.com>
Date: Tue, 6 Jul 2021 14:35:31 -0700
Subject: [PATCH 1/3] finishing week brings u back to story menu
instead of the main menu
---
source/PlayState.hx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 16cf9cd..195d32f 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -2776,7 +2776,7 @@ class PlayState extends MusicBeatState
else
{
FlxG.sound.playMusic(Paths.music('freakyMenu'));
- FlxG.switchState(new MainMenuState());
+ FlxG.switchState(new StoryMenuState());
}
#if windows
From b388fccf0c036ca248f54faa5cac9d6bd0acaf0d Mon Sep 17 00:00:00 2001
From: Spel0 <75626813+Spel0@users.noreply.github.com>
Date: Wed, 7 Jul 2021 03:16:14 +0300
Subject: [PATCH 2/3] fixed it
---
Project.xml | 2 +-
source/Paths.hx | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Project.xml b/Project.xml
index eeffad6..9516b71 100644
--- a/Project.xml
+++ b/Project.xml
@@ -123,7 +123,7 @@
-
+
diff --git a/source/Paths.hx b/source/Paths.hx
index 1dfe920..19b16bd 100644
--- a/source/Paths.hx
+++ b/source/Paths.hx
@@ -131,7 +131,10 @@ class Paths
inline static public function getSparrowAtlas(key:String, ?library:String, ?isCharacter:Bool = false)
{
if (isCharacter)
- return FlxAtlasFrames.fromSparrow(imageCached(key), file('images/characters/$key.xml', library));
+ if (FlxG.save.data.cacheImages)
+ return FlxAtlasFrames.fromSparrow(imageCached(key), file('images/characters/$key.xml', library));
+ else
+ return FlxAtlasFrames.fromSparrow(image('characters/'+key), file('images/characters/$key.xml'));
return FlxAtlasFrames.fromSparrow(image(key, library), file('images/$key.xml', library));
}
@@ -146,7 +149,10 @@ class Paths
inline static public function getPackerAtlas(key:String, ?library:String, ?isCharacter:Bool = false)
{
if (isCharacter)
- return FlxAtlasFrames.fromSpriteSheetPacker(imageCached(key), file('images/$key.txt', library));
+ if (FlxG.save.data.cacheImages)
+ return FlxAtlasFrames.fromSpriteSheetPacker(imageCached(key), file('images/$key.txt', library));
+ else
+ return FlxAtlasFrames.fromSpriteSheetPacker(image('characters/'+key), file('images/characters/$key.txt'));
return FlxAtlasFrames.fromSpriteSheetPacker(image(key, library), file('images/$key.txt', library));
}
}
From ed01550d4ddfbe2b237122d0eb48d6df70ae3be8 Mon Sep 17 00:00:00 2001
From: Spel0 <75626813+Spel0@users.noreply.github.com>
Date: Wed, 7 Jul 2021 03:17:21 +0300
Subject: [PATCH 3/3] Update Project.xml
---
Project.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Project.xml b/Project.xml
index 9516b71..eeffad6 100644
--- a/Project.xml
+++ b/Project.xml
@@ -123,7 +123,7 @@
-
+