Skip to content

Commit

Permalink
Update v3.0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lunaretic
Lunaretic committed Jul 13, 2024
2 parents 57a354c + fb6a9f8 commit aae0aed
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 16 deletions.
4 changes: 2 additions & 2 deletions FFXIV_TexTools/FFXIV_TexTools.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<Product>FFXIV_TexTools</Product>
<Copyright>Copyright © 2024</Copyright>

<ApplicationVersion>3.0.5.6</ApplicationVersion>
<AssemblyVersion>3.0.5.6</AssemblyVersion>
<ApplicationVersion>3.0.6.0</ApplicationVersion>
<AssemblyVersion>3.0.6.0</AssemblyVersion>
<FileVersion>3.0.5.6</FileVersion>

<LangVersion>9.0</LangVersion>
Expand Down
7 changes: 6 additions & 1 deletion FFXIV_TexTools/ViewModels/ModListViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,12 +448,17 @@ public async Task UpdateList(Category category, CancellationTokenSource cts)
{
modPackCategory = modPackCategory.ParentCategory;
}
var mpName = modPackCategory.Name;
if(mpName == UIStrings.Standalone_Non_ModPack)
{
mpName = "";
}

foreach (var mod in allMods)
{
if (!mod.ItemName.Equals(category.Name)) continue;

if (mod.ModPack == modPackCategory.Name)
if (mod.ModPack == mpName)
{
modItems.Add(mod);
}
Expand Down
2 changes: 1 addition & 1 deletion FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ public float LightingZValue
}
}

private int _ReflectionValue = 5;
private int _ReflectionValue = 2;
public int ReflectionValue
{
get => _ReflectionValue;
Expand Down
21 changes: 11 additions & 10 deletions FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right">Hair/Fluffy Tails:</Label>
<Label Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" Foreground="Green">~85%+</Label>
<Label Grid.Column="2" Grid.Row="2" HorizontalAlignment="Left" Foreground="Gray" FontStyle="Italic">Single-texture mods are not upgraded.</Label>
<Label Grid.Column="2" Grid.Row="2" HorizontalAlignment="Left" Foreground="Gray" FontStyle="Italic">Very complex hair modpacks must be manually repacked.</Label>

</Grid>
</Border>
Expand All @@ -104,17 +104,18 @@

</Grid>
</Border>



<Border BorderBrush="Gray" BorderThickness="1" Margin="2" Padding="2" Grid.Row="5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Grid.Row="4" HorizontalAlignment="Right">Faces:</Label>
<Label Grid.Column="1" Grid.Row="4" HorizontalAlignment="Left" Foreground="Red">0%</Label>
<Label Grid.Column="2" Grid.Row="4" HorizontalAlignment="Left" Foreground="Red" FontStyle="Italic">Must be manually updated.</Label>
<Label Grid.Column="0" Grid.Row="5" HorizontalAlignment="Right">Body/Scale-Tail Textures:</Label>
<Label Grid.Column="1" Grid.Row="5" HorizontalAlignment="Left" Foreground="Red">25%</Label>
<Label Grid.Column="2" Grid.Row="5" HorizontalAlignment="Left" Foreground="Red" FontStyle="Italic">Tattoos and Normal Maps are upgraded, but may have seams.</Label>

</Grid>
</Border>
Expand All @@ -126,13 +127,13 @@
<ColumnDefinition Width="150"/>
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Grid.Row="5" HorizontalAlignment="Right">Body Textures:</Label>
<Label Grid.Column="1" Grid.Row="5" HorizontalAlignment="Left" Foreground="Red">0%</Label>
<Label Grid.Column="2" Grid.Row="5" HorizontalAlignment="Left" Foreground="Red" FontStyle="Italic">Must be manually updated. *Tattoo mods may be OK in some cases.</Label>
<Label Grid.Column="0" Grid.Row="4" HorizontalAlignment="Right">Faces:</Label>
<Label Grid.Column="1" Grid.Row="4" HorizontalAlignment="Left" Foreground="Red">0%</Label>
<Label Grid.Column="2" Grid.Row="4" HorizontalAlignment="Left" Foreground="Red" FontStyle="Italic">ALL Face Mods Must be manually upgraded.</Label>

</Grid>
</Border>

<Border BorderBrush="Gray" BorderThickness="1" Margin="2" Padding="2" Grid.Row="7">
<Grid>
<Grid.ColumnDefinitions>
Expand All @@ -142,7 +143,7 @@
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Grid.Row="6" HorizontalAlignment="Right">Other Mods:</Label>
<Label Grid.Column="1" Grid.Row="6" HorizontalAlignment="Left" Foreground="Gray">N/A</Label>
<Label Grid.Column="2" Grid.Row="6" HorizontalAlignment="Left" Foreground="Gray" FontStyle="Italic">Other mods do not need to use this tool.</Label>
<Label Grid.Column="2" Grid.Row="6" HorizontalAlignment="Left" Foreground="Gray" FontStyle="Italic">Other mods are not affected by this tool.</Label>

</Grid>
</Border>
Expand Down
2 changes: 1 addition & 1 deletion FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ private void SkipItems_Click(object sender, RoutedEventArgs e)
foreach(KeyValuePair<string, string> kv in items)
{
if (Results.Upgrades.ContainsKey(kv.Key)) {
Results.Upgrades[kv.Key] = PenumbraUpgradeStatus.EUpgradeResult.Failure;
Results.Upgrades[kv.Key] = PenumbraUpgradeStatus.EUpgradeResult.Unchanged;
try
{

Expand Down
2 changes: 1 addition & 1 deletion lib/xivModdingFramework
Submodule xivModdingFramework updated 5 files
+14 −2 xivModdingFramework/Cache/XivCache.cs
+0 −8 xivModdingFramework/Models/ModelTextures/ModelTexture.cs
+62 −7 xivModdingFramework/Mods/EndwalkerUpgrade.cs
+25 −2 xivModdingFramework/Mods/ModpackUpgrader.cs
+1 −1 xivModdingFramework/Textures/FileTypes/Tex.cs

0 comments on commit aae0aed

Please sign in to comment.