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':