thuthing

Author: Z11Coding

Project.xml

@@ -52,6 +52,14 @@
 		<define name="TITLE_SCREEN_EASTER_EGG"/>
 	</section>
 
+	<!-- Apparently I can just drop this in and it'll work so i'll be the judge of that --> 
+
+	<haxedef name="FM_ENGINE" value="PSYCH"/>
+	<haxedef name="FM_ENGINE_VERSION" value="1.0"/>
+
+	<haxelib name="funkin-modchart" />
+	<haxeflag name="--macro" value="modchart.core.macros.Macro.includeFiles()"/>
+
 	<!-- ____________________________ Window Settings ___________________________ -->
 
 	<!--These window settings apply to all targets-->

setup/windows.bat

@@ -21,15 +21,16 @@ haxelib install actuate 1.9.0
 haxelib install flixel-ui 2.6.1
 haxelib install hscript 2.5.0
 haxelib install noisehx 0.0.1
+haxelib install haxeui-core 1.7.0
+haxelib install haxeui-flixel 1.7.0
 haxelib set lime 8.2.2
 haxelib set openfl 9.4.1
+haxelib git funkin-modchart https://github.com/TheoDevelops/FunkinModchart
 haxelib git linc_dialogs https://github.com/snowkit/linc_dialogs.git
 haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
 haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
 haxelib git funkin.vis https://github.com/beihu235/funkVis-FrequencyFixed
 haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
-haxelib git haxeui-core https://github.com/haxeui/haxeui-core 51c23588614397089a5ce182cddea729f0be6fa0
-haxelib git haxeui-flixel https://github.com/haxeui/haxeui-flixel da27e833947f32ef007ed11f523aa5524f5a5d54
 haxelib git flixel-text-input https://github.com/FunkinCrew/flixel-text-input 951a0103a17bfa55eed86703ce50b4fb0d7590bc
 haxelib git FlxPartialSound https://github.com/FunkinCrew/FlxPartialSound.git f986332ba5ab02abd386ce662578baf04904604a
 haxelib git moonchart https://github.com/MaybeMaru/moonchart

source/archipelago/TrapLinkFunctions.hx

@@ -74,6 +74,7 @@ class TrapLinkFunctions {
     @:privateAccess
         for (i in 0...randArray.length) {
             var cool:StrumNote = new StrumNote(0, 0, randArray[i], 0);
+            @:privateAccess
             if (!PlayState.isPixelStage) cool.animation.addByPrefix('color', colArray[cool.noteData] + '0', 24, true);
             cool.playAnim('static');
             cool.ID = i;
@@ -102,6 +103,7 @@ class TrapLinkFunctions {
             var strum = grpNotes[j];
             strum.playAnim('confirm', true);
             strum.animation.finishCallback = function(animName:String) {
+                @:privateAccess
                 if (PlayState.isPixelStage) strum.playAnim(colArray[strum.noteData]);
                 else strum.playAnim('color', true);
             }

source/objects/StrumNote.hx

@@ -18,6 +18,7 @@ class StrumNote extends NoteObject
 	public var direction:Float = 90;
 	public var downScroll:Bool = false;
 	public var sustainReduce:Bool = true;
+	private var player:Int;
 
 	public static var ogStrumPosX:Array<Null<Float>> = [];
 	public static var ogStrumPosY:Array<Null<Float>> = [];

source/objects/playfields/PlayField.hx

@@ -833,6 +833,8 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 			babyArrow.y = strumLineY;
 			babyArrow.handleRendering = false; // NoteField handles rendering
 			babyArrow.cameras = cameras;
+			@:privateAccess
+			babyArrow.player = this.playerId;
 			strumNotes.push(babyArrow);
 			babyArrow.playerPosition();
 			if (ClientPrefs.data.showKeybindsOnStart && this.isPlayer)

source/psychlua/HScript.hx

@@ -20,6 +20,8 @@ import crowplexus.hscript.Printer;
 
 import haxe.ValueException;
 
+import modchart.Manager;
+
 typedef HScriptInfos = {
 	> haxe.PosInfos,
 	var ?funcName:String;
@@ -429,6 +431,9 @@ class HScript extends Iris
 			}
 		);
 
+		//Funkin Modchart things
+		set("manager", Manager);
+
 		//Base game things
 		set("FlxPoint", {
 			get: FlxPoint.get,

source/psychlua/VideoFunctions.hx

@@ -13,7 +13,7 @@ class VideoFunctions
 			else trace('No argument for game over video!');
 		});
 
-		Lua_helper.add_callback(lua, 'makeVideoSprite', function(tag:String, videoFile:String, ?x:Float, ?y:Float, ?camera:String = 'game', ?shouldLoop:Bool = false, ?playOnLoad:Bool = true, ?isCutscene:Bool = false, addBehind:String = 'none') {	
+		Lua_helper.add_callback(lua, 'makeVideoSprite', function(tag:String, videoFile:String, ?x:Float, ?y:Float, ?camera:String = 'game', ?shouldLoop:Bool = false, ?playOnLoad:Bool = true, ?isCutscene:Bool = false, ?addBehind:String = 'none') {	
 			if (MusicBeatState.getVariables().exists(tag + '_video') || MusicBeatState.getVariables().exists(tag))
 			{
 				PlayState.instance.addTextToDebug('makeVideoSprite: This tag is not available! Use a different tag.', FlxColor.RED);
@@ -54,6 +54,10 @@ class VideoFunctions
 						videoCutscene = null;
 						PlayState.instance.canPause = true;
 						PlayState.instance.inCutscene = false;
+						if(PlayState.instance.endingSong)
+							PlayState.instance.endSong();
+						else
+							PlayState.instance.startCountdown();
 					}
 					videoCutscene.finishCallback = onVideoEnd;
 					videoCutscene.onSkip = onVideoEnd;

source/states/PlayState.hx

@@ -2229,7 +2229,7 @@ class PlayState extends MusicBeatState
 
 		setOnScripts('songLength', songLength);
 		callOnScripts('onSongStart');
-
+		
 		// my latest invention: THE CHAOS BRINGER
 		if (AprilFools.allowAF && !inArchipelagoMode) {
 			switch (FlxG.random.int(0, 5)) {
@@ -4104,19 +4104,13 @@ class PlayState extends MusicBeatState
 
 	public function newPlayfield()
 	{
-		try {
-			var field = new PlayField(modManager);
-			field.modNumber = playfields.members.length;
-			field.playerId = field.modNumber;
-			field.cameras = playfields.cameras;
-			initPlayfield(field);
-			playfields.add(field);
-			return field;
-		}
-		catch(e) {
-			trace("Playfield Failed to make a Field!");
-			return null;
-		}
+		var field = new PlayField(modManager);
+		field.modNumber = playfields.members.length;
+		field.playerId = field.modNumber;
+		field.cameras = playfields.cameras;
+		initPlayfield(field);
+		playfields.add(field);
+		return field;
 	}
 
 	// good to call this whenever you make a playfield
@@ -4320,16 +4314,15 @@ class PlayState extends MusicBeatState
 		doDeathCheck(true);
 	}
 
-	// // the void varient of the function above with trueKill set to true
-	// public function killhimtodeath():Void
-	// {
-	// 	bfkilledcheck = true;
-	// 	health = 0;
-	// 	lives = 0;
-	// 	else lives -= 1;
-	// 	noteMissPress(3, opponentmode ? dadField : playerField); // just to make sure you actually die
-	// 	doDeathCheck(true);
-	// }
+	// the void varient of the function above with trueKill set to true
+	/*public function killhimtodeath():Void
+	{
+		bfkilledcheck = true;
+		health = 0;
+		lives = 0;
+		noteMissPress(3, opponentmode ? dadField : playerField); // just to make sure you actually die
+		doDeathCheck(true);
+	}*/
 
 	function updateVisPos() { //Literaly so it doesn't look weird in the update function
 		try {