re-add character editor - wip???

charlesisfeline · Jul 24, 2024 · bf72491 · bf72491
1 parent c2d3e62
commit bf72491
Show file tree

Hide file tree

Showing 9 changed files with 524 additions and 3 deletions.
diff --git a/Project.xml b/Project.xml
@@ -117,6 +117,7 @@
 
 	<haxelib name="flixel" />
 	<haxelib name="flixel-addons" />
+	<haxelib name="flixel-ui" /> <!-- Temporary For Character Editor-->
 	<haxelib name="haxeui-flixel" />
 	<haxelib name="haxeui-core" />
 	<haxelib name="flixel-text-input" /> <!--Stupid Ass Text Layering In The Editors-->

diff --git a/easysetup.bat b/easysetup.bat
@@ -9,6 +9,7 @@ haxelib install lime
 haxelib install openfl
 haxelib install flixel
 haxelib install flixel-tools
+haxelib install flixel-ui
 haxelib install flixel-addons
 haxelib install hxcpp-debug-server
 haxelib install hxvlc

diff --git a/easysetup.sh b/easysetup.sh
@@ -2,6 +2,7 @@ haxelib install lime
 haxelib install openfl
 haxelib install flixel
 haxelib install flixel-tools
+haxelib install flixel-ui
 haxelib install flixel-addons
 haxelib install hxcpp-debug-server
 haxelib install hxvlc

diff --git a/hmm.json b/hmm.json
@@ -15,6 +15,11 @@
       "type": "haxelib",
       "version": null
     },
+    {
+      "name": "flixel-ui",
+      "type": "haxelib",
+      "version": null
+    },
     {
       "name": "flixel-tools",
       "type": "haxelib",

diff --git a/source/kec/backend/Options.hx b/source/kec/backend/Options.hx
@@ -1811,6 +1811,27 @@ class LaneUnderlayOption extends Option
 	}
 }
 
+class DebugMode extends Option
+{
+	public function new(desc:String)
+	{
+		description = desc;
+		super();
+		acceptType = true;
+	}
+
+	public override function press():Bool
+	{
+		MusicBeatState.switchState(new AnimationDebug());
+		return false;
+	}
+
+	private override function updateDisplay():String
+	{
+		return "Animation Debug";
+	}
+}
+
 class LockWeeksOption extends Option
 {
 	var confirm:Bool = false;

diff --git a/source/kec/states/MusicBeatState.hx b/source/kec/states/MusicBeatState.hx
@@ -105,6 +105,9 @@ class MusicBeatState extends FlxTransitionableState
 
 	override function add(Object:FlxBasic):FlxBasic
 	{
+		if (Std.isOfType(Object, FlxUI))
+			return null;
+
 		if (Std.isOfType(Object, FlxSprite))
 			var spr:FlxSprite = cast(Object, FlxSprite);
 

diff --git a/source/kec/states/PlayState.hx b/source/kec/states/PlayState.hx
@@ -34,6 +34,7 @@ import kec.backend.script.ScriptUtil;
 #end
 // Orginization Imports
 import kec.states.editors.StageDebugState;
+import kec.states.editors.AnimationDebug;
 import kec.states.editors.ChartingState;
 #if VIDEOS
 import hxvlc.flixel.FlxVideo as VideoHandler;
@@ -2566,6 +2567,34 @@ class PlayState extends MusicBeatState
 			LoadingState.loadAndSwitchState(new ChartingState());
 		}
 
+		if (FlxG.keys.justPressed.SIX)
+		{
+			LoadingState.loadAndSwitchState(new AnimationDebug(dad.curCharacter));
+			PlayState.stageTesting = false;
+			inDaPlay = false;
+			#if FEATURE_LUAMODCHART
+			if (luaModchart != null)
+			{
+				luaModchart.die();
+				luaModchart = null;
+			}
+			#end
+		}
+
+		if (FlxG.keys.justPressed.NUMPADSEVEN)
+		{
+			LoadingState.loadAndSwitchState(new AnimationDebug(boyfriend.curCharacter));
+			PlayState.stageTesting = false;
+			inDaPlay = false;
+			#if FEATURE_LUAMODCHART
+			if (luaModchart != null)
+			{
+				luaModchart.die();
+				luaModchart = null;
+			}
+			#end
+		}
+
 		if (FlxG.keys.justPressed.EIGHT && FlxG.save.data.background)
 		{
 			paused = true;

diff --git a/source/kec/states/SelectEditorsState.hx b/source/kec/states/SelectEditorsState.hx
@@ -7,8 +7,8 @@ import kec.backend.chart.Song;
 
 class SelectEditorsState extends MusicBeatState
 {
-	var editors:Array<String> = ['Stage Editor', 'Chart Editor'];
-	var icons = ['tankman', 'sm'];
+	var editors:Array<String> = ['Character Editor', 'Stage Editor', 'Chart Editor'];
+	var icons = ['face', 'tankman', 'sm'];
 
 	private var grpTexts:FlxTypedGroup<Alphabet>;
 
@@ -140,6 +140,9 @@ class SelectEditorsState extends MusicBeatState
 	{
 		switch (editors[curSelected])
 		{
+			case 'Character Editor':
+				kec.states.editors.AnimationDebug.fromEditor = true;
+				LoadingState.loadAndSwitchState(new kec.states.editors.AnimationDebug());
 			case 'Stage Editor':
 				PlayState.SONG = Song.loadFromJson('test', '');
 				kec.states.editors.StageDebugState.fromEditor = true;
@@ -172,8 +175,10 @@ class SelectEditorsState extends MusicBeatState
 		switch (curSelected)
 		{
 			case 0:
-				info.text = "Stage Editor, Move The Positions Of Stage Assets.";
+				info.text = "Character Editor, Edit Character Offsets.";
 			case 1:
+				info.text = "Stage Editor, Move The Positions Of Stage Assets.";
+			case 2:
 				info.text = "Chart Editor, Place Notes And Create Charts.";
 		}
 		info.updateHitbox();