diff --git a/TODO.md b/TODO.md index b3d2e4cf..080b537f 100644 --- a/TODO.md +++ b/TODO.md @@ -44,7 +44,7 @@ - [x] Dialogue - [ ] Finish Base Game port - [x] Add credits -- [ ] Verbose mode (`--verbose`) +- [x] Verbose mode (`--verbose`) - [ ] Tooltips - [ ] Fix bugs diff --git a/source/funkin/backend/system/CommandLineHandler.hx b/source/funkin/backend/system/CommandLineHandler.hx index 4b26f6d7..1545108f 100644 --- a/source/funkin/backend/system/CommandLineHandler.hx +++ b/source/funkin/backend/system/CommandLineHandler.hx @@ -64,8 +64,8 @@ class CommandLineHandler { Main.noCwdFix = true; case "-livereload": // do nothing - case "-verbose": - // do nothing + case "-v" | "-verbose" | "--verbose": + Main.verbose = true; default: Sys.println("Unknown command"); } diff --git a/source/funkin/backend/system/Logs.hx b/source/funkin/backend/system/Logs.hx index cefe6b93..dda3b9ee 100644 --- a/source/funkin/backend/system/Logs.hx +++ b/source/funkin/backend/system/Logs.hx @@ -143,25 +143,20 @@ class Logs { traceColored(text, level); } - public inline static function getPrefix(prefix:String) { + public inline static function getPrefix(prefix:String) return logText('[${prefix}] ', BLUE); - } - public inline static function infos(text:String, color:ConsoleColor = LIGHTGRAY, ?prefix:String) { + public inline static function infos(text:String, color:ConsoleColor = LIGHTGRAY, ?prefix:String) Logs.trace(text, INFO, color, prefix); - } - public inline static function verbose(text:String, color:ConsoleColor = LIGHTGRAY, ?prefix:String) { - Logs.trace(text, VERBOSE, color, prefix); - } + public inline static function verbose(text:String, color:ConsoleColor = LIGHTGRAY, ?prefix:String) + if (Main.verbose) Logs.trace(text, VERBOSE, color, prefix); - public inline static function warn(text:String, color:ConsoleColor = YELLOW, ?prefix:String) { + public inline static function warn(text:String, color:ConsoleColor = YELLOW, ?prefix:String) Logs.trace(text, WARNING, color, prefix); - } - public inline static function error(text:String, color:ConsoleColor = RED, ?prefix:String) { + public inline static function error(text:String, color:ConsoleColor = RED, ?prefix:String) Logs.trace(text, ERROR, color, prefix); - } } enum abstract Level(Int) { diff --git a/source/funkin/backend/system/Main.hx b/source/funkin/backend/system/Main.hx index 6509bbe6..d681a6f1 100644 --- a/source/funkin/backend/system/Main.hx +++ b/source/funkin/backend/system/Main.hx @@ -33,6 +33,7 @@ class Main extends Sprite public static var modToLoad:String = null; public static var forceGPUOnlyBitmapsOff:Bool = #if windows false #else true #end; public static var noTerminalColor:Bool = false; + public static var verbose:Bool = false; public static var scaleMode:FunkinRatioScaleMode; #if !mobile diff --git a/source/funkin/menus/credits/CreditsCodename.hx b/source/funkin/menus/credits/CreditsCodename.hx index a3ab4054..dcc93614 100644 --- a/source/funkin/menus/credits/CreditsCodename.hx +++ b/source/funkin/menus/credits/CreditsCodename.hx @@ -92,7 +92,7 @@ class CreditsCodename extends funkin.options.OptionsScreen { }); Options.contributors = contributors; } - Logs.trace('[CreditsCodename] Contributors list Updated!', VERBOSE); + Logs.verbose('[CreditsCodename] Contributors list Updated!'); var errorOnMain:Bool = false; var idk2 = GitHub.getOrganizationMembers(Flags.REPO_OWNER, function(e) { @@ -103,7 +103,7 @@ class CreditsCodename extends funkin.options.OptionsScreen { }); if(!errorOnMain) { Options.mainDevs = [for(m in idk2) m.id]; - Logs.trace('[CreditsCodename] Main Devs list Updated!', VERBOSE); + Logs.verbose('[CreditsCodename] Main Devs list Updated!'); } return true;