TO FIX: PICO

assets/data/characters/.foldercontent

@@ -1 +1,8 @@
-bf.xml
+bf.xml
+gf.xml
+dad.xml
+gf.xml
+mom-car.xml
+monster.xml
+pico.xml
+spooky.xml

assets/data/characters/bf.json

@@ -1,94 +0,0 @@
-{
-    "isPlayer": true,
-    "flipX": true,
-    "anims": [
-        {
-            "name": "idle",
-            "animation": "BF idle dance",
-            "fps": 24,
-            "loop": false,
-            "x": 0,
-            "y": -5
-        },
-        {
-            "name": "singUP",
-            "animation": "BF NOTE UP0",
-            "fps": 24,
-            "loop": false,
-            "x": -29,
-            "y": 27
-        },
-        {
-            "name": "singLEFT",
-            "animation": "BF NOTE LEFT0",
-            "fps": 24,
-            "loop": false,
-            "x": 12,
-            "y": -6
-        },
-        {
-            "name": "singRIGHT",
-            "animation": "BF NOTE RIGHT0",
-            "fps": 24,
-            "loop": false,
-            "x": -38,
-            "y": -7
-        },
-        {
-            "name": "singDOWN",
-            "animation": "BF NOTE DOWN0",
-            "fps": 24,
-            "loop": false,
-            "x": -10,
-            "y": -50
-        },
-        {
-            "name": "singUPmiss",
-            "animation": "BF NOTE UP MISS",
-            "fps": 24,
-            "loop": false,
-            "x": -29,
-            "y": 27
-        },
-        {
-            "name": "singLEFTmiss",
-            "animation": "BF NOTE LEFT MISS",
-            "fps": 24,
-            "loop": false,
-            "x": 12,
-            "y": 24
-        },
-        {
-            "name": "singRIGHTmiss",
-            "animation": "BF NOTE RIGHT MISS",
-            "fps": 24,
-            "loop": false,
-            "x": -30,
-            "y": 21
-        },
-        {
-            "name": "singDOWNmiss",
-            "animation": "BF NOTE DOWN MISS",
-            "fps": 24,
-            "loop": false,
-            "x": -11,
-            "y": -19
-        },
-        {
-            "name": "hey",
-            "animation": "BF HEY",
-            "fps": 24,
-            "loop": false,
-            "x": 7,
-            "y": 4
-        },
-        {
-            "name": "scared",
-            "animation": "BF idle shaking",
-            "fps": 24,
-            "loop": true,
-            "x": -4,
-            "y": 0
-        }
-    ]
-}

assets/data/characters/dad.xml

@@ -0,0 +1,8 @@
+<!DOCTYPE codename-engine-character>
+<character isPlayer="false" flipX="false" x="0" y="0">
+    <anim name="idle"       anim="Dad idle dance"       fps="24"    loop="false" x="0" y="0"/>
+    <anim name="singUP"     anim="Dad Sing Note UP"     fps="24"    loop="false" x="-6" y="50"/>
+    <anim name="singLEFT"   anim="Dad Sing Note LEFT"   fps="24"    loop="false" x="-10" y="10"/>
+    <anim name="singRIGHT"  anim="Dad Sing Note RIGHT"  fps="24"    loop="false" x="0" y="27"/>
+    <anim name="singDOWN"   anim="Dad Sing Note DOWN"   fps="24"    loop="false" x="0" y="-30"/>
+</character>

assets/data/characters/monster.xml

@@ -0,0 +1,8 @@
+<!DOCTYPE codename-engine-character>
+<character isPlayer="false" flipX="false" x="0" y="100">
+    <anim name="idle"       anim="monster idle"         fps="24"    loop="false" x="0" y="0"/>
+    <anim name="singUP"     anim="monster up note"      fps="24"    loop="false" x="-20" y="50"/>
+    <anim name="singLEFT"   anim="Monster left note"    fps="24"    loop="false" x="-30" y="0"/>
+    <anim name="singRIGHT"  anim="Monster Right note"   fps="24"    loop="false" x="-51" y="0"/>
+    <anim name="singDOWN"   anim="monster down"         fps="24"    loop="false" x="-30" y="-40"/>
+</character>

assets/data/characters/pico.xml

@@ -0,0 +1,16 @@
+<!DOCTYPE codename-engine-character>
+<character isPlayer="false" flipX="true" x="0" y="300" cam_x="600" >
+    <anim name="idle" anim="Pico Idle Dance" fps="24" loop="false" x="0" y="0" />
+
+    <!-- Sing Animations -->
+    <anim name="singLEFT" anim="Pico Note Right0" fps="24" loop="false" x="65" y="9" />
+    <anim name="singDOWN" anim="Pico Down Note0" fps="24" loop="false" x="0" y="-70" />
+    <anim name="singUP" anim="pico Up note0" fps="24" loop="false" x="-29" y="27" />
+    <anim name="singRIGHT" anim="Pico NOTE LEFT0" fps="24" loop="false" x="-68" y="-7" />
+
+    <!-- Miss Animations -->
+    <anim name="singLEFTmiss" anim="Pico Note Right Miss" fps="24" loop="false" x="62" y="64" />
+    <anim name="singDOWNmiss" anim="Pico Down Note MISS" fps="24" loop="false" x="210" y="-28" />
+    <anim name="singUPmiss" anim="pico Up note miss" fps="24" loop="false" x="-19" y="67" />
+    <anim name="singRIGHTmiss" anim="Pico NOTE LEFT miss" fps="24" loop="false" x="-60" y="41" />
+</character>

assets/data/characters/spooky.xml

@@ -0,0 +1,9 @@
+<!DOCTYPE codename-engine-character>
+<character isPlayer="false" flipX="false" x="0" y="200">
+    <anim name="danceLeft"  anim="spooky dance idle"    fps="12"    loop="false" x="0" y="0" indices="0,2,6"/>
+    <anim name="danceRight" anim="spooky dance idle"    fps="12"    loop="false" x="0" y="0" indices="8,10,12,14"/>
+    <anim name="singUP"     anim="spooky UP NOTE"       fps="24"    loop="false" x="-20" y="26"/>
+    <anim name="singLEFT"   anim="note sing left"       fps="24"    loop="false" x="130" y="-10"/>
+    <anim name="singRIGHT"  anim="spooky sing right"    fps="24"    loop="false" x="-130" y="-14"/>
+    <anim name="singDOWN"   anim="spooky DOWN note"     fps="24"    loop="false" x="-50" y="-130"/>
+</character>

buildnumber.txt

@@ -1 +1 @@
-135
+144

source/AnimationDebug.hx

@@ -1,5 +1,6 @@
 package;
 
+import funkin.game.Character;
 import flixel.FlxG;
 import flixel.FlxObject;
 import flixel.FlxSprite;
@@ -14,7 +15,7 @@ import flixel.util.FlxColor;
  */
 class AnimationDebug extends FlxState
 {
-	var bf:Boyfriend;
+	var bf:Character;
 	var dad:Character;
 	var char:Character;
 	var textAnim:FlxText;
@@ -54,7 +55,7 @@ class AnimationDebug extends FlxState
 		}
 		else
 		{
-			bf = new Boyfriend(0, 0);
+			bf = new Character(0, 0, daAnim, true);
 			bf.screenCenter();
 			bf.debugMode = true;
 			add(bf);

source/Main.hx

@@ -17,7 +17,7 @@ import flixel.math.FlxPoint;
 import flixel.math.FlxRect;
 
 // TODO: REMOVE TEST
-import modsfolder.ModsFolder;
+import funkin.mods.ModsFolder;
 
 @:build(funkin.macros.BuildCounterMacro.build())
 class Main extends Sprite
@@ -94,8 +94,8 @@ class Main extends Sprite
 		FlxG.save.bind('Save');
 		Highscore.load();
 
-		ModsFolder.loadMod("B-Sides");
-		ModsFolder.currentModFolder = "B-Sides";
+		// ModsFolder.loadMod("B-Sides");
+		// ModsFolder.currentModFolder = "B-Sides";
 		
 		FlxG.fixedTimestep = false;
 		FlxG.autoPause = false;

source/Paths.hx

@@ -4,7 +4,7 @@ import flixel.FlxG;
 import flixel.graphics.frames.FlxAtlasFrames;
 import openfl.utils.AssetType;
 import openfl.utils.Assets as OpenFlAssets;
-import modsfolder.ModsFolder;
+import funkin.mods.ModsFolder;
 
 using StringTools;
 

source/funkin/game/PlayState.hx

@@ -754,10 +754,8 @@ class PlayState extends MusicBeatState
 		/* if (FlxG.keys.justPressed.NINE)
 			FlxG.switchState(new Charting()); */
 
-		#if debug
 		if (FlxG.keys.justPressed.EIGHT)
 			FlxG.switchState(new AnimationDebug(SONG.player2));
-		#end
 
 		if (startingSong)
 		{

source/funkin/mods/ModsFolder.hx

@@ -1,4 +1,4 @@
-package modsfolder;
+package funkin.mods;
 
 import openfl.utils.AssetManifest;
 import openfl.utils.AssetLibrary;