AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some changes, + modcharts work

Browse Source
This commit is contained in:
Kade M 2021-05-08 18:26:38 -07:00
parent 1f49941f54
commit 00d15a3cfb
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/ModchartState.hx
View File

@ -690,10 +690,6 @@ class ModchartState
FlxG.camera.setFilters([new ShaderFilter(shaders[shaderIndex])]); FlxG.camera.setFilters([new ShaderFilter(shaders[shaderIndex])]);
});*/ });*/
objectToLua(lua,PlayState.instance.camHUD);
Lua.setglobal(lua,"fuckyou");
// default strums // default strums
for (i in 0...PlayState.strumLineNotes.length) { for (i in 0...PlayState.strumLineNotes.length) {

2
source/MusicBeatState.hx
View File

@ -70,7 +70,7 @@ class MusicBeatState extends FlxUIState
else else
skippedFrames++; skippedFrames++;
if ((cast (Lib.current.getChildAt(0), Main)).getFPSCap != FlxG.save.data.fpsCap) if ((cast (Lib.current.getChildAt(0), Main)).getFPSCap != FlxG.save.data.fpsCap && FlxG.save.data.fpsCap <= 290)
(cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap); (cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap);
super.update(elapsed); super.update(elapsed);

11
source/Options.hx
View File

@ -329,18 +329,23 @@ class FPSCapOption extends Option
override function right():Bool { override function right():Bool {
if (FlxG.save.data.fpsCap >= 290) if (FlxG.save.data.fpsCap >= 290)
FlxG.save.data.fpsCap = 2000; // set it really high lol, I mean. if you hit that cap, it really doesn't do much lol. {
FlxG.save.data.fpsCap = 800; // set it really high lol, I mean. if you hit that cap, it really doesn't do much lol.
(cast (Lib.current.getChildAt(0), Main)).setFPSCap(290);
}
else else
FlxG.save.data.fpsCap = FlxG.save.data.fpsCap + 10; FlxG.save.data.fpsCap = FlxG.save.data.fpsCap + 10;
(cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap); (cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap);
OptionsMenu.versionShit.text = "Current FPS Cap: " + FlxG.save.data.fpsCap + " - Description - " + description; OptionsMenu.versionShit.text = "Current FPS Cap: " + (FlxG.save.data.fpsCap > 290 ? "Unlimited (In Gameplay)" : FlxG.save.data.fpsCap) + " - Description - " + description;
return true; return true;
} }
override function left():Bool { override function left():Bool {
if (FlxG.save.data.fpsCap < 60) if (FlxG.save.data.fpsCap > 290)
FlxG.save.data.fpsCap = 290;
else if (FlxG.save.data.fpsCap < 60)
FlxG.save.data.fpsCap = Application.current.window.displayMode.refreshRate; FlxG.save.data.fpsCap = Application.current.window.displayMode.refreshRate;
else else
FlxG.save.data.fpsCap = FlxG.save.data.fpsCap - 10; FlxG.save.data.fpsCap = FlxG.save.data.fpsCap - 10;

3
source/PauseSubState.hx
View File

@ -1,5 +1,6 @@
package; package;
import openfl.Lib;
#if windows #if windows
import llua.Lua; import llua.Lua;
#end #end
@ -189,6 +190,8 @@ class PauseSubState extends MusicBeatSubstate
PlayState.luaModchart = null; PlayState.luaModchart = null;
} }
#end #end
if (FlxG.save.data.fpsCap > 290)
(cast (Lib.current.getChildAt(0), Main)).setFPSCap(290);
FlxG.switchState(new MainMenuState()); FlxG.switchState(new MainMenuState());
} }
} }

7
source/PlayState.hx
View File

@ -216,7 +216,9 @@ class PlayState extends MusicBeatState
{ {
instance = this; instance = this;
if (FlxG.save.data.fpsCap > 290)
(cast (Lib.current.getChildAt(0), Main)).setFPSCap(800);
if (FlxG.sound.music != null) if (FlxG.sound.music != null)
FlxG.sound.music.stop(); FlxG.sound.music.stop();
@ -2316,6 +2318,9 @@ class PlayState extends MusicBeatState
if (!loadRep) if (!loadRep)
rep.SaveReplay(); rep.SaveReplay();
if (FlxG.save.data.fpsCap > 290)
(cast (Lib.current.getChildAt(0), Main)).setFPSCap(290);
#if windows #if windows
if (luaModchart != null) if (luaModchart != null)
{ {