major fixes

switch to moonchart chart converter can convert the following with little issue - Legacy - Psych - Kade - VSlice (only 1 diff at a time) fixed middle scroll temporarily removed opponent mode because it's messy and I'm going to redo it fixed sustains not going transparent when missed
TheRealJake12 · Dec 15, 2024 · 04d8151 · 04d8151
1 parent ed072c1
commit 04d8151
Show file tree

Hide file tree

Showing 51 changed files with 1,343 additions and 1,771 deletions.
diff --git a/.hxpkg b/.hxpkg
@@ -1,68 +1 @@
-[
-	{
-		"profile": "default",
-		"pkgs": [
-			{
-				"name": "flixel"
-			},
-			{
-				"name": "openfl"
-			},
-			{
-				"name": "lime"
-			},
-			{
-				"name": "flixel-tools"
-			},
-			{
-				"name": "flixel-addons"
-			},
-			{
-				"name": "flixel-text-input"
-			},
-			{
-				"name": "hxcpp-debug-server"
-			},
-			{
-				"name": "polymod",
-				"link": "https://github.com/swordcube/scriptless-polymod.git"
-			},
-			{
-				"name": "hxvlc"
-			},
-			{
-				"name": "hscript"
-			},
-			{
-				"name": "hxdiscord_rpc",
-				"link": "https://github.com/MAJigsaw77/hxdiscord_rpc.git"
-			},
-			{
-				"name": "haxeui-core",
-				"link": "https://github.com/haxeui/haxeui-core.git"
-			},
-			{
-				"name": "haxeui-flixel",
-				"link": "https://github.com/haxeui/haxeui-flixel.git"
-			},
-			{
-				"name": "hxcpp"
-			},
-			{
-				"name": "thx.semver"
-			},
-			{
-				"name": "thx.core",
-				"link": "https://github.com/fponticelli/thx.core.git"
-			},
-			{
-				"name": "linc_luajit",
-				"link": "https://github.com/superpowers04/linc_luajit"
-			},
-			{
-				"name": "hscript-improved",
-				"link": "https://github.com/FNF-CNE-Devs/hscript-improved.git"
-			}
-		]
-	}
-]
+[{"profile":"default","pkgs":[{"name":"flixel"},{"name":"openfl"},{"name":"lime"},{"name":"flixel-tools"},{"name":"flixel-addons"},{"name":"flixel-text-input"},{"name":"hxcpp-debug-server"},{"name":"polymod","link":"https://github.com/swordcube/scriptless-polymod.git"},{"name":"hxvlc"},{"name":"hscript"},{"name":"hxdiscord_rpc","link":"https://github.com/MAJigsaw77/hxdiscord_rpc.git"},{"name":"haxeui-core","link":"https://github.com/haxeui/haxeui-core.git"},{"name":"haxeui-flixel","link":"https://github.com/haxeui/haxeui-flixel.git"},{"name":"hxcpp"},{"name":"thx.semver"},{"name":"thx.core","link":"https://github.com/fponticelli/thx.core.git"},{"name":"linc_luajit","link":"https://github.com/superpowers04/linc_luajit"},{"name":"hscript-improved","link":"https://github.com/FNF-CNE-Devs/hscript-improved.git"},{"name":"moonchart","link":"https://github.com/MaybeMaru/moonchart.git"}]}]
diff --git a/Project.xml b/Project.xml
@@ -86,6 +86,7 @@
 	<haxedef name="hscriptPos" if="FEATURE_HSCRIPT" />
 	<!-- Utilities -->
 	<haxelib name="hxcpp-debug-server" if="desktop" />
+	<haxelib name="moonchart" />
 	<section if="cpp">
 		<haxelib name="hxvlc" if="VIDEOS" />
 	</section>

diff --git a/assets/shared/data/editors/charter.xml b/assets/shared/data/editors/charter.xml
@@ -47,27 +47,27 @@
 			<frame width="350" height="350">
 				<vbox>
 					<grid>
-						<label text="Player" horizontalAlign="center" />
-						<dropdown id="playerSelect" width="75" horizontalAlign="center" />
-						<label text="GF" horizontalAlign="center" />
-						<dropdown id="gfSelect" width="75" horizontalAlign="center" />
+						<label text="Player" verticalAlign="center" />
+						<dropdown id="playerSelect" width="75" verticalAlign="center" />
+						<label text="GF" verticalAlign="center" />
+						<dropdown id="gfSelect" width="75" verticalAlign="center" />
 						<label text="Opponent" verticalAlign="center" />
-						<dropdown id="opponentSelect" width="75" horizontalAlign="center" />
+						<dropdown id="opponentSelect" width="75" verticalAlign="center" />
 					</grid>
 					<menu-separator />
 					<grid>
-						<label text="Stage" horizontalAlign="center" />
-						<dropdown id="stageSelect" width="90" horizontalAlign="center" />
-						<label text="Style" horizontalAlign="center" />
-						<dropdown id="styleSelect" width="90" horizontalAlign="center" />
+						<label text="Stage" verticalAlign="center" />
+						<dropdown id="stageSelect" width="90" verticalAlign="center" />
+						<label text="Style" verticalAlign="center" />
+						<dropdown id="styleSelect" width="90" verticalAlign="center" />
 					</grid>
 				</vbox>
 			</frame>
 		</vbox>
 		<vbox text="Section">
 			<frame width="350" height="350">
 				<vbox>
-					<checkbox id="sectionMustHit" text="Must Hit Section" horizontalAlign="center" />
+					<checkbox id="sectionMustHit" text="Must Hit Section" verticalAlign="center" />
 				</vbox>
 			</frame>
 		</vbox>
@@ -84,8 +84,37 @@
 					<number-stepper id="dataBPM" pos="100" step="0.1" verticalAlign="center" />
 					<label text="Scroll Speed" verticalAlign="center" />
 					<number-stepper id="dataSpeed" pos="100" step="0.1" verticalAlign="center" />
-					<label text="Difficulty" horizontalAlign="center" />
-					<dropdown id="diffSelect" width="90" horizontalAlign="center" />
+					<checkbox id="dataSplit" text="Split Voice Tracks?" verticalAlign="center" />
+					<checkbox id="dataVoices" text="Voice Tracks?" verticalAlign="center" />
+					<menu-separator />
+					<label text="Difficulty" verticalAlign="center" />
+					<dropdown id="diffSelect" width="90" verticalAlign="center" />
+				</grid>
+			</frame>
+		</vbox>
+		<vbox text="Events">
+			<frame width="350" height="350">
+				<grid>
+					<vbox>
+						<label text="Existing Events" verticalAlign="center"/>
+						<dropdown id="eventExistList" verticalAlign="center" />
+						<label text="Event Types" verticalAlign="center"/>
+						<dropdown id="eventTypes" verticalAlign="center" />
+						<label text="Current Event Name" verticalAlign="center"/>
+						<textfield id="eventName" verticalAlign="center" />
+						<label text="Event Value 1" verticalAlign="center"/>
+						<textfield id="eventValue1" verticalAlign="center" />
+						<label text="Event Value 2" verticalAlign="center"/>
+						<textfield id="eventValue2" verticalAlign="center" />
+						<label text="Event Position (Beats)" verticalAlign="center"/>
+						<number-stepper id="eventPos" pos="0" step="0.1" verticalAlign="center" />
+					</vbox>
+					<vbox>
+						<button id="eventAdd" text="Add Event" verticalAlign="center"/>
+						<button id="eventUpdate" text="Update Event" verticalAlign="center"/>
+						<button id="eventRemove" text="Remove Event" verticalAlign="center"/>
+						<button id="eventUpdatePos" text="Update Position" verticalAlign="center"/>
+					</vbox>
 				</grid>
 			</frame>
 		</vbox>

diff --git a/source/Init.hx b/source/Init.hx
@@ -27,6 +27,7 @@ class Init extends MusicBeatState
 
 		kec.backend.KeyBinds.keyCheck();
 		FilterUtils.initializeFilters();
+		kec.backend.Discord.load();
 
 		FilterUtils.setColorBlindess(FlxG.save.data.colorblind);
 

diff --git a/source/flixel/graphics/tile/FlxDrawQuadsItem.hx b/source/flixel/graphics/tile/FlxDrawQuadsItem.hx
diff --git a/source/import.hx b/source/import.hx
@@ -31,5 +31,13 @@ import kec.backend.Constants;
 import kec.backend.util.Sort;
 #end
 
+using Lambda;
 using StringTools;
-using kec.backend.util.StringTool;
+using kec.backend.tools.ArraySortTools;
+using kec.backend.tools.ArrayTools;
+using kec.backend.tools.FloatTools;
+using kec.backend.tools.Int64Tools;
+using kec.backend.tools.IntTools;
+using kec.backend.tools.IteratorTools;
+using kec.backend.tools.MapTools;
+using kec.backend.tools.StringTools;
diff --git a/source/kec/backend/PlayStateChangeables.hx b/source/kec/backend/PlayStateChangeables.hx
@@ -5,17 +5,15 @@ class PlayStateChangeables
 	public static var modchart:Bool;
 	public static var mirrorMode:Bool;
 	public static var healthDrain:Bool;
-	public static var opponentMode:Bool;
+	// public static var opponentMode:Bool;
 	public static var skillIssue:Bool;
 	public static var practiceMode:Bool;
 	public static var holds:Bool;
 	public static var healthGain:Float;
 	public static var healthLoss:Float;
 	public static var useDownscroll:Bool;
 	public static var middleScroll:Bool;
-	public static var safeFrames:Int;
 	public static var botPlay:Bool;
 	public static var zoom:Float;
-	public static var scrollSpeed:Float = 1.0;
 	public static var noteCamera:Bool;
 }