cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

LOTS OF SHIT

This commit is contained in:
Cameron Taylor 2021-01-17 04:16:02 -05:00
parent 0b3bf9df84
commit 4192fe2beb
7 changed files with 76 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/data/cocoa/cocoa.json
View File

File diff suppressed because one or more lines are too long

1
assets/data/eggnog/eggnog-easy.json Normal file
View File

File diff suppressed because one or more lines are too long

1
assets/data/eggnog/eggnog-hard.json Normal file
View File

File diff suppressed because one or more lines are too long

2
assets/data/eggnog/eggnog.json
View File

File diff suppressed because one or more lines are too long

97
source/Character.hx
View File

@ -281,14 +281,14 @@ class Character extends FlxSprite
animation.addByPrefix('singRIGHT-alt', 'Parent Right Note Mom', 24, false);
addOffset('idle');
addOffset("singUP", -20, 50);
addOffset("singRIGHT", -51);
addOffset("singLEFT", -30);
addOffset("singDOWN", -30, -40);
addOffset("singUP-alt", -20, 50);
addOffset("singRIGHT-alt", -51);
addOffset("singLEFT-alt", -30);
addOffset("singDOWN-alt", -30, -40);
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);
case 'monster-christmas':
frames = FlxAtlasFrames.fromSparrow('assets/images/christmas/Monster_Assets_Christmas.png',
'assets/images/christmas/Monster_Assets_Christmas.xml');
@ -369,51 +369,56 @@ class Character extends FlxSprite
*/
public function dance()
{
switch (curCharacter)
if (!debugMode)
{
case 'mom':
playAnim('idle');
case 'mom-car':
playAnim('idle');
case 'bf':
playAnim('idle');
case 'bf-car':
playAnim('idle');
case 'gf':
if (!animation.curAnim.name.startsWith('hair'))
{
switch (curCharacter)
{
case 'mom':
playAnim('idle');
case 'mom-car':
playAnim('idle');
case 'bf':
playAnim('idle');
case 'bf-car':
playAnim('idle');
case 'gf':
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
}
case 'gf-car':
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
}
case 'spooky':
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
}
case 'gf-car':
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
}
case 'spooky':
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
case 'dad':
playAnim('idle');
case 'monster':
playAnim('idle');
case 'pico':
playAnim('idle');
case 'dad':
playAnim('idle');
case 'parents-christmas':
playAnim('idle');
case 'monster':
playAnim('idle');
case 'pico':
playAnim('idle');
}
}
}

7
source/FreeplayState.hx
View File

@ -66,6 +66,13 @@ class FreeplayState extends MusicBeatState
songs.push('Milf');
}
if (StoryMenuState.weekUnlocked[5] || isDebug)
{
songs.push('Cocoa');
songs.push('Eggnog');
// songs.push('Milf');
}
// LOAD MUSIC
// LOAD CHARACTERS

18
source/PlayState.hx
View File

@ -987,16 +987,26 @@ class PlayState extends MusicBeatState
if (SONG.song != 'Tutorial')
camZooming = true;
var altAnim:String = "";
if (SONG.notes[Math.floor(curStep / 16)] != null)
{
if (SONG.notes[Math.floor(curStep / 16)].altAnim)
altAnim = '-alt';
}
trace("DA ALT THO?: " + SONG.notes[Math.floor(curStep / 16)].altAnim);
switch (Math.abs(daNote.noteData))
{
case 2:
dad.playAnim('singUP', true);
dad.playAnim('singUP' + altAnim, true);
case 3:
dad.playAnim('singRIGHT', true);
dad.playAnim('singRIGHT' + altAnim, true);
case 1:
dad.playAnim('singDOWN', true);
dad.playAnim('singDOWN' + altAnim, true);
case 0:
dad.playAnim('singLEFT', true);
dad.playAnim('singLEFT' + altAnim, true);
}
dad.holdTimer = 0;