Skip to content

Commit

Permalink
papyurs
Browse files Browse the repository at this point in the history
  • Loading branch information
@x8c8r
x8c8r committed Jun 26, 2024
1 parent db7f3ac commit 517026c
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 15 deletions.
Binary file added assets/fonts/papyrus.ttf
View file
Binary file not shown.
11 changes: 5 additions & 6 deletions source/FreeplayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,19 @@ class FreeplayState extends MusicBeatState
grpSongs = new FlxTypedGroup<Alphabet>();
add(grpSongs);


scoreText = new FlxText(FlxG.width * 0.7, 5, 0, "", 32);
scoreText.setFormat(Paths.font("vcr.ttf"), 32, FlxColor.WHITE, RIGHT);
scoreText = new FlxText(FlxG.width * 0.7, 5, 0, "", 24);
scoreText.setFormat(Paths.font("papyrus.ttf"), 24, FlxColor.WHITE, RIGHT);

var scoreBG:FlxSprite = new FlxSprite(scoreText.x - 6, 0).makeGraphic(Std.int(FlxG.width * 0.35), 99, 0xFF000000);
scoreBG.alpha = 0.6;
add(scoreBG);

diffText = new FlxText(FlxG.width * 0.7, 42, 0, "", 24);
diffText.setFormat(Paths.font("vcr.ttf"), 24, FlxColor.WHITE, RIGHT);
diffText = new FlxText(FlxG.width * 0.7, 42, 0, "", 20);
diffText.setFormat(Paths.font("papyrus.ttf"), 20, FlxColor.WHITE, RIGHT);
add(diffText);

pageText = new FlxText(FlxG.width * 0.7, 75, 0 , "", 16);
pageText.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT);
pageText.setFormat(Paths.font("papyrus.ttf"), 16, FlxColor.WHITE, RIGHT);
add(pageText);

addPageSongs(pages[page]);
Expand Down
6 changes: 4 additions & 2 deletions source/PauseSubState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,19 @@ class PauseSubState extends MusicBeatSubstate
bg.scrollFactor.set();
add(bg);

var font = PlayState.SONG.song.toLowerCase() == "thorns" ? "vcr.ttf" : "papyrus.ttf";

var levelInfo:FlxText = new FlxText(20, 15, 0, "", 32);
levelInfo.text += PlayState.SONG.song;
levelInfo.scrollFactor.set();
levelInfo.setFormat(Paths.font("vcr.ttf"), 32);
levelInfo.setFormat(Paths.font(font), 32);
levelInfo.updateHitbox();
add(levelInfo);

var levelDifficulty:FlxText = new FlxText(20, 15 + 32, 0, "", 32);
levelDifficulty.text += CoolUtil.difficultyString();
levelDifficulty.scrollFactor.set();
levelDifficulty.setFormat(Paths.font('vcr.ttf'), 32);
levelDifficulty.setFormat(Paths.font(font), 32);
levelDifficulty.updateHitbox();
add(levelDifficulty);

Expand Down
11 changes: 8 additions & 3 deletions source/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,14 +804,19 @@ class PlayState extends MusicBeatState
// healthBar
add(healthBar);

var scoreFont = PlayState.SONG.song.toLowerCase() == "thorns" ? "vcr.ttf" : "papyrus.ttf";
var scoreFontSize = PlayState.SONG.song.toLowerCase() == "thorns" ? 20 : 28;
var scorePosOffsetX = PlayState.SONG.song.toLowerCase() == "thorns" ? 150 : 600;
var scorePosOffsetY = PlayState.SONG.song.toLowerCase() == "thorns" ? 50 : 30;

// Add Kade Engine watermark
var kadeEngineWatermark = new FlxText(4,FlxG.height - 4,0,SONG.song + " " + (storyDifficulty == 2 ? "Hard" : storyDifficulty == 1 ? "Normal" : "Easy") + " - KE " + MainMenuState.kadeEngineVer, 16);
kadeEngineWatermark.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
kadeEngineWatermark.setFormat(Paths.font(scoreFont), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
kadeEngineWatermark.scrollFactor.set();
add(kadeEngineWatermark);

scoreTxt = new FlxText(healthBarBG.x + healthBarBG.width / 2 - 150, healthBarBG.y + 50, 0, "", 20);
scoreTxt.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
scoreTxt = new FlxText(healthBarBG.x + healthBarBG.width / 2 - scorePosOffsetX, healthBarBG.y + scorePosOffsetY, 0, "", scoreFontSize);
scoreTxt.setFormat(Paths.font(scoreFont), scoreFontSize, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
scoreTxt.scrollFactor.set();
add(scoreTxt);

Expand Down
8 changes: 4 additions & 4 deletions source/StoryMenuState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ class StoryMenuState extends MusicBeatState
persistentUpdate = persistentDraw = true;

scoreText = new FlxText(10, 10, 0, "SCORE: 49324858", 36);
scoreText.setFormat("VCR OSD Mono", 32);
scoreText.setFormat("papyrus.ttf", 32);

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

var rankText:FlxText = new FlxText(0, 10);
rankText.text = 'RANK: GREAT';
rankText.setFormat(Paths.font("vcr.ttf"), 32);
rankText.setFormat(Paths.font("papyrus.ttf"), 32);
rankText.size = scoreText.size;
rankText.screenCenter(X);

Expand Down Expand Up @@ -207,7 +207,7 @@ class StoryMenuState extends MusicBeatState
add(yellowBG);
add(grpWeekCharacters);

txtTracklist = new FlxText(FlxG.width * 0.05, yellowBG.x + yellowBG.height + 100, 0, "Tracks", 32);
txtTracklist = new FlxText(FlxG.width * 0.05, yellowBG.x + yellowBG.height + 75, 0, "Tracks", 28);
txtTracklist.alignment = CENTER;
txtTracklist.font = rankText.font;
txtTracklist.color = 0xFFe55777;
Expand Down

0 comments on commit 517026c

Please sign in to comment.