Skip to content
This repository was archived by the owner on Aug 29, 2022. It is now read-only.

Commit ac285e3

Browse files
committed
1.2.0
1 parent fd484df commit ac285e3

4 files changed

Lines changed: 38 additions & 12 deletions

File tree

source/MainMenuState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ using StringTools;
2929

3030
class MainMenuState extends MusicBeatState
3131
{
32-
public static var osEngineVesrion:String = '1.1.0'; //This is also used for Discord RPC
32+
public static var osEngineVesrion:String = '1.2.0'; //This is also used for Discord RPC
3333
public static var curSelected:Int = 0;
3434

3535
var menuItems:FlxTypedGroup<FlxSprite>;

source/PlayState.hx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2172,7 +2172,7 @@ class PlayState extends MusicBeatState
21722172
}
21732173
}
21742174

2175-
if (FlxG.keys.anyJustPressed(debugKeysChart) && !endingSong && !inCutscene)
2175+
if (FlxG.keys.anyJustPressed(debugKeysChart) && !endingSong && !inCutscene && !SONG.disableDebugButtons)
21762176
{
21772177
openChartEditor();
21782178
}
@@ -3401,7 +3401,11 @@ class PlayState extends MusicBeatState
34013401
sortedNotesList.push(daNote);
34023402
//notesDatas.push(daNote.noteData);
34033403
}
3404-
canMiss = true;
3404+
if (!SONG.disableAntiMash) {
3405+
canMiss = true;
3406+
} else { // best code ever
3407+
canMiss = false;
3408+
}
34053409
}
34063410
});
34073411
sortedNotesList.sort((a, b) -> Std.int(a.strumTime - b.strumTime));

source/Song.hx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ typedef SwagSong =
3535
var cameraMoveOnNotes:Bool;
3636
var healthdrain:Float;
3737
var songInstVolume:Float;
38+
var disableAntiMash:Bool;
39+
var disableDebugButtons:Bool;
3840
}
3941

4042
class Song
@@ -52,6 +54,8 @@ class Song
5254
public var stage:String;
5355
public var healthdrainKill:Bool = false;
5456
public var characterTrails:Bool = false;
57+
public var disableAntiMash:Bool = false;
58+
public var disableDebugButtons:Bool = false;
5559

5660
public var player1:String = 'bf';
5761
public var player2:String = 'dad';

source/editors/ChartingState.hx

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,9 @@ class ChartingState extends MusicBeatState
228228
gfVersion: 'gf',
229229
speed: 1,
230230
stage: 'stage',
231-
validScore: false
231+
validScore: false,
232+
disableAntiMash: false,
233+
disableDebugButtons: false
232234
};
233235
addSection();
234236
PlayState.SONG = _song;
@@ -481,6 +483,18 @@ class ChartingState extends MusicBeatState
481483
{
482484
_song.characterTrails = check_Trails.checked;
483485
};
486+
var check_antiMash = new FlxUICheckBox(reloadSong.x + 90, reloadSong.y, null, null, "Disable Antimash", 100);
487+
check_antiMash.checked = _song.disableAntiMash;
488+
check_antiMash.callback = function()
489+
{
490+
_song.disableAntiMash = check_antiMash.checked;
491+
};
492+
var check_disableDebug = new FlxUICheckBox(reloadSongJson.x + 90, reloadSongJson.y, null, null, "Disable Debugmenu Buttons", 100);
493+
check_disableDebug.checked = _song.disableDebugButtons;
494+
check_disableDebug.callback = function()
495+
{
496+
_song.disableDebugButtons = check_disableDebug.checked;
497+
};
484498
var check_cameraMove = new FlxUICheckBox(80, loadEventJson.y, null, null, "Move Camera on Note Hits", 100);
485499
check_cameraMove.checked = _song.cameraMoveOnNotes;
486500
check_cameraMove.callback = function()
@@ -606,13 +620,6 @@ class ChartingState extends MusicBeatState
606620

607621
if(stages.length < 1) stages.push('stage');
608622

609-
stageDropDown = new FlxUIDropDownMenuCustom(player1DropDown.x + 140, player1DropDown.y, FlxUIDropDownMenuCustom.makeStrIdLabelArray(stages, true), function(character:String)
610-
{
611-
_song.stage = stages[Std.parseInt(character)];
612-
});
613-
stageDropDown.selectedLabel = _song.stage;
614-
blockPressWhileScrolling.push(stageDropDown);
615-
616623
var healthdrainOBJ:FlxUINumericStepper = new FlxUINumericStepper(player1DropDown.x + 140, player3DropDown.y, 1, 0, 0, 99, 0);
617624
healthdrainOBJ.value = _song.healthdrain;
618625
healthdrainOBJ.name = 'health_drain';
@@ -630,14 +637,21 @@ class ChartingState extends MusicBeatState
630637
noteSkinInputText = new FlxUIInputText(player2DropDown.x, player2DropDown.y + 50, 150, skin, 8);
631638
blockPressWhileTypingOn.push(noteSkinInputText);
632639

633-
var songinstVolumeOBJ:FlxUINumericStepper = new FlxUINumericStepper(noteSkinInputText.x + 180, noteSkinInputText.y, 0.1, 1.0, 0.1, 1, 1);
640+
var songinstVolumeOBJ:FlxUINumericStepper = new FlxUINumericStepper(player1DropDown.x + 140, player1DropDown.y, 0.1, 1.0, 0.1, 1, 1);
634641
if (_song.songInstVolume > 0 ) songinstVolumeOBJ.value = _song.songInstVolume; else songinstVolumeOBJ.value = 1;
635642
songinstVolumeOBJ.name = 'instplay_Volume';
636643
blockPressWhileTypingOnStepper.push(songinstVolumeOBJ);
637644

638645
noteSplashesInputText = new FlxUIInputText(noteSkinInputText.x, noteSkinInputText.y + 35, 150, _song.splashSkin, 8);
639646
blockPressWhileTypingOn.push(noteSplashesInputText);
640647

648+
stageDropDown = new FlxUIDropDownMenuCustom(noteSplashesInputText.x + 170, noteSplashesInputText.y, FlxUIDropDownMenuCustom.makeStrIdLabelArray(stages, true), function(character:String)
649+
{
650+
_song.stage = stages[Std.parseInt(character)];
651+
});
652+
stageDropDown.selectedLabel = _song.stage;
653+
blockPressWhileScrolling.push(stageDropDown);
654+
641655
var reloadNotesButton:FlxButton = new FlxButton(noteSplashesInputText.x + 5, noteSplashesInputText.y + 20, 'Change Notes', function() {
642656
_song.arrowSkin = noteSkinInputText.text;
643657
updateGrid();
@@ -656,6 +670,8 @@ class ChartingState extends MusicBeatState
656670
tab_group_song.add(reloadSongJson);
657671
tab_group_song.add(loadAutosaveBtn);
658672
tab_group_song.add(check_Trails);
673+
tab_group_song.add(check_antiMash);
674+
tab_group_song.add(check_disableDebug);
659675
tab_group_song.add(check_cameraMove);
660676
tab_group_song.add(loadEventJson);
661677
tab_group_song.add(stepperBPM);
@@ -2894,6 +2910,8 @@ class ChartingState extends MusicBeatState
28942910
cameraMoveOnNotes: _song.cameraMoveOnNotes,
28952911
healthdrain: _song.healthdrain,
28962912
healthdrainKill: _song.healthdrainKill,
2913+
disableAntiMash: _song.disableAntiMash,
2914+
disableDebugButtons: _song.disableDebugButtons,
28972915

28982916
player1: _song.player1,
28992917
player2: _song.player2,

0 commit comments

Comments
 (0)