Update v3.0.7.1

TexTools · Jul 17, 2024 · d2aafc8 · d2aafc8
2 parents 01fd30b + 2f62ae0
commit d2aafc8
Show file tree

Hide file tree

Showing 12 changed files with 179 additions and 81 deletions.
diff --git a/FFXIV_TexTools/App.config b/FFXIV_TexTools/App.config
@@ -153,6 +153,12 @@
           <setting name="UseImportedTangents" serializeAs="String">
               <value>False</value>
           </setting>
+          <setting name="Default_Image_Format" serializeAs="String">
+              <value>dds</value>
+          </setting>
+          <setting name="Default_Modpack_Format" serializeAs="String">
+              <value>pmp</value>
+          </setting>
       </FFXIV_TexTools.Properties.Settings>
   </userSettings>
   <runtime>

diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,9 +23,9 @@
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
 
-    <ApplicationVersion>3.0.7.0</ApplicationVersion>
-    <AssemblyVersion>3.0.7.0</AssemblyVersion>
-    <FileVersion>3.0.7.0</FileVersion>
+    <ApplicationVersion>3.0.7.1</ApplicationVersion>
+    <AssemblyVersion>3.0.7.1</AssemblyVersion>
+    <FileVersion>3.0.7.1</FileVersion>
 
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>

diff --git a/FFXIV_TexTools/Helpers/ModpackUpgraderWrapper.cs b/FFXIV_TexTools/Helpers/ModpackUpgraderWrapper.cs
@@ -65,7 +65,7 @@ public static async Task UpgradeModpackPrompted(bool includePartials = true)
 
                     if (ext != ".ttmp2" && ext != ".pmp")
                     {
-                        ext = ".pmp";
+                        ext = "." + Settings.Default.Default_Modpack_Format;
                     }
 
 

diff --git a/FFXIV_TexTools/Properties/Settings.Designer.cs b/FFXIV_TexTools/Properties/Settings.Designer.cs
diff --git a/FFXIV_TexTools/Properties/Settings.settings b/FFXIV_TexTools/Properties/Settings.settings
@@ -143,5 +143,11 @@
     <Setting Name="UseImportedTangents" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="Default_Image_Format" Type="System.String" Scope="User">
+      <Value Profile="(Default)">dds</Value>
+    </Setting>
+    <Setting Name="Default_Modpack_Format" Type="System.String" Scope="User">
+      <Value Profile="(Default)">pmp</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/FFXIV_TexTools/ViewModels/CustomizeViewModel.cs b/FFXIV_TexTools/ViewModels/CustomizeViewModel.cs
@@ -57,7 +57,18 @@ public class CustomizeViewModel : INotifyPropertyChanged
             new KeyValuePair<string, int>("4096", 4096),
         };
 
+        public ObservableCollection<KeyValuePair<string, string>> ImageFormats { get; set; } = new ObservableCollection<KeyValuePair<string, string>>()
+        {
+            new KeyValuePair<string, string>("DDS", "dds"),
+            new KeyValuePair<string, string>("TGA", "tga"),
+            new KeyValuePair<string, string>("PNG", "png"),
+        };
 
+        public ObservableCollection<KeyValuePair<string, string>> ModpackFormats { get; set; } = new ObservableCollection<KeyValuePair<string, string>>()
+        {
+            new KeyValuePair<string, string>("PMP", "pmp"),
+            new KeyValuePair<string, string>("TTMP2", "ttmp2"),
+        };
         public CustomizeViewModel(CustomizeSettingsView view)
         {
             _view = view;
@@ -168,6 +179,26 @@ public string DefaultModpackUrl
                 }
             }
         }
+        public string DefaultModpackFormat
+        {
+            get => Settings.Default.Default_Modpack_Format;
+            set
+            {
+                Settings.Default.Default_Modpack_Format = value;
+                Settings.Default.Save();
+                NotifyPropertyChanged(nameof(DefaultModpackFormat));
+            }
+        }
+        public string DefaultImageFormat
+        {
+            get => Settings.Default.Default_Image_Format;
+            set
+            {
+                Settings.Default.Default_Image_Format = value;
+                Settings.Default.Save();
+                NotifyPropertyChanged(nameof(DefaultImageFormat));
+            }
+        }
 
         /// <summary>
         /// The selected skin color

diff --git a/FFXIV_TexTools/Views/CustomizeSettingsView.xaml b/FFXIV_TexTools/Views/CustomizeSettingsView.xaml
diff --git a/FFXIV_TexTools/Views/FileControls/TextureFileControl.xaml.cs b/FFXIV_TexTools/Views/FileControls/TextureFileControl.xaml.cs
@@ -229,8 +229,8 @@ protected override async Task<bool> INTERNAL_SaveAs(string externalFilePath)
             {
                 encoder = new BmpEncoder()
                 {
-                    SupportTransparency = true,
-                    BitsPerPixel = BmpBitsPerPixel.Pixel32
+                    SupportTransparency = false,
+                    BitsPerPixel = BmpBitsPerPixel.Pixel24
                 };
             }
             else if (ext == ".png")
@@ -377,13 +377,27 @@ public override string GetNiceName()
         {
             return "Texture";
         }
+
+        protected override KeyValuePair<string, string> GetDefaultExtension()
+        {
+            if (Settings.Default.Default_Image_Format == "tga")
+            {
+                return new KeyValuePair<string, string>(".tga", "TGA Image");
+            } else if (Settings.Default.Default_Image_Format == "png")
+            {
+                return new KeyValuePair<string, string>(".png", "PNG Image");
+            } else
+            {
+                return new KeyValuePair<string, string>(".dds", "DDS Image");
+            }
+        }
         public override Dictionary<string, string> GetValidFileExtensions()
         {
             return new Dictionary<string, string>()
             {
                 { ".dds", "DDS Image" },
-                { ".png", "PNG Image" },
                 { ".tga", "TGA Image" },
+                { ".png", "PNG Image" },
                 { ".bmp", "Bitmap Image" },
                 { ".tex", "FFXIV Texture" },
                 { ".atex", "FFXIV VFX Texture" },

diff --git a/FFXIV_TexTools/Views/ModPack/Simple/FileListExporter.xaml.cs b/FFXIV_TexTools/Views/ModPack/Simple/FileListExporter.xaml.cs
@@ -186,7 +186,7 @@ private async void Export_Click(object sender, RoutedEventArgs e)
                 Filter = ViewHelpers.ModpackFileFilter,
                 Title = "Save Modpack...",
                 InitialDirectory = startingFolder,
-                FileName = pathSafe + ".pmp"
+                FileName = pathSafe + "." + Settings.Default.Default_Modpack_Format
             };
 
             if (sfd.ShowDialog() != System.Windows.Forms.DialogResult.OK)

diff --git a/FFXIV_TexTools/Views/ModPack/Standard/StandardModpackFinalize.xaml.cs b/FFXIV_TexTools/Views/ModPack/Standard/StandardModpackFinalize.xaml.cs
@@ -60,7 +60,7 @@ private void CreateModpackButton_Click(object sender, RoutedEventArgs e)
                 Filter = ViewHelpers.ModpackFileFilter,
                 Title = "Save Modpack...",
                 InitialDirectory = startingFolder,
-                FileName = pathSafe + ".pmp"
+                FileName = pathSafe + "." + Settings.Default.Default_Modpack_Format
             };
 
             if (sfd.ShowDialog() != System.Windows.Forms.DialogResult.OK)

diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/ExportWizardWindow.xaml.cs b/FFXIV_TexTools/Views/ModPack/Wizard/ExportWizardWindow.xaml.cs
@@ -438,7 +438,7 @@ private async void Finalize_Click(object sender, System.Windows.RoutedEventArgs
 
             var sfd = new SaveFileDialog();
             sfd.Filter = ViewHelpers.ModpackFileFilter;
-            sfd.FileName = Data.MetaPage.Name + ".pmp";
+            sfd.FileName = Data.MetaPage.Name + "." + Settings.Default.Default_Modpack_Format;
             sfd.InitialDirectory = Path.GetFullPath(Settings.Default.ModPack_Directory);
 
             if(sfd.ShowDialog() != System.Windows.Forms.DialogResult.OK)

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
-Original file line number
+Diff line change
@@ Expand Up @@
                         if (ext != ".ttmp2" && ext != ".pmp")
                         {
-                            ext = ".pmp";
+                            ext = "." + Settings.Default.Default_Modpack_Format;
                         }
@@ Expand Down @@
+6 −1		xivModdingFramework/General/Enums/XivRace.cs
+2 −2		xivModdingFramework/Models/FileTypes/Mdl.cs