Update v3.0.9.0

TexTools · Feb 4, 2025 · f020af2 · f020af2
2 parents 908e773 + 40424c2
commit f020af2
Show file tree

Hide file tree

Showing 10 changed files with 427 additions and 17 deletions.
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.8.7</ApplicationVersion>
-    <AssemblyVersion>3.0.8.7</AssemblyVersion>
-    <FileVersion>3.0.8.7</FileVersion>
+    <ApplicationVersion>3.0.9.0</ApplicationVersion>
+    <AssemblyVersion>3.0.9.0</AssemblyVersion>
+    <FileVersion>3.0.9.0</FileVersion>
 
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>

diff --git a/FFXIV_TexTools/Localizations/Localization.cs b/FFXIV_TexTools/Localizations/Localization.cs
@@ -131,6 +131,10 @@ private static void Element_Loaded(object sender, RoutedEventArgs args)
             var list = new List<(PropertyInfo PropertyInfo, Object Target)>();
             foreach (var elm in elmList.Keys)
             {
+                //Auto-translating the contents of a ComboBox is probably always a mistake, because the item list is not auto-translated
+                if (elm is ComboBox)
+                    continue;
+
                 //GetStringPropertyInfos(elmList, list, elm);
                 var info= GetStringPropertyInfo(elm.GetType());
                 if (info == null)

diff --git a/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs b/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs
@@ -460,6 +460,7 @@ private void ShapesListBox_SelectionChanged(object sender, System.Windows.Contro
         }
         private void ModelTypeComboBox_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
         {
+            if (_view.ModelTypeComboBox.SelectedValue == null) return;
             var val = (EMeshType)_view.ModelTypeComboBox.SelectedValue;
             var m = GetGroup();
             m.MeshType = val;

diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/EditImcGroupWindow.xaml b/FFXIV_TexTools/Views/ModPack/Wizard/EditImcGroupWindow.xaml
@@ -14,14 +14,15 @@
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="280"></RowDefinition>
+            <RowDefinition Height="340"></RowDefinition>
             <RowDefinition Height="1*"></RowDefinition>
             <RowDefinition Height="40"></RowDefinition>
         </Grid.RowDefinitions>
         <GroupBox Grid.Row="0" Header="Basic Settings">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="40"/>
+                    <RowDefinition Height="60"/>
                     <RowDefinition Height="40"/>
                     <RowDefinition Height="1*"/>
                 </Grid.RowDefinitions>
@@ -42,15 +43,17 @@
                 <Label Grid.Column="4" Content="Group Priority:" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
                 <TextBox Grid.Column="5" Text="{Binding Path=GroupPriority}" Width="100" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBox>
 
-                <Label Grid.Row="1" Grid.Column="0" Content="Variant:" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
-                <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Path=Variant}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBox>
+                <Label Content="Description:" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="1"></Label>
+                <TextBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3" Text="{Binding Path=GroupDescription}" TextWrapping="Wrap" AcceptsReturn="True"></TextBox>
+
+                <Label Grid.Row="2" Grid.Column="0" Content="Variant:" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+                <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding Path=Variant}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBox>
 
-                <CheckBox x:Name="IncludeDisableBox" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Checked="IncludeDisable_Checked" Unchecked="IncludeDisable_Unchecked" Content="Include Disable Option"></CheckBox>
+                <CheckBox Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Content="Apply to All Variants" ToolTip="Apply to all variants and ignore variant ID value" IsChecked="{Binding Path=AllVariants}"></CheckBox>
+                <CheckBox Grid.Row="2" Grid.Column="4" Grid.ColumnSpan="2" Margin="5" Content="Apply Only Attribute Flags" ToolTip="Only apply attribute flags and ignore other values" IsChecked="{Binding Path=OnlyAttributes}"></CheckBox>
 
-                <CheckBox Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Margin="5" Content="Apply to All Variants" IsChecked="{Binding Path=AllVariants}"></CheckBox>
+                <metadata:ImcVariantEditor Grid.Row="3" Grid.ColumnSpan="6" x:Name="VariantEditor"></metadata:ImcVariantEditor>
 
-                <metadata:ImcVariantEditor Grid.Row="2" Grid.ColumnSpan="6" x:Name="VariantEditor"></metadata:ImcVariantEditor>
-
             </Grid>
         </GroupBox>
 
@@ -61,9 +64,17 @@
                     <RowDefinition Height="40"/>
                     <RowDefinition Height="1*"/>
                 </Grid.RowDefinitions>
-                <Button Content="Add Option" Width="150" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,5,5" Click="AddOption_Click"></Button>
-
-                <ListView x:Name="OptionList" Grid.Row="1" ItemTemplate="{StaticResource RowTemplate}" ItemsSource="{Binding Path=Options}">
+
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="200"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+                <CheckBox x:Name="IncludeDisableBox" Grid.Row="0" Grid.Column="0" Margin="5" Checked="IncludeDisable_Checked" Unchecked="IncludeDisable_Unchecked" Content="Include Disable Option"></CheckBox>
+
+                <Button Grid.Column="2" Content="Add Option" Width="150" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,5,5" Click="AddOption_Click"></Button>
+
+                <ListView x:Name="OptionList" Grid.Row="1" Grid.ColumnSpan="2" ItemTemplate="{StaticResource RowTemplate}" ItemsSource="{Binding Path=Options}">
 
                 </ListView>
             </Grid>

diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/EditImcGroupWindow.xaml.cs b/FFXIV_TexTools/Views/ModPack/Wizard/EditImcGroupWindow.xaml.cs
@@ -41,6 +41,15 @@ public string GroupName
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(GroupName)));
             }
         }
+        public string GroupDescription
+        {
+            get => Group.Description;
+            set
+            {
+                Group.Description = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(GroupDescription)));
+            }
+        }
         public ushort Variant
         {
             get => Group.ImcData.Variant;
@@ -75,6 +84,15 @@ public bool AllVariants
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(AllVariants)));
             }
         }
+        public bool OnlyAttributes
+        {
+            get => Group.ImcData.OnlyAttributes;
+            set
+            {
+                Group.ImcData.OnlyAttributes = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OnlyAttributes)));
+            }
+        }
 
         private ObservableCollection<WrappedImcOption> _Options = new ObservableCollection<WrappedImcOption>();
         public ObservableCollection<WrappedImcOption> Options

diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/ManipulationEditorWindow.xaml.cs b/FFXIV_TexTools/Views/ModPack/Wizard/ManipulationEditorWindow.xaml.cs
@@ -62,6 +62,7 @@ public PMPManipulationWrapperJson SelectedManipulation
             { typeof(PMPImcManipulationWrapperJson), typeof(ImcManipulationEditor) },
             { typeof(PMPGmpManipulationWrapperJson), typeof(GmpManipulationEditor) },
             { typeof(PMPRspManipulationWrapperJson), typeof(RspManipulationEditor) },
+            { typeof(PMPAtchManipulationWrapperJson), typeof(AtchManipulationEditor) },
             { typeof(PMPGlobalEqpManipulationWrapperJson), typeof(GlobalEqpEditor) },
         };
         private static Dictionary<string, Type> ManipulationTypes = new Dictionary<string, Type>()
@@ -72,6 +73,7 @@ public PMPManipulationWrapperJson SelectedManipulation
             { "Est", typeof(PMPEstManipulationWrapperJson) },
             { "Gmp", typeof(PMPGmpManipulationWrapperJson) },
             { "Rsp", typeof(PMPRspManipulationWrapperJson) },
+            { "Atch", typeof(PMPAtchManipulationWrapperJson) },
             { "GlobalEqp", typeof(PMPGlobalEqpManipulationWrapperJson) },
         };
 

diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/ManipulationEditors/AtchManipulationEditor.xaml b/FFXIV_TexTools/Views/ModPack/Wizard/ManipulationEditors/AtchManipulationEditor.xaml
@@ -0,0 +1,59 @@
+<UserControl x:Class="FFXIV_TexTools.Views.Wizard.ManipulationEditors.AtchManipulationEditor"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:FFXIV_TexTools.Views.Wizard.ManipulationEditors"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="40"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="100"/>
+            <ColumnDefinition Width="100"/>
+            <ColumnDefinition Width="100"/>
+            <ColumnDefinition Width="100"/>
+            <ColumnDefinition Width="100"/>
+            <ColumnDefinition Width="100"/>
+        </Grid.ColumnDefinitions>
+
+        <Label Content="Race:" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+        <Label Content="Gender:" Grid.Row="0" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+        <Label Content="Type:" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+        <Label Content="Index:" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+        <Label Content="Bone Name:" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+        <Label Content="Scale:" Grid.Row="2" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+        <Label Content="Offset:" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+        <Label Content="Rotation:" Grid.Row="4" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+
+        <ComboBox Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" ItemsSource="{Binding Path=Races}" DisplayMemberPath="Key" SelectedValuePath="Value" SelectedValue="{Binding Path=Race}" VerticalAlignment="Center"/>
+        <ComboBox Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" ItemsSource="{Binding Path=Genders}" DisplayMemberPath="Key" SelectedValuePath="Value" SelectedValue="{Binding Path=Gender}" VerticalAlignment="Center"/>
+        <ComboBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" ItemsSource="{Binding Path=Types}" DisplayMemberPath="Key" SelectedValuePath="Value" SelectedValue="{Binding Path=Type}" VerticalAlignment="Center" IsEditable="True"/>
+        <TextBox Grid.Row="1" Grid.Column="4" Text="{Binding Path=Index}" HorizontalAlignment="Left" VerticalAlignment="Center" Width="50"/>
+        <TextBox Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Text="{Binding Path=Bone}" VerticalAlignment="Center"/>
+        <TextBox Grid.Row="2" Grid.Column="4" Text="{Binding Path=Scale}" VerticalAlignment="Center"/>
+        <WrapPanel Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="5" VerticalAlignment="Center">
+            <Label VerticalAlignment="Center">X</Label>
+            <TextBox Text="{Binding Path=OffsetX}" Width="100"/>
+            <Label VerticalAlignment="Center" Margin="8,0,0,0">Y</Label>
+            <TextBox Text="{Binding Path=OffsetY}" Width="100"/>
+            <Label VerticalAlignment="Center" Margin="8,0,0,0">Z</Label>
+            <TextBox Text="{Binding Path=OffsetZ}" Width="100"/>
+        </WrapPanel>
+        <WrapPanel Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="5" VerticalAlignment="Center">
+            <Label VerticalAlignment="Center">X</Label>
+            <TextBox Text="{Binding Path=RotationX}" Width="100"/>
+            <Label VerticalAlignment="Center" Margin="8,0,0,0">Y</Label>
+            <TextBox Text="{Binding Path=RotationY}" Width="100"/>
+            <Label VerticalAlignment="Center" Margin="8,0,0,0">Z</Label>
+            <TextBox Text="{Binding Path=RotationZ}" Width="100"/>
+        </WrapPanel>
+    </Grid>
+</UserControl>