cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-24 19:09:21 +00:00
Code Issues Releases Wiki Activity

Revert "Moved scroll speed to an instance variable"

Browse source 
This reverts commit 6e5171b766.
This commit is contained in:
EliteMasterEric 2024-05-02 23:06:01 -04:00
parent a2aa1bd84a
commit 5e63832a87
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/funkin/play/PlayState.hx
View file

@ -216,16 +216,6 @@ class PlayState extends MusicBeatSubState
*/ */
public var playbackRate:Float = 1.0; public var playbackRate:Float = 1.0;
/**
* The scroll speed on the player's strumline.
*/
public var playerScrollSpeed:Float = 1.0;
/**
* The scroll speed on the opponent's strumline.
*/
public var opponentScrollSpeed:Float = 1.0;
/** /**
* An empty FlxObject contained in the scene. * An empty FlxObject contained in the scene.
* The current gameplay camera will always follow this object. Tween its position to move the camera smoothly. * The current gameplay camera will always follow this object. Tween its position to move the camera smoothly.
@ -879,9 +869,6 @@ class PlayState extends MusicBeatSubState
playerStrumline.clean(); playerStrumline.clean();
opponentStrumline.clean(); opponentStrumline.clean();
playerScrollSpeed = currentChart?.scrollSpeed ?? 1.0;
opponentScrollSpeed = currentChart?.scrollSpeed ?? 1.0;
// Delete all notes and reset the arrays. // Delete all notes and reset the arrays.
regenNoteData(); regenNoteData();
@ -1468,7 +1455,7 @@ class PlayState extends MusicBeatSubState
*/ */
function danceOnBeat():Void function danceOnBeat():Void
{ {
if (currentStage == null || Conductor.instance == null) return; if (currentStage == null) return;
// TODO: Add HEY! song events to Tutorial. // TODO: Add HEY! song events to Tutorial.
if (Conductor.instance.currentBeat % 16 == 15 if (Conductor.instance.currentBeat % 16 == 15

2
source/funkin/play/notes/Strumline.hx
View file

@ -283,7 +283,7 @@ class Strumline extends FlxSpriteGroup
// var vwoosh:Float = (strumTime < Conductor.songPosition) && vwoosh ? 2.0 : 1.0; // var vwoosh:Float = (strumTime < Conductor.songPosition) && vwoosh ? 2.0 : 1.0;
// ^^^ commented this out... do NOT make it move faster as it moves offscreen! // ^^^ commented this out... do NOT make it move faster as it moves offscreen!
var vwoosh:Float = 1.0; var vwoosh:Float = 1.0;
var scrollSpeed:Float = (isPlayer ? PlayState.instance?.playerScrollSpeed : PlayState.instance?.opponentScrollSpeed) ?? 1.0; var scrollSpeed:Float = PlayState.instance?.currentChart?.scrollSpeed ?? 1.0;
return return
Constants.PIXELS_PER_MS * (conductorInUse.songPosition - strumTime - Conductor.instance.inputOffset) * scrollSpeed * vwoosh * (Preferences.downscroll ? 1 : -1); Constants.PIXELS_PER_MS * (conductorInUse.songPosition - strumTime - Conductor.instance.inputOffset) * scrollSpeed * vwoosh * (Preferences.downscroll ? 1 : -1);