Skip to content

Commit

Permalink
Put ALL characters into shared/images/characters
Browse files Browse the repository at this point in the history
  • Loading branch information
poec987 committed Jun 26, 2024
1 parent 5e792aa commit 4297a99
Show file tree
Hide file tree
Showing 46 changed files with 23 additions and 23 deletions.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
44 changes: 22 additions & 22 deletions source/Character.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -63,7 +63,7 @@ class Character extends FlxSprite
playAnim('danceRight');

case 'gf-christmas':
tex = Paths.getSparrowAtlas('christmas/gfChristmas');
tex = Paths.getSparrowAtlas('characters/christmas/gfChristmas');
frames = tex;
animation.addByPrefix('cheer', 'GF Cheer', 24, false);
animation.addByPrefix('singLEFT', 'GF left note', 24, false);
Expand Down Expand Up @@ -94,7 +94,7 @@ class Character extends FlxSprite
playAnim('danceRight');

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);
Expand All @@ -107,7 +107,7 @@ class Character extends FlxSprite
playAnim('danceRight');

case 'gf-pixel':
tex = Paths.getSparrowAtlas('weeb/gfPixel');
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);
Expand All @@ -124,7 +124,7 @@ class Character extends FlxSprite

case 'dad':
// DAD ANIMATION LOADING CODE
tex = Paths.getSparrowAtlas('DADDY_DEAREST');
tex = Paths.getSparrowAtlas('characters/DADDY_DEAREST');
frames = tex;
animation.addByPrefix('idle', 'Dad idle dance', 24);
animation.addByPrefix('singUP', 'Dad Sing Note UP', 24);
Expand All @@ -142,7 +142,7 @@ class Character extends FlxSprite

case 'sonicexe':
// DAD ANIMATION LOADING CODE
tex = Paths.getSparrowAtlas('sonicexe');
tex = Paths.getSparrowAtlas('characters/sonicexe');
frames = tex;
animation.addByPrefix('idle', 'Idle', 30, false);
animation.addByPrefix('singUP', 'Up', 30, false);
Expand All @@ -161,7 +161,7 @@ class Character extends FlxSprite

playAnim('idle');
case 'spooky':
tex = Paths.getSparrowAtlas('spooky_kids_assets');
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);
Expand All @@ -180,7 +180,7 @@ class Character extends FlxSprite

playAnim('danceRight');
case 'mom':
tex = Paths.getSparrowAtlas('Mom_Assets');
tex = Paths.getSparrowAtlas('characters/Mom_Assets');
frames = tex;

animation.addByPrefix('idle', "Mom Idle", 24, false);
Expand All @@ -200,7 +200,7 @@ class Character extends FlxSprite
playAnim('idle');

case 'mom-car':
tex = Paths.getSparrowAtlas('momCar');
tex = Paths.getSparrowAtlas('characters/momCar');
frames = tex;

animation.addByPrefix('idle', "Mom Idle", 24, false);
Expand All @@ -219,7 +219,7 @@ class Character extends FlxSprite

playAnim('idle');
case 'monster':
tex = Paths.getSparrowAtlas('Monster_Assets');
tex = Paths.getSparrowAtlas('characters/Monster_Assets');
frames = tex;
animation.addByPrefix('idle', 'monster idle', 24, false);
animation.addByPrefix('singUP', 'monster up note', 24, false);
Expand All @@ -234,7 +234,7 @@ class Character extends FlxSprite
addOffset("singDOWN", -30, -40);
playAnim('idle');
case 'monster-christmas':
tex = Paths.getSparrowAtlas('christmas/monsterChristmas');
tex = Paths.getSparrowAtlas('characters/christmas/monsterChristmas');
frames = tex;
animation.addByPrefix('idle', 'monster idle', 60, true);
animation.addByPrefix('singUP', 'monster up note', 60, false);
Expand All @@ -253,7 +253,7 @@ class Character extends FlxSprite

antialiasing = false;
case 'pico':
tex = Paths.getSparrowAtlas('Pico_FNF_assetss');
tex = Paths.getSparrowAtlas('characters/Pico_FNF_assetss');
frames = tex;
animation.addByPrefix('idle', "Pico Idle Dance", 24);
animation.addByPrefix('singUP', 'pico Up note0', 24, false);
Expand Down Expand Up @@ -292,7 +292,7 @@ class Character extends FlxSprite
flipX = true;

case 'bf':
var tex = Paths.getSparrowAtlas('BOYFRIEND');
var tex = Paths.getSparrowAtlas('characters/BOYFRIEND');
frames = tex;
animation.addByPrefix('idle', 'BF idle dance', 24, false);
animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false);
Expand Down Expand Up @@ -331,7 +331,7 @@ class Character extends FlxSprite
flipX = true;

case 'bf-bside':
var tex = Paths.getSparrowAtlas('BOYFRIEND-BSIDE');
var tex = Paths.getSparrowAtlas('characters/BOYFRIEND-BSIDE');
frames = tex;
animation.addByPrefix('idle', 'BF idle dance', 24, false);
animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false);
Expand All @@ -357,7 +357,7 @@ class Character extends FlxSprite
flipX = true;

case 'bf-christmas':
var tex = Paths.getSparrowAtlas('christmas/bfChristmas');
var tex = Paths.getSparrowAtlas('characters/christmas/bfChristmas');
frames = tex;
animation.addByPrefix('idle', 'BF idle dance', 24, false);
animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false);
Expand Down Expand Up @@ -385,7 +385,7 @@ class Character extends FlxSprite

flipX = true;
case 'bf-car':
var tex = Paths.getSparrowAtlas('bfCar');
var tex = Paths.getSparrowAtlas('characters/bfCar');
frames = tex;
animation.addByPrefix('idle', 'BF idle dance', 24, false);
animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false);
Expand All @@ -410,7 +410,7 @@ class Character extends FlxSprite

flipX = true;
case 'bf-pixel':
frames = Paths.getSparrowAtlas('weeb/bfPixel');
frames = Paths.getSparrowAtlas('characters/weeb/bfPixel');
animation.addByPrefix('idle', 'BF IDLE', 24, false);
animation.addByPrefix('singUP', 'BF UP NOTE', 24, false);
animation.addByPrefix('singLEFT', 'BF LEFT NOTE', 24, false);
Expand Down Expand Up @@ -443,7 +443,7 @@ class Character extends FlxSprite

flipX = true;
case 'bf-pixel-good':
frames = Paths.getSparrowAtlas('weeb/bfPixel');
frames = Paths.getSparrowAtlas('characters/weeb/bfPixel');
animation.addByPrefix('idle', 'BF IDLE', 24, false);
animation.addByPrefix('singUP', 'BF UP NOTE', 24, false);
animation.addByPrefix('singLEFT', 'BF LEFT NOTE', 24, false);
Expand Down Expand Up @@ -476,7 +476,7 @@ class Character extends FlxSprite

flipX = true;
case 'bf-pixel-dead':
frames = Paths.getSparrowAtlas('weeb/bfPixelsDEAD');
frames = Paths.getSparrowAtlas('characters/weeb/bfPixelsDEAD');
animation.addByPrefix('singUP', "BF Dies pixel", 24, false);
animation.addByPrefix('firstDeath', "BF Dies pixel", 24, false);
animation.addByPrefix('deathLoop', "Retry Loop", 24, true);
Expand All @@ -494,7 +494,7 @@ class Character extends FlxSprite
flipX = true;

case 'senpai':
frames = Paths.getSparrowAtlas('weeb/senpai');
frames = Paths.getSparrowAtlas('characters/weeb/senpai');
animation.addByPrefix('idle', 'Senpai Idle', 24, false);
animation.addByPrefix('singUP', 'SENPAI UP NOTE', 24, false);
animation.addByPrefix('singLEFT', 'SENPAI LEFT NOTE', 24, false);
Expand All @@ -514,7 +514,7 @@ class Character extends FlxSprite

antialiasing = false;
case 'senpai-angry':
frames = Paths.getSparrowAtlas('weeb/senpai');
frames = Paths.getSparrowAtlas('characters/weeb/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);
Expand Down Expand Up @@ -555,7 +555,7 @@ class Character extends FlxSprite
antialiasing = false;

case 'parents-christmas':
frames = Paths.getSparrowAtlas('christmas/mom_dad_christmas_assets');
frames = Paths.getSparrowAtlas('characters/christmas/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);
Expand Down
2 changes: 1 addition & 1 deletion source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ class PlayState extends MusicBeatState
FlxG.sound.list.add(shootSound);

picoShoot = new FlxSprite(100, (dad.y/2)-30);
picoShoot.frames = Paths.getSparrowAtlas('philly/Pico_Shooting');
picoShoot.frames = Paths.getSparrowAtlas('characters/Pico_Shooting');
picoShoot.animation.addByPrefix('shoot', "Pico Shoot Hip Full");
picoShoot.flipX = true;
add(picoShoot);
Expand Down

0 comments on commit 4297a99

Please sign in to comment.