Small fixes
This commit is contained in:
@@ -108,16 +108,20 @@ class Logs {
|
||||
return logText('[${prefix}] ', BLUE);
|
||||
}
|
||||
|
||||
public inline static function verbose(text:String, level:Level = VERBOSE, color:ConsoleColor = LIGHTGRAY, ?prefix:String) {
|
||||
Logs.trace(text, level, color, prefix);
|
||||
public inline static function infos(text:String, color:ConsoleColor = LIGHTGRAY, ?prefix:String) {
|
||||
Logs.trace(text, INFO, color, prefix);
|
||||
}
|
||||
|
||||
public inline static function warn(text:String, level:Level = WARNING, color:ConsoleColor = YELLOW, ?prefix:String) {
|
||||
Logs.trace(text, level, color, prefix);
|
||||
public inline static function verbose(text:String, color:ConsoleColor = LIGHTGRAY, ?prefix:String) {
|
||||
Logs.trace(text, VERBOSE, color, prefix);
|
||||
}
|
||||
|
||||
public inline static function error(text:String, level:Level = ERROR, color:ConsoleColor = RED, ?prefix:String) {
|
||||
Logs.trace(text, level, color, prefix);
|
||||
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) {
|
||||
Logs.trace(text, ERROR, color, prefix);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@ class Main extends Sprite
|
||||
#end
|
||||
|
||||
#if (sys && TEST_BUILD)
|
||||
trace("Used cne test / cne build. Switching into source assets.");
|
||||
Logs.infos("Used cne test / cne build. Switching into source assets.");
|
||||
#if MOD_SUPPORT
|
||||
ModsFolder.modsPath = './${pathBack}mods/';
|
||||
ModsFolder.addonsPath = './${pathBack}addons/';
|
||||
|
||||
@@ -6,6 +6,7 @@ import flixel.math.FlxPoint;
|
||||
class EditorPicker extends MusicBeatSubstate {
|
||||
public var bg:FlxSprite;
|
||||
|
||||
// Name is for backwards compatability, dont use it, use id instead
|
||||
public var options:Array<Editor> = [
|
||||
{
|
||||
name: "Chart Editor",
|
||||
@@ -80,7 +81,8 @@ class EditorPicker extends MusicBeatSubstate {
|
||||
|
||||
optionHeight = FlxG.height / options.length;
|
||||
for(k=>o in options) {
|
||||
var visualName = o.name;
|
||||
var id = o.id + ".name";
|
||||
var visualName = TU.translate(id);
|
||||
var spr = new EditorPickerOption(visualName, o.iconID, optionHeight);
|
||||
spr.y = k * optionHeight;
|
||||
add(spr);
|
||||
@@ -234,4 +236,4 @@ class EditorPickerOption extends FlxTypedSpriteGroup<FlxSprite> {
|
||||
callback();
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -597,7 +597,7 @@ class PlayState extends MusicBeatState
|
||||
for(folder in scriptsFolders) {
|
||||
for(file in Paths.getFolderContent(folder, true, fromMods ? MODS : BOTH)) {
|
||||
if (folder == 'data/charts/')
|
||||
Logs.warn('data/charts/ is deprecrated and will be removed in the future. Please move script $file to songs/', WARNING, DARKYELLOW, "PlayState");
|
||||
Logs.warn('data/charts/ is deprecrated and will be removed in the future. Please move script $file to songs/', DARKYELLOW, "PlayState");
|
||||
|
||||
addScript(file);
|
||||
}
|
||||
@@ -1248,9 +1248,9 @@ class PlayState extends MusicBeatState
|
||||
FlxG.switchState(new funkin.editors.charter.Charter(SONG.meta.name, difficulty, false));
|
||||
}
|
||||
if (FlxG.keys.justPressed.F5) {
|
||||
Logs.warn('Reloading scripts...', WARNING, YELLOW, "PlayState");
|
||||
Logs.warn('Reloading scripts...', YELLOW, "PlayState");
|
||||
scripts.reload();
|
||||
Logs.warn('Song scripts successfully reloaded.', WARNING, GREEN, "PlayState");
|
||||
Logs.warn('Song scripts successfully reloaded.', GREEN, "PlayState");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -219,7 +219,7 @@ class FreeplayState extends MusicBeatState
|
||||
if (canSelect) {
|
||||
changeSelection((controls.UP_P ? -1 : 0) + (controls.DOWN_P ? 1 : 0));
|
||||
changeDiff((controls.LEFT_P ? -1 : 0) + (controls.RIGHT_P ? 1 : 0));
|
||||
changeCoopMode((FlxG.keys.justPressed.TAB ? 1 : 0));
|
||||
changeCoopMode((FlxG.keys.justPressed.TAB ? 1 : 0)); // TODO: make this configurable
|
||||
// putting it before so that its actually smooth
|
||||
updateOptionsAlpha();
|
||||
}
|
||||
@@ -362,10 +362,10 @@ class FreeplayState extends MusicBeatState
|
||||
* Array containing all labels for Co-Op / Opponent modes.
|
||||
*/
|
||||
public var coopLabels:Array<String> = [
|
||||
"[TAB] " + TU.translate("freeplay.solo"),
|
||||
"[TAB] " + TU.translate("freeplay.opponentMode"),
|
||||
"[TAB] " + TU.translate("freeplay.coopMode"),
|
||||
"[TAB] " + TU.translate("freeplay.coopModeSwitched")
|
||||
TU.translate("freeplay.solo"),
|
||||
TU.translate("freeplay.opponentMode"),
|
||||
TU.translate("freeplay.coopMode"),
|
||||
TU.translate("freeplay.coopModeSwitched")
|
||||
];
|
||||
|
||||
/**
|
||||
@@ -386,10 +386,12 @@ class FreeplayState extends MusicBeatState
|
||||
|
||||
updateScore();
|
||||
|
||||
var key = "[TAB] "; // TODO: make this configurable
|
||||
|
||||
if (bothEnabled) {
|
||||
coopText.text = coopLabels[curCoopMode];
|
||||
coopText.text = key + coopLabels[curCoopMode];
|
||||
} else {
|
||||
coopText.text = coopLabels[curCoopMode * (songs[curSelected].coopAllowed ? 2 : 1)];
|
||||
coopText.text = key + coopLabels[curCoopMode * (songs[curSelected].coopAllowed ? 2 : 1)];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,13 @@ class PauseSubState extends MusicBeatSubstate
|
||||
|
||||
var grpMenuShit:FlxTypedGroup<Alphabet>;
|
||||
|
||||
// TODO: make it possible to translate these
|
||||
// to translate these you need to convert them into ids
|
||||
// Resume -> pause.resume
|
||||
// Restart Song -> pause.restart
|
||||
// Change Controls -> pause.changeControls
|
||||
// Change Options -> pause.changeOptions
|
||||
// Exit to menu -> pause.exitToMenu
|
||||
// Exit to charter -> pause.exitToCharter
|
||||
var menuItems:Array<String> = ['Resume', 'Restart Song', 'Change Controls', 'Change Options', 'Exit to menu', "Exit to charter"];
|
||||
var curSelected:Int = 0;
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ class StoryMenuState extends MusicBeatState {
|
||||
}
|
||||
rightArrow.x -= rightArrow.width;
|
||||
|
||||
tracklist = new FunkinText(16, weekBG.y + weekBG.height + 44, Std.int(((FlxG.width - 400) / 2) - 80), "TRACKS", 32);
|
||||
tracklist = new FunkinText(16, weekBG.y + weekBG.height + 44, Std.int(((FlxG.width - 400) / 2) - 80), TU.translate("story.tracks"), 32);
|
||||
tracklist.alignment = CENTER;
|
||||
tracklist.color = 0xFFE55777;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user