From 38bd2a369413ef1c4326774a97030a9de025d67b Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Tue, 16 Jul 2024 02:55:36 -0400 Subject: [PATCH 1/3] Add extra default skin selections. --- FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs b/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs index 47d4ee9b..4c2c61e3 100644 --- a/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs +++ b/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs @@ -40,9 +40,13 @@ public class ImportModelEditViewModel private readonly Regex DefaultSkinRegex = new Regex("\\/mt_c[0-9]{4}b0001_a\\.mtrl"); private readonly Regex ItemMaterialRegex = new Regex("\\/mt_c([0-9]{4})[e|a][0-9]{4}_[a-z0-9]{3}_([a-z])+\\.mtrl"); private const string SkinMaterial = "/mt_c0101b0001_a.mtrl"; + private const string SkinBMaterial = "/mt_c0101b0001_b.mtrl"; + private const string SkinBiboMaterial = "/mt_c0101b0001_bibo.mtrl"; private readonly KeyValuePair DefaultTag = new KeyValuePair("_!ADDNEW!_", "Add Attributes...".L()); private readonly KeyValuePair CustomTag = new KeyValuePair("_!CUSTOM!_", "Custom".L()); - private readonly KeyValuePair SkinTag = new KeyValuePair(SkinMaterial, "Skin".L()); + private readonly KeyValuePair SkinTag = new KeyValuePair(SkinMaterial, "Skin A (Gen2/Vanilla)".L()); + private readonly KeyValuePair SkinBTag = new KeyValuePair(SkinBMaterial, "Skin B (Gen3/TBSE)".L()); + private readonly KeyValuePair SkinBiboTag = new KeyValuePair(SkinBiboMaterial, "Skin Bibo (Bibo+)".L()); private readonly string UnknownText = "Unknown".L(); private float OldModelSize; @@ -317,9 +321,11 @@ private void UpdateMaterialsList() if (!_view.MaterialsSource.Contains(SkinTag)) { _view.MaterialsSource.Add(SkinTag); + _view.MaterialsSource.Add(SkinBTag); + _view.MaterialsSource.Add(SkinBiboTag); // Get our root materials, if we have any - foreach(var m in RootMaterials) + foreach (var m in RootMaterials) { AddMaterial(m); } From 8097889df810cc988ab15601affb44dea29c5e2d Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Tue, 16 Jul 2024 02:57:07 -0400 Subject: [PATCH 2/3] regex --- FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs b/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs index 4c2c61e3..7cb2cb47 100644 --- a/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs +++ b/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs @@ -38,6 +38,8 @@ public class ImportModelEditViewModel private readonly Regex ImcAttributeRegex = new Regex("^atr_([a-z]{2})_([a-j])$"); private readonly Regex DefaultSkinRegex = new Regex("\\/mt_c[0-9]{4}b0001_a\\.mtrl"); + private readonly Regex SkinBRegex = new Regex("\\/mt_c[0-9]{4}b0001_b\\.mtrl"); + private readonly Regex SkinBiboRegex = new Regex("\\/mt_c[0-9]{4}b0001_bibo\\.mtrl"); private readonly Regex ItemMaterialRegex = new Regex("\\/mt_c([0-9]{4})[e|a][0-9]{4}_[a-z0-9]{3}_([a-z])+\\.mtrl"); private const string SkinMaterial = "/mt_c0101b0001_a.mtrl"; private const string SkinBMaterial = "/mt_c0101b0001_b.mtrl"; @@ -105,6 +107,14 @@ public async Task SetupUi() { m.Material = SkinMaterial; } + if(SkinBRegex.IsMatch(m.Material)) + { + m.Material = SkinBMaterial; + } + if (SkinBiboRegex.IsMatch(m.Material)) + { + m.Material = SkinBiboMaterial; + } } if(_newModel.MeshGroups.Count <= 1) From cc3dd414131e5e91c5e8ef37966de07d29ccadfe Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Tue, 16 Jul 2024 13:09:55 -0400 Subject: [PATCH 3/3] ref --- FFXIV_TexTools/FFXIV_TexTools.csproj | 6 +++--- lib/xivModdingFramework | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj index 056cf820..dd2b036a 100644 --- a/FFXIV_TexTools/FFXIV_TexTools.csproj +++ b/FFXIV_TexTools/FFXIV_TexTools.csproj @@ -23,9 +23,9 @@ FFXIV_TexTools Copyright © 2024 - 3.0.6.7 - 3.0.6.7 - 3.0.6.7 + 3.0.6.8 + 3.0.6.8 + 3.0.6.8 9.0 true diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework index 4875c1aa..2f18b40b 160000 --- a/lib/xivModdingFramework +++ b/lib/xivModdingFramework @@ -1 +1 @@ -Subproject commit 4875c1aa1ac452932cbede32285e8bc3d71e1ec3 +Subproject commit 2f18b40b34fb965d40ce0411c6978bf0a50457f8