cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-18 03:15:14 +00:00
Code Issues Releases Wiki Activity

more christmas stuff

Browse source
This commit is contained in:
Cameron Taylor 2021-01-19 21:44:09 -05:00
parent 48b1cab705
commit d20573b76c
4 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
source/Character.hx
View file

@ -271,6 +271,33 @@ class Character extends FlxSprite
addOffset('deathConfirm', 37, 69); addOffset('deathConfirm', 37, 69);
addOffset('scared', -4); addOffset('scared', -4);
flipX = true;
case 'bf-christmas':
var tex = FlxAtlasFrames.fromSparrow('assets/images/christmas/bfChristmas.png', 'assets/images/christmas/bfChristmas.xml');
frames = tex;
animation.addByPrefix('idle', 'BF idle dance', 24, false);
animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false);
animation.addByPrefix('singLEFT', 'BF NOTE LEFT0', 24, false);
animation.addByPrefix('singRIGHT', 'BF NOTE RIGHT0', 24, false);
animation.addByPrefix('singDOWN', 'BF NOTE DOWN0', 24, false);
animation.addByPrefix('singUPmiss', 'BF NOTE UP MISS', 24, false);
animation.addByPrefix('singLEFTmiss', 'BF NOTE LEFT MISS', 24, false);
animation.addByPrefix('singRIGHTmiss', 'BF NOTE RIGHT MISS', 24, false);
animation.addByPrefix('singDOWNmiss', 'BF NOTE DOWN MISS', 24, false);
animation.addByPrefix('hey', 'BF HEY', 24, false);
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);
flipX = true; flipX = true;
case 'bf-car': case 'bf-car':
var tex = FlxAtlasFrames.fromSparrow('assets/images/bfCar.png', 'assets/images/bfCar.xml'); var tex = FlxAtlasFrames.fromSparrow('assets/images/bfCar.png', 'assets/images/bfCar.xml');
@ -345,7 +372,7 @@ class Character extends FlxSprite
flipX = !flipX; flipX = !flipX;
// Doesn't flip for BF, since his are already in the right place??? // Doesn't flip for BF, since his are already in the right place???
if (character != 'bf' && character != 'bf-car') if (character != 'bf' && character != 'bf-car' && character != 'bf-christmas')
{ {
// var animArray // var animArray
var oldRight = animation.getByName('singRIGHT').frames; var oldRight = animation.getByName('singRIGHT').frames;
@ -410,6 +437,8 @@ class Character extends FlxSprite
playAnim('idle'); playAnim('idle');
case 'bf': case 'bf':
playAnim('idle'); playAnim('idle');
case 'bf-christmas':
playAnim('idle');
case 'bf-car': case 'bf-car':
playAnim('idle'); playAnim('idle');
case 'gf': case 'gf':

4
source/ChartingState.hx
View file

@ -225,9 +225,7 @@ class ChartingState extends MusicBeatState
stepperBPM.value = Conductor.bpm; stepperBPM.value = Conductor.bpm;
stepperBPM.name = 'song_bpm'; stepperBPM.name = 'song_bpm';
var characters:Array<String> = [ var characters:Array<String> = CoolUtil.coolTextFile('assets/data/characterList.txt');
"bf", 'dad', 'gf', 'spooky', 'monster', 'pico', 'mom', 'mom-car', 'bf-car', 'parents-christmas', 'monster-christmas'
];
for (i in Assets.getText('assets/images/custom_chars/charlist.txt').split('\n')) for (i in Assets.getText('assets/images/custom_chars/charlist.txt').split('\n'))
{ {

1
source/HealthIcon.hx
View file

@ -12,6 +12,7 @@ class HealthIcon extends FlxSprite
antialiasing = true; antialiasing = true;
animation.add('bf', [0, 1], 0, false, isPlayer); animation.add('bf', [0, 1], 0, false, isPlayer);
animation.add('bf-car', [0, 1], 0, false, isPlayer); animation.add('bf-car', [0, 1], 0, false, isPlayer);
animation.add('bf-christmas', [0, 1], 0, false, isPlayer);
animation.add('spooky', [2, 3], 0, false, isPlayer); animation.add('spooky', [2, 3], 0, false, isPlayer);
animation.add('pico', [4, 5], 0, false, isPlayer); animation.add('pico', [4, 5], 0, false, isPlayer);
animation.add('mom', [6, 7], 0, false, isPlayer); animation.add('mom', [6, 7], 0, false, isPlayer);

2
source/PlayState.hx
View file

@ -289,7 +289,7 @@ class PlayState extends MusicBeatState
tree.scrollFactor.set(0.85, 0.85); tree.scrollFactor.set(0.85, 0.85);
add(tree); add(tree);
bottomBoppers = new FlxSprite(-280, 220); bottomBoppers = new FlxSprite(-300, 220);
bottomBoppers.frames = FlxAtlasFrames.fromSparrow('assets/images/christmas/bottomBop.png', 'assets/images/christmas/bottomBop.xml'); bottomBoppers.frames = FlxAtlasFrames.fromSparrow('assets/images/christmas/bottomBop.png', 'assets/images/christmas/bottomBop.xml');
bottomBoppers.animation.addByPrefix('bop', 'Bottom Level Boppers', 24, false); bottomBoppers.animation.addByPrefix('bop', 'Bottom Level Boppers', 24, false);
bottomBoppers.antialiasing = true; bottomBoppers.antialiasing = true;