less goo
This commit is contained in:
CyndaquilDAC 2021-04-11 14:29:18 -05:00 committed by GitHub
commit 96398e6be1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 49 additions and 8 deletions

View File

@ -57,8 +57,13 @@ class KadeEngineData
if (FlxG.save.data.accuracyMod == null) if (FlxG.save.data.accuracyMod == null)
FlxG.save.data.accuracyMod = 1; FlxG.save.data.accuracyMod = 1;
if (FlxG.save.data.watermark == null)
FlxG.save.data.watermark = true;
Conductor.recalculateTimings(); Conductor.recalculateTimings();
Main.watermarks = FlxG.save.data.watermark;
(cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap); (cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap);
} }
} }

View File

@ -23,6 +23,8 @@ class Main extends Sprite
var skipSplash:Bool = true; // Whether to skip the flixel splash screen that appears in release mode. var skipSplash:Bool = true; // Whether to skip the flixel splash screen that appears in release mode.
var startFullscreen:Bool = false; // Whether to start the game in fullscreen on desktop targets var startFullscreen:Bool = false; // Whether to start the game in fullscreen on desktop targets
public static var watermarks = true; // Whether to put Kade Engine liteartly anywhere
// You can pretty much ignore everything from here on - your code should go in your states. // You can pretty much ignore everything from here on - your code should go in your states.
public static function main():Void public static function main():Void

View File

@ -103,7 +103,7 @@ class MainMenuState extends MusicBeatState
FlxG.camera.follow(camFollow, null, 0.60 * (60 / FlxG.save.data.fpsCap)); FlxG.camera.follow(camFollow, null, 0.60 * (60 / FlxG.save.data.fpsCap));
var versionShit:FlxText = new FlxText(5, FlxG.height - 18, 0, gameVer + " FNF - " + kadeEngineVer + " Kade Engine", 12); var versionShit:FlxText = new FlxText(5, FlxG.height - 18, 0, gameVer + (Main.watermarks ? " FNF - " + kadeEngineVer + " Kade Engine" : ""), 12);
versionShit.scrollFactor.set(); versionShit.scrollFactor.set();
versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(versionShit); add(versionShit);

View File

@ -438,6 +438,28 @@ class CustomizeGameplay extends Option
} }
} }
class WatermarkOption extends Option
{
public function new(desc:String)
{
super();
description = desc;
}
public override function press():Bool
{
Main.watermarks = !Main.watermarks;
FlxG.save.data.watermark = Main.watermarks;
display = updateDisplay();
return true;
}
private override function updateDisplay():String
{
return "Watermarks " + (Main.watermarks ? "on" : "off");
}
}
class OffsetMenu extends Option class OffsetMenu extends Option
{ {
public function new(desc:String) public function new(desc:String)

View File

@ -40,13 +40,16 @@ class OptionsMenu extends MusicBeatState
new AccuracyOption("Display accuracy information."), new AccuracyOption("Display accuracy information."),
new NPSDisplayOption("Shows your current Notes Per Second.") new NPSDisplayOption("Shows your current Notes Per Second.")
]), ]),
#if desktop
new OptionCatagory("Misc", [
new OptionCatagory("Misc", [
#if desktop
new FPSOption("Toggle the FPS Counter"), new FPSOption("Toggle the FPS Counter"),
new ReplayOption("View replays") new ReplayOption("View replays"),
])
#end #end
new WatermarkOption("Turn off all watermarks from the engine.")
])
]; ];
private var currentDescription:String = ""; private var currentDescription:String = "";

View File

@ -820,7 +820,7 @@ class PlayState extends MusicBeatState
add(healthBar); add(healthBar);
// Add Kade Engine watermark // Add Kade Engine watermark
var kadeEngineWatermark = new FlxText(4,healthBarBG.y + 50,0,SONG.song + " " + (storyDifficulty == 2 ? "Hard" : storyDifficulty == 1 ? "Normal" : "Easy") + " - KE " + MainMenuState.kadeEngineVer + " - " + (FlxG.save.data.etternaMode ? "E.Mode" : "FNF"), 16); var kadeEngineWatermark = new FlxText(4,healthBarBG.y + 50,0,SONG.song + " " + (storyDifficulty == 2 ? "Hard" : storyDifficulty == 1 ? "Normal" : "Easy") + (Main.watermarks ? " - KE " + MainMenuState.kadeEngineVer : ""), 16);
kadeEngineWatermark.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); kadeEngineWatermark.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
kadeEngineWatermark.scrollFactor.set(); kadeEngineWatermark.scrollFactor.set();
add(kadeEngineWatermark); add(kadeEngineWatermark);

View File

@ -398,9 +398,18 @@ class TitleState extends MusicBeatState
// credTextShit.text = 'In association \nwith'; // credTextShit.text = 'In association \nwith';
// credTextShit.screenCenter(); // credTextShit.screenCenter();
case 5: case 5:
if (Main.watermarks)
createCoolText(['Kade Engine', 'by']); createCoolText(['Kade Engine', 'by']);
else
createCoolText(['In Partnership', 'with']);
case 7: case 7:
if (Main.watermarks)
addMoreText('KadeDeveloper'); addMoreText('KadeDeveloper');
else
{
addMoreText('Newgrounds');
ngSpr.visible = true;
}
// credTextShit.text += '\nNewgrounds'; // credTextShit.text += '\nNewgrounds';
case 8: case 8:
deleteCoolText(); deleteCoolText();