From c00a8dc75ab045473547202421d8eb299d614b22 Mon Sep 17 00:00:00 2001 From: MtH Date: Tue, 30 Mar 2021 15:45:57 +0200 Subject: [PATCH] offset txts for all chars, move all chars to shared --- .../images/{ => characters}/DADDY_DEAREST.png | Bin .../images/{ => characters}/DADDY_DEAREST.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/bf-carOffsets.txt | 10 + .../images/characters/bf-christmasOffsets.txt | 10 + .../characters/bf-pixel-deadOffsets.txt | 3 + .../images/characters/bf-pixelOffsets.txt | 9 + .../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 .../shared/images/characters/dadOffsets.txt | 5 + .../images/characters/gf-carOffsets.txt | 3 + .../images/characters/gf-christmasOffsets.txt | 11 ++ .../images/characters/gf-pixelOffsets.txt | 2 + .../images/characters}/gfCar.png | Bin .../images/characters}/gfCar.xml | 0 .../images/characters}/gfChristmas.png | Bin .../images/characters}/gfChristmas.xml | 0 assets/shared/images/characters/gfOffsets.txt | Bin 229 -> 152 bytes .../images/characters}/gfPixel.png | Bin .../images/characters}/gfPixel.xml | 0 .../images/characters/mom-carOffsets.txt | 6 + .../images/characters}/momCar.png | Bin .../images/characters}/momCar.xml | 0 .../shared/images/characters/momOffsets.txt | 5 + .../characters}/mom_dad_christmas_assets.png | Bin .../characters}/mom_dad_christmas_assets.xml | 0 .../characters/monster-christmasOffsets.txt | 5 + .../images/characters}/monsterChristmas.png | Bin .../images/characters}/monsterChristmas.xml | 0 .../images/characters/monsterOffsets.txt | 5 + .../characters/parents-christmasOffsets.txt | 9 + .../images/characters/pico-speakerOffsets.txt | Bin 85 -> 56 bytes .../shared/images/characters/picoOffsets.txt | 9 + .../images/characters/senpai-angryOffsets.txt | 5 + .../images/characters}/senpai.png | Bin .../images/characters}/senpai.xml | 0 .../images/characters/senpaiOffsets.txt | 5 + .../images/characters}/spirit.png | Bin .../images/characters}/spirit.txt | 0 .../images/characters/spiritOffsets.txt | 5 + .../images/characters/spookyOffsets.txt | 6 + .../images/characters}/spooky_kids_assets.png | Bin .../images/characters}/spooky_kids_assets.xml | 0 source/Character.hx | 175 ++++-------------- 55 files changed, 154 insertions(+), 134 deletions(-) rename assets/shared/images/{ => characters}/DADDY_DEAREST.png (100%) rename assets/shared/images/{ => characters}/DADDY_DEAREST.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%) create mode 100644 assets/shared/images/characters/bf-carOffsets.txt create mode 100644 assets/shared/images/characters/bf-christmasOffsets.txt create mode 100644 assets/shared/images/characters/bf-pixel-deadOffsets.txt create mode 100644 assets/shared/images/characters/bf-pixelOffsets.txt 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%) create mode 100644 assets/shared/images/characters/dadOffsets.txt create mode 100644 assets/shared/images/characters/gf-carOffsets.txt create mode 100644 assets/shared/images/characters/gf-christmasOffsets.txt create mode 100644 assets/shared/images/characters/gf-pixelOffsets.txt 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%) create mode 100644 assets/shared/images/characters/mom-carOffsets.txt rename assets/{week4/images => shared/images/characters}/momCar.png (100%) rename assets/{week4/images => shared/images/characters}/momCar.xml (100%) create mode 100644 assets/shared/images/characters/momOffsets.txt 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%) create mode 100644 assets/shared/images/characters/monster-christmasOffsets.txt rename assets/{week5/images/christmas => shared/images/characters}/monsterChristmas.png (100%) rename assets/{week5/images/christmas => shared/images/characters}/monsterChristmas.xml (100%) create mode 100644 assets/shared/images/characters/monsterOffsets.txt create mode 100644 assets/shared/images/characters/parents-christmasOffsets.txt create mode 100644 assets/shared/images/characters/picoOffsets.txt create mode 100644 assets/shared/images/characters/senpai-angryOffsets.txt rename assets/{week6/images/weeb => shared/images/characters}/senpai.png (100%) rename assets/{week6/images/weeb => shared/images/characters}/senpai.xml (100%) create mode 100644 assets/shared/images/characters/senpaiOffsets.txt rename assets/{week6/images/weeb => shared/images/characters}/spirit.png (100%) rename assets/{week6/images/weeb => shared/images/characters}/spirit.txt (100%) create mode 100644 assets/shared/images/characters/spiritOffsets.txt create mode 100644 assets/shared/images/characters/spookyOffsets.txt 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/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/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/shared/images/characters/bf-carOffsets.txt b/assets/shared/images/characters/bf-carOffsets.txt new file mode 100644 index 000000000..53305d26f --- /dev/null +++ b/assets/shared/images/characters/bf-carOffsets.txt @@ -0,0 +1,10 @@ +idle -5 0 +singUP -29 27 +singRIGHT -38 -7 +singLEFT 12 -6 +singDOWN -10 -50 +singUPmiss -29 27 +singRIGHTmiss -30 21 +singLEFTmiss 12 24 +singDOWNmiss -11 -19 +idleHair -5 0 diff --git a/assets/shared/images/characters/bf-christmasOffsets.txt b/assets/shared/images/characters/bf-christmasOffsets.txt new file mode 100644 index 000000000..014284490 --- /dev/null +++ b/assets/shared/images/characters/bf-christmasOffsets.txt @@ -0,0 +1,10 @@ +idle -5 0 +singUP -29 27 +singRIGHT -38 -7 +singLEFT 12 -6 +singDOWN -10 -50 +singUPmiss -29 27 +singRIGHTmiss -30 21 +singLEFTmiss 12 24 +singDOWNmiss -11 -19 +hey 7 4 diff --git a/assets/shared/images/characters/bf-pixel-deadOffsets.txt b/assets/shared/images/characters/bf-pixel-deadOffsets.txt new file mode 100644 index 000000000..3544a2c9c --- /dev/null +++ b/assets/shared/images/characters/bf-pixel-deadOffsets.txt @@ -0,0 +1,3 @@ +firstDeath 0 0 +deathLoop -30 -12 +deathConfirm -30 -12 diff --git a/assets/shared/images/characters/bf-pixelOffsets.txt b/assets/shared/images/characters/bf-pixelOffsets.txt new file mode 100644 index 000000000..b8a82929b --- /dev/null +++ b/assets/shared/images/characters/bf-pixelOffsets.txt @@ -0,0 +1,9 @@ +idle 0 0 +singUP 0 0 +singRIGHT 0 0 +singLEFT 0 0 +singDOWN 0 0 +singUPmiss 0 0 +singRIGHTmiss 0 0 +singLEFTmiss 0 0 +singDOWNmiss 0 0 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/shared/images/characters/dadOffsets.txt b/assets/shared/images/characters/dadOffsets.txt new file mode 100644 index 000000000..69ba153a5 --- /dev/null +++ b/assets/shared/images/characters/dadOffsets.txt @@ -0,0 +1,5 @@ +idle 0 0 +singUP -6 50 +singRIGHT 0 27 +singLEFT -10 10 +singDOWN 0 -30 diff --git a/assets/shared/images/characters/gf-carOffsets.txt b/assets/shared/images/characters/gf-carOffsets.txt new file mode 100644 index 000000000..9c60cd800 --- /dev/null +++ b/assets/shared/images/characters/gf-carOffsets.txt @@ -0,0 +1,3 @@ +danceLeft 0 0 +danceRight 0 0 +idleHair 0 0 diff --git a/assets/shared/images/characters/gf-christmasOffsets.txt b/assets/shared/images/characters/gf-christmasOffsets.txt new file mode 100644 index 000000000..05abb7ab8 --- /dev/null +++ b/assets/shared/images/characters/gf-christmasOffsets.txt @@ -0,0 +1,11 @@ +cheer 0 0 +sad -2 -21 +danceLeft 0 -9 +danceRight 0 -9 +singUP 0 4 +singRIGHT 0 -20 +singLEFT 0 -19 +singDOWN 0 -20 +hairBlow 45 -8 +hairFall 0 -9 +scared -2 -17 diff --git a/assets/shared/images/characters/gf-pixelOffsets.txt b/assets/shared/images/characters/gf-pixelOffsets.txt new file mode 100644 index 000000000..9862aaecd --- /dev/null +++ b/assets/shared/images/characters/gf-pixelOffsets.txt @@ -0,0 +1,2 @@ +danceLeft 0 0 +danceRight 0 0 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/shared/images/characters/gfOffsets.txt b/assets/shared/images/characters/gfOffsets.txt index 37608ede3c11da4a8563deffe5ef27c6519036e8..05abb7ab84271e565d63ab5ce834b79a9b4a7898 100644 GIT binary patch delta 6 NcmaFLID>J*3;+p)0;m80 delta 84 RcmbQi_>^(N3||In0s!xj0`&j@ 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/shared/images/characters/mom-carOffsets.txt b/assets/shared/images/characters/mom-carOffsets.txt new file mode 100644 index 000000000..8c17195ae --- /dev/null +++ b/assets/shared/images/characters/mom-carOffsets.txt @@ -0,0 +1,6 @@ +idle 0 0 +singUP 14 71 +singRIGHT 10 -60 +singLEFT 250 -23 +singDOWN 20 -160 +idleHair 0 0 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/shared/images/characters/momOffsets.txt b/assets/shared/images/characters/momOffsets.txt new file mode 100644 index 000000000..65cbecdbe --- /dev/null +++ b/assets/shared/images/characters/momOffsets.txt @@ -0,0 +1,5 @@ +idle 0 0 +singUP 14 71 +singRIGHT 10 -60 +singLEFT 250 -23 +singDOWN 20 -160 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/shared/images/characters/monster-christmasOffsets.txt b/assets/shared/images/characters/monster-christmasOffsets.txt new file mode 100644 index 000000000..a35704617 --- /dev/null +++ b/assets/shared/images/characters/monster-christmasOffsets.txt @@ -0,0 +1,5 @@ +idle 0 0 +singUP -20 50 +singRIGHT -51 0 +singLEFT -30 0 +singDOWN -40 -94 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/shared/images/characters/monsterOffsets.txt b/assets/shared/images/characters/monsterOffsets.txt new file mode 100644 index 000000000..e211a5fdf --- /dev/null +++ b/assets/shared/images/characters/monsterOffsets.txt @@ -0,0 +1,5 @@ +idle 0 0 +singUP -20 94 +singRIGHT -51 30 +singLEFT -30 20 +singDOWN -50 -80 diff --git a/assets/shared/images/characters/parents-christmasOffsets.txt b/assets/shared/images/characters/parents-christmasOffsets.txt new file mode 100644 index 000000000..bdee13c63 --- /dev/null +++ b/assets/shared/images/characters/parents-christmasOffsets.txt @@ -0,0 +1,9 @@ +idle 0 0 +singUP -47 24 +singRIGHT -1 -23 +singLEFT -30 16 +singDOWN -31 -29 +singUP-alt -47 24 +singRIGHT-alt -1 -24 +singLEFT-alt -30 15 +singDOWN-alt -30 -27 diff --git a/assets/shared/images/characters/pico-speakerOffsets.txt b/assets/shared/images/characters/pico-speakerOffsets.txt index 5ccd7b432d7397400d3d273ccaaf6d8e95405ae3..586cd585712f5562ae43b87c1db01b2ee46e145c 100644 GIT binary patch delta 4 LcmWHwm|y__16To8 delta 34 PcmcBronRr$fDZrwF0}!3 diff --git a/assets/shared/images/characters/picoOffsets.txt b/assets/shared/images/characters/picoOffsets.txt new file mode 100644 index 000000000..e209da723 --- /dev/null +++ b/assets/shared/images/characters/picoOffsets.txt @@ -0,0 +1,9 @@ +idle 0 0 +singUP -29 27 +singRIGHT -68 -7 +singLEFT 65 9 +singDOWN 200 -70 +singUPmiss -19 67 +singRIGHTmiss -60 41 +singLEFTmiss 62 64 +singDOWNmiss 210 -28 diff --git a/assets/shared/images/characters/senpai-angryOffsets.txt b/assets/shared/images/characters/senpai-angryOffsets.txt new file mode 100644 index 000000000..c11825906 --- /dev/null +++ b/assets/shared/images/characters/senpai-angryOffsets.txt @@ -0,0 +1,5 @@ +idle 0 0 +singUP 5 37 +singRIGHT 0 0 +singLEFT 40 0 +singDOWN 14 0 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/shared/images/characters/senpaiOffsets.txt b/assets/shared/images/characters/senpaiOffsets.txt new file mode 100644 index 000000000..c11825906 --- /dev/null +++ b/assets/shared/images/characters/senpaiOffsets.txt @@ -0,0 +1,5 @@ +idle 0 0 +singUP 5 37 +singRIGHT 0 0 +singLEFT 40 0 +singDOWN 14 0 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/shared/images/characters/spiritOffsets.txt b/assets/shared/images/characters/spiritOffsets.txt new file mode 100644 index 000000000..ed2442d75 --- /dev/null +++ b/assets/shared/images/characters/spiritOffsets.txt @@ -0,0 +1,5 @@ +idle -220 -280 +singUP -220 -240 +singRIGHT -220 -280 +singLEFT -200 -280 +singDOWN 170 110 diff --git a/assets/shared/images/characters/spookyOffsets.txt b/assets/shared/images/characters/spookyOffsets.txt new file mode 100644 index 000000000..c14c5e752 --- /dev/null +++ b/assets/shared/images/characters/spookyOffsets.txt @@ -0,0 +1,6 @@ +danceLeft 0 0 +danceRight 0 0 +singUP -20 26 +singRIGHT -130 -14 +singLEFT 130 -10 +singDOWN -50 -130 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 860fc7317..042778b78 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -55,7 +55,7 @@ class Character extends FlxSprite playAnim('danceRight'); case 'gf-christmas': - tex = Paths.getSparrowAtlas('christmas/gfChristmas'); + tex = Paths.getSparrowAtlas('characters/gfChristmas'); frames = tex; quickAnimAdd('cheer', 'GF Cheer'); quickAnimAdd('singLEFT', 'GF left note'); @@ -69,19 +69,7 @@ class Character extends FlxSprite animation.addByIndices('hairFall', "GF Dancing Beat Hair Landing", [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], "", 24, false); animation.addByPrefix('scared', 'GF FEAR', 24, true); - addOffset('cheer'); - addOffset('sad', -2, -21); - addOffset('danceLeft', 0, -9); - addOffset('danceRight', 0, -9); - - addOffset("singUP", 0, 4); - addOffset("singRIGHT", 0, -20); - addOffset("singLEFT", 0, -19); - addOffset("singDOWN", 0, -20); - addOffset('hairBlow', 45, -8); - addOffset('hairFall', 0, -9); - - addOffset('scared', -2, -17); + loadOffsetFile(curCharacter); playAnim('danceRight'); @@ -106,7 +94,7 @@ class Character extends FlxSprite flipX = true; case 'gf-car': - tex = Paths.getSparrowAtlas('gfCar'); + 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); @@ -114,21 +102,18 @@ class Character extends FlxSprite false); animation.addByIndices('idleHair', 'GF Dancing Beat Hair blowing CAR', [10, 11, 12, 25, 26, 27], "", 24, true); - addOffset('danceLeft', 0); - addOffset('danceRight', 0); - addOffset('idleHair', 0); + loadOffsetFile(curCharacter); playAnim('danceRight'); case 'gf-pixel': - tex = Paths.getSparrowAtlas('weeb/gfPixel'); + tex = Paths.getSparrowAtlas('characters/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); animation.addByIndices('danceRight', 'GF IDLE', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false); - addOffset('danceLeft', 0); - addOffset('danceRight', 0); + loadOffsetFile(curCharacter); playAnim('danceRight'); @@ -138,7 +123,7 @@ class Character extends FlxSprite case 'dad': // DAD ANIMATION LOADING CODE - tex = Paths.getSparrowAtlas('DADDY_DEAREST'); + tex = Paths.getSparrowAtlas('characters/DADDY_DEAREST'); frames = tex; quickAnimAdd('idle', 'Dad idle dance'); quickAnimAdd('singUP', 'Dad Sing Note UP'); @@ -146,15 +131,11 @@ class Character extends FlxSprite quickAnimAdd('singDOWN', 'Dad Sing Note DOWN'); quickAnimAdd('singLEFT', 'Dad Sing Note LEFT'); - addOffset('idle'); - addOffset("singUP", -6, 50); - addOffset("singRIGHT", 0, 27); - addOffset("singLEFT", -10, 10); - addOffset("singDOWN", 0, -30); + loadOffsetFile(curCharacter); playAnim('idle'); case 'spooky': - tex = Paths.getSparrowAtlas('spooky_kids_assets'); + tex = Paths.getSparrowAtlas('characters/spooky_kids_assets'); frames = tex; quickAnimAdd('singUP', 'spooky UP NOTE'); quickAnimAdd('singDOWN', 'spooky DOWN note'); @@ -163,17 +144,11 @@ class Character extends FlxSprite animation.addByIndices('danceLeft', 'spooky dance idle', [0, 2, 6], "", 12, false); animation.addByIndices('danceRight', 'spooky dance idle', [8, 10, 12, 14], "", 12, false); - addOffset('danceLeft'); - addOffset('danceRight'); - - addOffset("singUP", -20, 26); - addOffset("singRIGHT", -130, -14); - addOffset("singLEFT", 130, -10); - addOffset("singDOWN", -50, -130); + loadOffsetFile(curCharacter); playAnim('danceRight'); case 'mom': - tex = Paths.getSparrowAtlas('Mom_Assets'); + tex = Paths.getSparrowAtlas('characters/Mom_Assets'); frames = tex; quickAnimAdd('idle', "Mom Idle"); @@ -184,16 +159,12 @@ class Character extends FlxSprite // CUZ DAVE IS DUMB! quickAnimAdd('singRIGHT', 'Mom Pose Left'); - addOffset('idle'); - addOffset("singUP", 14, 71); - addOffset("singRIGHT", 10, -60); - addOffset("singLEFT", 250, -23); - addOffset("singDOWN", 20, -160); + loadOffsetFile(curCharacter); playAnim('idle'); case 'mom-car': - tex = Paths.getSparrowAtlas('momCar'); + tex = Paths.getSparrowAtlas('characters/momCar'); frames = tex; quickAnimAdd('idle', "Mom Idle"); @@ -205,16 +176,11 @@ class Character extends FlxSprite quickAnimAdd('singRIGHT', 'Mom Pose Left'); animation.addByIndices('idleHair', "Mom Idle", [10, 11, 12, 13], "", 24, true); - addOffset('idle'); - addOffset("singUP", 14, 71); - addOffset("singRIGHT", 10, -60); - addOffset("singLEFT", 250, -23); - addOffset("singDOWN", 20, -160); - addOffset('idleHair'); + loadOffsetFile(curCharacter); playAnim('idle'); case 'monster': - tex = Paths.getSparrowAtlas('Monster_Assets'); + tex = Paths.getSparrowAtlas('characters/Monster_Assets'); frames = tex; quickAnimAdd('idle', 'monster idle'); quickAnimAdd('singUP', 'monster up note'); @@ -222,14 +188,11 @@ class Character extends FlxSprite quickAnimAdd('singLEFT', 'Monster left note'); quickAnimAdd('singRIGHT', 'Monster Right note'); - addOffset('idle'); - addOffset("singUP", -20, 94); - addOffset("singRIGHT", -51, 30); - addOffset("singLEFT", -30, 20); - addOffset("singDOWN", -50, -80); + loadOffsetFile(curCharacter); + playAnim('idle'); case 'monster-christmas': - tex = Paths.getSparrowAtlas('christmas/monsterChristmas'); + tex = Paths.getSparrowAtlas('characters/monsterChristmas'); frames = tex; quickAnimAdd('idle', 'monster idle'); quickAnimAdd('singUP', 'monster up note'); @@ -237,14 +200,11 @@ class Character extends FlxSprite quickAnimAdd('singLEFT', 'Monster left note'); quickAnimAdd('singRIGHT', 'Monster Right note'); - addOffset('idle'); - addOffset("singUP", -20, 50); - addOffset("singRIGHT", -51); - addOffset("singLEFT", -30); - addOffset("singDOWN", -40, -94); + loadOffsetFile(curCharacter); + playAnim('idle'); case 'pico': - tex = Paths.getSparrowAtlas('Pico_FNF_assetss'); + tex = Paths.getSparrowAtlas('characters/Pico_FNF_assetss'); frames = tex; quickAnimAdd('idle', "Pico Idle Dance"); quickAnimAdd('singUP', 'pico Up note0'); @@ -268,15 +228,7 @@ class Character extends FlxSprite quickAnimAdd('singUPmiss', 'pico Up note miss'); quickAnimAdd('singDOWNmiss', 'Pico Down Note MISS'); - addOffset('idle'); - addOffset("singUP", -29, 27); - addOffset("singRIGHT", -68, -7); - addOffset("singLEFT", 65, 9); - addOffset("singDOWN", 200, -70); - addOffset("singUPmiss", -19, 67); - addOffset("singRIGHTmiss", -60, 41); - addOffset("singLEFTmiss", 62, 64); - addOffset("singDOWNmiss", 210, -28); + loadOffsetFile(curCharacter); playAnim('idle'); @@ -325,7 +277,7 @@ class Character extends FlxSprite loadOffsetFile(curCharacter); case 'bf-christmas': - var tex = Paths.getSparrowAtlas('christmas/bfChristmas'); + var tex = Paths.getSparrowAtlas('characters/bfChristmas'); frames = tex; quickAnimAdd('idle', 'BF idle dance'); quickAnimAdd('singUP', 'BF NOTE UP0'); @@ -338,22 +290,13 @@ class Character extends FlxSprite quickAnimAdd('singDOWNmiss', 'BF NOTE DOWN MISS'); quickAnimAdd('hey', 'BF HEY'); - addOffset('idle', -5); - addOffset("singUP", -29, 27); - addOffset("singRIGHT", -38, -7); - addOffset("singLEFT", 12, -6); - addOffset("singDOWN", -10, -50); - addOffset("singUPmiss", -29, 27); - addOffset("singRIGHTmiss", -30, 21); - addOffset("singLEFTmiss", 12, 24); - addOffset("singDOWNmiss", -11, -19); - addOffset("hey", 7, 4); + loadOffsetFile(curCharacter); playAnim('idle'); flipX = true; case 'bf-car': - var tex = Paths.getSparrowAtlas('bfCar'); + var tex = Paths.getSparrowAtlas('characters/bfCar'); frames = tex; quickAnimAdd('idle', 'BF idle dance'); quickAnimAdd('singUP', 'BF NOTE UP0'); @@ -366,21 +309,13 @@ class Character extends FlxSprite quickAnimAdd('singDOWNmiss', 'BF NOTE DOWN MISS'); animation.addByIndices('idleHair', 'BF idle dance', [10, 11, 12, 13], "", 24, true); - addOffset('idle', -5); - addOffset("singUP", -29, 27); - addOffset("singRIGHT", -38, -7); - addOffset("singLEFT", 12, -6); - addOffset("singDOWN", -10, -50); - addOffset("singUPmiss", -29, 27); - addOffset("singRIGHTmiss", -30, 21); - addOffset("singLEFTmiss", 12, 24); - addOffset("singDOWNmiss", -11, -19); - addOffset('idleHair', -5); + loadOffsetFile(curCharacter); + playAnim('idle'); flipX = true; case 'bf-pixel': - frames = Paths.getSparrowAtlas('weeb/bfPixel'); + frames = Paths.getSparrowAtlas('characters/bfPixel'); quickAnimAdd('idle', 'BF IDLE'); quickAnimAdd('singUP', 'BF UP NOTE'); quickAnimAdd('singLEFT', 'BF LEFT NOTE'); @@ -391,15 +326,7 @@ class Character extends FlxSprite quickAnimAdd('singRIGHTmiss', 'BF RIGHT MISS'); quickAnimAdd('singDOWNmiss', 'BF DOWN MISS'); - addOffset('idle'); - addOffset("singUP"); - addOffset("singRIGHT"); - addOffset("singLEFT"); - addOffset("singDOWN"); - addOffset("singUPmiss"); - addOffset("singRIGHTmiss"); - addOffset("singLEFTmiss"); - addOffset("singDOWNmiss"); + loadOffsetFile(curCharacter); setGraphicSize(Std.int(width * 6)); updateHitbox(); @@ -413,16 +340,15 @@ class Character extends FlxSprite flipX = true; case 'bf-pixel-dead': - frames = Paths.getSparrowAtlas('weeb/bfPixelsDEAD'); + frames = Paths.getSparrowAtlas('characters/bfPixelsDEAD'); quickAnimAdd('singUP', "BF Dies pixel"); quickAnimAdd('firstDeath', "BF Dies pixel"); animation.addByPrefix('deathLoop', "Retry Loop", 24, true); quickAnimAdd('deathConfirm', "RETRY CONFIRM"); animation.play('firstDeath'); - addOffset('firstDeath'); - addOffset('deathLoop', -30, -12); - addOffset('deathConfirm', -30, -12); + loadOffsetFile(curCharacter); + playAnim('firstDeath'); // pixel bullshit setGraphicSize(Std.int(width * 6)); @@ -431,7 +357,7 @@ class Character extends FlxSprite flipX = true; case 'senpai': - frames = Paths.getSparrowAtlas('weeb/senpai'); + frames = Paths.getSparrowAtlas('characters/senpai'); quickAnimAdd('idle', 'Senpai Idle'); // at framerate 16.8 animation plays over 2 beats at 144bpm, // but if the game lags or the bpm is > 144 (mods etc.) @@ -443,11 +369,7 @@ class Character extends FlxSprite quickAnimAdd('singRIGHT', 'SENPAI RIGHT NOTE'); quickAnimAdd('singDOWN', 'SENPAI DOWN NOTE'); - addOffset('idle'); - addOffset("singUP", 5, 37); - addOffset("singRIGHT"); - addOffset("singLEFT", 40); - addOffset("singDOWN", 14); + loadOffsetFile(curCharacter); playAnim('idle'); @@ -456,18 +378,15 @@ class Character extends FlxSprite antialiasing = false; case 'senpai-angry': - frames = Paths.getSparrowAtlas('weeb/senpai'); + frames = Paths.getSparrowAtlas('characters/senpai'); quickAnimAdd('idle', 'Angry Senpai Idle'); quickAnimAdd('singUP', 'Angry Senpai UP NOTE'); quickAnimAdd('singLEFT', 'Angry Senpai LEFT NOTE'); quickAnimAdd('singRIGHT', 'Angry Senpai RIGHT NOTE'); quickAnimAdd('singDOWN', 'Angry Senpai DOWN NOTE'); - addOffset('idle'); - addOffset("singUP", 5, 37); - addOffset("singRIGHT"); - addOffset("singLEFT", 40); - addOffset("singDOWN", 14); + loadOffsetFile(curCharacter); + playAnim('idle'); setGraphicSize(Std.int(width * 6)); @@ -476,18 +395,14 @@ class Character extends FlxSprite antialiasing = false; case 'spirit': - frames = Paths.getPackerAtlas('weeb/spirit'); + frames = Paths.getPackerAtlas('characters/spirit'); quickAnimAdd('idle', "idle spirit_"); quickAnimAdd('singUP', "up_"); quickAnimAdd('singRIGHT', "right_"); quickAnimAdd('singLEFT', "left_"); quickAnimAdd('singDOWN', "spirit down_"); - addOffset('idle', -220, -280); - addOffset('singUP', -220, -240); - addOffset("singRIGHT", -220, -280); - addOffset("singLEFT", -200, -280); - addOffset("singDOWN", 170, 110); + loadOffsetFile(curCharacter); setGraphicSize(Std.int(width * 6)); updateHitbox(); @@ -497,7 +412,7 @@ class Character extends FlxSprite antialiasing = false; case 'parents-christmas': - frames = Paths.getSparrowAtlas('christmas/mom_dad_christmas_assets'); + frames = Paths.getSparrowAtlas('characters/mom_dad_christmas_assets'); quickAnimAdd('idle', 'Parent Christmas Idle'); quickAnimAdd('singUP', 'Parent Up Note Dad'); quickAnimAdd('singDOWN', 'Parent Down Note Dad'); @@ -510,15 +425,7 @@ class Character extends FlxSprite quickAnimAdd('singLEFT-alt', 'Parent Left Note Mom'); quickAnimAdd('singRIGHT-alt', 'Parent Right Note Mom'); - addOffset('idle'); - addOffset("singUP", -47, 24); - addOffset("singRIGHT", -1, -23); - addOffset("singLEFT", -30, 16); - addOffset("singDOWN", -31, -29); - addOffset("singUP-alt", -47, 24); - addOffset("singRIGHT-alt", -1, -24); - addOffset("singLEFT-alt", -30, 15); - addOffset("singDOWN-alt", -30, -27); + loadOffsetFile(curCharacter); playAnim('idle'); case 'tankman':