From 59b9f61d692512a7e5d1a0b1e9a539a3449ab877 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 26 Jan 2025 21:05:43 +0100 Subject: [PATCH] Font nova per a la intro --- data/font/04b_25_var01.png | Bin 0 -> 3314 bytes data/font/04b_25_var01.txt | 194 +++++++++++++++++++++++++++++++++++++ source/director.cpp | 4 +- source/intro.cpp | 4 +- source/resource.cpp | 1 + 5 files changed, 200 insertions(+), 3 deletions(-) create mode 100644 data/font/04b_25_var01.png create mode 100644 data/font/04b_25_var01.txt diff --git a/data/font/04b_25_var01.png b/data/font/04b_25_var01.png new file mode 100644 index 0000000000000000000000000000000000000000..e9963be9f558266247c14c293cbcefb7c60c7fe5 GIT binary patch literal 3314 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 literal 0 HcmV?d00001 diff --git a/data/font/04b_25_var01.txt b/data/font/04b_25_var01.txt new file mode 100644 index 0000000..6fc925b --- /dev/null +++ b/data/font/04b_25_var01.txt @@ -0,0 +1,194 @@ +# box width +14 +# box height +14 +# 32 espacio ( ) +8 +# 33 ! +5 +# 34 " +8 +# 35 +10 +# 36 $ +10 +# 37 % +9 +# 38 & +11 +# 39 ' +5 +# 40 ( +7 +# 41 ) +7 +# 42 * +7 +# 43 + +9 +# 44 , +5 +# 45 - +9 +# 46 . +5 +# 47 / +12 +# 48 0 +8 +# 49 1 +6 +# 50 2 +8 +# 51 3 +8 +# 52 4 +8 +# 53 5 +8 +# 54 6 +8 +# 55 7 +8 +# 56 8 +8 +# 57 9 +8 +# 58 : +5 +# 59 ; +5 +# 60 < +8 +# 61 = +8 +# 62 > +8 +# 63 ? +8 +# 64 @ +11 +# 65 A +8 +# 66 B +8 +# 67 C +8 +# 68 D +8 +# 69 E +8 +# 70 F +8 +# 71 G +8 +# 72 H +8 +# 73 I +5 +# 74 J +8 +# 75 K +8 +# 76 L +8 +# 77 M +11 +# 78 N +8 +# 79 O +8 +# 80 P +8 +# 81 Q +8 +# 82 R +8 +# 83 S +8 +# 84 T +9 +# 85 U +8 +# 86 V +8 +# 87 W +11 +# 88 X +8 +# 89 Y +8 +# 90 Z +8 +# 91 [ +7 +# 92 \ +11 +# 93 ] +7 +# 94 ^ +6 +# 95 _ +7 +# 96 ` +6 +# 97 a +8 +# 98 b +8 +# 99 c +8 +# 100 d +8 +# 101 e +8 +# 102 f +8 +# 103 g +8 +# 104 h +8 +# 105 i +5 +# 106 j +8 +# 107 k +8 +# 108 l +8 +# 109 m +11 +# 110 n +8 +# 111 o +8 +# 112 p +8 +# 113 q +8 +# 114 r +8 +# 115 s +8 +# 116 t +9 +# 117 u +8 +# 118 v +8 +# 119 w +11 +# 120 x +8 +# 121 y +8 +# 122 z +8 +# 123 { +1 +# 124 | +1 +# 125 } +1 +# 126 ~ +1 \ No newline at end of file diff --git a/source/director.cpp b/source/director.cpp index 2ada3de..3eb1c3d 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -52,7 +52,7 @@ Director::Director(int argc, const char *argv[]) section::name = section::Name::GAME; section::options = section::Options::GAME_PLAY_1P; #elif DEBUG - section::name = section::Name::INSTRUCTIONS; + section::name = section::Name::LOGO; #else // NORMAL GAME section::name = section::Name::LOGO; section::attract_mode = section::AttractMode::TITLE_TO_DEMO; @@ -545,6 +545,8 @@ void Director::setFileList() Asset::get()->add(prefix + "/data/font/04b_25.txt", AssetType::FONT); Asset::get()->add(prefix + "/data/font/04b_25_2x.png", AssetType::BITMAP); Asset::get()->add(prefix + "/data/font/04b_25_2x.txt", AssetType::FONT); + Asset::get()->add(prefix + "/data/font/04b_25_var01.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/font/04b_25_var01.txt", AssetType::FONT); // Textos Asset::get()->add(prefix + "/data/lang/es_ES.txt", AssetType::LANG); diff --git a/source/intro.cpp b/source/intro.cpp index f5b6790..18c4439 100644 --- a/source/intro.cpp +++ b/source/intro.cpp @@ -21,7 +21,7 @@ // Constructor Intro::Intro() : texture_(Resource::get()->getTexture("intro.png")), - text_(Resource::get()->getText("nokia")) + text_(Resource::get()->getText("04b_25_var01")) { // Inicializa variables @@ -97,7 +97,7 @@ Intro::Intro() auto w = std::make_unique(text_); w->setPosX(BLOCK * 0); w->setPosY(param.game.height - (BLOCK * 6)); - w->setKerning(-1); + w->setKerning(-2); w->setEnabled(false); w->setFinishedCounter(180); texts_.push_back(std::move(w)); diff --git a/source/resource.cpp b/source/resource.cpp index 0fe7772..8deb24a 100644 --- a/source/resource.cpp +++ b/source/resource.cpp @@ -323,6 +323,7 @@ void Resource::createText() std::vector> resources = { {"04b_25", "04b_25.png"}, {"04b_25_2x", "04b_25_2x.png"}, + {"04b_25_var01", "04b_25_var01.png"}, {"8bithud", "8bithud.png"}, {"nokia", "nokia.png"}, {"smb2", "smb2.gif"}};