Added more variants of Ysabeuau fonts

src/dawn/games/vn/components/VNTextboxScroller.hpp

@@ -5,7 +5,7 @@
 
 #pragma once
 #include "scene/SceneItemComponent.hpp"
-#include "scene/components/ui/text/UILabel.hpp"
+#include "scene/components/ui/text/UIRichTextLabel.hpp"
 #include "input/InputManager.hpp"
 
 #define VN_TEXTBOX_SPEED 25.0f
@@ -15,7 +15,7 @@ namespace Dawn {
   class VNTextboxScroller : public SceneItemComponent {
     public:
       // @optional
-      StateProperty<UILabel*> label;
+      StateProperty<UIRichTextLabel*> label;
 
       // @optional
       StateProperty<int32_t> visibleLines;

src/dawn/games/vn/events/VNTextEvent.hpp

@@ -20,8 +20,7 @@ namespace Dawn {
         scroller = this->getScene()->findComponent<VNTextboxScroller>();
         assertNotNull(scroller);
 
-        assertUnreachable();
+        scroller->label->richText = "<font font=\"font_main\" size=\"32\">" + text + "</font>";
-        // scroller->label->text = text;
 
         useEvent([&](inputbind_t bind){
           if(bind != INPUT_BIND_ACCEPT) return;

src/dawnliminal/CMakeLists.txt

@@ -23,6 +23,9 @@ tool_texture(texture_eth FILE=${LIMINAL_ASSETS_DIR}/textures/eth.png)
 tool_texture(texture_border FILE=${LIMINAL_ASSETS_DIR}/textures/texture_test.png)
 tool_truetype(font_main
   REGULAR=${LIMINAL_ASSETS_DIR}/fonts/Ysabeau-Medium.ttf
+  BOLD=${LIMINAL_ASSETS_DIR}/fonts/Ysabeau-SemiBold.ttf
+  ITALICS=${LIMINAL_ASSETS_DIR}/fonts/Ysabeau-MediumItalic.ttf
+  BOLD_ITALICS=${LIMINAL_ASSETS_DIR}/fonts/Ysabeau-SemiBoldItalic.ttf
 )
 
 tool_scene(${LIMINAL_ASSETS_DIR}/scenes/SceneBase.xml)

src/dawnliminal/game/LiminalGame.cpp

@@ -10,6 +10,6 @@
 using namespace Dawn;
 
 Scene * Dawn::dawnGameGetInitialScene(DawnGame *game) {
-  return new HelloWorldScene(game);
+  // return new HelloWorldScene(game);
-  // return new Scene1Prologue(game);
+  return new Scene1Prologue(game);
 }

src/dawntools/truetypetool/TrueTypeTool.cpp

@@ -13,13 +13,13 @@ TrueTypeFile::TrueTypeFile(std::string path) : file(path) {
   // Remove extension
   size_t pos = path.find_last_of(".");
   std::string filename = path.substr(0, pos);
-
+  std::string pathLower = stringToLowercase(path);
 
   style = 0;
-  if(path.find("bold") != std::string::npos || filename.ends_with("bd") || filename.ends_with("bi")) {
+  if(pathLower.find("bold") != std::string::npos || filename.ends_with("bd") || filename.ends_with("bi")) {
     style |= TRUE_TYPE_VARIANT_BOLD;
   }
-  if(path.find("italics") != std::string::npos || filename.ends_with("i") || filename.ends_with("bi")) {
+  if(pathLower.find("italic") != std::string::npos || filename.ends_with("i") || filename.ends_with("bi")) {
     style |= TRUE_TYPE_VARIANT_ITALICS;
   }
 

src/dawntools/truetypetool/TrueTypeTool.hpp

@@ -7,6 +7,7 @@
 #include "util/DawnTool.hpp"
 #include "util/File.hpp"
 #include "display/font/truetype/TrueTypeShared.hpp"
+#include "util/string.hpp"
 
 namespace Dawn {
   class TrueTypeFile {

src/dawntools/vnscenetool/VNSceneGen.cpp

@@ -23,7 +23,7 @@ void VNSceneGen::test(
     case VN_SCENE_EVENT_TYPE_TEXT:
       initType = "VNTextEvent";
       toInclude = "games/vn/events/VNTextEvent.hpp";
-      line(&afterLines, eventName + "->" + "text = \"" + event->text.texts.begin()->text + "\";", "");
+      line(&afterLines, eventName + "->" + "text = " + event->text.texts.begin()->text + ";", "");
       break;
 
     case VN_SCENE_EVENT_TYPE_POSITION:

src/dawntools/vnscenetool/events/VNTextEventParser.cpp

@@ -4,6 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #include "VNTextEventParser.hpp"
+#include "util/parser/TypeParsers.hpp"
 
 using namespace Dawn;
 
@@ -22,8 +23,8 @@ int32_t VNTextParser::onParse(
   std::string *error
 ) {
   out->language = values["lang"];
-  out->text = node->value;
+  out->text = stringParser(node->innerXml, error);
-  return 0;
+  return error->length() == 0 ? 0 : -1;
 }
 
 // // // // // // // // // // // // // // // // // // // // // // // // // // //