From a52a4f6bc0aab5d3c8f574de831ec4c79e0c1c6e Mon Sep 17 00:00:00 2001 From: M&M Date: Thu, 29 Apr 2021 22:50:31 -0700 Subject: [PATCH] Move characters to their own folder in shared library fixes crash when changing characters via charting state on web --- .../images/{ => characters}/BOYFRIEND.png | Bin .../images/{ => characters}/BOYFRIEND.xml | 0 .../images/{ => characters}/DADDY_DEAREST.png | Bin .../images/{ => characters}/DADDY_DEAREST.xml | 0 .../images/{ => characters}/GF_assets.png | Bin .../images/{ => characters}/GF_assets.xml | 0 .../images/characters}/Mom_Assets.png | Bin .../images/characters}/Mom_Assets.xml | 0 .../images/characters}/Monster_Assets.png | Bin .../images/characters}/Monster_Assets.xml | 0 .../images/characters}/Pico_FNF_assetss.png | Bin .../images/characters}/Pico_FNF_assetss.xml | 0 .../images/characters}/bfCar.png | Bin .../images/characters}/bfCar.xml | 0 .../images/characters}/bfChristmas.png | Bin .../images/characters}/bfChristmas.xml | 0 .../images/characters}/bfPixel.png | Bin .../images/characters}/bfPixel.xml | 0 .../images/characters}/bfPixelsDEAD.png | Bin .../images/characters}/bfPixelsDEAD.xml | 0 .../images/characters}/gfCar.png | Bin .../images/characters}/gfCar.xml | 0 .../images/characters}/gfChristmas.png | Bin .../images/characters}/gfChristmas.xml | 0 .../images/characters}/gfPixel.png | Bin .../images/characters}/gfPixel.xml | 0 .../images/characters}/momCar.png | Bin .../images/characters}/momCar.xml | 0 .../characters}/mom_dad_christmas_assets.png | Bin .../characters}/mom_dad_christmas_assets.xml | 0 .../images/characters}/monsterChristmas.png | Bin .../images/characters}/monsterChristmas.xml | 0 .../images/characters}/senpai.png | Bin .../images/characters}/senpai.xml | 0 .../images/characters}/spirit.png | Bin .../images/characters}/spirit.txt | 0 .../images/characters}/spooky_kids_assets.png | Bin .../images/characters}/spooky_kids_assets.xml | 0 source/Character.hx | 40 +++++++++--------- 39 files changed, 20 insertions(+), 20 deletions(-) rename assets/shared/images/{ => characters}/BOYFRIEND.png (100%) rename assets/shared/images/{ => characters}/BOYFRIEND.xml (100%) rename assets/shared/images/{ => characters}/DADDY_DEAREST.png (100%) rename assets/shared/images/{ => characters}/DADDY_DEAREST.xml (100%) rename assets/shared/images/{ => characters}/GF_assets.png (100%) rename assets/shared/images/{ => characters}/GF_assets.xml (100%) rename assets/{week4/images => shared/images/characters}/Mom_Assets.png (100%) rename assets/{week4/images => shared/images/characters}/Mom_Assets.xml (100%) rename assets/{week2/images => shared/images/characters}/Monster_Assets.png (100%) rename assets/{week2/images => shared/images/characters}/Monster_Assets.xml (100%) rename assets/{week3/images => shared/images/characters}/Pico_FNF_assetss.png (100%) rename assets/{week3/images => shared/images/characters}/Pico_FNF_assetss.xml (100%) rename assets/{week4/images => shared/images/characters}/bfCar.png (100%) rename assets/{week4/images => shared/images/characters}/bfCar.xml (100%) rename assets/{week5/images/christmas => shared/images/characters}/bfChristmas.png (100%) rename assets/{week5/images/christmas => shared/images/characters}/bfChristmas.xml (100%) rename assets/{week6/images/weeb => shared/images/characters}/bfPixel.png (100%) rename assets/{week6/images/weeb => shared/images/characters}/bfPixel.xml (100%) rename assets/{week6/images/weeb => shared/images/characters}/bfPixelsDEAD.png (100%) rename assets/{week6/images/weeb => shared/images/characters}/bfPixelsDEAD.xml (100%) rename assets/{week4/images => shared/images/characters}/gfCar.png (100%) rename assets/{week4/images => shared/images/characters}/gfCar.xml (100%) rename assets/{week5/images/christmas => shared/images/characters}/gfChristmas.png (100%) rename assets/{week5/images/christmas => shared/images/characters}/gfChristmas.xml (100%) rename assets/{week6/images/weeb => shared/images/characters}/gfPixel.png (100%) rename assets/{week6/images/weeb => shared/images/characters}/gfPixel.xml (100%) rename assets/{week4/images => shared/images/characters}/momCar.png (100%) rename assets/{week4/images => shared/images/characters}/momCar.xml (100%) rename assets/{week5/images/christmas => shared/images/characters}/mom_dad_christmas_assets.png (100%) rename assets/{week5/images/christmas => shared/images/characters}/mom_dad_christmas_assets.xml (100%) rename assets/{week5/images/christmas => shared/images/characters}/monsterChristmas.png (100%) rename assets/{week5/images/christmas => shared/images/characters}/monsterChristmas.xml (100%) rename assets/{week6/images/weeb => shared/images/characters}/senpai.png (100%) rename assets/{week6/images/weeb => shared/images/characters}/senpai.xml (100%) rename assets/{week6/images/weeb => shared/images/characters}/spirit.png (100%) rename assets/{week6/images/weeb => shared/images/characters}/spirit.txt (100%) rename assets/{week2/images => shared/images/characters}/spooky_kids_assets.png (100%) rename assets/{week2/images => shared/images/characters}/spooky_kids_assets.xml (100%) diff --git a/assets/shared/images/BOYFRIEND.png b/assets/shared/images/characters/BOYFRIEND.png similarity index 100% rename from assets/shared/images/BOYFRIEND.png rename to assets/shared/images/characters/BOYFRIEND.png diff --git a/assets/shared/images/BOYFRIEND.xml b/assets/shared/images/characters/BOYFRIEND.xml similarity index 100% rename from assets/shared/images/BOYFRIEND.xml rename to assets/shared/images/characters/BOYFRIEND.xml diff --git a/assets/shared/images/DADDY_DEAREST.png b/assets/shared/images/characters/DADDY_DEAREST.png similarity index 100% rename from assets/shared/images/DADDY_DEAREST.png rename to assets/shared/images/characters/DADDY_DEAREST.png diff --git a/assets/shared/images/DADDY_DEAREST.xml b/assets/shared/images/characters/DADDY_DEAREST.xml similarity index 100% rename from assets/shared/images/DADDY_DEAREST.xml rename to assets/shared/images/characters/DADDY_DEAREST.xml diff --git a/assets/shared/images/GF_assets.png b/assets/shared/images/characters/GF_assets.png similarity index 100% rename from assets/shared/images/GF_assets.png rename to assets/shared/images/characters/GF_assets.png diff --git a/assets/shared/images/GF_assets.xml b/assets/shared/images/characters/GF_assets.xml similarity index 100% rename from assets/shared/images/GF_assets.xml rename to assets/shared/images/characters/GF_assets.xml diff --git a/assets/week4/images/Mom_Assets.png b/assets/shared/images/characters/Mom_Assets.png similarity index 100% rename from assets/week4/images/Mom_Assets.png rename to assets/shared/images/characters/Mom_Assets.png diff --git a/assets/week4/images/Mom_Assets.xml b/assets/shared/images/characters/Mom_Assets.xml similarity index 100% rename from assets/week4/images/Mom_Assets.xml rename to assets/shared/images/characters/Mom_Assets.xml diff --git a/assets/week2/images/Monster_Assets.png b/assets/shared/images/characters/Monster_Assets.png similarity index 100% rename from assets/week2/images/Monster_Assets.png rename to assets/shared/images/characters/Monster_Assets.png diff --git a/assets/week2/images/Monster_Assets.xml b/assets/shared/images/characters/Monster_Assets.xml similarity index 100% rename from assets/week2/images/Monster_Assets.xml rename to assets/shared/images/characters/Monster_Assets.xml diff --git a/assets/week3/images/Pico_FNF_assetss.png b/assets/shared/images/characters/Pico_FNF_assetss.png similarity index 100% rename from assets/week3/images/Pico_FNF_assetss.png rename to assets/shared/images/characters/Pico_FNF_assetss.png diff --git a/assets/week3/images/Pico_FNF_assetss.xml b/assets/shared/images/characters/Pico_FNF_assetss.xml similarity index 100% rename from assets/week3/images/Pico_FNF_assetss.xml rename to assets/shared/images/characters/Pico_FNF_assetss.xml diff --git a/assets/week4/images/bfCar.png b/assets/shared/images/characters/bfCar.png similarity index 100% rename from assets/week4/images/bfCar.png rename to assets/shared/images/characters/bfCar.png diff --git a/assets/week4/images/bfCar.xml b/assets/shared/images/characters/bfCar.xml similarity index 100% rename from assets/week4/images/bfCar.xml rename to assets/shared/images/characters/bfCar.xml diff --git a/assets/week5/images/christmas/bfChristmas.png b/assets/shared/images/characters/bfChristmas.png similarity index 100% rename from assets/week5/images/christmas/bfChristmas.png rename to assets/shared/images/characters/bfChristmas.png diff --git a/assets/week5/images/christmas/bfChristmas.xml b/assets/shared/images/characters/bfChristmas.xml similarity index 100% rename from assets/week5/images/christmas/bfChristmas.xml rename to assets/shared/images/characters/bfChristmas.xml diff --git a/assets/week6/images/weeb/bfPixel.png b/assets/shared/images/characters/bfPixel.png similarity index 100% rename from assets/week6/images/weeb/bfPixel.png rename to assets/shared/images/characters/bfPixel.png diff --git a/assets/week6/images/weeb/bfPixel.xml b/assets/shared/images/characters/bfPixel.xml similarity index 100% rename from assets/week6/images/weeb/bfPixel.xml rename to assets/shared/images/characters/bfPixel.xml diff --git a/assets/week6/images/weeb/bfPixelsDEAD.png b/assets/shared/images/characters/bfPixelsDEAD.png similarity index 100% rename from assets/week6/images/weeb/bfPixelsDEAD.png rename to assets/shared/images/characters/bfPixelsDEAD.png diff --git a/assets/week6/images/weeb/bfPixelsDEAD.xml b/assets/shared/images/characters/bfPixelsDEAD.xml similarity index 100% rename from assets/week6/images/weeb/bfPixelsDEAD.xml rename to assets/shared/images/characters/bfPixelsDEAD.xml diff --git a/assets/week4/images/gfCar.png b/assets/shared/images/characters/gfCar.png similarity index 100% rename from assets/week4/images/gfCar.png rename to assets/shared/images/characters/gfCar.png diff --git a/assets/week4/images/gfCar.xml b/assets/shared/images/characters/gfCar.xml similarity index 100% rename from assets/week4/images/gfCar.xml rename to assets/shared/images/characters/gfCar.xml diff --git a/assets/week5/images/christmas/gfChristmas.png b/assets/shared/images/characters/gfChristmas.png similarity index 100% rename from assets/week5/images/christmas/gfChristmas.png rename to assets/shared/images/characters/gfChristmas.png diff --git a/assets/week5/images/christmas/gfChristmas.xml b/assets/shared/images/characters/gfChristmas.xml similarity index 100% rename from assets/week5/images/christmas/gfChristmas.xml rename to assets/shared/images/characters/gfChristmas.xml diff --git a/assets/week6/images/weeb/gfPixel.png b/assets/shared/images/characters/gfPixel.png similarity index 100% rename from assets/week6/images/weeb/gfPixel.png rename to assets/shared/images/characters/gfPixel.png diff --git a/assets/week6/images/weeb/gfPixel.xml b/assets/shared/images/characters/gfPixel.xml similarity index 100% rename from assets/week6/images/weeb/gfPixel.xml rename to assets/shared/images/characters/gfPixel.xml diff --git a/assets/week4/images/momCar.png b/assets/shared/images/characters/momCar.png similarity index 100% rename from assets/week4/images/momCar.png rename to assets/shared/images/characters/momCar.png diff --git a/assets/week4/images/momCar.xml b/assets/shared/images/characters/momCar.xml similarity index 100% rename from assets/week4/images/momCar.xml rename to assets/shared/images/characters/momCar.xml diff --git a/assets/week5/images/christmas/mom_dad_christmas_assets.png b/assets/shared/images/characters/mom_dad_christmas_assets.png similarity index 100% rename from assets/week5/images/christmas/mom_dad_christmas_assets.png rename to assets/shared/images/characters/mom_dad_christmas_assets.png diff --git a/assets/week5/images/christmas/mom_dad_christmas_assets.xml b/assets/shared/images/characters/mom_dad_christmas_assets.xml similarity index 100% rename from assets/week5/images/christmas/mom_dad_christmas_assets.xml rename to assets/shared/images/characters/mom_dad_christmas_assets.xml diff --git a/assets/week5/images/christmas/monsterChristmas.png b/assets/shared/images/characters/monsterChristmas.png similarity index 100% rename from assets/week5/images/christmas/monsterChristmas.png rename to assets/shared/images/characters/monsterChristmas.png diff --git a/assets/week5/images/christmas/monsterChristmas.xml b/assets/shared/images/characters/monsterChristmas.xml similarity index 100% rename from assets/week5/images/christmas/monsterChristmas.xml rename to assets/shared/images/characters/monsterChristmas.xml diff --git a/assets/week6/images/weeb/senpai.png b/assets/shared/images/characters/senpai.png similarity index 100% rename from assets/week6/images/weeb/senpai.png rename to assets/shared/images/characters/senpai.png diff --git a/assets/week6/images/weeb/senpai.xml b/assets/shared/images/characters/senpai.xml similarity index 100% rename from assets/week6/images/weeb/senpai.xml rename to assets/shared/images/characters/senpai.xml diff --git a/assets/week6/images/weeb/spirit.png b/assets/shared/images/characters/spirit.png similarity index 100% rename from assets/week6/images/weeb/spirit.png rename to assets/shared/images/characters/spirit.png diff --git a/assets/week6/images/weeb/spirit.txt b/assets/shared/images/characters/spirit.txt similarity index 100% rename from assets/week6/images/weeb/spirit.txt rename to assets/shared/images/characters/spirit.txt diff --git a/assets/week2/images/spooky_kids_assets.png b/assets/shared/images/characters/spooky_kids_assets.png similarity index 100% rename from assets/week2/images/spooky_kids_assets.png rename to assets/shared/images/characters/spooky_kids_assets.png diff --git a/assets/week2/images/spooky_kids_assets.xml b/assets/shared/images/characters/spooky_kids_assets.xml similarity index 100% rename from assets/week2/images/spooky_kids_assets.xml rename to assets/shared/images/characters/spooky_kids_assets.xml diff --git a/source/Character.hx b/source/Character.hx index a4677aa..fc010c6 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -32,7 +32,7 @@ class Character extends FlxSprite { case 'gf': // GIRLFRIEND CODE - tex = Paths.getSparrowAtlas('GF_assets'); + tex = Paths.getSparrowAtlas('characters/GF_assets'); frames = tex; animation.addByPrefix('cheer', 'GF Cheer', 24, false); animation.addByPrefix('singLEFT', 'GF left note', 24, false); @@ -63,7 +63,7 @@ class Character extends FlxSprite playAnim('danceRight'); case 'gf-christmas': - tex = Paths.getSparrowAtlas('christmas/gfChristmas','week5'); + tex = Paths.getSparrowAtlas('characters/gfChristmas'); frames = tex; animation.addByPrefix('cheer', 'GF Cheer', 24, false); animation.addByPrefix('singLEFT', 'GF left note', 24, false); @@ -94,7 +94,7 @@ class Character extends FlxSprite playAnim('danceRight'); case 'gf-car': - tex = Paths.getSparrowAtlas('gfCar','week4'); + tex = Paths.getSparrowAtlas('characters/gfCar'); frames = tex; animation.addByIndices('singUP', 'GF Dancing Beat Hair blowing CAR', [0], "", 24, false); animation.addByIndices('danceLeft', 'GF Dancing Beat Hair blowing CAR', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); @@ -107,7 +107,7 @@ class Character extends FlxSprite playAnim('danceRight'); case 'gf-pixel': - tex = Paths.getSparrowAtlas('weeb/gfPixel','week6'); + tex = Paths.getSparrowAtlas('characters/weeb/gfPixel'); frames = tex; animation.addByIndices('singUP', 'GF IDLE', [2], "", 24, false); animation.addByIndices('danceLeft', 'GF IDLE', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); @@ -124,7 +124,7 @@ class Character extends FlxSprite case 'dad': // DAD ANIMATION LOADING CODE - tex = Paths.getSparrowAtlas('DADDY_DEAREST','shared'); + tex = Paths.getSparrowAtlas('characters/DADDY_DEAREST'); frames = tex; animation.addByPrefix('idle', 'Dad idle dance', 24); animation.addByPrefix('singUP', 'Dad Sing Note UP', 24); @@ -140,7 +140,7 @@ class Character extends FlxSprite playAnim('idle'); case 'spooky': - tex = Paths.getSparrowAtlas('spooky_kids_assets','week2'); + tex = Paths.getSparrowAtlas('characters/spooky_kids_assets'); frames = tex; animation.addByPrefix('singUP', 'spooky UP NOTE', 24, false); animation.addByPrefix('singDOWN', 'spooky DOWN note', 24, false); @@ -159,7 +159,7 @@ class Character extends FlxSprite playAnim('danceRight'); case 'mom': - tex = Paths.getSparrowAtlas('Mom_Assets','week4'); + tex = Paths.getSparrowAtlas('characters/Mom_Assets'); frames = tex; animation.addByPrefix('idle', "Mom Idle", 24, false); @@ -179,7 +179,7 @@ class Character extends FlxSprite playAnim('idle'); case 'mom-car': - tex = Paths.getSparrowAtlas('momCar','week4'); + tex = Paths.getSparrowAtlas('characters/momCar'); frames = tex; animation.addByPrefix('idle', "Mom Idle", 24, false); @@ -198,7 +198,7 @@ class Character extends FlxSprite playAnim('idle'); case 'monster': - tex = Paths.getSparrowAtlas('Monster_Assets','week2'); + tex = Paths.getSparrowAtlas('characters/Monster_Assets'); frames = tex; animation.addByPrefix('idle', 'monster idle', 24, false); animation.addByPrefix('singUP', 'monster up note', 24, false); @@ -213,7 +213,7 @@ class Character extends FlxSprite addOffset("singDOWN", -30, -40); playAnim('idle'); case 'monster-christmas': - tex = Paths.getSparrowAtlas('christmas/monsterChristmas','week5'); + tex = Paths.getSparrowAtlas('characters/monsterChristmas'); frames = tex; animation.addByPrefix('idle', 'monster idle', 24, false); animation.addByPrefix('singUP', 'monster up note', 24, false); @@ -228,7 +228,7 @@ class Character extends FlxSprite addOffset("singDOWN", -40, -94); playAnim('idle'); case 'pico': - tex = Paths.getSparrowAtlas('Pico_FNF_assetss','week3'); + tex = Paths.getSparrowAtlas('characters/Pico_FNF_assetss'); frames = tex; animation.addByPrefix('idle', "Pico Idle Dance", 24); animation.addByPrefix('singUP', 'pico Up note0', 24, false); @@ -267,7 +267,7 @@ class Character extends FlxSprite flipX = true; case 'bf': - var tex = Paths.getSparrowAtlas('BOYFRIEND','shared'); + var tex = Paths.getSparrowAtlas('characters/BOYFRIEND'); frames = tex; animation.addByPrefix('idle', 'BF idle dance', 24, false); animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false); @@ -306,7 +306,7 @@ class Character extends FlxSprite flipX = true; case 'bf-christmas': - var tex = Paths.getSparrowAtlas('christmas/bfChristmas','week5'); + var tex = Paths.getSparrowAtlas('characters/bfChristmas'); frames = tex; animation.addByPrefix('idle', 'BF idle dance', 24, false); animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false); @@ -334,7 +334,7 @@ class Character extends FlxSprite flipX = true; case 'bf-car': - var tex = Paths.getSparrowAtlas('bfCar','week4'); + var tex = Paths.getSparrowAtlas('characters/bfCar'); frames = tex; animation.addByPrefix('idle', 'BF idle dance', 24, false); animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false); @@ -359,7 +359,7 @@ class Character extends FlxSprite flipX = true; case 'bf-pixel': - frames = Paths.getSparrowAtlas('weeb/bfPixel','week6'); + frames = Paths.getSparrowAtlas('characters/bfPixel'); animation.addByPrefix('idle', 'BF IDLE', 24, false); animation.addByPrefix('singUP', 'BF UP NOTE', 24, false); animation.addByPrefix('singLEFT', 'BF LEFT NOTE', 24, false); @@ -392,7 +392,7 @@ class Character extends FlxSprite flipX = true; case 'bf-pixel-dead': - frames = Paths.getSparrowAtlas('weeb/bfPixelsDEAD','week6'); + frames = Paths.getSparrowAtlas('characters/bfPixelsDEAD'); animation.addByPrefix('singUP', "BF Dies pixel", 24, false); animation.addByPrefix('firstDeath', "BF Dies pixel", 24, false); animation.addByPrefix('deathLoop', "Retry Loop", 24, true); @@ -410,7 +410,7 @@ class Character extends FlxSprite flipX = true; case 'senpai': - frames = Paths.getSparrowAtlas('weeb/senpai','week6'); + frames = Paths.getSparrowAtlas('characters/senpai'); animation.addByPrefix('idle', 'Senpai Idle', 24, false); animation.addByPrefix('singUP', 'SENPAI UP NOTE', 24, false); animation.addByPrefix('singLEFT', 'SENPAI LEFT NOTE', 24, false); @@ -430,7 +430,7 @@ class Character extends FlxSprite antialiasing = false; case 'senpai-angry': - frames = Paths.getSparrowAtlas('weeb/senpai','week6'); + frames = Paths.getSparrowAtlas('characters/senpai'); animation.addByPrefix('idle', 'Angry Senpai Idle', 24, false); animation.addByPrefix('singUP', 'Angry Senpai UP NOTE', 24, false); animation.addByPrefix('singLEFT', 'Angry Senpai LEFT NOTE', 24, false); @@ -450,7 +450,7 @@ class Character extends FlxSprite antialiasing = false; case 'spirit': - frames = Paths.getPackerAtlas('weeb/spirit','week6'); + frames = Paths.getPackerAtlas('characters/spirit'); animation.addByPrefix('idle', "idle spirit_", 24, false); animation.addByPrefix('singUP', "up_", 24, false); animation.addByPrefix('singRIGHT', "right_", 24, false); @@ -471,7 +471,7 @@ class Character extends FlxSprite antialiasing = false; case 'parents-christmas': - frames = Paths.getSparrowAtlas('christmas/mom_dad_christmas_assets','week5'); + frames = Paths.getSparrowAtlas('characters/mom_dad_christmas_assets'); animation.addByPrefix('idle', 'Parent Christmas Idle', 24, false); animation.addByPrefix('singUP', 'Parent Up Note Dad', 24, false); animation.addByPrefix('singDOWN', 'Parent Down Note Dad', 24, false);