Skip to content

Commit

Permalink
Update 2.1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@KoraLyn
KoraLyn committed Jul 23, 2020
2 parents 4efea35 + a9d5d2a commit d7d2b9c
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 393 deletions.
79 changes: 29 additions & 50 deletions FFXIV_TexTools/Models/SimpleModpackEntry.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,61 +373,44 @@ private static XivRace GetRace(string modPath)
/// </summary>
/// <param name="modPath">The mod path</param>
/// <returns>The number</returns>
private static string GetNumber(string modPath)
public static string GetNumber(string modPath)
{
string number = "-";

if (modPath.Contains("/human/") && modPath.Contains("/body/"))
{
string subString = modPath.Substring(modPath.LastIndexOf("/b") + 2, 4);
number = int.Parse(subString).ToString();
number = modPath.Substring(modPath.LastIndexOf("/b") + 2, 4).TrimStart('0');
}

if (modPath.Contains("/face/"))
else if (modPath.Contains("/face/"))
{
string subString = modPath.Substring(modPath.LastIndexOf("/f") + 2, 4);
number = int.Parse(subString).ToString();
number = modPath.Substring(modPath.LastIndexOf("/f") + 2, 4).TrimStart('0');
}

if (modPath.Contains("decal_face"))
else if (modPath.Contains("decal_face"))
{
int length = modPath.LastIndexOf(".") - (modPath.LastIndexOf("_") + 1);
string subString = modPath.Substring(modPath.LastIndexOf("_") + 1, length);

number = int.Parse(subString).ToString();
number = modPath.Substring(modPath.IndexOf("/decal_face") + 19, 2).TrimEnd('.');
}

if (modPath.Contains("decal_equip"))
else if (modPath.Contains("decal_equip"))
{
string subString = modPath.Substring(modPath.LastIndexOf("_") + 1, 3);

try
if (modPath.Contains("stigma"))
{
number = int.Parse(subString).ToString();
number = "stigma";
}
catch
else
{
if (modPath.Contains("stigma"))
{
number = "stigma";
}
else
{
number = "Error";
}
number = modPath.Substring(modPath.LastIndexOf("_") + 1, 3).TrimStart('0');
}
}

if (modPath.Contains("/hair/"))
else if (modPath.Contains("/hair/"))
{
string t = modPath.Substring(modPath.LastIndexOf("/h") + 2, 4);
number = int.Parse(t).ToString();
number = modPath.Substring(modPath.LastIndexOf("/h") + 2, 4).TrimStart('0');
}

if (modPath.Contains("/tail/"))
else if (modPath.Contains("/tail/"))
{
number = modPath.Substring(modPath.LastIndexOf("l/t") + 3, 4).TrimStart('0');
}
else if (modPath.Contains("/zear/"))
{
string t = modPath.Substring(modPath.LastIndexOf("l/t") + 3, 4);
number = int.Parse(t).ToString();
number = modPath.Substring(modPath.IndexOf("/zear") + 8, 3).TrimStart('0');
}

return number;
Expand Down Expand Up @@ -500,27 +483,23 @@ private static string GetType(string modPath)
/// </summary>
/// <param name="modPath">The mod path</param>
/// <returns>The part</returns>
private static string GetPart(string modPath)
public static string GetPart(string modPath)
{
string part = "-";
string[] parts = new[] { "a", "b", "c", "d", "e", "f" };

if (modPath.Contains("/equipment/"))
if (modPath.Contains("/texture/"))
{
if (modPath.Contains("/texture/"))
part = modPath.Substring(modPath.LastIndexOf("_") - 1, 1);
foreach (string letter in parts)
{
part = modPath.Substring(modPath.LastIndexOf("_") - 1, 1);
foreach (string letter in parts)
{
if (part == letter) return part;
}
return "a";
}

if (modPath.Contains("/material/"))
{
return modPath.Substring(modPath.LastIndexOf("_") + 1, 1);
if (part == letter) return part;
}
return "a";
}
else if (modPath.Contains("/material/"))
{
return modPath.Substring(modPath.LastIndexOf("_") + 1, 1);
}

return part;
Expand Down
4 changes: 2 additions & 2 deletions FFXIV_TexTools/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.0.1")]
[assembly: AssemblyFileVersion("2.1.0.1")]
[assembly: AssemblyVersion("2.1.0.2")]
[assembly: AssemblyFileVersion("2.1.0.2")]
10 changes: 9 additions & 1 deletion FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,15 @@ private void MeshNumberBox_SelectionChanged(object sender, System.Windows.Contro
for (var pIdx = 0; pIdx < m.Parts.Count; pIdx++)
{
var p = m.Parts[pIdx];
_view.PartSource.Add(new KeyValuePair<int, string>(pIdx, "#" + pIdx + ": " + (p.Name == null ? "Unnamed" : p.Name)));

string name = null;
if (p.Name != null)
{
var itemName = Path.GetFileNameWithoutExtension(_oldModel.Source);
name = p.Name.Replace(itemName, "");
name = name.Trim();
}
_view.PartSource.Add(new KeyValuePair<int, string>(pIdx, "#" + pIdx + ": " + (name == null ? "Unnamed" : name)));
}


Expand Down
50 changes: 2 additions & 48 deletions FFXIV_TexTools/ViewModels/ModListViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,56 +681,10 @@ await Task.Run(async () =>
}
// Part
if (itemPath.Contains("_b_")|| itemPath.Contains("_b."))
{
modListModel.Part = "b";
}
else if (itemPath.Contains("_c_")|| itemPath.Contains("_c."))
{
modListModel.Part = "c";
}
else if (itemPath.Contains("_d_")|| itemPath.Contains("_d."))
{
modListModel.Part = "d";
}
else
{
modListModel.Part = "a";
}
modListModel.Part = SimpleModpackEntry.GetPart(itemPath);
// Number
if (itemPath.Contains("/hair"))
{
modListModel.Number = itemPath.Substring(itemPath.IndexOf("/hair") + 8, 3).TrimStart('0');
}
else if (itemPath.Contains("/body"))
{
modListModel.Number = itemPath.Substring(itemPath.IndexOf("/body") + 8, 3).TrimStart('0');
}
else if (itemPath.Contains("/face"))
{
modListModel.Number = itemPath.Substring(itemPath.IndexOf("/face") + 8, 3).TrimStart('0');
}
else if (itemPath.Contains("/tail"))
{
modListModel.Number = itemPath.Substring(itemPath.IndexOf("/tail") + 8, 3).TrimStart('0');
}
else if (itemPath.Contains("/zear"))
{
modListModel.Number = itemPath.Substring(itemPath.IndexOf("/zear") + 8, 3).TrimStart('0');
}
else if (itemPath.Contains("/decal_face"))
{
modListModel.Number = itemPath.Substring(itemPath.IndexOf("/decal_face") + 19, 2).TrimEnd('.');
}
else if (itemPath.Contains("/decal_equip") && !itemPath.Contains("stigma"))
{
modListModel.Number = itemPath.Substring(itemPath.IndexOf("/decal_equip") + 20, 3);
}
else
{
modListModel.Number = "--";
}
modListModel.Number = SimpleModpackEntry.GetNumber(itemPath);
// Image
if (itemPath.Contains("material"))
Expand Down
Loading

0 comments on commit d7d2b9c

Please sign in to comment.