From 49b1a9225292ebe7959c47528d3b6025d140227d Mon Sep 17 00:00:00 2001 From: jeffi Date: Tue, 27 Feb 2024 13:09:34 -0600 Subject: [PATCH] Update Font. --- DiesalStyle-2.0/DiesalStyle-2.0.lua | 107 +++++++++++++--------------- 1 file changed, 49 insertions(+), 58 deletions(-) diff --git a/DiesalStyle-2.0/DiesalStyle-2.0.lua b/DiesalStyle-2.0/DiesalStyle-2.0.lua index d695de5..8d4a524 100644 --- a/DiesalStyle-2.0/DiesalStyle-2.0.lua +++ b/DiesalStyle-2.0/DiesalStyle-2.0.lua @@ -509,64 +509,49 @@ do -- | Text Formatters |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ end do -- | Set Media |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ addMedia("font", "calibrib", "Fonts\\calibrib.ttf") - -- Material - addMedia("font", "MaterialIcons", "Fonts\\MaterialIcons-Regular.ttf") - --addMedia("font", "MaterialIconsOutlined", "Fonts\\MaterialIconsOutlined-Regular.ttf") - addMedia("font", "MaterialIconsOutlined", "Fonts\\MaterialIconsOutlined-Regular.otf") - addMedia("font", "MaterialIconsRound", "Fonts\\MaterialIconsRound-Regular.otf") - addMedia("font", "MaterialIconsSharp", "Fonts\\MaterialIconsSharp-Regular.otf") - addMedia("font", "MaterialIconsTwoTone", "Fonts\\MaterialIconsTwoTone-Regular.otf") - addMedia("font", "MaterialSymbolsRounded", "Fonts\\MaterialSymbolsRounded.ttf") - -- monospaced - addMedia("font", "DejaVuSansMono", "Fonts\\DejaVuSansMono.ttf") - addMedia("font", "DejaVuSansMonoBold", "Fonts\\DejaVuSansMono-Bold.ttf") - - addMedia("font", "FiraMonoMedium", "Fonts\\FiraMono-Medium.ttf") - addMedia("font", "FiraMonoRegular", "Fonts\\FiraMono-Regular.ttf") - addMedia("font", "FiraMonoBold", "Fonts\\FiraMono-Bold.ttf") - - addMedia("font", "HackRegular", "Fonts\\Hack-Regular.ttf") - addMedia("font", "HackBold", "Fonts\\Hack-Bold.ttf") - - addMedia("font", "InconsolataRegular", "Fonts\\Inconsolata-Regular.ttf") - addMedia("font", "InconsolataBold", "Fonts\\Inconsolata-Bold.ttf") - - addMedia("font", "LucidiaMono", "Fonts\\LUCON.ttf") - - addMedia("font", "MonoFur", "Fonts\\monof55.ttf") - addMedia("font", "MonoFurItalic", "Fonts\\monof56.ttf") - - addMedia("font", "OfficeCodeProRegular", "Fonts\\OfficeCodePro-Regular.ttf") - addMedia("font", "OfficeCodeProMedium", "Fonts\\OfficeCodePro-Medium.ttf") - addMedia("font", "OfficeCodeProBold", "Fonts\\OfficeCodePro-Bold.ttf") - - addMedia("font", "RobotoMonoRegular", "Fonts\\RobotoMono-Regular.ttf") - addMedia("font", "RobotoMonoMedium", "Fonts\\RobotoMono-Medium.ttf") - addMedia("font", "RobotoMonoBold", "Fonts\\RobotoMono-Bold.ttf") - - addMedia("font", "SourceCodeProRegular", "Fonts\\SourceCodePro-Regular.ttf") - addMedia("font", "SourceCodeProMedium", "Fonts\\SourceCodePro-Medium.ttf") - addMedia("font", "SourceCodeProSemibold", "Fonts\\SourceCodePro-Semibold.ttf") - addMedia("font", "SourceCodeProBold", "Fonts\\SourceCodePro-Bold.ttf") - addMedia("font", "SourceCodeProBlack", "Fonts\\SourceCodePro-Black.ttf") - - addMedia("font", "UbuntuMonoBold", "Fonts\\UbuntuMono-B.ttf") - addMedia("font", "UbuntuMonoRegular", "Fonts\\UbuntuMono-R.ttf") - - -- pixel fonts - addMedia("font", "FiraSans", "Fonts\\FiraSans-Regular.ttf") - addMedia("font", "Standard0755", "Fonts\\Standard0755.ttf") - addMedia("font", "FFF Intelligent Thin Condensed", "Fonts\\FFF Intelligent Thin Condensed.ttf") - - -- Icons - addMedia("texture", "DiesalGUIcons", "Textures\\DiesalGUIcons16x256x128.tga") - addMedia("texture", "DiesalGUIcons64", "Textures\\DiesalGUIcons64x256x256.tga") - addMedia("texture", "DiesalGUIcons32", "Textures\\DiesalGUIcons32x256x256.tga") - addMedia("texture", "DiesalButtonIcons32", "Textures\\DiesalButtonIcons32x128x512.tga") - - -- Shadows - addMedia("border", "shadow", "Textures\\shadow.tga") - addMedia("border", "shadowNoDist", "Textures\\shadowNoDist.tga") + addMedia("font", "DejaVuSansMono", "Fonts\\DejaVuSansMono.ttf") -- Monospaced + addMedia("font", "DejaVuSansMonoBold", "Fonts\\DejaVuSansMono-Bold.ttf") -- Monospaced + addMedia("font", "FFF Intelligent Thin Condensed", "Fonts\\FFF Intelligent Thin Condensed.ttf") -- pixel fonts + addMedia("font", "FiraMonoBold", "Fonts\\FiraMono-Bold.ttf") -- Monospaced + addMedia("font", "FiraMonoMedium", "Fonts\\FiraMono-Medium.ttf") -- Monospaced + addMedia("font", "FiraMonoRegular", "Fonts\\FiraMono-Regular.ttf") -- Monospaced + addMedia("font", "FiraSans", "Fonts\\FiraSans-Regular.ttf") -- pixel fonts + addMedia("font", "HackBold", "Fonts\\Hack-Bold.ttf") -- Monospaced + addMedia("font", "HackRegular", "Fonts\\Hack-Regular.ttf") -- Monospaced + addMedia("font", "InconsolataBold", "Fonts\\Inconsolata-Bold.ttf") -- Monospaced + addMedia("font", "InconsolataRegular", "Fonts\\Inconsolata-Regular.ttf") -- Monospaced + addMedia("font", "LucidiaMono", "Fonts\\LUCON.ttf") -- Monospaced + addMedia("font", "MaterialIcons", "Fonts\\MaterialIcons-Regular.ttf") -- Material + addMedia("font", "MaterialIconsOutlinedTTF", "Fonts\\MaterialIconsOutlined-Regular.ttf") -- Material + addMedia("font", "MaterialIconsOutlined", "Fonts\\MaterialIconsOutlined-Regular.otf") -- Material + addMedia("font", "MaterialIconsRound", "Fonts\\MaterialIconsRound-Regular.otf") -- Material + addMedia("font", "MaterialIconsSharp", "Fonts\\MaterialIconsSharp-Regular.otf") -- Material + addMedia("font", "MaterialIconsTwoTone", "Fonts\\MaterialIconsTwoTone-Regular.otf") -- Material + addMedia("font", "MaterialSymbolsRounded", "Fonts\\MaterialSymbolsRounded.ttf") -- Material + addMedia("font", "MonoFur", "Fonts\\monof55.ttf") -- Monospaced + addMedia("font", "MonoFurItalic", "Fonts\\monof56.ttf") -- Monospaced + addMedia("font", "OfficeCodeProBold", "Fonts\\OfficeCodePro-Bold.ttf") -- Monospaced + addMedia("font", "OfficeCodeProMedium", "Fonts\\OfficeCodePro-Medium.ttf") -- Monospaced + addMedia("font", "OfficeCodeProRegular", "Fonts\\OfficeCodePro-Regular.ttf") -- Monospaced + addMedia("font", "RobotoMonoBold", "Fonts\\RobotoMono-Bold.ttf") -- Monospaced + addMedia("font", "RobotoMonoMedium", "Fonts\\RobotoMono-Medium.ttf") -- Monospaced + addMedia("font", "RobotoMonoRegular", "Fonts\\RobotoMono-Regular.ttf") -- Monospaced + addMedia("font", "SourceCodeProBlack", "Fonts\\SourceCodePro-Black.ttf") -- Monospaced + addMedia("font", "SourceCodeProBold", "Fonts\\SourceCodePro-Bold.ttf") -- Monospaced + addMedia("font", "SourceCodeProMedium", "Fonts\\SourceCodePro-Medium.ttf") -- Monospaced + addMedia("font", "SourceCodeProRegular", "Fonts\\SourceCodePro-Regular.ttf") -- Monospaced + addMedia("font", "SourceCodeProSemibold", "Fonts\\SourceCodePro-Semibold.ttf") -- Monospaced + addMedia("font", "Standard0755", "Fonts\\Standard0755.ttf") -- pixel fonts + addMedia("font", "UbuntuMonoBold", "Fonts\\UbuntuMono-B.ttf") -- Monospaced + addMedia("font", "UbuntuMonoRegular", "Fonts\\UbuntuMono-R.ttf") -- Monospaced + + addMedia("texture", "DiesalGUIcons", "Textures\\DiesalGUIcons16x256x128.tga") -- Icon Textures + addMedia("texture", "DiesalGUIcons64", "Textures\\DiesalGUIcons64x256x256.tga") -- Icon Textures + addMedia("texture", "DiesalGUIcons32", "Textures\\DiesalGUIcons32x256x256.tga") -- Icons Textures + addMedia("texture", "DiesalButtonIcons32", "Textures\\DiesalButtonIcons32x128x512.tga") -- Icons Textures + + addMedia("border", "shadow", "Textures\\shadow.tga") -- Shadows + addMedia("border", "shadowNoDist", "Textures\\shadowNoDist.tga") -- Shadows end do @@ -612,6 +597,12 @@ do -- | Set Fonts |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DiesalFontNormal:SetFont(font, 11, "") end + local font = getMedia("font", "calibrib") + if font then + DiesalFontNormalOutline = CreateFont("DiesalFontNormalOutline") + DiesalFontNormalOutline:SetFont(font, 11, "OUTLINE") + end + font = getMedia("font", "Standard0755") if font then DiesalFontPixel = CreateFont("DiesalFontPixel")