Improvements over localization data.

isadorasophia · Dec 8, 2023 · db51afc · db51afc
1 parent f43ba6a
commit db51afc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/src/Murder.Editor/CustomEditors/CharacterEditor_Dialogs.cs b/src/Murder.Editor/CustomEditors/CharacterEditor_Dialogs.cs
@@ -244,7 +244,7 @@ private void DrawLines(ScriptInformation info, Dialog dialog)
                 if (line.Text is not null)
                 {
                     // Centralizes the text vertically.
-                    string value = LocalizationServices.GetLocalizedString(line.Text);
+                    string value = LocalizationServices.GetLocalizedString(line.Text.Value);
 
                     float textHeight = (ImGui.GetItemRectSize().Y -
                         ImGui.CalcTextSize(value, wrapWidth: ImGui.GetWindowContentRegionMax().X - ImGui.GetCursorPosX()).Y) / 2f;

diff --git a/src/Murder.Editor/Data/EditorDataManager_Dialog.cs b/src/Murder.Editor/Data/EditorDataManager_Dialog.cs
@@ -39,7 +39,7 @@ public bool ReloadDialogs(bool force = false)
             string dialogsPackedPath = FileHelper.GetPath(Path.Join(EditorSettings.SourcePackedPath, GameProfile.DialoguesPath));
 
             string descriptorPath = Path.Join(dialogsPackedPath, _dialogsDescriptorName);
-            if (force || !FileLoadHelpers.ShouldRecalculate(dialogsRawResourcesPath, descriptorPath))
+            if (!force && !FileLoadHelpers.ShouldRecalculate(dialogsRawResourcesPath, descriptorPath))
             {
                 return false;
             }

diff --git a/src/Murder/Core/Dialogs/CharacterRuntime.cs b/src/Murder/Core/Dialogs/CharacterRuntime.cs
@@ -551,7 +551,7 @@ string FormatText(string? input)
             DialogEdge choices = ActiveSituation.Edges[dialog.Id];
 
             (Guid speaker, string? portrait) = (titleLine.Speaker ?? _character.Speaker, titleLine.Portrait);
-            string title = FormatText(LocalizationServices.GetLocalizedString(titleLine.Text));
+            string title = FormatText(LocalizationServices.TryGetLocalizedString(titleLine.Text));
 
             var choicesArray = ImmutableArray.CreateBuilder<string>();
             foreach (int c in choices.Dialogs)
@@ -563,7 +563,7 @@ string FormatText(string? input)
                     continue;
                 }
 
-                choicesArray.Add(FormatText(LocalizationServices.GetLocalizedString(choice.Lines[0].Text)));
+                choicesArray.Add(FormatText(LocalizationServices.TryGetLocalizedString(choice.Lines[0].Text)));
             }
 
             return new(speaker, portrait, title, choicesArray.ToImmutable());
@@ -582,7 +582,7 @@ private Line FormatLine(Line line)
                 line = line.WithSpeakerAndPortrait(_character.Speaker, _character.Portrait);
             }
 
-            if (!BlackboardHelpers.FormatText(LocalizationServices.GetLocalizedString(text), out string result))
+            if (!BlackboardHelpers.FormatText(LocalizationServices.GetLocalizedString(text.Value), out string result))
             {
                 return line;
             }

diff --git a/src/Murder/Data/GameDataManager.cs b/src/Murder/Data/GameDataManager.cs
@@ -249,6 +249,7 @@ protected async Task LoadContentAsync()
             LoadAssetsAtPath(Path.Join(_binResourcesDirectory, GameProfile.AssetResourcesPath, GameProfile.ContentECSPath));
 
             LoadAllSaves();
+            ChangeLanguage(Game.Preferences.Language);
 
             CallAfterLoadContent = true;
         }
@@ -430,8 +431,6 @@ private void LoadGameSettings()
                 GameProfile = CreateGameProfile();
                 GameProfile.MakeGuid();
             }
-
-            ChangeLanguage(Game.Preferences.Language);
         }
 
         public MonoWorld CreateWorldInstanceFromSave(Guid guid, Camera2D camera)

diff --git a/src/Murder/Services/LocalizationServices.cs b/src/Murder/Services/LocalizationServices.cs
@@ -8,26 +8,24 @@ public static class LocalizationServices
     {
         public static LocalizationAsset GetCurrentLocalization() => Game.Data.Localization;
 
-        public static string GetLocalizedString(LocalizedString? localized)
-        {
-            if (localized is null)
-            {
-                return string.Empty;
-            }
+        public static string? TryGetLocalizedString(LocalizedString? localized) =>
+            localized is null ? null : GetLocalizedString(localized.Value);
 
-            if (localized.Value.OverrideText is not null)
+        public static string GetLocalizedString(LocalizedString localized)
+        {
+            if (localized.OverrideText is not null)
             {
-                return localized.Value.OverrideText;
+                return localized.OverrideText;
             }
 
             LocalizationAsset asset = Game.Data.Localization;
 
-            LocalizedStringData? data = asset.TryGetResource(localized.Value.Id) ??
-                Game.Data.GetDefaultLocalization().TryGetResource(localized.Value.Id);
+            LocalizedStringData? data = asset.TryGetResource(localized.Id) ??
+                Game.Data.GetDefaultLocalization().TryGetResource(localized.Id);
 
             if (data is null)
             {
-                GameLogger.Error($"Unable to acquire resource for {localized.Value.Id}.");
+                GameLogger.Error($"Unable to acquire resource for {localized.Id}.");
                 return string.Empty;
             }