AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #367 from prokube/patch-3

Browse Source 
adding labels n' stuff to the Charting State
This commit is contained in:
Kade M 2021-05-04 10:50:58 -07:00 committed by GitHub
commit 8f5399447f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
source/ChartingState.hx
View File

@ -162,9 +162,9 @@ class ChartingState extends MusicBeatState
add(dummyArrow); add(dummyArrow);
var tabs = [ var tabs = [
{name: "Song", label: 'Song'}, {name: "Song", label: 'Song Data'},
{name: "Section", label: 'Section'}, {name: "Section", label: 'Section Data'},
{name: "Note", label: 'Note'}, {name: "Note", label: 'Note Data'},
{name: "Assets", label: 'Assets'} {name: "Assets", label: 'Assets'}
]; ];
@ -227,7 +227,7 @@ class ChartingState extends MusicBeatState
}); });
var restart = new FlxButton(10,140,"Reset", function() var restart = new FlxButton(10,140,"Reset Chart", function()
{ {
for (ii in 0..._song.notes.length) for (ii in 0..._song.notes.length)
{ {
@ -245,10 +245,14 @@ class ChartingState extends MusicBeatState
stepperSpeed.value = _song.speed; stepperSpeed.value = _song.speed;
stepperSpeed.name = 'song_speed'; stepperSpeed.name = 'song_speed';
var stepperSpeedLabel = new FlxText(74,80,'Scroll Speed');
var stepperBPM:FlxUINumericStepper = new FlxUINumericStepper(10, 65, 0.1, 1, 1.0, 5000.0, 1); var stepperBPM:FlxUINumericStepper = new FlxUINumericStepper(10, 65, 0.1, 1, 1.0, 5000.0, 1);
stepperBPM.value = Conductor.bpm; stepperBPM.value = Conductor.bpm;
stepperBPM.name = 'song_bpm'; stepperBPM.name = 'song_bpm';
var stepperBPMLabel = new FlxText(74,65,'BPM');
var characters:Array<String> = CoolUtil.coolTextFile(Paths.txt('characterList')); var characters:Array<String> = CoolUtil.coolTextFile(Paths.txt('characterList'));
var gfVersions:Array<String> = CoolUtil.coolTextFile(Paths.txt('gfVersionList')); var gfVersions:Array<String> = CoolUtil.coolTextFile(Paths.txt('gfVersionList'));
var stages:Array<String> = CoolUtil.coolTextFile(Paths.txt('stageList')); var stages:Array<String> = CoolUtil.coolTextFile(Paths.txt('stageList'));
@ -260,30 +264,39 @@ class ChartingState extends MusicBeatState
}); });
player1DropDown.selectedLabel = _song.player1; player1DropDown.selectedLabel = _song.player1;
var player1Label = new FlxText(10,80,64,'Player 1');
var player2DropDown = new FlxUIDropDownMenu(140, 100, FlxUIDropDownMenu.makeStrIdLabelArray(characters, true), function(character:String) var player2DropDown = new FlxUIDropDownMenu(140, 100, FlxUIDropDownMenu.makeStrIdLabelArray(characters, true), function(character:String)
{ {
_song.player2 = characters[Std.parseInt(character)]; _song.player2 = characters[Std.parseInt(character)];
}); });
player2DropDown.selectedLabel = _song.player2; player2DropDown.selectedLabel = _song.player2;
var player2Label = new FlxText(140,80,64,'Player 2');
var gfVersionDropDown = new FlxUIDropDownMenu(10, 200, FlxUIDropDownMenu.makeStrIdLabelArray(gfVersions, true), function(gfVersion:String) var gfVersionDropDown = new FlxUIDropDownMenu(10, 200, FlxUIDropDownMenu.makeStrIdLabelArray(gfVersions, true), function(gfVersion:String)
{ {
_song.gfVersion = gfVersions[Std.parseInt(gfVersion)]; _song.gfVersion = gfVersions[Std.parseInt(gfVersion)];
}); });
gfVersionDropDown.selectedLabel = _song.gfVersion; gfVersionDropDown.selectedLabel = _song.gfVersion;
var gfVersionLabel = new FlxText(10,180,64,'Girlfriend');
var stageDropDown = new FlxUIDropDownMenu(140, 200, FlxUIDropDownMenu.makeStrIdLabelArray(stages, true), function(stage:String) var stageDropDown = new FlxUIDropDownMenu(140, 200, FlxUIDropDownMenu.makeStrIdLabelArray(stages, true), function(stage:String)
{ {
_song.stage = stages[Std.parseInt(stage)]; _song.stage = stages[Std.parseInt(stage)];
}); });
stageDropDown.selectedLabel = _song.stage; stageDropDown.selectedLabel = _song.stage;
var stageLabel = new FlxText(140,180,64,'Stage');
var noteStyleDropDown = new FlxUIDropDownMenu(10, 300, FlxUIDropDownMenu.makeStrIdLabelArray(noteStyles, true), function(noteStyle:String) var noteStyleDropDown = new FlxUIDropDownMenu(10, 300, FlxUIDropDownMenu.makeStrIdLabelArray(noteStyles, true), function(noteStyle:String)
{ {
_song.noteStyle = noteStyles[Std.parseInt(noteStyle)]; _song.noteStyle = noteStyles[Std.parseInt(noteStyle)];
}); });
noteStyleDropDown.selectedLabel = _song.noteStyle; noteStyleDropDown.selectedLabel = _song.noteStyle;
var noteStyleLabel = new FlxText(10,280,64,'Note Skin');
var tab_group_song = new FlxUI(null, UI_box); var tab_group_song = new FlxUI(null, UI_box);
tab_group_song.name = "Song"; tab_group_song.name = "Song";
@ -296,15 +309,22 @@ class ChartingState extends MusicBeatState
tab_group_song.add(reloadSongJson); tab_group_song.add(reloadSongJson);
tab_group_song.add(loadAutosaveBtn); tab_group_song.add(loadAutosaveBtn);
tab_group_song.add(stepperBPM); tab_group_song.add(stepperBPM);
tab_group_song.add(stepperBPMLabel);
tab_group_song.add(stepperSpeed); tab_group_song.add(stepperSpeed);
tab_group_song.add(stepperSpeedLabel);
var tab_group_assets = new FlxUI(null, UI_box); var tab_group_assets = new FlxUI(null, UI_box);
tab_group_assets.name = "Assets"; tab_group_assets.name = "Assets";
tab_group_assets.add(noteStyleDropDown); tab_group_assets.add(noteStyleDropDown);
tab_group_assets.add(noteStyleLabel);
tab_group_assets.add(gfVersionDropDown); tab_group_assets.add(gfVersionDropDown);
tab_group_assets.add(gfVersionLabel);
tab_group_assets.add(stageDropDown); tab_group_assets.add(stageDropDown);
tab_group_assets.add(stageLabel);
tab_group_assets.add(player1DropDown); tab_group_assets.add(player1DropDown);
tab_group_assets.add(player2DropDown); tab_group_assets.add(player2DropDown);
tab_group_assets.add(player1Label);
tab_group_assets.add(player2Label);
UI_box.addGroup(tab_group_song); UI_box.addGroup(tab_group_song);
UI_box.addGroup(tab_group_assets); UI_box.addGroup(tab_group_assets);
@ -328,20 +348,23 @@ class ChartingState extends MusicBeatState
stepperLength.value = _song.notes[curSection].lengthInSteps; stepperLength.value = _song.notes[curSection].lengthInSteps;
stepperLength.name = "section_length"; stepperLength.name = "section_length";
var stepperLengthLabel = new FlxText(74,10,'Section Length (in steps)');
stepperSectionBPM = new FlxUINumericStepper(10, 80, 1, Conductor.bpm, 0, 999, 0); stepperSectionBPM = new FlxUINumericStepper(10, 80, 1, Conductor.bpm, 0, 999, 0);
stepperSectionBPM.value = Conductor.bpm; stepperSectionBPM.value = Conductor.bpm;
stepperSectionBPM.name = 'section_bpm'; stepperSectionBPM.name = 'section_bpm';
var stepperCopy:FlxUINumericStepper = new FlxUINumericStepper(110, 130, 1, 1, -999, 999, 0); var stepperCopy:FlxUINumericStepper = new FlxUINumericStepper(110, 132, 1, 1, -999, 999, 0);
var stepperCopyLabel = new FlxText(174,132,'sections back');
var copyButton:FlxButton = new FlxButton(10, 130, "Copy last section", function() var copyButton:FlxButton = new FlxButton(10, 130, "Copy last section", function()
{ {
copySection(Std.int(stepperCopy.value)); copySection(Std.int(stepperCopy.value));
}); });
var clearSectionButton:FlxButton = new FlxButton(10, 150, "Clear", clearSection); var clearSectionButton:FlxButton = new FlxButton(10, 150, "Clear Section", clearSection);
var swapSection:FlxButton = new FlxButton(10, 170, "Swap section", function() var swapSection:FlxButton = new FlxButton(10, 170, "Swap Section", function()
{ {
for (i in 0..._song.notes[curSection].sectionNotes.length) for (i in 0..._song.notes[curSection].sectionNotes.length)
{ {
@ -351,21 +374,22 @@ class ChartingState extends MusicBeatState
updateGrid(); updateGrid();
} }
}); });
check_mustHitSection = new FlxUICheckBox(10, 30, null, null, "Camera Points to P1?", 100);
check_mustHitSection = new FlxUICheckBox(10, 30, null, null, "Must hit section", 100);
check_mustHitSection.name = 'check_mustHit'; check_mustHitSection.name = 'check_mustHit';
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 = new FlxUICheckBox(10, 400, null, null, "Alternate Animation", 100);
check_altAnim.name = 'check_altAnim'; 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';
tab_group_section.add(stepperLength); tab_group_section.add(stepperLength);
tab_group_section.add(stepperLengthLabel);
tab_group_section.add(stepperSectionBPM); tab_group_section.add(stepperSectionBPM);
tab_group_section.add(stepperCopy); tab_group_section.add(stepperCopy);
tab_group_section.add(stepperCopyLabel);
tab_group_section.add(check_mustHitSection); tab_group_section.add(check_mustHitSection);
tab_group_section.add(check_altAnim); tab_group_section.add(check_altAnim);
tab_group_section.add(check_changeBPM); tab_group_section.add(check_changeBPM);
@ -392,10 +416,13 @@ class ChartingState extends MusicBeatState
stepperSusLength.value = 0; stepperSusLength.value = 0;
stepperSusLength.name = 'note_susLength'; stepperSusLength.name = 'note_susLength';
var applyLength:FlxButton = new FlxButton(100, 10, 'Apply'); var stepperSusLengthLabel = new FlxText(74,10,'Note Sustain Length');
var applyLength:FlxButton = new FlxButton(10, 100, 'Apply Data');
tab_group_note.add(writingNotesText); tab_group_note.add(writingNotesText);
tab_group_note.add(stepperSusLength); tab_group_note.add(stepperSusLength);
tab_group_note.add(stepperSusLengthLabel);
tab_group_note.add(applyLength); tab_group_note.add(applyLength);
UI_box.addGroup(tab_group_note); UI_box.addGroup(tab_group_note);