mirror of
https://github.com/FunkinCrew/Funkin.git
synced 2024-11-27 10:05:41 -05:00
basically down scroll
This commit is contained in:
parent
fe91708b9b
commit
95e53ebc38
3 changed files with 24 additions and 3 deletions
|
@ -7,6 +7,7 @@ import flixel.math.FlxMath;
|
||||||
import flixel.util.FlxColor;
|
import flixel.util.FlxColor;
|
||||||
import flixel.util.FlxTimer;
|
import flixel.util.FlxTimer;
|
||||||
import shaderslmfao.ColorSwap;
|
import shaderslmfao.ColorSwap;
|
||||||
|
import ui.PreferencesMenu;
|
||||||
|
|
||||||
using StringTools;
|
using StringTools;
|
||||||
|
|
||||||
|
@ -144,6 +145,9 @@ class Note extends FlxSprite
|
||||||
noteScore * 0.2;
|
noteScore * 0.2;
|
||||||
alpha = 0.6;
|
alpha = 0.6;
|
||||||
|
|
||||||
|
if (PreferencesMenu.getPref('downscroll'))
|
||||||
|
angle = 180;
|
||||||
|
|
||||||
x += width / 2;
|
x += width / 2;
|
||||||
|
|
||||||
switch (noteData)
|
switch (noteData)
|
||||||
|
|
|
@ -708,6 +708,12 @@ class PlayState extends MusicBeatState
|
||||||
Conductor.songPosition = -5000;
|
Conductor.songPosition = -5000;
|
||||||
|
|
||||||
strumLine = new FlxSprite(0, 50).makeGraphic(FlxG.width, 10);
|
strumLine = new FlxSprite(0, 50).makeGraphic(FlxG.width, 10);
|
||||||
|
|
||||||
|
if (PreferencesMenu.getPref('downscroll'))
|
||||||
|
{
|
||||||
|
strumLine.y = FlxG.height - 150; // 150 just random ass number lol
|
||||||
|
}
|
||||||
|
|
||||||
strumLine.scrollFactor.set();
|
strumLine.scrollFactor.set();
|
||||||
|
|
||||||
strumLineNotes = new FlxTypedGroup<FlxSprite>();
|
strumLineNotes = new FlxTypedGroup<FlxSprite>();
|
||||||
|
@ -747,6 +753,9 @@ class PlayState extends MusicBeatState
|
||||||
healthBarBG.scrollFactor.set();
|
healthBarBG.scrollFactor.set();
|
||||||
add(healthBarBG);
|
add(healthBarBG);
|
||||||
|
|
||||||
|
if (PreferencesMenu.getPref('downscroll'))
|
||||||
|
healthBarBG.y = FlxG.height * 0.1;
|
||||||
|
|
||||||
healthBar = new FlxBar(healthBarBG.x + 4, healthBarBG.y + 4, RIGHT_TO_LEFT, Std.int(healthBarBG.width - 8), Std.int(healthBarBG.height - 8), this,
|
healthBar = new FlxBar(healthBarBG.x + 4, healthBarBG.y + 4, RIGHT_TO_LEFT, Std.int(healthBarBG.width - 8), Std.int(healthBarBG.height - 8), this,
|
||||||
'health', 0, 2);
|
'health', 0, 2);
|
||||||
healthBar.scrollFactor.set();
|
healthBar.scrollFactor.set();
|
||||||
|
@ -1638,6 +1647,9 @@ class PlayState extends MusicBeatState
|
||||||
daNote.active = true;
|
daNote.active = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (PreferencesMenu.getPref('downscroll'))
|
||||||
|
daNote.y = (strumLine.y + (Conductor.songPosition - daNote.strumTime) * (0.45 * FlxMath.roundDecimal(SONG.speed, 2)));
|
||||||
|
else
|
||||||
daNote.y = (strumLine.y - (Conductor.songPosition - daNote.strumTime) * (0.45 * FlxMath.roundDecimal(SONG.speed, 2)));
|
daNote.y = (strumLine.y - (Conductor.songPosition - daNote.strumTime) * (0.45 * FlxMath.roundDecimal(SONG.speed, 2)));
|
||||||
|
|
||||||
// i am so fucking sorry for this if condition
|
// i am so fucking sorry for this if condition
|
||||||
|
@ -1690,7 +1702,12 @@ class PlayState extends MusicBeatState
|
||||||
// WIP interpolation shit? Need to fix the pause issue
|
// WIP interpolation shit? Need to fix the pause issue
|
||||||
// daNote.y = (strumLine.y - (songTime - daNote.strumTime) * (0.45 * PlayState.SONG.speed));
|
// daNote.y = (strumLine.y - (songTime - daNote.strumTime) * (0.45 * PlayState.SONG.speed));
|
||||||
|
|
||||||
if (daNote.y < -daNote.height)
|
var noteMiss:Bool = daNote.y < -daNote.height;
|
||||||
|
|
||||||
|
if (PreferencesMenu.getPref('downscroll'))
|
||||||
|
noteMiss = daNote.y > FlxG.height;
|
||||||
|
|
||||||
|
if (noteMiss)
|
||||||
{
|
{
|
||||||
if (daNote.tooLate || !daNote.wasGoodHit)
|
if (daNote.tooLate || !daNote.wasGoodHit)
|
||||||
{
|
{
|
||||||
|
|
|
@ -34,7 +34,7 @@ class PreferencesMenu extends ui.OptionsState.Page
|
||||||
public static function initPrefs():Void
|
public static function initPrefs():Void
|
||||||
{
|
{
|
||||||
preferenceCheck('censor-naughty', false);
|
preferenceCheck('censor-naughty', false);
|
||||||
preferenceCheck('downscroll', false);
|
preferenceCheck('downscroll', true);
|
||||||
preferenceCheck('flashing-menu', true);
|
preferenceCheck('flashing-menu', true);
|
||||||
preferenceCheck('camera-zoom', true);
|
preferenceCheck('camera-zoom', true);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue