cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-07-12 22:28:03 +00:00
Code Issues Releases Wiki Activity

CHARTS LOL

Browse source
This commit is contained in:
Cameron Taylor 2021-01-16 15:14:56 -05:00
parent 5e7ad47bb7
commit a42e3b9dfc
4 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/Character.hx
View file

@ -269,6 +269,20 @@ class Character extends FlxSprite
addOffset("singDOWNmiss", -11, -19); addOffset("singDOWNmiss", -11, -19);
flipX = true; flipX = true;
case 'parents-christmas':
frames = FlxAtlasFrames.fromSparrow('assets/images/christmas/mom_dad_christmas_assets.png',
'assets/images/christmas/mom_dad_christmas_assets.xml');
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);
animation.addByPrefix('singLEFT', 'Parent Left Note Dad', 24, false);
animation.addByPrefix('singRIGHT', 'Parent Right Note Dad', 24, false);
animation.addByPrefix('singUP-alt', 'Parent Up Note Mom', 24, false);
animation.addByPrefix('singDOWN-alt', 'Parent Down Note Mom', 24, false);
animation.addByPrefix('singLEFT-alt', 'Parent Left Note Mom', 24, false);
animation.addByPrefix('singRIGHT-alt', 'Parent Right Note Mom', 24, false);
} }
playAnim('singUP'); playAnim('singUP');

11
source/ChartingState.hx
View file

@ -253,6 +253,7 @@ class ChartingState extends MusicBeatState
var check_mustHitSection:FlxUICheckBox; var check_mustHitSection:FlxUICheckBox;
var check_changeBPM:FlxUICheckBox; var check_changeBPM:FlxUICheckBox;
var stepperSectionBPM:FlxUINumericStepper; var stepperSectionBPM:FlxUINumericStepper;
var check_altAnim:FlxUICheckBox;
function addSectionUI():Void function addSectionUI():Void
{ {
@ -292,6 +293,9 @@ class ChartingState extends MusicBeatState
check_mustHitSection.checked = true; check_mustHitSection.checked = true;
// _song.needsVoices = check_mustHit.checked; // _song.needsVoices = check_mustHit.checked;
check_altAnim = new FlxUICheckBox(10, 400, null, null, "Alt Animation", 100);
check_altAnim.name = 'check_altAnim';
check_changeBPM = new FlxUICheckBox(10, 60, null, null, 'Change BPM', 100); check_changeBPM = new FlxUICheckBox(10, 60, null, null, 'Change BPM', 100);
check_changeBPM.name = 'check_changeBPM'; check_changeBPM.name = 'check_changeBPM';
@ -299,6 +303,7 @@ class ChartingState extends MusicBeatState
tab_group_section.add(stepperSectionBPM); tab_group_section.add(stepperSectionBPM);
tab_group_section.add(stepperCopy); tab_group_section.add(stepperCopy);
tab_group_section.add(check_mustHitSection); tab_group_section.add(check_mustHitSection);
tab_group_section.add(check_altAnim);
tab_group_section.add(check_changeBPM); tab_group_section.add(check_changeBPM);
tab_group_section.add(copyButton); tab_group_section.add(copyButton);
tab_group_section.add(clearSectionButton); tab_group_section.add(clearSectionButton);
@ -384,6 +389,8 @@ class ChartingState extends MusicBeatState
case 'Change BPM': case 'Change BPM':
_song.notes[curSection].changeBPM = check.checked; _song.notes[curSection].changeBPM = check.checked;
FlxG.log.add('changed bpm shit'); FlxG.log.add('changed bpm shit');
case "Alt Animation":
_song.notes[curSection].altAnim = check.checked;
} }
} }
else if (id == FlxUINumericStepper.CHANGE_EVENT && (sender is FlxUINumericStepper)) else if (id == FlxUINumericStepper.CHANGE_EVENT && (sender is FlxUINumericStepper))
@ -746,6 +753,7 @@ class ChartingState extends MusicBeatState
stepperLength.value = sec.lengthInSteps; stepperLength.value = sec.lengthInSteps;
check_mustHitSection.checked = sec.mustHitSection; check_mustHitSection.checked = sec.mustHitSection;
check_altAnim.checked = sec.altAnim;
check_changeBPM.checked = sec.changeBPM; check_changeBPM.checked = sec.changeBPM;
stepperSectionBPM.value = sec.bpm; stepperSectionBPM.value = sec.bpm;
} }
@ -824,7 +832,8 @@ class ChartingState extends MusicBeatState
changeBPM: false, changeBPM: false,
mustHitSection: true, mustHitSection: true,
sectionNotes: [], sectionNotes: [],
typeOfSection: 0 typeOfSection: 0,
altAnim: false
}; };
_song.notes.push(sec); _song.notes.push(sec);

2
source/HealthIcon.hx
View file

@ -21,6 +21,8 @@ class HealthIcon extends FlxSprite
animation.add('dad', [12, 13], 0, false, isPlayer); animation.add('dad', [12, 13], 0, false, isPlayer);
animation.add('bf-old', [14, 15], 0, false, isPlayer); animation.add('bf-old', [14, 15], 0, false, isPlayer);
animation.add('gf', [16], 0, false, isPlayer); animation.add('gf', [16], 0, false, isPlayer);
animation.add('parents-christmas', [0, 1], 0, false, isPlayer);
animation.add('monster', [0], 0, false, isPlayer);
animation.play(char); animation.play(char);
scrollFactor.set(); scrollFactor.set();
} }

1
source/Section.hx
View file

@ -8,6 +8,7 @@ typedef SwagSection =
var mustHitSection:Bool; var mustHitSection:Bool;
var bpm:Int; var bpm:Int;
var changeBPM:Bool; var changeBPM:Bool;
var altAnim:Bool;
} }
class Section class Section