charts and shit fixied

This commit is contained in:
Cameron Taylor 2020-12-25 18:24:20 -05:00
parent 32b222db12
commit a0c74ae053
12 changed files with 43 additions and 19 deletions

View File

@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Clear section button to note editor
- Swap button in note editor
### Changed
- Made Spookeez on Normal easier.
- Mouse is now visible in note editor
### Fixed
- Crash when playing Week 3 and then playing a non-week 3 song

View File

@ -27,4 +27,5 @@ too many people--my head hurts
newgrounds--forever
refined taste in music--if i say so myself
his name isnt keith--dumb eggy lol
his name isnt evan--silly tiktok
his name isnt evan--silly tiktok
stream chuckie finster--on spotify

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -178,7 +178,7 @@ class ChartingState extends MusicBeatState
loadJson(_song.song.toLowerCase());
});
var loadAutosaveBtn:FlxButton = new FlxButton(reloadSongJson.x, reloadSongJson.y + 60, 'load autosave', loadAutosave);
var loadAutosaveBtn:FlxButton = new FlxButton(reloadSongJson.x, reloadSongJson.y + 30, 'load autosave', loadAutosave);
var stepperSpeed:FlxUINumericStepper = new FlxUINumericStepper(10, 80, 0.1, 1, 0.1, 10, 1);
stepperSpeed.value = _song.speed;
@ -510,21 +510,43 @@ class ChartingState extends MusicBeatState
changeSection(curSection);
}
if (FlxG.keys.pressed.W || FlxG.keys.pressed.S)
if (!FlxG.keys.pressed.SHIFT)
{
FlxG.sound.music.pause();
vocals.pause();
var daTime:Float = 700 * FlxG.elapsed;
if (FlxG.keys.pressed.W)
if (FlxG.keys.pressed.W || FlxG.keys.pressed.S)
{
FlxG.sound.music.time -= daTime;
}
else
FlxG.sound.music.time += daTime;
FlxG.sound.music.pause();
vocals.pause();
vocals.time = FlxG.sound.music.time;
var daTime:Float = 700 * FlxG.elapsed;
if (FlxG.keys.pressed.W)
{
FlxG.sound.music.time -= daTime;
}
else
FlxG.sound.music.time += daTime;
vocals.time = FlxG.sound.music.time;
}
}
else
{
if (FlxG.keys.justPressed.W || FlxG.keys.justPressed.S)
{
FlxG.sound.music.pause();
vocals.pause();
var daTime:Float = Conductor.stepCrochet * 2;
if (FlxG.keys.justPressed.W)
{
FlxG.sound.music.time -= daTime;
}
else
FlxG.sound.music.time += daTime;
vocals.time = FlxG.sound.music.time;
}
}
}

View File

@ -22,7 +22,7 @@ class MainMenuState extends MusicBeatState
var menuItems:FlxTypedGroup<FlxSprite>;
#if !switch
var optionShit:Array<String> = ['story mode', 'freeplay', 'donate'];
var optionShit:Array<String> = ['story mode', 'freeplay', 'options', 'donate'];
#else
var optionShit:Array<String> = ['story mode', 'freeplay'];
#end

View File

@ -20,9 +20,9 @@ class OutdatedSubState extends MusicBeatState
var txt:FlxText = new FlxText(0, 0, FlxG.width,
"HEY! You're running an outdated version of the game!\nCurrent version is "
+ ver
+ " while the current version is "
+ " while the most recent version is "
+ NGio.GAME_VER
+ " ! Press Space to go to itch.io, or ESCAPE to ignore this!!",
+ "! Press Space to go to itch.io, or ESCAPE to ignore this!!",
32);
txt.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, CENTER);
txt.screenCenter();