Skip to content

Commit

Permalink
Icon bop toggle (#320)
Browse files Browse the repository at this point in the history
* Icon bop toggle

* Disabled Icon lerping too

* fixin the format n shit

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
  • Loading branch information
usb-port-2 and NexIsDumb authored Jun 17, 2024
1 parent 823c1a7 commit 7b5d975
Showing 1 changed file with 18 additions and 10 deletions.
28 changes: 18 additions & 10 deletions source/funkin/game/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,13 @@ class PlayState extends MusicBeatState
*/
public var canAccessDebugMenus:Bool = true;
/**
* Wether or not to show the secret gitaroo pause.
* Whether or not to show the secret gitaroo pause.
*/
public var allowGitaroo:Bool = true;
/**
* Whether or not to bop the icons on beat.
*/
public var doIconBop:Bool = true;

/**
* Whenever cam zooming is enabled, enables on a note hit if not cancelled.
Expand Down Expand Up @@ -1231,12 +1235,13 @@ class PlayState extends MusicBeatState
}
}

iconP1.scale.set(lerp(iconP1.scale.x, 1, 0.33), lerp(iconP1.scale.y, 1, 0.33));
iconP2.scale.set(lerp(iconP2.scale.x, 1, 0.33), lerp(iconP2.scale.y, 1, 0.33));

iconP1.updateHitbox();
iconP2.updateHitbox();
if (doIconBop) {
iconP1.scale.set(lerp(iconP1.scale.x, 1, 0.33), lerp(iconP1.scale.y, 1, 0.33));
iconP2.scale.set(lerp(iconP2.scale.x, 1, 0.33), lerp(iconP2.scale.y, 1, 0.33));

iconP1.updateHitbox();
iconP2.updateHitbox();
}
updateIconPositions();

if (startingSong)
Expand Down Expand Up @@ -1784,11 +1789,14 @@ class PlayState extends MusicBeatState
camHUD.zoom += 0.03 * camZoomingStrength;
}

iconP1.scale.set(1.2, 1.2);
iconP2.scale.set(1.2, 1.2);
if (doIconBop)
{
iconP1.scale.set(1.2, 1.2);
iconP2.scale.set(1.2, 1.2);

iconP1.updateHitbox();
iconP2.updateHitbox();
iconP1.updateHitbox();
iconP2.updateHitbox();
}

scripts.call("beatHit", [curBeat]);
}
Expand Down

0 comments on commit 7b5d975

Please sign in to comment.