diff --git a/source/ChartingState.hx b/source/ChartingState.hx index 4f99b73..9e2ccb2 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -129,7 +129,7 @@ class ChartingState extends MusicBeatState blackBorder.alpha = 0.3; - snapText = new FlxText(60,10,0,"Snap: 1/" + snap + " (Control + Left or Right to change.)\nAdd Notes: 1-8 (or click)\n", 14); + snapText = new FlxText(60,10,0,"Snap: 1/" + snap + " (Press Control to unsnap the cursor)\nAdd Notes: 1-8 (or click)\n", 14); snapText.scrollFactor.set(); gridBlackLine = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK); @@ -660,6 +660,7 @@ class ChartingState extends MusicBeatState } var writingNotes:Bool = false; + var doSnapShit:Bool = false; override function update(elapsed:Float) { @@ -674,14 +675,18 @@ class ChartingState extends MusicBeatState writingNotes = !writingNotes; } - if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.RIGHT) + /*if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.RIGHT) snap = snap * 2; if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.LEFT) snap = Math.round(snap / 2); if (snap >= 192) snap = 192; if (snap <= 1) - snap = 1; + snap = 1;*/ + + if (FlxG.keys.justPressed.CONTROL) + doSnapShit = false; + Conductor.songPosition = FlxG.sound.music.time; _song.song = typingShit.text; @@ -946,13 +951,16 @@ class ChartingState extends MusicBeatState var stepMs = curStep * Conductor.stepCrochet; - if (FlxG.sound.music.time < 0) + if (FlxG.sound.music.time < 0 || curStep < 0) FlxG.sound.music.time = 0; trace(Conductor.stepCrochet / snap); - FlxG.sound.music.time = (stepMs + (Conductor.stepCrochet / snap)) * FlxG.mouse.wheel; + if (doSnapShit) + FlxG.sound.music.time = (stepMs + (Conductor.stepCrochet / snap)) * FlxG.mouse.wheel; + else + FlxG.sound.music.time = (stepMs + (Conductor.stepCrochet / 16)) * FlxG.mouse.wheel; trace(stepMs + " + " + Conductor.stepCrochet / snap + " -> " + FlxG.sound.music.time); vocals.time = FlxG.sound.music.time; diff --git a/source/ModchartState.hx b/source/ModchartState.hx index 8362853..c5e3ca3 100644 --- a/source/ModchartState.hx +++ b/source/ModchartState.hx @@ -251,7 +251,7 @@ class ModchartState PlayState.instance.addObject(PlayState.boyfriend); PlayState.instance.iconP2.animation.play(id); } - + function makeAnimatedLuaSprite(spritePath:String,names:Array,prefixes:Array,startAnim:String, id:String) { #if sys @@ -403,7 +403,8 @@ class ModchartState Lua_helper.add_callback(lua,"getProperty", getPropertyByName); - Lua_helper.add_callback(lua,"makeAnimatedSprite", makeAnimatedLuaSprite); + // Lua_helper.add_callback(lua,"makeAnimatedSprite", makeAnimatedLuaSprite); + // this one is still in development Lua_helper.add_callback(lua,"destroySprite", function(id:String) { var sprite = luaSprites.get(id); diff --git a/source/Note.hx b/source/Note.hx index 657010b..bf36ed4 100644 --- a/source/Note.hx +++ b/source/Note.hx @@ -193,6 +193,7 @@ class Note extends FlxSprite // ass if (isSustainNote) { + trace('sustain note'); if (strumTime > Conductor.songPosition - (Conductor.safeZoneOffset * 1.5) && strumTime < Conductor.songPosition + (Conductor.safeZoneOffset * 0.5)) canBeHit = true; diff --git a/source/PlayState.hx b/source/PlayState.hx index c796f83..99d320e 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2940,7 +2940,7 @@ class PlayState extends MusicBeatState if(dontCheck && possibleNotes.length > 0 && FlxG.save.data.ghost && !FlxG.save.data.botplay) { - if (mashViolations > 4) + if (mashViolations > 8) { trace('mash violations ' + mashViolations); scoreTxt.color = FlxColor.RED;