Working on fixing bugs

.github/workflows/main.yml

@@ -44,7 +44,7 @@ jobs:
           haxelib install flixel-addons
           haxelib install tjson
           haxelib install hxjsonast
-          haxelib install hxCodec
+          haxelib install hxCodec 2.5.1 
           haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
           haxelib install hscript
           haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex
@@ -86,7 +86,7 @@ jobs:
           haxelib install flixel-addons
           haxelib install tjson
           haxelib install hxjsonast
-          haxelib install hxCodec
+          haxelib install hxCodec 2.5.1 
           haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
           haxelib install hscript 
           haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex
@@ -129,7 +129,7 @@ jobs:
           haxelib install flixel-addons
           haxelib install tjson
           haxelib install hxjsonast
-          haxelib install hxCodec
+          haxelib install hxCodec 2.5.1 
           haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
           haxelib install hscript
           haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex
@@ -171,7 +171,7 @@ jobs:
           haxelib install flixel-addons
           haxelib install tjson
           haxelib install hxjsonast
-          haxelib install hxCodec
+          haxelib install hxCodec 2.5.1 
           haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
           haxelib install hscript 
           haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex
@@ -214,7 +214,7 @@ jobs:
            haxelib install flixel-addons
            haxelib install tjson
            haxelib install hxjsonast
-           haxelib install hxCodec
+           haxelib install hxCodec 2.5.1 
            haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
            haxelib install hscript 
            haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex

assets/preload/characters/bf-holding-gf.json

@@ -1,114 +1,114 @@
 {
 	"animations": [
 		{
+			"loop": false,
 			"offsets": [
 				-5,
 				0
 			],
-			"loop": false,
-			"fps": 24,
 			"anim": "idle",
-			"indices": [],
-			"name": "BF idle dance"
+			"fps": 24,
+			"name": "BF idle dance",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
 				12,
 				7
 			],
-			"loop": false,
-			"fps": 24,
 			"anim": "singLEFT",
-			"indices": [],
-			"name": "BF NOTE LEFT0"
+			"fps": 24,
+			"name": "BF NOTE LEFT0",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
 				-10,
 				-10
 			],
-			"loop": false,
-			"fps": 24,
 			"anim": "singDOWN",
-			"indices": [],
-			"name": "BF NOTE DOWN0"
+			"fps": 24,
+			"name": "BF NOTE DOWN0",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
 				-29,
 				10
 			],
-			"loop": false,
-			"fps": 24,
 			"anim": "singUP",
-			"indices": [],
-			"name": "BF NOTE UP0"
+			"fps": 24,
+			"name": "BF NOTE UP0",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
 				-41,
 				23
 			],
-			"loop": false,
-			"fps": 24,
 			"anim": "singRIGHT",
-			"indices": [],
-			"name": "BF NOTE RIGHT0"
+			"fps": 24,
+			"name": "BF NOTE RIGHT0",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
 				12,
 				7
 			],
-			"loop": false,
-			"fps": 24,
 			"anim": "singLEFTmiss",
-			"indices": [],
-			"name": "BF NOTE LEFT MISS"
+			"fps": 24,
+			"name": "BF NOTE LEFT MISS",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
 				-10,
 				-10
 			],
-			"loop": false,
-			"fps": 24,
 			"anim": "singDOWNmiss",
-			"indices": [],
-			"name": "BF NOTE DOWN MISS"
+			"fps": 24,
+			"name": "BF NOTE DOWN MISS",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
 				-29,
 				10
 			],
-			"loop": false,
-			"fps": 24,
 			"anim": "singUPmiss",
-			"indices": [],
-			"name": "BF NOTE UP MISS"
+			"fps": 24,
+			"name": "BF NOTE UP MISS",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
 				-41,
 				33
 			],
-			"loop": false,
-			"fps": 24,
 			"anim": "singRIGHTmiss",
-			"indices": [],
-			"name": "BF NOTE RIGHT MISS"
+			"fps": 24,
+			"name": "BF NOTE RIGHT MISS",
+			"indices": []
 		},
 		{
-			"loop": false,
 			"offsets": [
 				0,
 				90
 			],
-			"anim": "bfCatch",
+			"loop": false,
 			"fps": 24,
-			"name": "BF catches GF",
-			"indices": []
+			"anim": "bfCatch",
+			"indices": [],
+			"name": "BF catches GF"
 		}
 	],
 	"no_antialiasing": false,
@@ -117,7 +117,7 @@
 		0,
 		350
 	],
-	"healthicon": "bf",
+	"healthicon": "bfgf",
 	"flip_x": true,
 	"healthbar_colors": [
 		49,
@@ -130,4 +130,4 @@
 	],
 	"sing_duration": 4,
 	"scale": 1
-}
+}

source/Achievements.hx

@@ -222,12 +222,17 @@ class AttachedAchievement extends FlxSprite {
 
 	public function forget() // from BeastlyGhost
  	{
- 		if (Achievements.isAchievementUnlocked(tag) && FlxG.save.data.achievementsMap)
+ 		if (Achievements.isAchievementUnlocked(tag) && FlxG.save.data.achievementsMap != null)
  		{
  			var savedStuff:Map<String, String> = FlxG.save.data.achievementsMap;
- 			if (savedStuff.exists(tag))
+ 			if (savedStuff.exists(tag)) 
  				savedStuff.remove(tag);
+
  			FlxG.save.data.achievementsMap = savedStuff;
+			if(Achievements.achievementsMap.exists(tag)) {
+				if(Achievements.achievementsMap.get(tag)) // its unlocked {
+					Achievements.achievementsMap.set(tag, false);
+			}
  			loadGraphic(Paths.image('achievements/lockedachievement'));
 		}
 	}

source/ClientPrefs.hx

@@ -11,6 +11,7 @@ class ClientPrefs
 	public static var downScroll:Bool = false;
 	public static var middleScroll:Bool = false;
 	public static var showFPS:Bool = true;
+	public static var fullscreen:Bool = false;
 	public static var showRAM:Bool = true;
 	public static var flashing:Bool = true;
 	public static var iconBounce:String = 'Default';
@@ -39,6 +40,8 @@ class ClientPrefs
 	public static var checkForUpdates:Bool = true;
 	public static var comboStacking = true;
 	public static var introbg:Bool = false;
+	public static var ogbar = false;
+	public static var ogscore = false;
 	public static var longhealthbar:Bool = true;
 	public static var resumeTime:Float = 3;
 	public static var noscore:Bool = false;
@@ -134,6 +137,7 @@ class ClientPrefs
 		FlxG.save.data.showFPS = showFPS;
 		FlxG.save.data.showRAM = showRAM;
 		FlxG.save.data.flashing = flashing;
+		FlxG.save.data.ogscore = ogscore;
 		FlxG.save.data.musicSelected = musicSelected;
 		FlxG.save.data.globalAntialiasing = globalAntialiasing;
 		FlxG.save.data.noteSplashes = noteSplashes;
@@ -144,7 +148,8 @@ class ClientPrefs
 		FlxG.save.data.longhealthbar = longhealthbar;
 		FlxG.save.data.crazycounter = crazycounter;
 		//FlxG.save.data.cursing = cursing;
-		//FlxG.save.data.violence = violence;
+		//FlxG.save.data.violence = violence;                                                           Honestly fuck you children fnf is not for children
+		FlxG.save.data.ogbar = ogbar;
 		FlxG.save.data.iconBounce = iconBounce;
 		FlxG.save.data.autoPause = autoPause;
 		FlxG.save.data.camZooms = camZooms;
@@ -158,6 +163,7 @@ class ClientPrefs
 		FlxG.save.data.kadetxt = kadetxt;
 		FlxG.save.data.introbg = introbg;
 		FlxG.save.data.noReset = noReset;
+		FlxG.save.data.fullscreen = fullscreen;
 		FlxG.save.data.noscore = noscore;
 		FlxG.save.data.opponentStrums = opponentStrums;
 		FlxG.save.data.camfollow = camfollow;
@@ -205,6 +211,18 @@ class ClientPrefs
 		{
 			winningIcon = FlxG.save.data.winningIcon;
 		}
+		if(FlxG.save.data.ogbar != null)
+		{
+			ogbar = FlxG.save.data.ogbar;
+		}
+		if(FlxG.save.data.ogbar != null)
+		{
+			ogscore = FlxG.save.data.ogscore;
+		}
+		if(FlxG.save.data.fullscreen != null)
+		{
+			fullscreen = FlxG.save.data.fullscreen;
+		}
 		if(FlxG.save.data.downScroll != null)
 		{
 			downScroll = FlxG.save.data.downScroll;

source/FunkinLua.hx

@@ -3367,8 +3367,9 @@ class FunkinLua {
 	}
 
  	function getErrorMessage(status:Int):String {
+		var v:String = 'Unknown Error';
 		#if LUA_ALLOWED
-		var v:String = Lua.tostring(lua, -1);
+		v = Lua.tostring(lua, -1);
 		Lua.pop(lua, 1);
 
 		if (v != null) v = v.trim();
@@ -3381,8 +3382,8 @@ class FunkinLua {
 			return "Unknown Error";
 		}
 
-		return v;
 		#end
+		return v;
  	}
 
 	var lastCalledFunction:String = '';
@@ -3429,7 +3430,7 @@ class FunkinLua {
 		return Function_Continue;
 	}
 
-	public static function getPropertyLoopThingWhatever(killMe:Array<String>, ?checkForTextsToo:Bool = true, ?getProperty:Bool=true):Dynamic
+	public static function getPropertyLoopThingWhatever(killMe:Array<String>, ?checkForTextsToo:Bool = true, ?getProperty:Bool = true):Dynamic
 	{
 		var coverMeInPiss:Dynamic = getObjectDirectly(killMe[0], checkForTextsToo);
 		var end = killMe.length;

source/Main.hx

@@ -33,7 +33,8 @@ class Main extends Sprite
 	var zoom:Float = -1; // If -1, zoom is automatically calculated to fit the window dimensions.
 	var framerate:Int = 60; // How many frames per second the game should run at.
 	var skipSplash:Bool = true; // Whether to skip the flixel splash screen that appears in release mode.
-	var startFullscreen:Bool = false; // Whether to start the game in fullscreen on desktop targets
+	var startFullscreen:Bool = (ClientPrefs.fullscreen); // Whether to start the game in fullscreen on desktop targets
+
 	public static var fpsVar:FPS;
 
 	// You can pretty much ignore everything from here on - your code should go in your states.

source/Note.hx

@@ -344,13 +344,13 @@ class Note extends FlxSprite
 
 	var lastNoteOffsetXForPixelAutoAdjusting:Float = 0;
 	var lastNoteScaleToo:Float = 1;
-	public var originalHeightForCalcs:Float = 6; 
-	function reloadNote(?prefix:String = '', ?Texture:String = '', ?suffix:String = '') {
+	public var originalHeightForCalcs:Float = 6;
+	function reloadNote(?prefix:String = '', ?texture:String = '', ?suffix:String = '') {
 		if(prefix == null) prefix = '';
 		if(texture == null) texture = '';
 		if(suffix == null) suffix = '';
 
-		var skin:String = Texture;
+		var skin:String = texture;
 		if (texture.length < 1)
 		{
 			skin = PlayState.SONG.arrowSkin;
@@ -373,19 +373,19 @@ class Note extends FlxSprite
 		if(PlayState.isPixelStage) {
 			var notefile:String = 'pixelUI/$blahblah';
 			if(isSustainNote) {
-				notefile += 'ENDS';
-				//if(!Paths.fileExists(Paths.image(notefile), IMAGE)) notefile = 'pixelUI/noteskins/NOTENOEXISTS_assetsENDS';
-				loadGraphic(Paths.image(notefile));
+				//if(!Paths.fileExists('images/' + notefile + 'ENDS', IMAGE)) notefile = 'pixelUI/noteskins/NOTENOEXISTS_assets';
+				loadGraphic(Paths.image(notefile + 'ENDS'));
 				width = width / 4;
 				height = height / 2;
 				originalHeightForCalcs = height;
+				loadGraphic(Paths.image(notefile + 'ENDS'), true, Math.floor(width), Math.floor(height));
 			} else {
-				//if(!Paths.fileExists(Paths.image(notefile), IMAGE)) notefile = 'pixelUI/noteskins/NOTENOEXISTS_assets';
+				//if(!Paths.fileExists('images/' + notefile, IMAGE)) notefile = 'pixelUI/noteskins/NOTENOEXISTS_assets';
 				loadGraphic(Paths.image(notefile));
 				width = width / 4;
 				height = height / 5;
+				loadGraphic(Paths.image(notefile), true, Math.floor(width), Math.floor(height));
 			}
-			loadGraphic(Paths.image(notefile), true, Math.floor(width), Math.floor(height));
 			setGraphicSize(Std.int(width * PlayState.daPixelZoom));
 			loadPixelNoteAnims();
 			antialiasing = false;