diff --git a/assets/data/high/high.json b/assets/data/high/high-hard.json similarity index 100% rename from assets/data/high/high.json rename to assets/data/high/high-hard.json diff --git a/assets/data/satin-panties/satin-panties.json b/assets/data/satin-panties/satin-panties.json new file mode 100644 index 000000000..ac00e2d47 Binary files /dev/null and b/assets/data/satin-panties/satin-panties.json differ diff --git a/assets/images/lol.png b/assets/images/lol.png new file mode 100644 index 000000000..fe978b93a Binary files /dev/null and b/assets/images/lol.png differ diff --git a/assets/music/Satin-Panties_Inst.mp3 b/assets/music/Satin-Panties_Inst.mp3 index d0b4d686e..330cbc56d 100644 Binary files a/assets/music/Satin-Panties_Inst.mp3 and b/assets/music/Satin-Panties_Inst.mp3 differ diff --git a/assets/music/Satin-Panties_Inst.ogg b/assets/music/Satin-Panties_Inst.ogg index 09b9690c6..cd1e0de89 100644 Binary files a/assets/music/Satin-Panties_Inst.ogg and b/assets/music/Satin-Panties_Inst.ogg differ diff --git a/assets/music/Satin-Panties_Voices.mp3 b/assets/music/Satin-Panties_Voices.mp3 index d0b4d686e..305681411 100644 Binary files a/assets/music/Satin-Panties_Voices.mp3 and b/assets/music/Satin-Panties_Voices.mp3 differ diff --git a/assets/music/Satin-Panties_Voices.ogg b/assets/music/Satin-Panties_Voices.ogg index dde5f4a55..3ec6bb784 100644 Binary files a/assets/music/Satin-Panties_Voices.ogg and b/assets/music/Satin-Panties_Voices.ogg differ diff --git a/source/ChartingState.hx b/source/ChartingState.hx index cc93694e8..1832c6d00 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -242,6 +242,19 @@ class ChartingState extends MusicBeatState copySection(Std.int(stepperCopy.value)); }); + var clearSectionButton:FlxButton = new FlxButton(10, 150, "Clear", clearSection); + + var swapSection:FlxButton = new FlxButton(10, 170, "Swap section", function() + { + for (i in 0..._song.notes[curSection].sectionNotes.length) + { + var note = _song.notes[curSection].sectionNotes[i]; + note[1] = (note[1] + 4) % 8; + _song.notes[curSection].sectionNotes[i] = note; + updateGrid(); + } + }); + check_mustHitSection = new FlxUICheckBox(10, 30, null, null, "Must hit section", 100); check_mustHitSection.name = 'check_mustHit'; check_mustHitSection.checked = true; @@ -256,6 +269,8 @@ class ChartingState extends MusicBeatState tab_group_section.add(check_mustHitSection); tab_group_section.add(check_changeBPM); tab_group_section.add(copyButton); + tab_group_section.add(clearSectionButton); + tab_group_section.add(swapSection); UI_box.addGroup(tab_group_section); } @@ -722,6 +737,13 @@ class ChartingState extends MusicBeatState updateGrid(); } + function clearSection():Void + { + _song.notes[curSection].sectionNotes = []; + + updateGrid(); + } + function clearSong():Void { for (daSection in 0..._song.notes.length) diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index 0f287a040..5b1afb628 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -13,6 +13,8 @@ import flixel.util.FlxColor; import io.newgrounds.NG; import lime.app.Application; +using StringTools; + class MainMenuState extends MusicBeatState { var curSelected:Int = 0; @@ -87,7 +89,7 @@ class MainMenuState extends MusicBeatState versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); add(versionShit); - if (versionShit.text != NGio.GAME_VER && !OutdatedSubState.leftState) + if (versionShit.text.trim() != NGio.GAME_VER.trim() && !OutdatedSubState.leftState) { trace('OLD VERSION!');