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

Merge branch 'master' of https://github.com/KadeDev/Kade-Engine

Browse Source
This commit is contained in:
Kade M 2021-07-12 13:27:40 -07:00
commit c69e83d8e0
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/AnimationDebug.hx
View File

@ -118,6 +118,9 @@ class AnimationDebug extends FlxState
if (FlxG.keys.justPressed.Q) if (FlxG.keys.justPressed.Q)
FlxG.camera.zoom -= 0.25; FlxG.camera.zoom -= 0.25;
if (FlxG.keys.justPressed.F)
char.flipX = !char.flipX;
if (FlxG.keys.pressed.I || FlxG.keys.pressed.J || FlxG.keys.pressed.K || FlxG.keys.pressed.L) if (FlxG.keys.pressed.I || FlxG.keys.pressed.J || FlxG.keys.pressed.K || FlxG.keys.pressed.L)
{ {
if (FlxG.keys.pressed.I) if (FlxG.keys.pressed.I)

5
source/GameplayCustomizeState.hx
View File

@ -33,6 +33,7 @@ class GameplayCustomizeState extends MusicBeatState
var bf:Boyfriend; var bf:Boyfriend;
var dad:Character; var dad:Character;
var gf:Character;
var strumLine:FlxSprite; var strumLine:FlxSprite;
var strumLineNotes:FlxTypedGroup<FlxSprite>; var strumLineNotes:FlxTypedGroup<FlxSprite>;
@ -74,10 +75,14 @@ class GameplayCustomizeState extends MusicBeatState
bf = new Boyfriend(770, 450, 'bf'); bf = new Boyfriend(770, 450, 'bf');
gf = new Character(400, 130, 'gf');
gf.scrollFactor.set(0.95, 0.95);
var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x + 400, dad.getGraphicMidpoint().y); var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x + 400, dad.getGraphicMidpoint().y);
camFollow.setPosition(camPos.x, camPos.y); camFollow.setPosition(camPos.x, camPos.y);
add(gf);
add(bf); add(bf);
add(dad); add(dad);

14
source/Note.hx
View File

@ -178,6 +178,8 @@ class Note extends FlxSprite
if (FlxG.save.data.downscroll && sustainNote) if (FlxG.save.data.downscroll && sustainNote)
flipY = true; flipY = true;
var stepHeight = (0.45 * Conductor.stepCrochet * FlxMath.roundDecimal(PlayStateChangeables.scrollSpeed == 1 ? PlayState.SONG.speed : PlayStateChangeables.scrollSpeed, 2));
if (isSustainNote && prevNote != null) if (isSustainNote && prevNote != null)
{ {
noteScore * 0.2; noteScore * 0.2;
@ -202,19 +204,13 @@ class Note extends FlxSprite
prevNote.animation.play(dataColor[prevNote.originColor] + 'hold'); prevNote.animation.play(dataColor[prevNote.originColor] + 'hold');
prevNote.updateHitbox(); prevNote.updateHitbox();
prevNote.noteYOff = 0; prevNote.scale.y *= (stepHeight + 1) / prevNote.height; // + 1 so that there's no odd gaps as the notes scroll
prevNote.scale.y *= (0.45 * Conductor.stepCrochet * FlxMath.roundDecimal(PlayStateChangeables.scrollSpeed == 1 ? PlayState.SONG.speed : PlayStateChangeables.scrollSpeed, 2)) / prevNote.height * 1.01; //The 1.01 is so that there aren't odd 1 pixel gaps as the notes scroll
prevNote.updateHitbox(); prevNote.updateHitbox();
prevNote.noteYOff = Math.round(-prevNote.offset.y);
// prevNote.setGraphicSize(); // prevNote.setGraphicSize();
switch (noteTypeCheck) noteYOff = Math.round(-offset.y);
{
case 'pixel':
noteYOff = -13;
default:
noteYOff = -23;
}
} }
} }
} }

4
source/PlayState.hx
View File

@ -2825,9 +2825,9 @@ class PlayState extends MusicBeatState
if (daNote.isSustainNote) if (daNote.isSustainNote)
{ {
daNote.x += daNote.width / 2 + 17; daNote.x += daNote.width / 2 + 20;
if (PlayState.curStage.startsWith('school')) if (PlayState.curStage.startsWith('school'))
daNote.x -= 8; daNote.x -= 11;
} }
// trace(daNote.y); // trace(daNote.y);