[Request For Comment] The Great Sorting

exclude/README.md

@@ -1,3 +1,5 @@
 # assets/exclude
 
 These are assets used during compilation! They should be present for macros to use but not included in the final export!
+
+The directory structure should otherwise mimic that of the main assets folder.

exclude/data/ui/stage-editor/dialogs/about.xml → exclude/ui/stage-editor/dialogs/about.xml

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dialog width="500" title="About">
-	<vbox width="100%">
-		<label text="Friday Night Funkin'" horizontalAlign="center" />
-		<label text="Stage Editor v1.1" horizontalAlign="center" />
-		<label text="Built by Kolo" horizontalAlign="center" />
-		<label text="HaxeUI by Ian Harrigan" horizontalAlign="center" />
-	</vbox>
-</dialog>
+<?xml version="1.0" encoding="utf-8"?>
+<dialog width="500" title="About">
+	<vbox width="100%">
+		<label text="Friday Night Funkin'" horizontalAlign="center" />
+		<label text="Stage Editor v1.1" horizontalAlign="center" />
+		<label text="Built by Kolo" horizontalAlign="center" />
+		<label text="HaxeUI by Ian Harrigan" horizontalAlign="center" />
+	</vbox>
+</dialog>

exclude/data/ui/stage-editor/main-view.xml → exclude/ui/stage-editor/main-view.xml

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vbox width="100%" height="100%">
-	<import source="components/menu.xml" />
-	<import source="components/style.xml" />
-	<spacer height="100%" />
-	<import source="components/bottom-bar.xml" />
-</vbox>
+<?xml version="1.0" encoding="utf-8"?>
+<vbox width="100%" height="100%">
+	<import source="components/menu.xml" />
+	<import source="components/style.xml" />
+	<spacer height="100%" />
+	<import source="components/bottom-bar.xml" />
+</vbox>

preload/scripts/characters/bf.hxc → gameplay/characters/bf/bf.hxc

@@ -18,7 +18,7 @@ class BoyfriendCharacter extends MultiSparrowCharacter {
 	}
 
 	function doFakeoutDeath():Void {
-		FunkinSound.playOnce(Paths.sound("gameplay/gameover/fakeout_death"), 1.0);
+		FunkinSound.playOnce(Paths.sound("gameplay/gameover/fakeout_death").toString(), 1.0);
 
 		var bfFakeout:FlxAtlasSprite = new FlxAtlasSprite(this.x - 440, this.y - 240, Paths.animateAtlas("characters/bfFakeOut", "shared"));
     FlxG.state.subState.add(bfFakeout);

preload/data/characters/bf.json → gameplay/characters/bf/bf.json

@@ -2,7 +2,7 @@
   "version": "1.0.0",
   "name": "Boyfriend",
   "renderType": "multisparrow",
-  "assetPath": "characters/BOYFRIEND",
+  "assetPath": "gameplay/characters/bf/boyfriend",
   "flipX": true,
   "singTime": 8.0,
   "animations": [
@@ -74,13 +74,12 @@
     {
       "name": "cheer",
       "prefix": "Cheer",
-      "assetPath": "characters/BFCheer",
+      "assetPath": "gameplay/characters/bf/boyfriend-cheer",
       "offsets": [0, 0]
     },
     {
       "name": "hit",
       "prefix": "BF hit",
-      "assetPath": "characters/BOYFRIEND",
       "offsets": [0, 0]
     },
     {

preload/data/characters/dad.json → gameplay/characters/dad/dad.json

@@ -1,7 +1,7 @@
 {
   "version": "1.0.0",
   "name": "Daddy Dearest",
-  "assetPath": "characters/daddyDearest",
+  "assetPath": "gameplay/characters/dad/daddy-dearest",
   "singTime": 8.0,
   "animations": [
     {

preload/data/characters/gf.json → gameplay/characters/gf/gf.json

@@ -1,7 +1,7 @@
 {
   "version": "1.0.0",
   "name": "Girlfriend",
-  "assetPath": "characters/GF_assets",
+  "assetPath": "gameplay/characters/gf/girlfriend",
   "startingAnimation": "danceRight",
   "singTime": 8.0,
   "animations": [

preload/scripts/stages/props/ABotVisualizer.hxc → gameplay/characters/nene/ABotVisualizer.hxc

@@ -7,7 +7,7 @@ class ABotVisualizer extends FlxTypedSpriteGroup
   {
     super(0, 0);
 
-    var vizFrames = Paths.getSparrowAtlas('aBotViz');
+    var vizFrames = Assets.getSparrowAtlas(Paths.spritesheet('aBotViz'));
 
     for (i in 1...8)
     {

preload/scripts/characters/pico-blazin.hxc → gameplay/characters/pico-blazin/pico-blazin.hxc

@@ -145,7 +145,7 @@ class PicoBlazinCharacter extends AnimateAtlasCharacter
 	}
 
 	function doDeathConfirm():Void {
-		var picoDeathConfirm:FunkinSprite = FunkinSprite.createSparrow(this.x + 905, this.y + 1030, 'picoBlazinDeathConfirm');
+		var picoDeathConfirm:FunkinSprite = FunkinSprite.createSparrow(this.x + 905, this.y + 1030, Paths.spritesheet('picoBlazinDeathConfirm'));
 		picoDeathConfirm.animation.addByPrefix('confirm', "Pico Gut Punch Death0", 24, false);
 		picoDeathConfirm.animation.play('confirm');
 		picoDeathConfirm.scale.set(1.75, 1.75);

preload/scripts/characters/pico-christmas.hxc → gameplay/characters/pico-christmas/pico-christmas.hxc

@@ -43,7 +43,7 @@ class PicoChristmasCharacter extends MultiSparrowCharacter {
 	 */
 	function createDeathSprites() {
 		//trace('PICO: Creating death sprites');
-		deathSpriteRetry = FunkinSprite.createSparrow(0, 0, "characters/Pico_Death_Retry");
+		deathSpriteRetry = FunkinSprite.createSparrow(0, 0, Paths.spritesheet("characters/Pico_Death_Retry"));
 		deathSpriteRetry.animation.addByPrefix('idle', "Retry Text Loop0", 24, true);
 		deathSpriteRetry.animation.addByPrefix('confirm', "Retry Text Confirm0", 24, false);
 
@@ -53,7 +53,7 @@ class PicoChristmasCharacter extends MultiSparrowCharacter {
 
 		//FlxG.debugger.track(deathSpriteRetry);
 
-		deathSpriteNene = FunkinSprite.createSparrow(0, 0, "characters/neneChristmas/neneChristmasKnife");
+		deathSpriteNene = FunkinSprite.createSparrow(0, 0, Paths.spritesheet("characters/neneChristmas/neneChristmasKnife"));
 		var gf = PlayState.instance.currentStage.getGirlfriend();
 		deathSpriteNene.x = gf.originalPosition.x; // + 280;
 		deathSpriteNene.y = gf.originalPosition.y; // + 70;

preload/scripts/characters/pico-dark.hxc → gameplay/characters/pico-dark/pico-dark.hxc

@@ -76,15 +76,15 @@ class PicoDarkCharacter extends MultiSparrowCharacter {
 	 * for use later.
 	 */
 	function createDeathSprites() {
-		deathSpriteRetry = FunkinSprite.createSparrow(0, 0, "characters/Pico_Death_Retry");
+		deathSpriteRetry = FunkinSprite.createSparrow(0, 0, Paths.spritesheet("characters/Pico_Death_Retry"));
 		deathSpriteRetry.animation.addByPrefix('idle', "Retry Text Loop0", 24, true);
 		deathSpriteRetry.animation.addByPrefix('confirm', "Retry Text Confirm0", 24, false);
 
 		deathSpriteRetry.visible = false;
 
 		//FlxG.debugger.track(deathSpriteRetry);
 
-		deathSpriteNene = FunkinSprite.createSparrow(0, 0, "characters/NeneKnifeToss");
+		deathSpriteNene = FunkinSprite.createSparrow(0, 0, Paths.spritesheet("characters/NeneKnifeToss"));
 		var gf = PlayState.instance.currentStage.getGirlfriend();
 		deathSpriteNene.x = gf.originalPosition.x + 120;// + 280;
 		deathSpriteNene.y = gf.originalPosition.y - 200;// + 70;

preload/scripts/characters/pico-playable.hxc → gameplay/characters/pico-playable/pico-playable.hxc

@@ -44,15 +44,15 @@ class PicoPlayerCharacter extends MultiSparrowCharacter {
 	 * for use later.
 	 */
 	function createDeathSprites() {
-		deathSpriteRetry = FunkinSprite.createSparrow(0, 0, "characters/Pico_Death_Retry");
+		deathSpriteRetry = FunkinSprite.createSparrow(0, 0, Paths.spritesheet("characters/Pico_Death_Retry"));
 		deathSpriteRetry.animation.addByPrefix('idle', "Retry Text Loop0", 24, true);
 		deathSpriteRetry.animation.addByPrefix('confirm', "Retry Text Confirm0", 24, false);
 
 		deathSpriteRetry.visible = false;
 
 		//FlxG.debugger.track(deathSpriteRetry);
 
-		deathSpriteNene = FunkinSprite.createSparrow(0, 0, "characters/NeneKnifeToss");
+		deathSpriteNene = FunkinSprite.createSparrow(0, 0, Paths.spritesheet("characters/NeneKnifeToss"));
 		var gf = PlayState.instance.currentStage.getGirlfriend();
 		deathSpriteNene.x = gf.originalPosition.x + 120;// + 280;
 		deathSpriteNene.y = gf.originalPosition.y - 200;// + 70;
@@ -319,14 +319,14 @@ class PicoPlayerCharacter extends MultiSparrowCharacter {
 		FlxTween.tween(picoFade, {alpha: 0}, 0.4);
 
 
-		FunkinSound.playOnce(Paths.sound('Gun_Prep'), 1.0);
+		FunkinSound.playOnce(Paths.sound('Gun_Prep').toString(), 1.0);
 	}
 	/**
 	 * Play the animation where Pico shoots the can successfully.
 	 */
 	function playFireGunAnim(hip:Bool) {
 		this.playAnimation('shoot', true, true);
-		FunkinSound.playOnce(Paths.soundRandom('shot', 1, 4));
+		FunkinSound.playOnce(Paths.soundRandom('shot', 1, 4).toString());
 	}
 	/**
 	 * Play the animation where Pico is hit by the exploding can.
@@ -335,7 +335,7 @@ class PicoPlayerCharacter extends MultiSparrowCharacter {
 
 		this.playAnimation('shootMISS', true, true);
 		// Donk.
-		FunkinSound.playOnce(Paths.sound('Pico_Bonk'), 1.0);
+		FunkinSound.playOnce(Paths.sound('Pico_Bonk').toString(), 1.0);
 	}
 
 	function addToStage(sprite:FlxSprite) {