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

troll city

Browse Source 
troll city
This commit is contained in:
CyndaquilDAC 2021-04-26 18:18:19 -05:00 committed by GitHub
commit 65e1d756af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
source/PlayState.hx
View File

@ -2596,6 +2596,49 @@ class PlayState extends MusicBeatState
daNote.active = true; daNote.active = true;
} }
if (!daNote.modifiedByLua)
{
if (FlxG.save.data.downscroll)
{
daNote.y = (strumLine.y + 0.45 * (Conductor.songPosition - daNote.strumTime) * FlxMath.roundDecimal(FlxG.save.data.scrollSpeed == 1 ? SONG.speed : FlxG.save.data.scrollSpeed, 2));
if(daNote.isSustainNote)
{
// Remember = minus makes notes go up, plus makes them go down
if(daNote.animation.curAnim.name.endsWith('end') && daNote.prevNote != null)
daNote.y += daNote.prevNote.height;
else
daNote.y += daNote.height / 2;
if((!daNote.mustPress || daNote.wasGoodHit || daNote.prevNote.wasGoodHit && !daNote.canBeHit) && daNote.y - daNote.offset.y * daNote.scale.y + daNote.height >= (strumLine.y + Note.swagWidth / 2))
{
// Clip to strumline
var swagRect = new FlxRect(0, 0, daNote.frameWidth * 2, daNote.frameHeight * 2);
swagRect.height = (strumLine.y + Note.swagWidth / 2 - daNote.y) / daNote.scale.y;
swagRect.y = daNote.frameHeight - swagRect.height;
daNote.clipRect = swagRect;
}
}
}else
{
daNote.y = (strumLine.y - 0.45 * (Conductor.songPosition - daNote.strumTime) * FlxMath.roundDecimal(FlxG.save.data.scrollSpeed == 1 ? SONG.speed : FlxG.save.data.scrollSpeed, 2));
if(daNote.isSustainNote)
{
daNote.y -= daNote.height / 2;
if((!daNote.mustPress || daNote.wasGoodHit || daNote.prevNote.wasGoodHit && !daNote.canBeHit) && daNote.y + daNote.offset.y * daNote.scale.y <= (strumLine.y + Note.swagWidth / 2))
{
// Clip to strumline
var swagRect = new FlxRect(0, 0, daNote.width / daNote.scale.x, daNote.height / daNote.scale.y);
swagRect.y = (strumLine.y + Note.swagWidth / 2 - daNote.y) / daNote.scale.y;
swagRect.height -= swagRect.y;
daNote.clipRect = swagRect;
}
}
}
}
if (!daNote.mustPress && daNote.wasGoodHit) if (!daNote.mustPress && daNote.wasGoodHit)
{ {
if (SONG.song != 'Tutorial') if (SONG.song != 'Tutorial')
@ -2638,14 +2681,6 @@ class PlayState extends MusicBeatState
daNote.destroy(); daNote.destroy();
} }
if (!daNote.modifiedByLua)
{
if (FlxG.save.data.downscroll)
daNote.y = (strumLine.y - (Conductor.songPosition - daNote.strumTime) * (-0.45 * FlxMath.roundDecimal(FlxG.save.data.scrollSpeed == 1 ? SONG.speed : FlxG.save.data.scrollSpeed, 2)));
else
daNote.y = (strumLine.y - (Conductor.songPosition - daNote.strumTime) * (0.45 * FlxMath.roundDecimal(FlxG.save.data.scrollSpeed == 1 ? SONG.speed : FlxG.save.data.scrollSpeed, 2)));
}
if (daNote.mustPress && !daNote.modifiedByLua) if (daNote.mustPress && !daNote.modifiedByLua)
{ {
daNote.visible = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].visible; daNote.visible = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].visible;
@ -3238,36 +3273,8 @@ class PlayState extends MusicBeatState
if (controlArray[coolNote.noteData]) if (controlArray[coolNote.noteData])
{ {
// ANTI MASH CODE FOR THE BOYS
if (mashing > getKeyPresses(coolNote) && mashViolations < 2)
{
mashViolations++;
goodNoteHit(coolNote, (mashing > getKeyPresses(coolNote))); goodNoteHit(coolNote, (mashing > getKeyPresses(coolNote)));
}
else
{
// this is bad but fuck you
playerStrums.members[0].animation.play('static');
playerStrums.members[1].animation.play('static');
playerStrums.members[2].animation.play('static');
playerStrums.members[3].animation.play('static');
health -= 0.2;
trace('mash ' + mashing);
}
if (mashing != 0)
mashing = 0;
}
else
{
var inIgnoreList:Bool = false;
for (shit in 0...ignoreList.length)
{
if (controlArray[ignoreList[shit]])
inIgnoreList = true;
}
} }
} }
} }
@ -3632,7 +3639,9 @@ class PlayState extends MusicBeatState
else if (controlArray[note.noteData]) else if (controlArray[note.noteData])
{ {
if (mashing > getKeyPresses(note) && mashViolations <= 2) goodNoteHit(note, (mashing > getKeyPresses(note)));
/*if (mashing > getKeyPresses(note) && mashViolations <= 2)
{ {
mashViolations++; mashViolations++;
@ -3651,7 +3660,7 @@ class PlayState extends MusicBeatState
mashing = 0; mashing = 0;
} }
else else
goodNoteHit(note, false); goodNoteHit(note, false);*/
} }
} }
@ -3859,7 +3868,7 @@ class PlayState extends MusicBeatState
if (generatedMusic) if (generatedMusic)
{ {
notes.sort(FlxSort.byY, FlxSort.DESCENDING); notes.sort(FlxSort.byY, (FlxG.save.data.downscroll ? FlxSort.ASCENDING : FlxSort.DESCENDING));
} }
#if windows #if windows