Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-02-18 20:55:12 -05:00
Code Issues Projects Releases Packages Wiki Activity

no camera zoom shit

Browse source
This commit is contained in:
Cameron Taylor 2021-03-26 21:28:04 -04:00
parent 105c05f2e2
commit c7097eae62
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/PlayState.hx
View file

@ -39,6 +39,7 @@ import openfl.display.BlendMode;
import openfl.display.StageQuality; import openfl.display.StageQuality;
import openfl.filters.ShaderFilter; import openfl.filters.ShaderFilter;
import shaderslmfao.ColorSwap; import shaderslmfao.ColorSwap;
import ui.PreferencesMenu;
using StringTools; using StringTools;
@ -2451,16 +2452,20 @@ class PlayState extends MusicBeatState
wiggleShit.update(Conductor.crochet); wiggleShit.update(Conductor.crochet);
// HARDCODING FOR MILF ZOOMS! // HARDCODING FOR MILF ZOOMS!
if (curSong.toLowerCase() == 'milf' && curBeat >= 168 && curBeat < 200 && camZooming && FlxG.camera.zoom < 1.35)
{
FlxG.camera.zoom += 0.015;
camHUD.zoom += 0.03;
}
if (camZooming && FlxG.camera.zoom < 1.35 && curBeat % 4 == 0) if (PreferencesMenu.getPref('camera-zoom'))
{ {
FlxG.camera.zoom += 0.015; if (curSong.toLowerCase() == 'milf' && curBeat >= 168 && curBeat < 200 && camZooming && FlxG.camera.zoom < 1.35)
camHUD.zoom += 0.03; {
FlxG.camera.zoom += 0.015;
camHUD.zoom += 0.03;
}
if (camZooming && FlxG.camera.zoom < 1.35 && curBeat % 4 == 0)
{
FlxG.camera.zoom += 0.015;
camHUD.zoom += 0.03;
}
} }
iconP1.setGraphicSize(Std.int(iconP1.width + 30)); iconP1.setGraphicSize(Std.int(iconP1.width + 30));

7
source/ui/PreferencesMenu.hx
View file

@ -23,6 +23,12 @@ class PreferencesMenu extends ui.OptionsState.Page
createPrefItem('naughtyness', 'censor-naughty', false); createPrefItem('naughtyness', 'censor-naughty', false);
createPrefItem('downscroll', 'downscroll', false); createPrefItem('downscroll', 'downscroll', false);
createPrefItem('flashing menu', 'flashing-menu', true); createPrefItem('flashing menu', 'flashing-menu', true);
createPrefItem('Camera Zooming on Beat', 'camera-zoom', true);
}
public static function getPref(pref:String):Dynamic
{
return preferences.get(pref);
} }
public static function initPrefs():Void public static function initPrefs():Void
@ -30,6 +36,7 @@ class PreferencesMenu extends ui.OptionsState.Page
preferenceCheck('censor-naughty', false); preferenceCheck('censor-naughty', false);
preferenceCheck('downscroll', false); preferenceCheck('downscroll', false);
preferenceCheck('flashing-menu', true); preferenceCheck('flashing-menu', true);
preferenceCheck('camera-zoom', true);
} }
private function createPrefItem(prefName:String, prefString:String, prefValue:Dynamic):Void private function createPrefItem(prefName:String, prefString:String, prefValue:Dynamic):Void