diff --git a/assets/credits.json b/assets/credits.json index 1df8b6e..a847bcf 100644 --- a/assets/credits.json +++ b/assets/credits.json @@ -10,7 +10,7 @@ "iconData": ["joalor64", 0, 0], "textData": ["Main Creator/Programmer of Rhythmo, Artist, Composer", "I do stuff."], "urlData": [ - ["Twitter", "https://twitter.com/fnfkeith19/"], + ["Bluesky", "https://bsky.app/profile/joalor64.bsky.social/"], ["Discord", "https://discordapp.com/users/584516163296559117/"], ["GitHub", "https://github.com/Joalor64GH/"], ["YT", "https://youtube.com/@joalor64ytofficial/"] @@ -32,7 +32,7 @@ { "name": "huy1234th", "iconData": ["huy1234th", 0, 0], - "textData": ["Additional Programmer", "I like haxe."], + "textData": ["Additional Programmer, Vietnamese VCR Font", "I like haxe."], "urlData": [["GitHub", "https://github.com/khuonghoanghuy/"]], "colors": [26, 184, 28] } diff --git a/assets/fonts/main.ttf b/assets/fonts/main.ttf deleted file mode 100644 index 153aaeb..0000000 Binary files a/assets/fonts/main.ttf and /dev/null differ diff --git a/assets/fonts/vcr.ttf b/assets/fonts/vcr.ttf new file mode 100644 index 0000000..69422b2 Binary files /dev/null and b/assets/fonts/vcr.ttf differ diff --git a/source/backend/ToastCore.hx b/source/backend/ToastCore.hx index c87ce82..076b205 100644 --- a/source/backend/ToastCore.hx +++ b/source/backend/ToastCore.hx @@ -154,7 +154,7 @@ class Toast extends Sprite { title = new TextField(); title.text = titleText; - title.setTextFormat(new TextFormat(Paths.font("main.ttf"), 24, titleColor, true)); + title.setTextFormat(new TextFormat(Paths.font("vcr.ttf"), 24, titleColor, true)); title.wordWrap = true; title.width = 360; title.y = 5; @@ -163,7 +163,7 @@ class Toast extends Sprite { desc = new TextField(); desc.text = description; - desc.setTextFormat(new TextFormat(Paths.font("main.ttf"), 18, 0xFFFFFF)); + desc.setTextFormat(new TextFormat(Paths.font("vcr.ttf"), 18, 0xFFFFFF)); desc.wordWrap = true; desc.width = 360; desc.height = 95; diff --git a/source/debug/FPS.hx b/source/debug/FPS.hx index 46cfa4d..793cc51 100644 --- a/source/debug/FPS.hx +++ b/source/debug/FPS.hx @@ -29,7 +29,7 @@ class FPS extends TextField { width = 1280; height = 720; selectable = false; - defaultTextFormat = new TextFormat(Paths.font(font ?? 'main.ttf'), 16, color); + defaultTextFormat = new TextFormat(Paths.font(font ?? 'vcr.ttf'), 16, color); addEventListener(Event.ENTER_FRAME, (_) -> { final now:Float = Timer.stamp() * 1000; diff --git a/source/options/ControlsSubState.hx b/source/options/ControlsSubState.hx index 6c354af..4331553 100644 --- a/source/options/ControlsSubState.hx +++ b/source/options/ControlsSubState.hx @@ -57,13 +57,13 @@ class ControlsSubState extends ExtendableSubState { for (i in 0...coolControls.length) { var bindTxt:FlxText = new FlxText(20, 20 + (i * 80), 0, Localization.get(coolControls[i]), 32); - bindTxt.setFormat(Paths.font('main.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + bindTxt.setFormat(Paths.font('vcr.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); bindTxt.ID = i; ctrlGroup.add(bindTxt); } curControl = new FlxText(700, 0, 0, "", 12); - curControl.setFormat(Paths.font('main.ttf'), 60, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + curControl.setFormat(Paths.font('vcr.ttf'), 60, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); curControl.scrollFactor.set(); curControl.screenCenter(Y); add(curControl); @@ -82,7 +82,7 @@ class ControlsSubState extends ExtendableSubState { add(tempBG); anyKeyTxt = new FlxText(0, 0, 0, "", 12); - anyKeyTxt.setFormat(Paths.font('main.ttf'), 30, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + anyKeyTxt.setFormat(Paths.font('vcr.ttf'), 30, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); anyKeyTxt.scrollFactor.set(); anyKeyTxt.screenCenter(XY); add(anyKeyTxt); diff --git a/source/options/LanguageState.hx b/source/options/LanguageState.hx index c62d554..becaee4 100644 --- a/source/options/LanguageState.hx +++ b/source/options/LanguageState.hx @@ -40,7 +40,7 @@ class LanguageState extends ExtendableState { add(grid); var title:FlxText = new FlxText(0, 0, 0, Localization.get("langSelect"), 12); - title.setFormat(Paths.font('main.ttf'), 70, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + title.setFormat(Paths.font('vcr.ttf'), 70, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); title.scrollFactor.set(); title.screenCenter(X); add(title); @@ -50,14 +50,14 @@ class LanguageState extends ExtendableState { for (i in 0...langStrings.length) { var text:FlxText = new FlxText(0, 295 + (i * 80), 0, langStrings[i].lang, 32); - text.setFormat(Paths.font('main.ttf'), 80, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + text.setFormat(Paths.font('vcr.ttf'), 80, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); text.screenCenter(X); text.ID = i; group.add(text); } var noticeTxt:FlxText = new FlxText(5, FlxG.height - 24, 0, Localization.get("langNotCompletelyAccurate"), 12); - noticeTxt.setFormat(Paths.font('main.ttf'), 18, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + noticeTxt.setFormat(Paths.font('vcr.ttf'), 18, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); noticeTxt.scrollFactor.set(); noticeTxt.screenCenter(X); add(noticeTxt); diff --git a/source/options/NoteColorState.hx b/source/options/NoteColorState.hx index 3aea282..a9226e8 100644 --- a/source/options/NoteColorState.hx +++ b/source/options/NoteColorState.hx @@ -41,7 +41,7 @@ class NoteColorState extends ExtendableState { } daText = new FlxText(0, 280, FlxG.width, "", 12); - daText.setFormat(Paths.font('main.ttf'), 28, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + daText.setFormat(Paths.font('vcr.ttf'), 28, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); daText.screenCenter(X); add(daText); diff --git a/source/options/OptionsState.hx b/source/options/OptionsState.hx index 0710056..c4be6d6 100644 --- a/source/options/OptionsState.hx +++ b/source/options/OptionsState.hx @@ -28,7 +28,7 @@ class OptionsState extends ExtendableState { for (i in 0...options.length) { var text:FlxText = new FlxText(0, 255 + (i * 70), 0, Localization.get(options[i]), 32); - text.setFormat(Paths.font('main.ttf'), 80, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + text.setFormat(Paths.font('vcr.ttf'), 80, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); text.scrollFactor.set(); text.screenCenter(X); text.ID = i; @@ -36,7 +36,7 @@ class OptionsState extends ExtendableState { } var resetControlsTxt:FlxText = new FlxText(5, FlxG.height - 30, 0, Localization.get("ctrlResetGuide"), 12); - resetControlsTxt.setFormat(Paths.font('main.ttf'), 26, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + resetControlsTxt.setFormat(Paths.font('vcr.ttf'), 26, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); resetControlsTxt.scrollFactor.set(); add(resetControlsTxt); diff --git a/source/options/OptionsSubState.hx b/source/options/OptionsSubState.hx index 53ef4a6..73b1b69 100644 --- a/source/options/OptionsSubState.hx +++ b/source/options/OptionsSubState.hx @@ -109,13 +109,13 @@ class OptionsSubState extends ExtendableSubState { for (i in 0...options.length) { var optionTxt:FlxText = new FlxText(20, 20 + (i * 80), 0, options[i].toString(), 32); - optionTxt.setFormat(Paths.font('main.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + optionTxt.setFormat(Paths.font('vcr.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); optionTxt.ID = i; grpOptions.add(optionTxt); } description = new FlxText(0, FlxG.height * 0.1, FlxG.width * 0.9, '', 28); - description.setFormat(Paths.font('main.ttf'), 28, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + description.setFormat(Paths.font('vcr.ttf'), 28, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); description.screenCenter(X); description.scrollFactor.set(); add(description); diff --git a/source/states/AchievementsState.hx b/source/states/AchievementsState.hx index b57842f..9bcc2a5 100644 --- a/source/states/AchievementsState.hx +++ b/source/states/AchievementsState.hx @@ -54,7 +54,7 @@ class AchievementsState extends ExtendableState { isUnlocked.push(unlocked); var text:FlxText = new FlxText(20, 60 + (i * 80), stringToUse, 32); - text.setFormat(Paths.font('main.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + text.setFormat(Paths.font('vcr.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); text.ID = i; achievementGrp.add(text); @@ -64,7 +64,7 @@ class AchievementsState extends ExtendableState { } description = new FlxText(0, FlxG.height * 0.1, FlxG.width * 0.9, '', 28); - description.setFormat(Paths.font('main.ttf'), 28, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + description.setFormat(Paths.font('vcr.ttf'), 28, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); description.screenCenter(X); description.scrollFactor.set(); add(description); @@ -170,7 +170,7 @@ class AchievementsState extends ExtendableState { isUnlocked.push(unlocked); var text:FlxText = new FlxText(20, 60 + (i * 80), stringToUse, 32); - text.setFormat(Paths.font('main.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + text.setFormat(Paths.font('vcr.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); text.ID = i; achievementGrp.add(text); diff --git a/source/states/ChartingState.hx b/source/states/ChartingState.hx index 27dc30d..8d9d21f 100644 --- a/source/states/ChartingState.hx +++ b/source/states/ChartingState.hx @@ -176,7 +176,7 @@ class ChartingState extends ExtendableState { add(strumLine); var prototypeNotice:FlxText = new FlxText(5, FlxG.height - 24, 0, 'Charter v0.2-pre // Functionality is subject to change.', 12); - prototypeNotice.setFormat(Paths.font('main.ttf'), 18, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + prototypeNotice.setFormat(Paths.font('vcr.ttf'), 18, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); prototypeNotice.scrollFactor.set(); add(prototypeNotice); @@ -542,12 +542,12 @@ class LoadSongSubState extends ExtendableSubState { add(bg); var text:FlxText = new FlxText(0, 180, 0, "Enter a song to load.\n(Note: Unsaved progress will be lost!)", 32); - text.setFormat(Paths.font('main.ttf'), 40, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + text.setFormat(Paths.font('vcr.ttf'), 40, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); text.screenCenter(X); add(text); input = new FlxUIInputText(10, 10, FlxG.width, '', 8); - input.setFormat(Paths.font('main.ttf'), 96, FlxColor.WHITE, FlxTextAlign.CENTER); + input.setFormat(Paths.font('vcr.ttf'), 96, FlxColor.WHITE, FlxTextAlign.CENTER); input.alignment = CENTER; input.setBorderStyle(OUTLINE, 0xFF000000, 5, 1); input.screenCenter(XY); diff --git a/source/states/CreditsState.hx b/source/states/CreditsState.hx index ffc4484..2920e1f 100644 --- a/source/states/CreditsState.hx +++ b/source/states/CreditsState.hx @@ -61,7 +61,7 @@ class CreditsState extends ExtendableState { for (i in 0...credData.users.length) { var name:FlxText = new FlxText(20, 60 + (i * 80), 0, credData.users[i].name, 32); - name.setFormat(Paths.font('main.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + name.setFormat(Paths.font('vcr.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); name.ID = i; credsGrp.add(name); @@ -89,26 +89,26 @@ class CreditsState extends ExtendableState { add(topBar); topBar.y -= topBar.height; - topMarker = new FlxText(8, 8, 0, "CREDITS").setFormat(Paths.font('main.ttf'), 32, FlxColor.WHITE); + topMarker = new FlxText(8, 8, 0, "CREDITS").setFormat(Paths.font('vcr.ttf'), 32, FlxColor.WHITE); topMarker.scrollFactor.set(); topMarker.alpha = 0; add(topMarker); - centerMarker = new FlxText(0, 8, FlxG.width, "< PLATFORM >").setFormat(Paths.font('main.ttf'), 32, FlxColor.WHITE); + centerMarker = new FlxText(0, 8, FlxG.width, "< PLATFORM >").setFormat(Paths.font('vcr.ttf'), 32, FlxColor.WHITE); centerMarker.alignment = CENTER; centerMarker.screenCenter(X); centerMarker.scrollFactor.set(); centerMarker.alpha = 0; add(centerMarker); - rightMarker = new FlxText(-8, 8, FlxG.width, "RHYTHMO").setFormat(Paths.font('main.ttf'), 32, FlxColor.WHITE); + rightMarker = new FlxText(-8, 8, FlxG.width, "RHYTHMO").setFormat(Paths.font('vcr.ttf'), 32, FlxColor.WHITE); rightMarker.scrollFactor.set(); rightMarker.alignment = RIGHT; rightMarker.alpha = 0; add(rightMarker); bottomMarker = new FlxText(0, FlxG.height - 24, 0, "", 32); - bottomMarker.setFormat(Paths.font('main.ttf'), 20, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + bottomMarker.setFormat(Paths.font('vcr.ttf'), 20, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); bottomMarker.textField.background = true; bottomMarker.textField.backgroundColor = FlxColor.BLACK; bottomMarker.scrollFactor.set(); diff --git a/source/states/EditorState.hx b/source/states/EditorState.hx index 4a84720..a4306e7 100644 --- a/source/states/EditorState.hx +++ b/source/states/EditorState.hx @@ -22,13 +22,13 @@ class EditorState extends ExtendableState { for (i in 0...options.length) { var optionTxt:FlxText = new FlxText(20, 20 + (i * 50), 0, options[i], 32); - optionTxt.setFormat(Paths.font('main.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + optionTxt.setFormat(Paths.font('vcr.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); optionTxt.ID = i; grpOptions.add(optionTxt); } daText = new FlxText(5, FlxG.height - 30, 0, "", 12); - daText.setFormat(Paths.font('main.ttf'), 20, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + daText.setFormat(Paths.font('vcr.ttf'), 20, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); add(daText); changeSelection(0, false); diff --git a/source/states/MenuState.hx b/source/states/MenuState.hx index 96b6110..12a5870 100644 --- a/source/states/MenuState.hx +++ b/source/states/MenuState.hx @@ -88,7 +88,7 @@ class MenuState extends ExtendableState { final versii:FlxText = new FlxText(5, FlxG.height - 30, 0, 'Rhythmo v${Lib.application.meta.get('version')}' #if debug + ' (${MacrosUtil.getCommitId()})' #end, 12); - versii.setFormat(Paths.font('main.ttf'), 26, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + versii.setFormat(Paths.font('vcr.ttf'), 26, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); versii.scrollFactor.set(); add(versii); diff --git a/source/states/ModsState.hx b/source/states/ModsState.hx index 738c7ee..25c6203 100644 --- a/source/states/ModsState.hx +++ b/source/states/ModsState.hx @@ -34,7 +34,7 @@ class ModsState extends ExtendableState { for (i in 0...ModHandler.trackedMods.length) { var text:FlxText = new FlxText(20, 60 + (i * 80), ModHandler.trackedMods[i].title, 32); - text.setFormat(Paths.font('main.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + text.setFormat(Paths.font('vcr.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); text.ID = i; daMods.add(text); @@ -45,7 +45,7 @@ class ModsState extends ExtendableState { } description = new FlxText(0, FlxG.height * 0.1, FlxG.width * 0.9, '', 28); - description.setFormat(Paths.font('main.ttf'), 28, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + description.setFormat(Paths.font('vcr.ttf'), 28, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); description.screenCenter(X); description.scrollFactor.set(); add(description); diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx index 6de492a..e634daa 100644 --- a/source/states/PlayState.hx +++ b/source/states/PlayState.hx @@ -139,11 +139,11 @@ class PlayState extends ExtendableState { } scoreTxt = new FlxText(0, (FlxG.height * (SaveData.settings.downScroll ? 0.11 : 0.89)) + 20, FlxG.width, "", 20); - scoreTxt.setFormat(Paths.font('main.ttf'), 35, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + scoreTxt.setFormat(Paths.font('vcr.ttf'), 35, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); scoreTxt.screenCenter(X); judgementCounter = new FlxText(20, 0, 0, "", 20); - judgementCounter.setFormat(Paths.font('main.ttf'), 20, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + judgementCounter.setFormat(Paths.font('vcr.ttf'), 20, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); judgementCounter.screenCenter(Y); add(judgementCounter); @@ -154,7 +154,7 @@ class PlayState extends ExtendableState { add(scoreTxt); timeTxt = new FlxText(20, timeBar.y - 5, 0, "[-:--/-:--]", 20); - timeTxt.setFormat(Paths.font('main.ttf'), 20, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + timeTxt.setFormat(Paths.font('vcr.ttf'), 20, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); add(timeTxt); var ratingDisplayYPos:Float = 80; @@ -627,7 +627,7 @@ class PlayState extends ExtendableState { remove(i); var precision:FlxText = new FlxText(0, ((SaveData.settings.downScroll) ? -250 : 250), FlxG.width, Math.round(Conductor.songPosition - note.strum) + ' ms'); - precision.setFormat(Paths.font('main.ttf'), 22, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + precision.setFormat(Paths.font('vcr.ttf'), 22, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); precision.screenCenter(X); FlxTween.tween(precision, {y: (SaveData.settings.downScroll ? -260 : 260)}, 0.01, {ease: FlxEase.bounceOut}); precisions.push(precision); diff --git a/source/states/SongSelectState.hx b/source/states/SongSelectState.hx index 5aa9454..0416f9e 100644 --- a/source/states/SongSelectState.hx +++ b/source/states/SongSelectState.hx @@ -73,7 +73,7 @@ class SongSelectState extends ExtendableState { add(bottomPanel); panelTxt = new FlxText(bottomPanel.x, bottomPanel.y + 8, FlxG.width, "", 32); - panelTxt.setFormat(Paths.font('main.ttf'), 40, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + panelTxt.setFormat(Paths.font('vcr.ttf'), 40, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); panelTxt.scrollFactor.set(); panelTxt.screenCenter(X); add(panelTxt); @@ -81,11 +81,11 @@ class SongSelectState extends ExtendableState { tinyTxt = new FlxText(panelTxt.x, panelTxt.y + 50, FlxG.width, Localization.get("tinyGuide"), 22); tinyTxt.screenCenter(X); tinyTxt.scrollFactor.set(); - tinyTxt.setFormat(Paths.font('main.ttf'), 20, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + tinyTxt.setFormat(Paths.font('vcr.ttf'), 20, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); add(tinyTxt); titleTxt = new FlxText(0, 0, FlxG.width, "", 32); - titleTxt.setFormat(Paths.font('main.ttf'), 70, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + titleTxt.setFormat(Paths.font('vcr.ttf'), 70, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); titleTxt.scrollFactor.set(); titleTxt.screenCenter(X); add(titleTxt); diff --git a/source/states/TitleState.hx b/source/states/TitleState.hx index f94711b..d46c3fd 100644 --- a/source/states/TitleState.hx +++ b/source/states/TitleState.hx @@ -45,7 +45,7 @@ class TitleState extends ExtendableState { }, 0); var text:FlxText = new FlxText(0, logo.y + 400, 0, Localization.get("pressEnter"), 12); - text.setFormat(Paths.font('main.ttf'), 48, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + text.setFormat(Paths.font('vcr.ttf'), 48, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); text.screenCenter(X); add(text); } diff --git a/source/states/UpdateState.hx b/source/states/UpdateState.hx index fe51093..25261df 100644 --- a/source/states/UpdateState.hx +++ b/source/states/UpdateState.hx @@ -14,7 +14,7 @@ class UpdateState extends ExtendableState { + daJson.description + '\nPress ENTER to go to GitHub. Otherwise, press ESCAPE to proceed anyways.\n Thanks for playing!', 32); - text.setFormat(Paths.font('main.ttf'), 40, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + text.setFormat(Paths.font('vcr.ttf'), 40, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); text.screenCenter(XY); add(text); } diff --git a/source/substates/PauseSubState.hx b/source/substates/PauseSubState.hx index 0794bff..d359ba7 100644 --- a/source/substates/PauseSubState.hx +++ b/source/substates/PauseSubState.hx @@ -17,7 +17,7 @@ class PauseSubState extends ExtendableSubState { add(bg); var text:FlxText = new FlxText(0, 0, 0, Localization.get("pauseTxt"), 12); - text.setFormat(Paths.font('main.ttf'), 64, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + text.setFormat(Paths.font('vcr.ttf'), 64, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); text.screenCenter(X); add(text); @@ -26,7 +26,7 @@ class PauseSubState extends ExtendableSubState { for (i in 0...pauseOptions.length) { var text:FlxText = new FlxText(0, 245 + (i * 65), 0, Localization.get(pauseOptions[i]), 32); - text.setFormat(Paths.font('main.ttf'), 80, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + text.setFormat(Paths.font('vcr.ttf'), 80, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); text.screenCenter(X); text.ID = i; pauseGrp.add(text); @@ -37,7 +37,7 @@ class PauseSubState extends ExtendableSubState { add(bottomPanel); tipTxt = new FlxText(20, FlxG.height - 80, 1000, "", 22); - tipTxt.setFormat(Paths.font('main.ttf'), 26, 0xFFffffff, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + tipTxt.setFormat(Paths.font('vcr.ttf'), 26, 0xFFffffff, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); add(tipTxt); changeSelection(0, false); diff --git a/source/substates/PromptSubState.hx b/source/substates/PromptSubState.hx index 8f9175d..627ea20 100644 --- a/source/substates/PromptSubState.hx +++ b/source/substates/PromptSubState.hx @@ -21,7 +21,7 @@ class PromptSubState extends FlxSubState { add(box); var questionTxt:FlxText = new FlxText(box.x, box.y + 20, width, question); - questionTxt.setFormat(Paths.font('main.ttf'), 50, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + questionTxt.setFormat(Paths.font('vcr.ttf'), 50, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); questionTxt.scrollFactor.set(); add(questionTxt); diff --git a/source/substates/ResultsSubState.hx b/source/substates/ResultsSubState.hx index 90f57ec..4386409 100644 --- a/source/substates/ResultsSubState.hx +++ b/source/substates/ResultsSubState.hx @@ -40,12 +40,12 @@ class ResultsSubState extends ExtendableSubState { + Localization.get("accTxt") + accuracy + "%", 12); - rankTxt.setFormat(Paths.font('main.ttf'), 40, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + rankTxt.setFormat(Paths.font('vcr.ttf'), 40, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); rankTxt.alpha = 0; add(rankTxt); anyKeyTxt = new FlxText(10, 480, 0, Localization.get("ctrlGuide"), 12); - anyKeyTxt.setFormat(Paths.font('main.ttf'), 30, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + anyKeyTxt.setFormat(Paths.font('vcr.ttf'), 30, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); anyKeyTxt.alpha = 0; add(anyKeyTxt);