revert it because im so fucking sick and tired of this bullshit
This commit is contained in:
Kade M
parent
22f99d1f1f
commit
9e22af2d28
@ -25,7 +25,6 @@ class Note extends FlxSprite
|
||||
public var prevNote:Note;
|
||||
public var modifiedByLua:Bool = false;
|
||||
public var sustainLength:Float = 0;
|
||||
public var hit:Bool = false;
|
||||
public var isSustainNote:Bool = false;
|
||||
|
||||
public var noteScore:Float = 1;
|
||||
@ -51,9 +50,7 @@ class Note extends FlxSprite
|
||||
x += 50;
|
||||
// MAKE SURE ITS DEFINITELY OFF SCREEN?
|
||||
y -= 2000;
|
||||
|
||||
// Take half the sprite's height to compensate for the offset down below
|
||||
this.strumTime = strumTime - frameHeight / 2;
|
||||
this.strumTime = strumTime;
|
||||
|
||||
if (this.strumTime < 0 )
|
||||
this.strumTime = 0;
|
||||
@ -128,16 +125,20 @@ class Note extends FlxSprite
|
||||
animation.play('redScroll');
|
||||
}
|
||||
|
||||
// trace(prevNote);
|
||||
|
||||
// we make sure its downscroll and its a SUSTAIN NOTE (aka a trail, not a note)
|
||||
// and flip it so it doesn't look weird.
|
||||
// THIS DOESN'T FUCKING FLIP THE NOTE, CONTRIBUTERS DON'T JUST COMMENT THIS OUT JESUS
|
||||
if (FlxG.save.data.downscroll && sustainNote)
|
||||
flipY = true;
|
||||
|
||||
if (isSustainNote && prevNote != null)
|
||||
{
|
||||
noteScore * 0.2;
|
||||
alpha = 0.6;
|
||||
|
||||
x += width / 2;
|
||||
|
||||
flipY = true;
|
||||
|
||||
offset.y = frameHeight;
|
||||
|
||||
switch (noteData)
|
||||
{
|
||||
@ -160,8 +161,6 @@ class Note extends FlxSprite
|
||||
|
||||
if (prevNote.isSustainNote)
|
||||
{
|
||||
if(!FlxG.save.data.downscroll) flipY = false;
|
||||
|
||||
switch (prevNote.noteData)
|
||||
{
|
||||
case 0:
|
||||
@ -174,15 +173,11 @@ class Note extends FlxSprite
|
||||
prevNote.animation.play('redhold');
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(FlxG.save.data.scrollSpeed != 1)
|
||||
prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * FlxG.save.data.scrollSpeed;
|
||||
else
|
||||
prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * PlayState.SONG.speed;
|
||||
|
||||
|
||||
|
||||
|
||||
prevNote.updateHitbox();
|
||||
// prevNote.setGraphicSize();
|
||||
}
|
||||
@ -230,4 +225,4 @@ class Note extends FlxSprite
|
||||
alpha = 0.3;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2202,38 +2202,28 @@ class PlayState extends MusicBeatState
|
||||
daNote.y = (playerStrums.members[Math.floor(Math.abs(daNote.noteData))].y + 0.45 * (Conductor.songPosition - daNote.strumTime) * FlxMath.roundDecimal(FlxG.save.data.scrollSpeed == 1 ? SONG.speed : FlxG.save.data.scrollSpeed, 2));
|
||||
else
|
||||
daNote.y = (strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].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.frameHeight / 2;
|
||||
|
||||
if(daNote.animation.curAnim.name.endsWith('holdend'))
|
||||
{
|
||||
daNote.y = daNote.prevNote.y - daNote.offset.y * 2;
|
||||
|
||||
if (daNote.prevNote.hit)
|
||||
{
|
||||
daNote.visible = false;
|
||||
}
|
||||
|
||||
if(SONG.noteStyle == 'pixel')
|
||||
daNote.y += daNote.offset.y * 2;
|
||||
}
|
||||
|
||||
// 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 not in botplay, only clip sustain notes when properly hit, botplay gets to clip it everytime
|
||||
if(!FlxG.save.data.botplay)
|
||||
{
|
||||
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 * 4);
|
||||
var swagRect = new FlxRect(0, 0, daNote.frameWidth * 2, daNote.frameHeight * 2);
|
||||
swagRect.height = (strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].y + Note.swagWidth / 2 - daNote.y) / daNote.scale.y;
|
||||
swagRect.y = daNote.frameHeight - swagRect.height;
|
||||
|
||||
daNote.clipRect = swagRect;
|
||||
}
|
||||
}else {
|
||||
var swagRect = new FlxRect(0, 0, daNote.frameWidth * 2, daNote.frameHeight * 4);
|
||||
var swagRect = new FlxRect(0, 0, daNote.frameWidth * 2, daNote.frameHeight * 2);
|
||||
swagRect.height = (strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].y + Note.swagWidth / 2 - daNote.y) / daNote.scale.y;
|
||||
swagRect.y = daNote.frameHeight - swagRect.height;
|
||||
|
||||
@ -2246,37 +2236,10 @@ class PlayState extends MusicBeatState
|
||||
daNote.y = (playerStrums.members[Math.floor(Math.abs(daNote.noteData))].y - 0.45 * (Conductor.songPosition - daNote.strumTime) * FlxMath.roundDecimal(FlxG.save.data.scrollSpeed == 1 ? SONG.speed : FlxG.save.data.scrollSpeed, 2));
|
||||
else
|
||||
daNote.y = (strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].y - 0.45 * (Conductor.songPosition - daNote.strumTime) * FlxMath.roundDecimal(FlxG.save.data.scrollSpeed == 1 ? SONG.speed : FlxG.save.data.scrollSpeed, 2));
|
||||
|
||||
if(daNote.isSustainNote)
|
||||
{
|
||||
// Don't look at this goofy ass shit, my hatred for upscroll knows no bounds
|
||||
// I personally love upscroll and I fixed this code - Kade
|
||||
daNote.y += daNote.frameHeight / 2;
|
||||
|
||||
daNote.offset.y = -daNote.frameHeight - 15;
|
||||
|
||||
|
||||
if(SONG.noteStyle == 'pixel')
|
||||
daNote.y += daNote.height / 2;
|
||||
|
||||
daNote.y -= daNote.height / 2;
|
||||
|
||||
if(daNote.animation.curAnim.name.endsWith('holdend'))
|
||||
{
|
||||
daNote.y = daNote.prevNote.y + daNote.prevNote.height / 2 + daNote.frameHeight / 6;
|
||||
|
||||
daNote.offset.y = -daNote.prevNote.frameHeight + 6;
|
||||
|
||||
if (daNote.prevNote.hit)
|
||||
{
|
||||
daNote.y -= 50;
|
||||
daNote.visible = false;
|
||||
}
|
||||
|
||||
if(SONG.noteStyle == 'pixel')
|
||||
daNote.y += daNote.offset.y / 2;
|
||||
}
|
||||
|
||||
|
||||
if(!FlxG.save.data.botplay)
|
||||
{
|
||||
if((!daNote.mustPress || daNote.wasGoodHit || daNote.prevNote.wasGoodHit && !daNote.canBeHit) && daNote.y + daNote.offset.y * daNote.scale.y <= (strumLine.y + Note.swagWidth / 2))
|
||||
@ -2298,6 +2261,7 @@ class PlayState extends MusicBeatState
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!daNote.mustPress && daNote.wasGoodHit)
|
||||
{
|
||||
@ -2355,10 +2319,8 @@ class PlayState extends MusicBeatState
|
||||
|
||||
daNote.active = false;
|
||||
|
||||
daNote.hit = true;
|
||||
|
||||
daNote.kill();
|
||||
daNote.hit = true;
|
||||
notes.remove(daNote, true);
|
||||
daNote.destroy();
|
||||
}
|
||||
@ -2392,19 +2354,10 @@ class PlayState extends MusicBeatState
|
||||
|
||||
if ((daNote.mustPress && daNote.tooLate && !FlxG.save.data.downscroll || daNote.mustPress && daNote.tooLate && FlxG.save.data.downscroll) && daNote.mustPress)
|
||||
{
|
||||
if (!daNote.visible)
|
||||
{
|
||||
notes.remove(daNote, true);
|
||||
daNote.kill();
|
||||
daNote.destroy();
|
||||
}
|
||||
else
|
||||
{
|
||||
if (daNote.isSustainNote && daNote.wasGoodHit)
|
||||
{
|
||||
daNote.kill();
|
||||
notes.remove(daNote, true);
|
||||
daNote.destroy();
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -2415,12 +2368,10 @@ class PlayState extends MusicBeatState
|
||||
}
|
||||
|
||||
daNote.visible = false;
|
||||
daNote.hit = true;
|
||||
daNote.kill();
|
||||
notes.remove(daNote, true);
|
||||
daNote.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
@ -2942,7 +2893,6 @@ class PlayState extends MusicBeatState
|
||||
{
|
||||
FlxG.log.add("killing dumb ass note at " + note.strumTime);
|
||||
note.kill();
|
||||
note.hit = true;
|
||||
notes.remove(note, true);
|
||||
note.destroy();
|
||||
}
|
||||
@ -3258,7 +3208,6 @@ class PlayState extends MusicBeatState
|
||||
vocals.volume = 1;
|
||||
|
||||
note.kill();
|
||||
note.hit = true;
|
||||
notes.remove(note, true);
|
||||
note.destroy();
|
||||
|
||||
|
||||
@ -1 +1,10 @@
|
||||
1.4.2
|
||||
1.5;
|
||||
- Added toggle for ghost tapping
|
||||
- Officially support macOS (and add macOS requirements to docs)
|
||||
- Autoplay
|
||||
- Clap assist for syncing charts
|
||||
- Bring back R to reset, but now you can toggle it in the options
|
||||
- You can now fully customize your keybinds
|
||||
- Change how replays work + store scroll speed and direction in replays
|
||||
- Opponent strumline now lights up when they hit a note, like the player's does
|
||||
- Now using the new recharts from Funkin v0.2.8
|
||||
Loading…
x
Reference in New Issue
Block a user