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

Fix note positioning

Browse Source
This commit is contained in:
CuckyDev 2021-07-11 18:04:30 -04:00
parent 910105b852
commit ad89799f58
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/Note.hx
View File

@ -67,7 +67,12 @@ class Note extends FlxSprite
this.prevNote = prevNote; this.prevNote = prevNote;
isSustainNote = sustainNote; isSustainNote = sustainNote;
x += 50; this.noteData = noteData;
if (!inCharter)
x = PlayState.strumLineNotes.members[Math.floor(Math.abs(noteData))].x;
else
x += 50;
// MAKE SURE ITS DEFINITELY OFF SCREEN? // MAKE SURE ITS DEFINITELY OFF SCREEN?
y -= 2000; y -= 2000;
@ -86,8 +91,6 @@ class Note extends FlxSprite
if (this.strumTime < 0 ) if (this.strumTime < 0 )
this.strumTime = 0; this.strumTime = 0;
this.noteData = noteData;
var daStage:String = PlayState.curStage; var daStage:String = PlayState.curStage;
//defaults if no noteStyle was found in chart //defaults if no noteStyle was found in chart
@ -177,20 +180,20 @@ class Note extends FlxSprite
noteScore * 0.2; noteScore * 0.2;
alpha = 0.6; alpha = 0.6;
x += width / 2; x += width / 2 + 17;
if (noteTypeCheck == 'pixel')
x -= 8;
//x += width / 2;
originColor = prevNote.originColor; originColor = prevNote.originColor;
animation.play(dataColor[originColor] + 'holdend'); // This works both for normal colors and quantization colors animation.play(dataColor[originColor] + 'holdend'); // This works both for normal colors and quantization colors
updateHitbox(); updateHitbox();
x -= width / 2; //x -= width / 2;
if (noteTypeCheck == 'pixel') //if (PlayState.curStage.startsWith('school'))
x += 30; // x += 30;
if (inCharter)
x += 30;
if (prevNote.isSustainNote) if (prevNote.isSustainNote)
{ {

27
source/PlayState.hx
View File

@ -997,6 +997,9 @@ class PlayState extends MusicBeatState
playerStrums = new FlxTypedGroup<FlxSprite>(); playerStrums = new FlxTypedGroup<FlxSprite>();
cpuStrums = new FlxTypedGroup<FlxSprite>(); cpuStrums = new FlxTypedGroup<FlxSprite>();
generateStaticArrows(0);
generateStaticArrows(1);
// startCountdown(); // startCountdown();
if (SONG.song == null) if (SONG.song == null)
@ -1308,8 +1311,9 @@ class PlayState extends MusicBeatState
{ {
inCutscene = false; inCutscene = false;
generateStaticArrows(0); appearStaticArrows();
generateStaticArrows(1); //generateStaticArrows(0);
//generateStaticArrows(1);
#if windows #if windows
// pre lowercasing the song name (startCountdown) // pre lowercasing the song name (startCountdown)
@ -1796,9 +1800,6 @@ class PlayState extends MusicBeatState
{ {
swagNote.x += FlxG.width / 2; // general offset swagNote.x += FlxG.width / 2; // general offset
} }
else
{
}
} }
daBeats += 1; daBeats += 1;
} }
@ -1901,10 +1902,11 @@ class PlayState extends MusicBeatState
babyArrow.updateHitbox(); babyArrow.updateHitbox();
babyArrow.scrollFactor.set(); babyArrow.scrollFactor.set();
babyArrow.alpha = 0;
if (!isStoryMode) if (!isStoryMode)
{ {
babyArrow.y -= 10; babyArrow.y -= 10;
babyArrow.alpha = 0; //babyArrow.alpha = 0;
FlxTween.tween(babyArrow, {y: babyArrow.y + 10, alpha: 1}, 1, {ease: FlxEase.circOut, startDelay: 0.5 + (0.2 * i)}); FlxTween.tween(babyArrow, {y: babyArrow.y + 10, alpha: 1}, 1, {ease: FlxEase.circOut, startDelay: 0.5 + (0.2 * i)});
} }
@ -1934,6 +1936,15 @@ class PlayState extends MusicBeatState
} }
} }
private function appearStaticArrows():Void
{
strumLineNotes.forEach(function(babyArrow:FlxSprite)
{
if (isStoryMode)
babyArrow.alpha = 1;
});
}
function tweenCamIn():Void function tweenCamIn():Void
{ {
FlxTween.tween(FlxG.camera, {zoom: 1.3}, (Conductor.stepCrochet * 4 / 1000), {ease: FlxEase.elasticInOut}); FlxTween.tween(FlxG.camera, {zoom: 1.3}, (Conductor.stepCrochet * 4 / 1000), {ease: FlxEase.elasticInOut});
@ -2796,7 +2807,11 @@ class PlayState extends MusicBeatState
} }
if (daNote.isSustainNote) if (daNote.isSustainNote)
{
daNote.x += daNote.width / 2 + 17; daNote.x += daNote.width / 2 + 17;
if (PlayState.curStage.startsWith('school'))
daNote.x -= 8;
}
// trace(daNote.y); // trace(daNote.y);
// WIP interpolation shit? Need to fix the pause issue // WIP interpolation shit? Need to fix the pause issue