Bonus Features

This should be alright, they're not necessary features but they're nice to have
Sonamaker1 · Dec 11, 2023 · bc1cfc7 · bc1cfc7
1 parent 37fc46d
commit bc1cfc7
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 7 deletions.
diff --git a/source/FunkinLua.hx b/source/FunkinLua.hx
@@ -1053,8 +1053,26 @@ class FunkinLua {
 			Reflect.getProperty(getInstance(), obj).remove(Reflect.getProperty(getInstance(), obj)[index]);
 		});
 
-		Lua_helper.add_callback(lua, "getPropertyFromClass", function(classVar:String, variable:String) {
+		Lua_helper.add_callback(lua, "getPropertyFromClass", function(classVarInput:String, variable:String) {
 			@:privateAccess
+			var classVar = classVarInput;
+			trace("Is clientprefs? " + (classVar.indexOf("backend.ClientPrefs")>=0));
+
+			//Is this a 0.7 thing?
+			var isZeroPointSeven = classVar.indexOf("backend.")>=0 ||
+				classVar.indexOf("states.")>=0||
+				classVar.indexOf("substates.")>=0;
+
+			//Has this been back-ported already?
+			var isMapped = classVar.indexOf("substates.GameOverSubstate")>=0 || 
+				classVar.indexOf("substates.PauseSubState")>=0 || 
+				classVar.indexOf("backend.ClientPrefs")>=0;
+
+			if( isZeroPointSeven && !isMapped ){
+				var splitIt=classVar.split('.');
+				classVar = classVar.split('.').slice(1,splitIt.length).join("");
+			}
+
 			var killMe:Array<String> = variable.split('.');
 			if(killMe.length > 1) {
 				var coverMeInPiss:Dynamic = getVarInArray(Type.resolveClass(classVar), killMe[0]);
@@ -1065,8 +1083,26 @@ class FunkinLua {
 			}
 			return getVarInArray(Type.resolveClass(classVar), variable);
 		});
-		Lua_helper.add_callback(lua, "setPropertyFromClass", function(classVar:String, variable:String, value:Dynamic) {
+		Lua_helper.add_callback(lua, "setPropertyFromClass", function(classVarInput:String, variable:String, value:Dynamic) {
 			@:privateAccess
+			var classVar = classVarInput;
+			trace("Is clientprefs? " + (classVar.indexOf("backend.ClientPrefs")>=0));
+
+			//Is this a 0.7 thing?
+			var isZeroPointSeven = classVar.indexOf("backend.")>=0 ||
+				classVar.indexOf("states.")>=0||
+				classVar.indexOf("substates.")>=0;
+
+			//Has this been back-ported already?
+			var isMapped = classVar.indexOf("substates.GameOverSubstate")>=0 || 
+				classVar.indexOf("substates.PauseSubState")>=0 || 
+				classVar.indexOf("backend.ClientPrefs")>=0;
+
+			if( isZeroPointSeven && !isMapped ){
+				var splitIt=classVar.split('.');
+				classVar = classVar.split('.').slice(1,splitIt.length).join("");
+			}
+
 			var killMe:Array<String> = variable.split('.');
 			if(killMe.length > 1) {
 				var coverMeInPiss:Dynamic = getVarInArray(Type.resolveClass(classVar), killMe[0]);

diff --git a/source/MusicBeatState.hx b/source/MusicBeatState.hx
@@ -43,7 +43,6 @@ class MusicBeatState extends FlxUIState
 	inline function get_controls():Controls
 		return PlayerSettings.player1.controls;
 
-
 	public function new()
 	{
 		super();
@@ -257,4 +256,11 @@ class MusicBeatState extends FlxUIState
 		if(PlayState.SONG != null && PlayState.SONG.notes[curSection] != null) val = PlayState.SONG.notes[curSection].sectionBeats;
 		return val == null ? 4 : val;
 	}
+
+	//Hi 7oltan lol
+	override function draw(){
+		menuscripts.executeAllFunc("super_draw", []);
+		super.draw();
+		menuscripts.executeAllFunc("super_drawPost", []);
+	}
 }
diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -643,8 +643,12 @@ class PlayState extends MusicBeatState
 				gf.visible = false;
 		}
 		//W, TODO: fast cars and flxTrails go here
-
-		DialogueUtil.buffer = [];
+		if(!DialogueUtil.skipNextClear){
+			DialogueUtil.buffer = [];
+		}
+		else{
+			DialogueUtil.skipNextClear = false;
+		}
 		var file:String = Paths.json(songName + '/dialogue'); //Checks for json/Psych Engine dialogue
 		if (OpenFlAssets.exists(file)) {
 			dialogueJson = DialogueBoxPsych.parseDialogue(file);
@@ -1267,6 +1271,24 @@ class PlayState extends MusicBeatState
 		}
 	}
 
+	public function sayDialogue(?music:String = null):Void {
+		var shit:DialogueFile = {dialogue: DialogueUtil.buffer};
+		if(shit.dialogue.length > 0) {
+			PlayState.instance.startDialogue(shit, music);
+			return;
+		} else {
+			if(PlayState.instance.endingSong) {
+				PlayState.instance.endSong();
+			} else {
+				PlayState.instance.startCountdown();
+			}
+		}
+	}
+
+	public function clearDialogue() {
+		DialogueUtil.buffer = [];
+		return 0;
+	}
 	//Removed intro function stuff lol
 
 	var startTimer:FlxTimer;
@@ -2441,6 +2463,14 @@ class PlayState extends MusicBeatState
 		}
 	}
 
+	override function draw(){
+		if(scripts!=null)
+			scripts.executeAllFunc("onDraw", []);
+		super.draw();
+		if(scripts!=null)
+			scripts.executeAllFunc("onDrawPost", []);
+	}
+
 	function openPauseMenu()
 	{
 		persistentUpdate = false;
@@ -4205,7 +4235,7 @@ class PlayState extends MusicBeatState
 				scripts.addScript(scriptName).executeString(hxData);
 			else
 			{
-				scripts.getScriptByTag(scriptName).error("Duplacite Script Error!", '$scriptName: Duplicate Script');
+				scripts.getScriptByTag(scriptName).error("Duplicate Script Error!", '$scriptName: Duplicate Script');
 			}
 		}
 	}

diff --git a/source/tools/DialogueUtil.hx b/source/tools/DialogueUtil.hx
@@ -41,7 +41,7 @@ class DialogueUtil extends FlxSpriteGroup
     private static var DEFAULT_TEXT:String = "coolswag";
 	private static var DEFAULT_SPEED:Float = 0.05;
 	private static var DEFAULT_BUBBLETYPE:String = "normal";
-
+    public static var skipNextClear = false;
     public static var buffer:Array<DialogueLine> = [];
 
     public static function makeLine(