Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use modded fonts in Story Mode Menu and other missing places #15399

Merged
merged 2 commits into from
Sep 15, 2024
Merged

Use modded fonts in Story Mode Menu and other missing places #15399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89b3fe5
Update StoryMenuState.hx
crowplexus Aug 23, 2024
1f02839
replace all occurences of VCR OSD Mono with Paths.font("vcr.ttf")
crowplexus Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/states/FlashingState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class FlashingState extends MusicBeatState
Press ESCAPE to ignore this message.\n
You've been warned!",
32);
warnText.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, CENTER);
warnText.setFormat(Paths.font("vcr.ttf"), 32, FlxColor.WHITE, CENTER);
warnText.screenCenter(Y);
add(warnText);
}
Expand Down
4 changes: 2 additions & 2 deletions source/states/MainMenuState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ class MainMenuState extends MusicBeatState

var psychVer:FlxText = new FlxText(12, FlxG.height - 44, 0, "Psych Engine v" + psychEngineVersion, 12);
psychVer.scrollFactor.set();
psychVer.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
psychVer.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(psychVer);
var fnfVer:FlxText = new FlxText(12, FlxG.height - 24, 0, "Friday Night Funkin' v" + Application.current.meta.get('version'), 12);
fnfVer.scrollFactor.set();
fnfVer.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
fnfVer.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(fnfVer);
changeItem();

Expand Down
2 changes: 1 addition & 1 deletion source/states/OutdatedState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class OutdatedState extends MusicBeatState
\n
Thank you for using the Engine!",
32);
warnText.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, CENTER);
warnText.setFormat(Paths.font("vcr.ttf"), 32, FlxColor.WHITE, CENTER);
warnText.screenCenter(Y);
add(warnText);
}
Expand Down
6 changes: 3 additions & 3 deletions source/states/StoryMenuState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ class StoryMenuState extends MusicBeatState
if(curWeek >= WeekData.weeksList.length) curWeek = 0;

scoreText = new FlxText(10, 10, 0, Language.getPhrase('week_score', 'WEEK SCORE: {1}', [lerpScore]), 36);
scoreText.setFormat("VCR OSD Mono", 32);
scoreText.setFormat(Paths.font("vcr.ttf"), 32);

txtWeekTitle = new FlxText(FlxG.width * 0.7, 10, 0, "", 32);
txtWeekTitle.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, RIGHT);
txtWeekTitle.setFormat(Paths.font("vcr.ttf"), 32, FlxColor.WHITE, RIGHT);
txtWeekTitle.alpha = 0.7;

var ui_tex = Paths.getSparrowAtlas('campaign_menu_UI_assets');
Expand Down Expand Up @@ -208,7 +208,7 @@ class StoryMenuState extends MusicBeatState
return;
}

// scoreText.setFormat('VCR OSD Mono', 32);
// scoreText.setFormat(Paths.font("vcr.ttf"), 32);
if(intendedScore != lerpScore)
{
lerpScore = Math.floor(FlxMath.lerp(intendedScore, lerpScore, Math.exp(-elapsed * 30)));
Expand Down
4 changes: 2 additions & 2 deletions source/states/editors/MenuCharacterEditorState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class MenuCharacterEditorState extends MusicBeatState implements PsychUIEventHan
add(grpWeekCharacters);

txtOffsets = new FlxText(20, 10, 0, "[0, 0]", 32);
txtOffsets.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, CENTER);
txtOffsets.setFormat(Paths.font("vcr.ttf"), 32, FlxColor.WHITE, CENTER);
txtOffsets.alpha = 0.7;
add(txtOffsets);

Expand Down Expand Up @@ -378,4 +378,4 @@ class MenuCharacterEditorState extends MusicBeatState implements PsychUIEventHan
_file = null;
FlxG.log.error("Problem saving file");
}
}
}
2 changes: 1 addition & 1 deletion source/states/editors/WeekEditorState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class WeekEditorState extends MusicBeatState implements PsychUIEventHandler.Psyc

override function create() {
txtWeekTitle = new FlxText(FlxG.width * 0.7, 10, 0, "", 32);
txtWeekTitle.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, RIGHT);
txtWeekTitle.setFormat(Paths.font("vcr.ttf"), 32, FlxColor.WHITE, RIGHT);
txtWeekTitle.alpha = 0.7;

var ui_tex = Paths.getSparrowAtlas('campaign_menu_UI_assets');
Expand Down