Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
TheRealJake12 committed Jan 28, 2024
1 parent 77062a1 commit b1cb691
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion source/Character.hx
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ class Character extends FlxSprite
var daOffset = animOffsets.get(AnimName);
if (animOffsets.exists(AnimName))
{
offset.set(daOffset[0], daOffset[1]);
offset.set(daOffset[0] * scale.x, daOffset[1] * scale.y);
}
else
offset.set(0, 0);
Expand Down
1 change: 1 addition & 0 deletions source/CoolUtil.hx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import flixel.graphics.frames.FlxBitmapFont;
import flixel.text.FlxBitmapText;
#if VIDEOS
import hxvlc.flixel.FlxVideo as VideoHandler;
import hxvlc.libvlc.Handle;
#end
#if FEATURE_FILESYSTEM
import sys.io.File;
Expand Down
14 changes: 7 additions & 7 deletions source/Note.hx
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,12 @@ class Note extends FlxSprite
{
prevNote.animation.play(dataColor[prevNote.originColor] + 'hold');
prevNote.updateHitbox();

prevNote.scale.y *= (stepHeight / prevNote.height);
prevNote.updateHitbox();

if (noteTypeCheck != 'pixel')
prevNote.scale.y *= 1.0 + (1.0 / prevNote.frameHeight) * 1.05;

prevNote.updateHitbox();
updateHitbox();
}
}
else if (!isSustainNote)
Expand Down Expand Up @@ -359,11 +356,14 @@ class Note extends FlxSprite
centerOffsets();
centerOrigin();
}
}

if (isSustainNote)
{
scale.y = lastScaleY;
}
if (noteTypeCheck != 'pixel')
{
if (isSustainNote)
{
scale.y = lastScaleY;
}
}

prevNote.updateHitbox();
Expand Down
4 changes: 2 additions & 2 deletions source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ class PlayState extends MusicBeatState
switch (index)
{
case 0:
if (Stage.hasGF && gf != null)
if (gf != null)
{
add(gfGroup);
gf.scrollFactor.set(0.95, 0.95);
Expand All @@ -859,7 +859,7 @@ class PlayState extends MusicBeatState
}
else
{
if (Stage.hasGF && gf != null)
if (gf != null)
{
add(gfGroup);
gf.scrollFactor.set(0.95, 0.95);
Expand Down
3 changes: 3 additions & 0 deletions source/debug/StageDebugState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ class StageDebugState extends MusicBeatState
UI_options.resize(300, 200);
UI_options.x = FlxG.width - UI_options.width - 20;
UI_options.y = FlxG.height - 300;
UI_options.color = FlxColor.fromRGB(40, 40, 40);
add(UI_options);

posText = new FlxText(0, 690);
Expand Down Expand Up @@ -305,6 +306,8 @@ class StageDebugState extends MusicBeatState
dad.setPosition(gf.x, gf.y);
}

hasGF.checked = Stage.hasGF;

if (!gf.visible || !Stage.hasGF) // for when gf is an opponent
curChars.pop();
curChar = curChars[curCharIndex];
Expand Down

0 comments on commit b1cb691

Please sign in to comment.