Skip to content

Commit

Permalink
welp
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesisfeline committed Nov 12, 2023
1 parent 0c36b50 commit 7a15352
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion source/states/FlashingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class FlashingState extends MusicBeatState
Press ESCAPE to ignore this message.\n
You've been warned!",
32);
warnText.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, CENTER);
warnText.setFormat(Paths.font("vcr.ttf"), 32, FlxColor.WHITE, CENTER);
warnText.screenCenter(Y);
add(warnText);
}
Expand Down
9 changes: 8 additions & 1 deletion source/states/LoadingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class LoadingState extends MusicBeatState
{
inline static var MIN_TIME = 1.0;

// TO DO: Make this easier
// TO DO: Make this easier, and uhhh fix the load screen so the game doesn't softlock at the end of the point

var target:FlxState;
var stopMusic = false;
Expand All @@ -41,6 +41,13 @@ class LoadingState extends MusicBeatState
var bg:FlxSprite = new FlxSprite(0, 0).makeGraphic(FlxG.width, FlxG.height, 0xffcaff4d);
bg.antialiasing = ClientPrefs.data.antialiasing;
add(bg);

var grid:FlxBackdrop = new FlxBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x33525252, 0x0));
grid.velocity.set(40, 40);
grid.alpha = 0;
FlxTween.tween(grid, {alpha: 1}, 0.5, {ease: FlxEase.quadOut});
add(grid);

funkay = new FlxSprite(0, 0).loadGraphic(Paths.getPath('images/funkay.png', IMAGE));
funkay.setGraphicSize(0, FlxG.height);
funkay.updateHitbox();
Expand Down
3 changes: 1 addition & 2 deletions source/states/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -3468,8 +3468,7 @@ class PlayState extends MusicBeatState
var shits:Int = ratingsData[3].hits;

ratingFC = 'Clear';
if(songMisses < 1)
{
if(songMisses < 1){
if (bads > 0 || shits > 0) ratingFC = 'FC';
else if (goods > 0) ratingFC = 'GFC';
else if (sicks > 0) ratingFC = 'SFC';
Expand Down

0 comments on commit 7a15352

Please sign in to comment.