Skip to content
This repository has been archived by the owner on Nov 9, 2024. It is now read-only.

Commit

Permalink
fixed BF staring into space.
Browse files Browse the repository at this point in the history
  • Loading branch information
RadiantCorium committed May 31, 2022
1 parent 6f538fb commit a4fb7e6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
12 changes: 12 additions & 0 deletions source/states/gameplay/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -2038,6 +2038,7 @@ class PlayState extends MusicBeatState

if (upP)
{
boyfriend.holdTimer = 0;
if (!FlxG.overlap(notes, playerStrums))
{
// we didn't hit shit.
Expand Down Expand Up @@ -2065,6 +2066,7 @@ class PlayState extends MusicBeatState

if (downP)
{
boyfriend.holdTimer = 0;
if (!FlxG.overlap(notes, playerStrums))
{
// we didn't hit shit.
Expand Down Expand Up @@ -2092,6 +2094,7 @@ class PlayState extends MusicBeatState

if (leftP)
{
boyfriend.holdTimer = 0;
if (!FlxG.overlap(notes, playerStrums))
{
// we didn't hit shit.
Expand Down Expand Up @@ -2119,6 +2122,7 @@ class PlayState extends MusicBeatState

if (rightP)
{
boyfriend.holdTimer = 0;
if (!FlxG.overlap(notes, playerStrums))
{
// we didn't hit shit.
Expand Down Expand Up @@ -2220,6 +2224,14 @@ class PlayState extends MusicBeatState
});
}

if (boyfriend.holdTimer > Conductor.stepCrochet * 4 * 0.001 && !up && !down && !right && !left)
{
if (boyfriend.animation.curAnim.name.startsWith('sing') && !boyfriend.animation.curAnim.name.endsWith('miss'))
{
boyfriend.playAnim('idle');
}
}

playerStrums.forEach(function(spr:FlxSprite)
{
switch (spr.ID)
Expand Down
6 changes: 3 additions & 3 deletions source/states/menu/OptionsMenu.hx
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ class OptionsMenu extends MusicBeatState
]),
#if debug
new OptionGroup("Debug", [
new RangeOption("Good Timing %v", "Controls the timing window of good", 40, 100, 5, "DEBUG_goodTiming"),
new RangeOption("Bad Timing %v", "Controls the timing window of bad", 60, 100, 5, "DEBUG_badTiming"),
new RangeOption("Shit Timing %v", "Controls the timing window of shit", 75, 100, 5, "DEBUG_shitTiming"),
new RangeOption("Good Timing %v", "Controls the timing window of good", 22, 100, 2, "DEBUG_goodTiming"),
new RangeOption("Bad Timing %v", "Controls the timing window of bad", 38, 100, 2, "DEBUG_badTiming"),
new RangeOption("Shit Timing %v", "Controls the timing window of shit", 56, 100, 2, "DEBUG_shitTiming"),
])
#end
];
Expand Down

0 comments on commit a4fb7e6

Please sign in to comment.