Update v3.0.8.5

TexTools · Jul 30, 2024 · decdf96 · decdf96
2 parents 0cfb4c0 + 8f72fbd
commit decdf96
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 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.4</ApplicationVersion>
-    <AssemblyVersion>3.0.8.4</AssemblyVersion>
-    <FileVersion>3.0.8.4</FileVersion>
+    <ApplicationVersion>3.0.8.5</ApplicationVersion>
+    <AssemblyVersion>3.0.8.5</AssemblyVersion>
+    <FileVersion>3.0.8.5</FileVersion>
 
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>

diff --git a/FFXIV_TexTools/ViewModels/ColorsetEditorViewModel.cs b/FFXIV_TexTools/ViewModels/ColorsetEditorViewModel.cs
@@ -100,6 +100,9 @@ public async Task SetMaterial(XivMtrl mtrl, StainingTemplateFile dyeFile) {
                     TileTextureNormal = await Tex.GetXivTex("chara/common/texture/tile_norm_array.tex");
                     // This is not the correct usage, but works for the moment.
                     TileTextureOrb = await Tex.GetXivTex("chara/common/texture/tile_orb_array.tex");
+
+                    // Sphere Array
+                    // chara/common/texture/sphere_d_array.tex 
                 }
                 catch
                 {

diff --git a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml
@@ -176,10 +176,10 @@
                                     <RowDefinition Height="35"></RowDefinition>
                                     <RowDefinition Height="35"></RowDefinition>
                                 </Grid.RowDefinitions>
-                                <Label Grid.Row="0" Content="Effect ID:" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+                                <Label Grid.Row="0" Content="Sphere Map ID:" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
                                 <TextBox x:Name="ShaderEffectBox" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Width="100"/>
 
-                                <Label Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" VerticalAlignment="Center">Effect Opacity:</Label>
+                                <Label Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" VerticalAlignment="Center">Sphere Map Opacity:</Label>
                                 <TextBox x:Name="EffectOpacityBox" Grid.Column="3" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"></TextBox>
 
                                 <Label Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" VerticalAlignment="Center">Effect Unknown R:</Label>
@@ -209,10 +209,10 @@
                                     <RowDefinition Height="35"></RowDefinition>
                                 </Grid.RowDefinitions>
 
-                                <Label Content="Submaterial ID:" Grid.Row="0" HorizontalAlignment="Right" VerticalAlignment="Center" Height="26" Margin="0,2" HorizontalContentAlignment="Right" VerticalContentAlignment="Center"/>
+                                <Label Content="Tile Map ID:" Grid.Row="0" HorizontalAlignment="Right" VerticalAlignment="Center" Height="26" Margin="0,2" HorizontalContentAlignment="Right" VerticalContentAlignment="Center"/>
                                 <ComboBox x:Name="TileIdBox" Grid.Row="0" Grid.Column="1" Width="100" VerticalAlignment="Center" Margin="0,2" Height="26"></ComboBox>
 
-                                <Label x:Name="TileOpacityLabel" Content="Submaterial Opacity:" Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center" Height="26" Margin="0,2" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" />
+                                <Label x:Name="TileOpacityLabel" Content="Tile Map Opacity:" Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center" Height="26" Margin="0,2" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" />
                                 <TextBox x:Name="TileOpacityBox" Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" Width="100"/>
 
                                 <Label Content="Tile Count X:" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework