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

fybb

Browse Source
This commit is contained in:
Kade M 2021-06-04 14:31:13 -07:00
parent a79b29ce14
commit 8ed8942323
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/ChartingState.hx
View File

@ -129,7 +129,7 @@ class ChartingState extends MusicBeatState
blackBorder.alpha = 0.3; 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(); snapText.scrollFactor.set();
gridBlackLine = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK); 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 writingNotes:Bool = false;
var doSnapShit:Bool = false;
override function update(elapsed:Float) override function update(elapsed:Float)
{ {
@ -674,14 +675,18 @@ class ChartingState extends MusicBeatState
writingNotes = !writingNotes; writingNotes = !writingNotes;
} }
if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.RIGHT) /*if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.RIGHT)
snap = snap * 2; snap = snap * 2;
if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.LEFT) if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.LEFT)
snap = Math.round(snap / 2); snap = Math.round(snap / 2);
if (snap >= 192) if (snap >= 192)
snap = 192; snap = 192;
if (snap <= 1) if (snap <= 1)
snap = 1; snap = 1;*/
if (FlxG.keys.justPressed.CONTROL)
doSnapShit = false;
Conductor.songPosition = FlxG.sound.music.time; Conductor.songPosition = FlxG.sound.music.time;
_song.song = typingShit.text; _song.song = typingShit.text;
@ -946,13 +951,16 @@ class ChartingState extends MusicBeatState
var stepMs = curStep * Conductor.stepCrochet; var stepMs = curStep * Conductor.stepCrochet;
if (FlxG.sound.music.time < 0) if (FlxG.sound.music.time < 0 || curStep < 0)
FlxG.sound.music.time = 0; FlxG.sound.music.time = 0;
trace(Conductor.stepCrochet / snap); trace(Conductor.stepCrochet / snap);
if (doSnapShit)
FlxG.sound.music.time = (stepMs + (Conductor.stepCrochet / snap)) * FlxG.mouse.wheel; 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); trace(stepMs + " + " + Conductor.stepCrochet / snap + " -> " + FlxG.sound.music.time);
vocals.time = FlxG.sound.music.time; vocals.time = FlxG.sound.music.time;

3
source/ModchartState.hx
View File

@ -403,7 +403,8 @@ class ModchartState
Lua_helper.add_callback(lua,"getProperty", getPropertyByName); 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) { Lua_helper.add_callback(lua,"destroySprite", function(id:String) {
var sprite = luaSprites.get(id); var sprite = luaSprites.get(id);

1
source/Note.hx
View File

@ -193,6 +193,7 @@ class Note extends FlxSprite
// ass // ass
if (isSustainNote) if (isSustainNote)
{ {
trace('sustain note');
if (strumTime > Conductor.songPosition - (Conductor.safeZoneOffset * 1.5) if (strumTime > Conductor.songPosition - (Conductor.safeZoneOffset * 1.5)
&& strumTime < Conductor.songPosition + (Conductor.safeZoneOffset * 0.5)) && strumTime < Conductor.songPosition + (Conductor.safeZoneOffset * 0.5))
canBeHit = true; canBeHit = true;

2
source/PlayState.hx
View File

@ -2940,7 +2940,7 @@ class PlayState extends MusicBeatState
if(dontCheck && possibleNotes.length > 0 && FlxG.save.data.ghost && !FlxG.save.data.botplay) if(dontCheck && possibleNotes.length > 0 && FlxG.save.data.ghost && !FlxG.save.data.botplay)
{ {
if (mashViolations > 4) if (mashViolations > 8)
{ {
trace('mash violations ' + mashViolations); trace('mash violations ' + mashViolations);
scoreTxt.color = FlxColor.RED; scoreTxt.color = FlxColor.RED;