im gonna go insane

Z11Coding · Z11Coding · commit cb03d1ce15ea · 2025-03-11T02:19:01.000-04:00
this one thing fixed SO much

the thing is in loading state btw
diff --git a/assets/shared/images/pixelUI/marv-pixel.png b/assets/shared/images/pixelUI/marv-pixel.png
diff --git a/source/archipelago/APInfo.hx b/source/archipelago/APInfo.hx
@@ -6,15 +6,15 @@ class APInfo {
 
 	public static final baseGame:Array<String> = 
 	[
+		'Tutorial',
 		'Bopeebo', 'Fresh', 'Dad Battle',
 		'Spookeez', 'South', 'Monster',
 		'Pico', 'Philly Nice', 'Blammed',
 		'Satin Panties', 'High', 'Milf',
 		'Cocoa', 'Eggnog', 'Winter Horrorland',
 		'Senpai', 'Roses', 'Thorns',
 		'Ugh', 'Guns', 'Stress',
-		'Darnell', 'Lit Up', '2Hot', 'Blazin',
-		'Darnell (BF Mix)', 'Tutorial'
+		'Darnell (BF Mix)'
 	];
 
 	public static final baseErect:Array<String> = 
@@ -30,6 +30,7 @@ class APInfo {
 
 	public static final basePico:Array<String> = 
 	[
+		'Darnell', 'Lit Up', '2Hot', 'Blazin',
 		'Bopeebo (Pico mix)', 'Fresh (Pico mix)', 'Dad Battle (Pico mix)',
 	 	'Spookeez (Pico mix)', 'South (Pico mix)',
 	 	'Pico (Pico mix)', 'Philly Nice (Pico mix)', 'Blammed (Pico mix)',
diff --git a/source/archipelago/console/MainTab.hx b/source/archipelago/console/MainTab.hx
@@ -114,6 +114,7 @@ class MainTab extends TabSprite {
 			message.width = Std.int(instance.widthTab);
 			message.y = lastY = (lastY ?? Lib.application.window.height - instance.chatBg.height) - (message.textHeight + 5);
 			instance.msgSprite.addChild(message);
+			message.visible = message.y <= instance.info.y;
 		}
 	}
 
@@ -144,6 +145,10 @@ class MainTab extends TabSprite {
 			msgSprite.y = 0;
 		if (msgSprite.y >= msgSprite.height)
 			msgSprite.y = msgSprite.height;
+
+		for (message in messages) {
+			message.visible = message.y <= info.y;
+		}
 	}
 
 	override function onShow() {
diff --git a/source/objects/Note.hx b/source/objects/Note.hx
@@ -293,7 +293,7 @@ class Note extends NoteObject
 	public static var swagWidthAlt:Float = 160; //For ModManager
 	public static var colArray:Array<String> = ['purple', 'blue', 'green', 'red'];
 	public static var colArrayAlt:Array<String> = ['purple', 'blue', 'green', 'red', 'white', 'yellow', 'violet', 'black', 'dark'];
-	public static var defaultNoteSkin(default, never):String = 'noteskins/NOTE_assets';
+	public static var defaultNoteSkin(default, never):String = 'noteSkins/NOTE_assets';
 
 	public var noteSplashData:NoteSplashData = {
 		disabled: false,
@@ -683,6 +683,8 @@ class Note extends NoteObject
 		return globalRgbShaders[noteData];
 	}
 
+	public var publicTexture:String = '';
+	public var publicTextureSus:String = '';
 	var _lastNoteOffX:Float = 0;
 	static var _lastValidChecked:String; //optimization
 	public var originalHeight:Float = 6;
@@ -696,7 +698,7 @@ class Note extends NoteObject
 		{
 			skin = PlayState.SONG != null ? PlayState.SONG.arrowSkin : null;
 			if (skin == null || skin.length < 1)
-				skin = "noteskins/NOTE_assets" + postfix;
+				skin = "noteSkins/NOTE_assets" + postfix;
 		}
 		else rgbShader.enabled = false;
 
@@ -734,15 +736,17 @@ class Note extends NoteObject
 				case 'Fake Heal Note':
 					loadGraphic(Paths.image("streamervschat/pixelUI/fakehealnote"), false);
 				default:
+					publicTexture = 'pixelUI/' + skinPixel + skinPostfix;
+					publicTextureSus = 'pixelUI/' + skinPixel + 'ENDS' + skinPostfix;
 					if(isSustainNote) {
 						var graphic = Paths.image('pixelUI/' + skinPixel + 'ENDS' + skinPostfix);
-						loadGraphic(graphic, true, Math.floor(graphic.width / Note.pixelNotesDivisionValue[0]), Math.floor(graphic.height / 2));
+						loadGraphic(graphic, true, Math.floor(graphic.width / pixelNotesDivisionValue[graphic.width == 126 ? 1 : 0]), Math.floor(graphic.height / 2));
 						originalHeight = graphic.height / 2;
 					} else {
 						var graphic = Paths.image('pixelUI/' + skinPixel + skinPostfix);
-						loadGraphic(graphic, true, Math.floor(graphic.width / Note.pixelNotesDivisionValue[0]), Math.floor(graphic.height / 5));
+						loadGraphic(graphic, true, Math.floor(graphic.width / pixelNotesDivisionValue[graphic.width == 306 ? 1 : 0]), Math.floor(graphic.height / 5));
 					}
-					setGraphicSize(Std.int(width * PlayState.daPixelZoom * Note.pixelScales[PlayState.mania]));
+					setGraphicSize(Std.int(width * PlayState.daPixelZoom * pixelScales[PlayState.mania]));
 					loadPixelNoteAnims();
 					antialiasing = false;
 			}
@@ -815,11 +819,12 @@ class Note extends NoteObject
 	function loadPixelNoteAnims() {
 		for (i in 0...gfxLetter.length)
 		{
-			animation.add(gfxLetter[i], [i + pixelNotesDivisionValue[0]]);
+			var graphic = Paths.image(publicTexture);
+			animation.add(gfxLetter[i], [i + pixelNotesDivisionValue[graphic.width == 306 ? 1 : 0]]);
 			if (isSustainNote)
 			{
 				animation.add(gfxLetter[i] + ' hold', [i]);
-				animation.add(gfxLetter[i] + ' tail', [i + pixelNotesDivisionValue[0]]);
+				animation.add(gfxLetter[i] + ' tail', [i + (pixelNotesDivisionValue[graphic.width == 126 ? 1 : 0] * 2)]);
 			}
 		}
 	}
diff --git a/source/objects/StrumNote.hx b/source/objects/StrumNote.hx
@@ -95,21 +95,7 @@ class StrumNote extends NoteObject
 		this.noteData = leData;
 		this.ID = noteData; 
 
-		var skin:String = null;
-		if(PlayState.SONG != null && PlayState.SONG.arrowSkin != null && PlayState.SONG.arrowSkin.length > 1) skin = PlayState.SONG.arrowSkin;
-		else skin = Note.defaultNoteSkin;
-
-		if (Note.getNoteSkinPostfix() != '')
-		{
-			var customSkin:String = skin + Note.getNoteSkinPostfix();
-			if(Paths.fileExists('images/$customSkin.png', IMAGE)) skin = customSkin;
-		}
-		else {
-			var customSkin:String = 'NOTE_assets' + Note.getNoteSkinPostfix();
-			skin = 'noteskins/' + (PlayState.isPixelStage ? customSkin : 'strums');
-		}
-
-		texture = skin; //Load texture and anims
+		texture = ''; //Load texture and anims
 		scrollFactor.set();
 		playAnim('static');
 	}
@@ -119,14 +105,24 @@ class StrumNote extends NoteObject
 
 	public function reloadNote()
 	{
+		var skin:String = texture;
+		if(texture.length < 1)
+		{
+			skin = PlayState.SONG != null ? PlayState.SONG.arrowSkin : null;
+			if ((skin == null || skin.length < 1) && PlayState.isPixelStage)
+				skin = "noteSkins/NOTE_assets";
+			else if ((skin == null || skin.length < 1) && !PlayState.isPixelStage)
+				skin = "noteSkins/strums";
+		}
+
 		var lastAnim:String = null;
 		if(animation.curAnim != null) lastAnim = animation.curAnim.name;
-		var br:String = texture;
+		var br:String = skin;
 
 		frames = Paths.getSparrowAtlas(br);
 
 		antialiasing = ClientPrefs.data.antialiasing;
-		setGraphicSize(Std.int(width * 0.7));
+		setGraphicSize(Std.int(width * Note.scales[PlayState.mania]));
 
 		animationArray[0] = Note.keysShit.get(PlayState.mania).get('strumAnims')[column];
 		animationArray[1] = Note.keysShit.get(PlayState.mania).get('letters')[column];
@@ -135,11 +131,12 @@ class StrumNote extends NoteObject
 
 		if(PlayState.isPixelStage)
 		{
-			loadGraphic(Paths.image('pixelUI/' + texture));
+			loadGraphic(Paths.image('pixelUI/' + skin));
+			pxDV = Note.pixelNotesDivisionValue[width == 306 ? 1 : 0];
 			width = width / pxDV;
 			height = height / 5;
 			antialiasing = false;
-			loadGraphic(Paths.image('pixelUI/' + texture), true, Math.floor(width), Math.floor(height));
+			loadGraphic(Paths.image('pixelUI/' + skin), true, Math.floor(width), Math.floor(height));
 			var daFrames:Array<Int> = Note.keysShit.get(PlayState.mania).get('pixelAnimIndex');
 
 			setGraphicSize(Std.int(width * PlayState.daPixelZoom * Note.pixelScales[PlayState.mania]));
@@ -152,7 +149,7 @@ class StrumNote extends NoteObject
 		}
 		else
 		{
-			frames = Paths.getSparrowAtlas(texture);
+			frames = Paths.getSparrowAtlas(skin);
 			antialiasing = ClientPrefs.data.antialiasing;
 			setGraphicSize(Std.int(width * Note.scales[PlayState.mania]));
 
diff --git a/source/objects/charting/ChartingStrumNote.hx b/source/objects/charting/ChartingStrumNote.hx
@@ -116,16 +116,6 @@ class ChartingStrumNote extends FlxSprite
 	{
 		var lastAnim:String = null;
 		if(animation.curAnim != null) lastAnim = animation.curAnim.name;
-		var br:String = texture;
-
-		frames = Paths.getSparrowAtlas(br);
-
-		antialiasing = ClientPrefs.data.antialiasing;
-		setGraphicSize(Std.int(width * 0.7));
-
-		animationArray[0] = Note.keysShit.get(PlayState.mania).get('strumAnims')[noteData];
-		animationArray[1] = Note.keysShit.get(PlayState.mania).get('letters')[noteData];
-		animationArray[2] = Note.keysShit.get(PlayState.mania).get('letters')[noteData]; //jic
 		var pxDV:Int = Note.pixelNotesDivisionValue[1];
 
 		if(PlayState.isPixelStage)
@@ -167,7 +157,9 @@ class ChartingStrumNote extends FlxSprite
 
 			antialiasing = ClientPrefs.data.antialiasing;
 			setGraphicSize(Std.int(width * Note.scales[PlayState.mania]));
-
+			animationArray[0] = Note.keysShit.get(PlayState.mania).get('strumAnims')[noteData];
+			animationArray[1] = Note.keysShit.get(PlayState.mania).get('letters')[noteData];
+			animationArray[2] = Note.keysShit.get(PlayState.mania).get('letters')[noteData]; //jic
 			switch (Math.abs(noteData))
 			{
 				case 0:
diff --git a/source/psychlua/ExtraFunctions.hx b/source/psychlua/ExtraFunctions.hx
@@ -105,6 +105,7 @@ class ExtraFunctions
 			}
 			FunkinLua.luaTrace('initSaveData: Save file already initialized: ' + name);
 		});
+		
 		Lua_helper.add_callback(lua, "flushSaveData", function(name:String) {
 			var variables = MusicBeatState.getVariables();
 			if(variables.exists('save_$name'))
diff --git a/source/psychlua/HScript.hx b/source/psychlua/HScript.hx
@@ -301,6 +301,7 @@ class HScript extends Iris
 		#if LUA_ALLOWED
 		set('createGlobalCallback', function(name:String, func:Dynamic)
 		{
+			if (name == 'makeVideoSprite') return;
 			for (script in PlayState.instance.luaArray)
 				if(script != null && script.lua != null && !script.closed)
 					Lua_helper.add_callback(script.lua, name, func);
diff --git a/source/psychlua/ReflectionFunctions.hx b/source/psychlua/ReflectionFunctions.hx
@@ -32,6 +32,15 @@ class ReflectionFunctions
 			return value;
 		});
 		Lua_helper.add_callback(lua, "getPropertyFromClass", function(classVar:String, variable:String, ?allowMaps:Bool = false) {
+			var trueVar:String = variable;
+			switch(classVar) {
+				case "PlayState":
+					classVar = "states.PlayState";
+				case "ClientPrefs":
+					classVar = "backend.ClientPrefs";
+					variable = 'data.$trueVar';
+			}
+			
 			var myClass:Dynamic = Type.resolveClass(classVar);
 			if(myClass == null)
 			{
@@ -50,6 +59,15 @@ class ReflectionFunctions
 			return LuaUtils.getVarInArray(myClass, variable, allowMaps);
 		});
 		Lua_helper.add_callback(lua, "setPropertyFromClass", function(classVar:String, variable:String, value:Dynamic, ?allowMaps:Bool = false, ?allowInstances:Bool = false) {
+			var trueVar:String = variable;
+			switch(classVar) {
+				case "PlayState":
+					classVar = "states.PlayState";
+				case "ClientPrefs":
+					classVar = "backend.ClientPrefs";
+					variable = 'data.$trueVar';
+			}
+			
 			var myClass:Dynamic = Type.resolveClass(classVar);
 			if(myClass == null)
 			{
diff --git a/source/stages/Tank.hx b/source/stages/Tank.hx
@@ -4,8 +4,9 @@ import stages.objects.*;
 import cutscenes.CutsceneHandler;
 import substates.GameOverSubstate;
 import objects.Character;
+import stages.PicoCapableStage;
 
-class Tank extends BaseStage
+class Tank extends PicoCapableStage
 {
 	var tankWatchtower:BGSprite;
 	var tankGround:BackgroundTank;
diff --git a/source/states/FreeplayState.hx b/source/states/FreeplayState.hx
@@ -142,8 +142,9 @@ class FreeplayState extends MusicBeatState
 				return "";
 			}
 
-			if (curUnlocked.exists(APEntryState.victorySong) && callVictory)
+			if (curUnlocked.exists(APEntryState.victorySong.trim().toLowerCase().replace('-', ' ')) && callVictory)
 			{
+				trace("GOAL COMPLETE");
 				callVictory = false;
 				APEntryState.apGame.info().clientStatus = ClientStatus.GOAL;
 				openSubState(new Prompt("Congradulations! You Win!", 0, 
@@ -649,7 +650,7 @@ class FreeplayState extends MusicBeatState
 					modName = WeekData.weeksLoaded.get(WeekData.weeksList[songs[i].week]).folder;
 					locationId = APEntryState.apGame.info().get_location_id(songName + (modName != "" ? " (" + modName + ")" : ""));
 					isMissing = APEntryState.apGame.isLocationMissing(APEntryState.apGame.info().get_location_name(locationId));
-					if (CategoryState.loadWeekForce == "all") color = isMissing ? FlxColor.RED : FlxColor.GREEN;
+					color = isMissing ? FlxColor.RED : FlxColor.GREEN;
 
 					for (daSongName in curUnlocked.keys())
 					{
@@ -665,7 +666,7 @@ class FreeplayState extends MusicBeatState
 				}
 
 				var songText:Alphabet;
-				if (APEntryState.inArchipelagoMode && CategoryState.loadWeekForce == "all") {
+				if (APEntryState.inArchipelagoMode) {
 					//trace('Song: ' + songName + ', Mod: ' + (modName != "" ? modName : "(not modded)") + ', Missing: ' + isMissing);
 					songText = isVictorySong(songName, modName) ? (isMissing ? new VictorySong(90, 320, songName, color) : new ColoredAlphabet(90, 320, songName, true, 0xFFFFD700)) : new ColoredAlphabet(90, 320, songName, true, color);
 				} else {
diff --git a/source/states/LoadingState.hx b/source/states/LoadingState.hx
@@ -92,6 +92,13 @@ class LoadingState extends MusicBeatState
 	#end
 	override function create()
 	{
+		@:privateAccess
+		if(PlayState._lastLoadedModDirectory != Mods.currentModDirectory)
+		{
+			trace('CHANGED MOD DIRECTORY, RELOADING STUFF');
+			Paths.freeGraphicsFromMemory();
+		}
+
 		persistentUpdate = true;
 		allowSkip = false;
 		barGroup = new FlxSpriteGroup();
diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -391,7 +391,6 @@ class PlayState extends MusicBeatState
 	{
 		//trace('Playback Rate: ' + playbackRate);
 		_lastLoadedModDirectory = Mods.currentModDirectory;
-		Paths.clearStoredMemory();
 		if(nextReloadAll)
 		{
 			Paths.clearUnusedMemory();
@@ -1183,10 +1182,11 @@ class PlayState extends MusicBeatState
 			return false;
 		}
 
-		seenCutscene = true;
-		inCutscene = false;
 		var ret:Dynamic = callOnScripts('onStartCountdown', null, true);
 		if(ret != LuaUtils.Function_Stop) {
+			seenCutscene = true;
+			inCutscene = false;
+
 			if (skipCountdown || startOnTime > 0) skipArrowStartTween = true;
 
 			trace("Starting Countdown!");
@@ -2180,11 +2180,16 @@ class PlayState extends MusicBeatState
 			field.fadeIn(skipArrowStartTween);
 
 		#if PE_MOD_COMPATIBILITY
-		for (i in dadField.strumNotes)
+		for (i in dadField.strumNotes) {
 			opponentStrums.add(i);
+			strumLineNotes.add(i);
+		}
 
-		for (i in playerField.strumNotes)
+		for (i in playerField.strumNotes) {
 			playerStrums.add(i);
+			strumLineNotes.add(i);
+		}
+		
 		#end
 	}
 
@@ -2813,6 +2818,12 @@ class PlayState extends MusicBeatState
 				&& !isDead 
 				&& bfkilledcheck
 				&& gameOverTimer == null;
+
+			default:
+				killPlayer = health <= 0 
+				&& !practiceMode 
+				&& !isDead 
+				&& gameOverTimer == null;
 		}
 		if (skipHealthCheck || instakillOnMiss || killPlayer)
 		{

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ class MainTab extends TabSprite {`
`114`	`114`	`message.width = Std.int(instance.widthTab);`
`115`	`115`	`message.y = lastY = (lastY ?? Lib.application.window.height - instance.chatBg.height) - (message.textHeight + 5);`
`116`	`116`	`instance.msgSprite.addChild(message);`
	`117`	`+ message.visible = message.y <= instance.info.y;`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`
`@@ -144,6 +145,10 @@ class MainTab extends TabSprite {`
`144`	`145`	`msgSprite.y = 0;`
`145`	`146`	`if (msgSprite.y >= msgSprite.height)`
`146`	`147`	`msgSprite.y = msgSprite.height;`
	`148`	`+`
	`149`	`+ for (message in messages) {`
	`150`	`+ message.visible = message.y <= info.y;`
	`151`	`+ }`
`147`	`152`	`}`
`148`	`153`
`149`	`154`	`override function onShow() {`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ class ExtraFunctions`
`105`	`105`	`}`
`106`	`106`	`FunkinLua.luaTrace('initSaveData: Save file already initialized: ' + name);`
`107`	`107`	`});`
	`108`	`+`
`108`	`109`	`Lua_helper.add_callback(lua, "flushSaveData", function(name:String) {`
`109`	`110`	`var variables = MusicBeatState.getVariables();`
`110`	`111`	`if(variables.exists('save_$name'))`
Original file line number	Diff line number	Diff line change
`@@ -301,6 +301,7 @@ class HScript extends Iris`
`301`	`301`	`#if LUA_ALLOWED`
`302`	`302`	`set('createGlobalCallback', function(name:String, func:Dynamic)`
`303`	`303`	`{`
	`304`	`+ if (name == 'makeVideoSprite') return;`
`304`	`305`	`for (script in PlayState.instance.luaArray)`
`305`	`306`	`if(script != null && script.lua != null && !script.closed)`
`306`	`307`	`Lua_helper.add_callback(script.lua, name, func);`