Merge pull request #24 from Hackx2/experimental

eeeee
AstroEngineDevs · Feb 17, 2024 · bcb5c86 · bcb5c86
2 parents 6510e08 + b24df89
commit bcb5c86
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 0 deletions.
diff --git a/source/Import.hx b/source/Import.hx
@@ -30,5 +30,6 @@ import backend.client.Discord.DiscordClient;
 #end
 
 import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 
 #end
diff --git a/source/backend/FunkinLua.hx b/source/backend/FunkinLua.hx
@@ -53,6 +53,8 @@ import sys.io.File;
 import Type.ValueType;
 import backend.utils.Controls;
 import game.objects.DialogueBoxPsych;
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 
 #if hscript
 import backend.Hscript;

diff --git a/source/game/editors/CharacterEditorState.hx b/source/game/editors/CharacterEditorState.hx
@@ -36,6 +36,8 @@ import flixel.system.debug.interaction.tools.Pointer.GraphicCursorCross;
 import lime.system.Clipboard;
 import flixel.animation.FlxAnimation;
 import game.objects.HealthIcon;
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 
 #if MODS_ALLOWED
 import sys.FileSystem;

diff --git a/source/game/editors/ChartingState.hx b/source/game/editors/ChartingState.hx
@@ -53,6 +53,8 @@ import openfl.utils.Assets as OpenFlAssets;
 import openfl.utils.ByteArray;
 import game.objects.HealthIcon;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 using StringTools;
 #if sys
 import flash.media.Sound;

diff --git a/source/game/editors/DialogueCharacterEditorState.hx b/source/game/editors/DialogueCharacterEditorState.hx
@@ -34,6 +34,8 @@ import game.objects.Alphabet;
 import sys.io.File;
 #end
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 using StringTools;
 
 class DialogueCharacterEditorState extends MusicBeatState

diff --git a/source/game/editors/DialogueEditorState.hx b/source/game/editors/DialogueEditorState.hx
@@ -33,6 +33,8 @@ import game.objects.Alphabet;
 #if sys
 import sys.io.File;
 #end
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 
 using StringTools;
 

diff --git a/source/game/editors/EditorPlayState.hx b/source/game/editors/EditorPlayState.hx
@@ -21,6 +21,8 @@ import flixel.util.FlxTimer;
 import flixel.input.keyboard.FlxKey;
 import openfl.events.KeyboardEvent;
 import backend.FunkinLua;
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 
 using StringTools;
 

diff --git a/source/game/editors/MasterEditorMenu.hx b/source/game/editors/MasterEditorMenu.hx
@@ -16,6 +16,8 @@ import flixel.system.FlxSound;
 #if MODS_ALLOWED
 import sys.FileSystem;
 #end
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 
 using StringTools;
 

diff --git a/source/game/editors/MenuCharacterEditorState.hx b/source/game/editors/MenuCharacterEditorState.hx
@@ -28,6 +28,8 @@ import haxe.Json;
 #if sys
 import sys.io.File;
 #end
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 
 using StringTools;
 

diff --git a/source/game/editors/WeekEditorState.hx b/source/game/editors/WeekEditorState.hx
@@ -33,6 +33,8 @@ import sys.io.File;
 import sys.FileSystem;
 #end
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 
 using StringTools;
 

diff --git a/source/game/options/BaseOptionsMenu.hx b/source/game/options/BaseOptionsMenu.hx
@@ -26,6 +26,8 @@ import flixel.input.keyboard.FlxKey;
 import flixel.graphics.FlxGraphic;
 import backend.utils.Controls;
 import backend.data.*;
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 
 using StringTools;
 

diff --git a/source/game/options/NoteOffsetState.hx b/source/game/options/NoteOffsetState.hx
@@ -17,6 +17,8 @@ import flixel.FlxG;
 import flixel.ui.FlxBar;
 import flixel.math.FlxPoint;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 using StringTools;
 
 class NoteOffsetState extends MusicBeatState

diff --git a/source/game/states/AnimatedImageState.hx b/source/game/states/AnimatedImageState.hx
@@ -1,11 +1,14 @@
 package game.states;
 
+import backend.utils.FlxColorPastel;
 import flixel.FlxState;
 import flixel.FlxG;
 import flixel.text.FlxText;
 import flixel.FlxSprite;
 import flixel.util.FlxColor;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 using StringTools;
 
 class AnimatedImageState extends MusicBeatState

diff --git a/source/game/states/CreditsState.hx b/source/game/states/CreditsState.hx
@@ -19,6 +19,8 @@ import sys.io.File;
 #end
 import lime.utils.Assets;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 using StringTools;
 
 class CreditsState extends MusicBeatState

diff --git a/source/game/states/FlashingState.hx b/source/game/states/FlashingState.hx
@@ -11,6 +11,8 @@ import flixel.addons.transition.FlxTransitionableState;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxTimer;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 class FlashingState extends MusicBeatState
 {
 	public static var leftState:Bool = false;

diff --git a/source/game/states/FreeplayState.hx b/source/game/states/FreeplayState.hx
@@ -25,6 +25,8 @@ import lime.utils.Assets;
 import flixel.system.FlxSound;
 import openfl.utils.Assets as OpenFlAssets;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 #if MODS_ALLOWED
 import sys.FileSystem;
 #end

diff --git a/source/game/states/GitarooPause.hx b/source/game/states/GitarooPause.hx
@@ -5,6 +5,8 @@ import flixel.FlxSprite;
 import flixel.graphics.frames.FlxAtlasFrames;
 import backend.system.MusicBeatState;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 class GitarooPause extends MusicBeatState
 {
 	var replayButton:FlxSprite;

diff --git a/source/game/states/LoadingState.hx b/source/game/states/LoadingState.hx
@@ -11,6 +11,8 @@ import flixel.graphics.frames.FlxAtlasFrames;
 import flixel.util.FlxTimer;
 import flixel.math.FlxMath;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 import openfl.utils.Assets;
 import lime.utils.Assets as LimeAssets;
 import lime.utils.AssetLibrary;

diff --git a/source/game/states/MainMenuState.hx b/source/game/states/MainMenuState.hx
@@ -24,6 +24,8 @@ import game.editors.MasterEditorMenu;
 import flixel.input.keyboard.FlxKey;
 import backend.data.*;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 #if (flixel >= "5.0.0")
 	import flixel.input.mouse.FlxMouseEvent;
 #end

diff --git a/source/game/states/ModsMenuState.hx b/source/game/states/ModsMenuState.hx
@@ -31,6 +31,8 @@ import haxe.zip.Entry;
 import haxe.zip.Uncompress;
 import haxe.zip.Writer;*/
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 using StringTools;
 
 class ModsMenuState extends MusicBeatState

diff --git a/source/game/states/OptionsState.hx b/source/game/states/OptionsState.hx
@@ -27,6 +27,8 @@ import backend.utils.Controls;
 import backend.StatChangeables;
 import game.options.*;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 using StringTools;
 
 class OptionsState extends MusicBeatState

diff --git a/source/game/states/OutdatedState.hx b/source/game/states/OutdatedState.hx
@@ -12,6 +12,8 @@ import flixel.tweens.FlxTween;
 import flixel.util.FlxTimer;
 import backend.data.PsychData;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 class OutdatedState extends MusicBeatState
 {
 	public static var leftState:Bool = false;

diff --git a/source/game/states/PlayState.hx b/source/game/states/PlayState.hx
@@ -89,6 +89,8 @@ import game.objects.characters.Boyfriend;
 import sys.FileSystem;
 import sys.io.File;
 #end
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 
 #if VIDEOS_ALLOWED
 	#if (hxCodec >= "2.6.1")

diff --git a/source/game/states/StoryMenuState.hx b/source/game/states/StoryMenuState.hx
@@ -23,6 +23,8 @@ import lime.net.curl.CURLCode;
 import flixel.graphics.FlxGraphic;
 import backend.Song;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 using StringTools;
 
 class StoryMenuState extends MusicBeatState

diff --git a/source/game/states/substates/GameOverSubstate.hx b/source/game/states/substates/GameOverSubstate.hx
@@ -13,6 +13,8 @@ import backend.Conductor;
 import flixel.tweens.FlxTween;
 import game.objects.characters.Boyfriend;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
 class GameOverSubstate extends MusicBeatSubstate
 {
 	public var boyfriend:Boyfriend;

diff --git a/source/game/states/substates/PauseSubState.hx b/source/game/states/substates/PauseSubState.hx
@@ -20,6 +20,9 @@ import flixel.FlxCamera;
 import flixel.util.FlxStringUtil;
 import backend.Song;
 
+import backend.system.MusicBeatSubstate;
+import backend.system.MusicBeatState;
+
 class PauseSubState extends MusicBeatSubstate
 {
 	var grpMenuShit:FlxTypedGroup<game.objects.Alphabet>;