Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-23 12:56:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify some logic

Browse Source
This commit is contained in:
Kurt
2018-07-29 21:54:02 -07:00
parent 02a6d26e1b
commit 32b90fab13
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Editing/ShowdownSet.cs
View File

@@ -469,7 +469,7 @@ private bool ParseSpeciesForm(string spec)
private void ParseSpeciesNickname(string line)
{
int index = line.LastIndexOf("(", StringComparison.Ordinal);
int index = line.LastIndexOf('(');
string n1, n2;
if (index > 1) // correct format
{
@@ -479,7 +479,7 @@ private void ParseSpeciesNickname(string line)
}
else // nickname first (manually created set, incorrect)
{
int end = line.IndexOf(")", StringComparison.Ordinal);
int end = line.IndexOf(')');
n2 = line.Substring(index + 1, end - 1);
n1 = line.Substring(end + 2);
}

12
PKHeX.Core/Saves/Util/SaveExtensions.cs
View File

@@ -36,15 +36,11 @@ public static void SetFileInfo(this SaveFile sav, string path)
sav.FilePath = path;
sav.FileFolder = Path.GetDirectoryName(path);
sav.FileName = string.Empty;
var bakName = Util.CleanFileName(sav.BAKName);
sav.FileName = Path.GetFileName(path);
if (!sav.FileName.EndsWith(".bak"))
return;
// trim off any bak details to get original file name
int index = sav.FileName.LastIndexOf(" [", StringComparison.Ordinal);
if (index < 0)
return;
sav.FileName = sav.FileName.Substring(0, index);
if (sav.FileName?.EndsWith(bakName) == true)
sav.FileName = sav.FileName.Substring(0, sav.FileName.Length - bakName.Length);
}
/// <summary>