[Tweak] Fronts

AtaraxiaSpaceFoundation · Nov 17, 2024 · cb60332 · cb60332
1 parent 468c1a4
commit cb60332
Show file tree

Hide file tree

Showing 40 changed files with 122 additions and 33 deletions.
diff --git a/Content.Client/Access/AccessOverlay.cs b/Content.Client/Access/AccessOverlay.cs
@@ -9,7 +9,7 @@ namespace Content.Client.Access;
 
 public sealed class AccessOverlay : Overlay
 {
-    private const string TextFontPath = "/Fonts/NotoSans/NotoSans-Regular.ttf";
+    private const string TextFontPath = "/Fonts/_Everwood/medieval.ttf";  // Everwood EDIT
     private const int TextFontSize = 12;
 
     private readonly IEntityManager _entityManager;

diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs
@@ -24,7 +24,7 @@ public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeMa
             _eyeManager = eyeManager;
             _entityLookup = entityLookup;
             ZIndex = 200;
-            _font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
+            _font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/_Everwood/medieval.ttf"), 10); // Everwood EDIT
         }
 
         public override OverlaySpace Space => OverlaySpace.ScreenSpace;

diff --git a/Content.Client/Fluids/PuddleOverlay.cs b/Content.Client/Fluids/PuddleOverlay.cs
@@ -27,7 +27,7 @@ public PuddleOverlay()
         IoCManager.InjectDependencies(this);
         _debugOverlaySystem = _entitySystemManager.GetEntitySystem<PuddleDebugOverlaySystem>();
         var cache = IoCManager.Resolve<IResourceCache>();
-        _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 8);
+        _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/_Everwood/medieval.ttf"), 8); // Everwood EDIT
     }
 
     protected override void Draw(in OverlayDrawArgs args)

diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
@@ -188,7 +188,7 @@ private void UpdateLobbyUi()
             if (_gameTicker.ServerInfoBlob != null)
                 Lobby!.ServerInfo.SetInfoBlob(_gameTicker.ServerInfoBlob);
 
-            Lobby!.LabelName.SetMarkup("[font=\"Bedstead\" size=20] White Dream [/font]"); // WD EDIT
+            Lobby!.LabelName.SetMarkup("[font=\"FallenAngel\" size=45] Everwood [/font]"); // WD EDIT | Everwood EDIT
             Lobby!.ChangelogLabel.SetMarkup(Loc.GetString("ui-lobby-changelog")); // WD EDIT
         }
 

diff --git a/Content.Client/NPC/HTN/HTNOverlay.cs b/Content.Client/NPC/HTN/HTNOverlay.cs
@@ -15,7 +15,7 @@ public sealed class HTNOverlay : Overlay
     public HTNOverlay(IEntityManager entManager, IResourceCache resourceCache)
     {
         _entManager = entManager;
-        _font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
+        _font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/_Everwood/medieval.ttf"), 10); // Everwood EDIT
     }
 
     protected override void Draw(in OverlayDrawArgs args)

diff --git a/Content.Client/Parallax/BiomeDebugOverlay.cs b/Content.Client/Parallax/BiomeDebugOverlay.cs
@@ -33,7 +33,7 @@ public BiomeDebugOverlay()
         _biomes = _entManager.System<BiomeSystem>();
         _maps = _entManager.System<SharedMapSystem>();
 
-        _font = new VectorFont(_cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 12);
+        _font = new VectorFont(_cache.GetResource<FontResource>("/Fonts/_Everwood/medieval.ttf"), 12); // Everwood EDIT
     }
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)

diff --git a/Content.Client/Popups/PopupUIController.cs b/Content.Client/Popups/PopupUIController.cs
@@ -26,9 +26,9 @@ public override void Initialize()
         base.Initialize();
         var cache = IoCManager.Resolve<IResourceCache>();
 
-        _smallFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Italic.ttf"), 10);
-        _mediumFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Italic.ttf"), 12);
-        _largeFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-BoldItalic.ttf"), 14);
+        _smallFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/_Everwood/medieval.ttf"), 10);// Everwood EDIT START
+        _mediumFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/_Everwood/medieval.ttf"), 12);
+        _largeFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/_Everwood/medieval.ttf"), 14); // Everwood EDIT END
     }
 
     public void OnStateEntered(GameplayState state)

diff --git a/Content.Client/Replay/UI/Loading/LoadingScreenControl.xaml.cs b/Content.Client/Replay/UI/Loading/LoadingScreenControl.xaml.cs
@@ -19,8 +19,8 @@ public LoadingScreenControl(IResourceCache resCache)
         RobustXamlLoader.Load(this);
 
         LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
-        Header.FontOverride = resCache.GetFont("/Fonts/NotoSansDisplay/NotoSansDisplay-Bold.ttf", 24);
-        Subtext.FontOverride = resCache.GetFont("/Fonts/NotoSansDisplay/NotoSansDisplay-Bold.ttf", 12);
+        Header.FontOverride = resCache.GetFont("/Fonts/_Everwood/medieval.ttf", 24); // Everwood EDIT
+        Subtext.FontOverride = resCache.GetFont("/Fonts/_Everwood/medieval.ttf", 12); // Everwood EDIT
 
         SpriteLeft.SetFromSpriteSpecifier(Sprite);
         SpriteRight.SetFromSpriteSpecifier(Sprite);

diff --git a/Content.Client/Stylesheets/StyleBase.cs b/Content.Client/Stylesheets/StyleBase.cs
@@ -16,7 +16,7 @@ public abstract class StyleBase
         public const string ClassLowDivider = "LowDivider";
         public const string StyleClassLabelHeading = "LabelHeading";
         public const string StyleClassLabelSubText = "LabelSubText";
-        public const string StyleClassItalic = "Italic";
+        public const string StyleClassItalic = "Supernatural"; // Everwood EDIT
 
         public const string ClassAngleRect = "AngleRect";
 
@@ -49,19 +49,15 @@ protected StyleBase(IResourceCache resCache)
             (
                 new []
                 {
-                    "/Fonts/NotoSans/NotoSans-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
+                    "/Fonts/_Everwood/supernatural.ttf" // Everwood EDIT
                 },
                 12
             );
             var notoSans12Italic = resCache.GetFont
             (
                 new []
                 {
-                    "/Fonts/NotoSans/NotoSans-Italic.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
+                    "/Fonts/_Everwood/supernatural.ttf" // Everwood EDIT
                 },
                 12
             );

diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
@@ -29,9 +29,7 @@ public static Font NotoStack(this IResourceCache resCache, string variation = "R
                 // Ew, but ok
                 new[]
                 {
-                    $"/Fonts/NotoSans{ds}/NotoSans{ds}-{variation}.ttf",
-                    $"/Fonts/NotoSans/NotoSansSymbols-{sv}.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
+                    "/Fonts/_Everwood/supernatural.ttf" // Everwood EDIT
                 },
                 size
             );
@@ -178,7 +176,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
             var notoSansBold16 = resCache.NotoStack(variation: "Bold", size: 16);
             var notoSansBold18 = resCache.NotoStack(variation: "Bold", size: 18);
             var notoSansBold20 = resCache.NotoStack(variation: "Bold", size: 20);
-            var notoSansMono = resCache.GetFont("/EngineFonts/NotoSans/NotoSansMono-Regular.ttf", size: 12);
+            var notoSansMono = resCache.GetFont("/Fonts/_Everwood/supernatural.ttf", size: 12); // Everwood EDIT
             var windowHeaderTex = resCache.GetTexture("/Textures/Interface/Nano/window_header.png");
             var windowHeader = new StyleBoxTexture
             {
@@ -535,7 +533,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
             var sliderFillBlue = new StyleBoxTexture(sliderFillBox) { Modulate = Color.Blue };
             var sliderFillWhite = new StyleBoxTexture(sliderFillBox) { Modulate = Color.White };
 
-            var boxFont13 = resCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
+            var boxFont13 = resCache.GetFont("/Fonts/_Everwood/supernatural.ttf", 13); // Everwood EDIT
 
             var insetBack = new StyleBoxTexture
             {

diff --git a/Content.Client/Stylesheets/StyleSpace.cs b/Content.Client/Stylesheets/StyleSpace.cs
@@ -30,19 +30,15 @@ public StyleSpace(IResourceCache resCache) : base(resCache)
             (
                 new []
                 {
-                    "/Fonts/NotoSans/NotoSans-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
+                    "/Fonts/_Everwood/supernatural.ttf" // Everwood EDIT
                 },
                 10
             );
             var notoSansBold16 = resCache.GetFont
             (
                 new []
                 {
-                    "/Fonts/NotoSans/NotoSans-Bold.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
+                    "/Fonts/_Everwood/supernatural.ttf" // Everwood EDIT
                 },
                 16
             );

diff --git a/Content.Client/_White/UI/Buttons/WhiteLobbyTextButton.cs b/Content.Client/_White/UI/Buttons/WhiteLobbyTextButton.cs
@@ -26,7 +26,7 @@ public WhiteLobbyTextButton()
     {
         IoCManager.InjectDependencies(this);
 
-        _font = new VectorFont(_resourceCache.GetResource<FontResource>("/Fonts/_White/Bedstead/Bedstead.otf"), 15);
+        _font = new VectorFont(_resourceCache.GetResource<FontResource>("/Fonts/_Everwood/supernatural.ttf"), 15); // Everwood EDIT
     }
 
     private void RebuildTexture()

diff --git a/Content.Shared/Speech/SpeechVerbPrototype.cs b/Content.Shared/Speech/SpeechVerbPrototype.cs
@@ -35,7 +35,7 @@ public sealed partial class SpeechVerbPrototype : IPrototype
     /// </summary>
     /// font proto is client only so cant lint this lol sorry
     [DataField("fontId")]
-    public string FontId = "Default";
+    public string FontId = "Supernatural"; // Everwood EDIT
 
     /// <summary>
     ///     If multiple applicable speech verb protos are found (i.e. through speech suffixes) this will determine

diff --git a/Resources/Fonts/_Everwood/behrens.ttf b/Resources/Fonts/_Everwood/behrens.ttf
diff --git a/Resources/Fonts/_Everwood/blackmoor.ttf b/Resources/Fonts/_Everwood/blackmoor.ttf
diff --git a/Resources/Fonts/_Everwood/book1.ttf b/Resources/Fonts/_Everwood/book1.ttf
diff --git a/Resources/Fonts/_Everwood/book2.ttf b/Resources/Fonts/_Everwood/book2.ttf
diff --git a/Resources/Fonts/_Everwood/book3.ttf b/Resources/Fonts/_Everwood/book3.ttf
diff --git a/Resources/Fonts/_Everwood/book4.ttf b/Resources/Fonts/_Everwood/book4.ttf
diff --git a/Resources/Fonts/_Everwood/chiseld.ttf b/Resources/Fonts/_Everwood/chiseld.ttf
diff --git a/Resources/Fonts/_Everwood/fallenangel.otf b/Resources/Fonts/_Everwood/fallenangel.otf
diff --git a/Resources/Fonts/_Everwood/handwrite.ttf b/Resources/Fonts/_Everwood/handwrite.ttf
diff --git a/Resources/Fonts/_Everwood/isabella.ttf b/Resources/Fonts/_Everwood/isabella.ttf
diff --git a/Resources/Fonts/_Everwood/languages/cat.ttf b/Resources/Fonts/_Everwood/languages/cat.ttf
diff --git a/Resources/Fonts/_Everwood/languages/draconic.ttf b/Resources/Fonts/_Everwood/languages/draconic.ttf
diff --git a/Resources/Fonts/_Everwood/languages/dwarf.ttf b/Resources/Fonts/_Everwood/languages/dwarf.ttf
diff --git a/Resources/Fonts/_Everwood/languages/elf.ttf b/Resources/Fonts/_Everwood/languages/elf.ttf
diff --git a/Resources/Fonts/_Everwood/languages/fae.ttf b/Resources/Fonts/_Everwood/languages/fae.ttf
diff --git a/Resources/Fonts/_Everwood/languages/hell.ttf b/Resources/Fonts/_Everwood/languages/hell.ttf
diff --git a/Resources/Fonts/_Everwood/languages/orc.ttf b/Resources/Fonts/_Everwood/languages/orc.ttf
diff --git a/Resources/Fonts/_Everwood/languages/sand.ttf b/Resources/Fonts/_Everwood/languages/sand.ttf
diff --git a/Resources/Fonts/_Everwood/languages/undead.ttf b/Resources/Fonts/_Everwood/languages/undead.ttf
diff --git a/Resources/Fonts/_Everwood/lombardina.ttf b/Resources/Fonts/_Everwood/lombardina.ttf
diff --git a/Resources/Fonts/_Everwood/malefissent.ttf b/Resources/Fonts/_Everwood/malefissent.ttf
diff --git a/Resources/Fonts/_Everwood/medieval.ttf b/Resources/Fonts/_Everwood/medieval.ttf
diff --git a/Resources/Fonts/_Everwood/paladin.ttf b/Resources/Fonts/_Everwood/paladin.ttf
diff --git a/Resources/Fonts/_Everwood/pterra.ttf b/Resources/Fonts/_Everwood/pterra.ttf
diff --git a/Resources/Fonts/_Everwood/supernatural.ttf b/Resources/Fonts/_Everwood/supernatural.ttf
diff --git a/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl b/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl
@@ -22,8 +22,8 @@ chat-manager-server-wrap-message = СЕРВЕР: { $message }
 chat-manager-sender-announcement-wrap-message = [font size=14][bold]Объявление {$sender}:[/font][font size=12]
                                                 {$message}[/bold][/font]
 
-chat-manager-entity-say-wrap-message = [BubbleHeader][bold][Name]{$entityName}[/Name][/bold][/BubbleHeader] [italic]{$verb}[/italic], [font={$fontType} size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font]
-chat-manager-entity-say-bold-wrap-message = [BubbleHeader][bold][Name]{$entityName}[/Name][/bold][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent][bold]{$message}[/bold][/BubbleContent]"[/font]
+chat-manager-entity-say-wrap-message = [BubbleHeader][bold][Name]{$entityName}[/Name][/bold][/BubbleHeader] [italic]{$verb}[/italic], [font="Supernatural" size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font]
+chat-manager-entity-say-bold-wrap-message = [BubbleHeader][bold][Name]{$entityName}[/Name][/bold][/BubbleHeader] {$verb}, [font="Supernatural" size={$fontSize}]"[BubbleContent][bold]{$message}[/bold][/BubbleContent]"[/font]
 
 chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader]{$entityName}[/BubbleHeader] шепчет,"[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]
 chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Некто[/BubbleHeader] шепчет, "[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]

diff --git a/Resources/Prototypes/_Everwood/fonts.yml b/Resources/Prototypes/_Everwood/fonts.yml
@@ -0,0 +1,99 @@
+- type: font
+  id: FallenAngel
+  path: /Fonts/_Everwood/fallenangel.otf
+
+- type: font
+  id: Supernatural
+  path: /Fonts/_Everwood/supernatural.ttf
+
+- type: font
+  id: Behrens
+  path: /Fonts/_Everwood/behrens.ttf
+
+- type: font
+  id: Malefissent
+  path: /Fonts/_Everwood/malefissent.ttf
+
+- type: font
+  id: Isabella
+  path: /Fonts/_Everwood/isabella.ttf
+
+- type: font
+  id: Paladin
+  path: /Fonts/_Everwood/paladin.ttf
+
+- type: font
+  id: Medieval
+  path: /Fonts/_Everwood/medieval.ttf
+
+- type: font
+  id: Lombardina
+  path: /Fonts/_Everwood/lombardina.ttf
+
+- type: font
+  id: Blackmoor
+  path: /Fonts/_Everwood/blackmoor.ttf
+
+- type: font
+  id: ChiselD
+  path: /Fonts/_Everwood/chiseld.ttf
+
+- type: font
+  id: SteveRegular
+  path: /Fonts/_Everwood/handwrite.ttf
+
+- type: font
+  id: Pterra
+  path: /Fonts/_Everwood/pterra.ttf
+
+- type: font
+  id: Haiku
+  path: /Fonts/_Everwood/languages/cat.ttf
+
+- type: font
+  id: KingthingsPetrock
+  path: /Fonts/_Everwood/languages/draconic.ttf
+
+- type: font
+  id: MasonAlternateRegular
+  path: /Fonts/_Everwood/languages/dwarf.ttf
+
+- type: font
+  id: Dauphin
+  path: /Fonts/_Everwood/languages/elf.ttf
+
+- type: font
+  id: SweetDreams
+  path: /Fonts/_Everwood/languages/fae.ttf
+
+- type: font
+  id: Nosfer
+  path: /Fonts/_Everwood/languages/hell.ttf
+
+- type: font
+  id: TimesNewRomanCursed
+  path: /Fonts/_Everwood/languages/orc.ttf
+
+- type: font
+  id: Arabolical
+  path: /Fonts/_Everwood/languages/sand.ttf
+
+- type: font
+  id: FriskyVapmpire
+  path: /Fonts/_Everwood/languages/undead.ttf
+
+- type: font
+  id: RosemaryRoman
+  path: /Fonts/_Everwood/book1.ttf
+
+- type: font
+  id: Benegraphic
+  path: /Fonts/_Everwood/book2.ttf
+
+- type: font
+  id: GoudyMediaevalDemiBold
+  path: /Fonts/_Everwood/book3.ttf
+
+- type: font
+  id: Friedolin
+  path: /Fonts/_Everwood/book4.ttf