0.75a:

Appearances will now be imported even if there's no StrRef specified as the STR_REF is optional and not required.
Cjreek · Aug 12, 2024 · e2c3b2f · e2c3b2f
1 parent b3e3d19
commit e2c3b2f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/eos-edit/Views/MainWindow.axaml b/eos-edit/Views/MainWindow.axaml
@@ -20,7 +20,7 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="Eos.Views.MainWindow" MinHeight="300" MinWidth="500"
         Height="700" Width="1100" Loaded="mainWindow_Loaded"
-        x:Name="mainWindow" Tag="Eos Toolset v0.75" FontFamily="Segoe UI"
+        x:Name="mainWindow" Tag="Eos Toolset v0.75a" FontFamily="Segoe UI"
         Closing="mainWindow_Closing"
         Icon="/Assets/Icons/Eos.ico">
   <Window.Title>

diff --git a/eos/Services/GameDataImport.cs b/eos/Services/GameDataImport.cs
@@ -2403,7 +2403,19 @@ private void ImportAppearances()
                 tmpAppearance.Index = i;
                 tmpAppearance.SourceLabel = appearance2da[i].AsString("LABEL");
 
-                if (!SetText(tmpAppearance.Name, appearance2da[i].AsInteger("STRING_REF"))) continue;
+                if (!SetText(tmpAppearance.Name, appearance2da[i].AsInteger("STRING_REF")))
+                {
+                    if ((tmpAppearance.SourceLabel != "") && (tmpAppearance.SourceLabel != null))
+                    {
+                        foreach (TLKLanguage lang in Enum.GetValues(typeof(TLKLanguage)))
+                        {
+                            tmpAppearance.Name[lang].Text = tmpAppearance.SourceLabel;
+                            tmpAppearance.Name[lang].TextF = tmpAppearance.SourceLabel;
+                        }
+                    }
+                    else
+                        continue;
+                }
                 tmpAppearance.RaceModel = appearance2da[i].AsString("RACE") ?? "";
                 tmpAppearance.EnvironmentMap = appearance2da[i].AsString("ENVMAP") ?? "";
                 tmpAppearance.BloodColor = Enum.Parse<BloodColor>(appearance2da[i].AsString("BLOODCOLR") ?? "R", true);

diff --git a/eos/Services/ImportService.cs b/eos/Services/ImportService.cs
@@ -1262,7 +1262,19 @@ private void ImportAppearances()
                     tmpAppearance.Index = i;
                     tmpAppearance.SourceLabel = appearance2da[i].AsString("LABEL");
 
-                    if (!SetText(tmpAppearance.Name, appearance2da[i].AsInteger("STRING_REF"))) continue;
+                    if (!SetText(tmpAppearance.Name, appearance2da[i].AsInteger("STRING_REF")))
+                    {
+                        if ((tmpAppearance.SourceLabel != "") && (tmpAppearance.SourceLabel != null))
+                        {
+                            foreach (TLKLanguage lang in Enum.GetValues(typeof(TLKLanguage)))
+                            {
+                                tmpAppearance.Name[lang].Text = tmpAppearance.SourceLabel;
+                                tmpAppearance.Name[lang].TextF = tmpAppearance.SourceLabel;
+                            }
+                        }
+                        else
+                            continue;
+                    }
                     tmpAppearance.RaceModel = appearance2da[i].AsString("RACE") ?? "";
                     tmpAppearance.EnvironmentMap = appearance2da[i].AsString("ENVMAP") ?? "";
                     tmpAppearance.BloodColor = Enum.Parse<BloodColor>(appearance2da[i].AsString("BLOODCOLR") ?? "R", true);