Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-05-19 20:28:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't cast 5+ string properties as version 6 (#403)

Browse Source 
With the addition of Generation 7, this "down-converts" these properties
to the previous generation, and are incompatible. It should be safe to
use the native properties' ToString() functions to do this job.
This commit is contained in:
Kaphotics 2016-11-14 07:17:37 -08:00 committed by GitHub
commit f68bc66371
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PKHeX/Subforms/frmReport.cs
View File

@ -36,9 +36,9 @@ public class Preview
public string OT => pkm.OT_Name;
public string Version => Main.GameStrings.gamelist[pkm.Version];
public string OTLang => Main.GameStrings.gamelanguages[pkm.Language] ?? $"UNK {pkm.Language}";
public string CountryID => pkm.Format > 5 ? ((PK6) pkm).Country.ToString() : "N/A";
public string RegionID => pkm.Format > 5 ? ((PK6) pkm).Region.ToString() : "N/A";
public string DSRegionID => pkm.Format > 5 ? ((PK6) pkm).ConsoleRegion.ToString() : "N/A";
public string CountryID => pkm.Format > 5 ? pkm.Country.ToString() : "N/A";
public string RegionID => pkm.Format > 5 ? pkm.Region.ToString() : "N/A";
public string DSRegionID => pkm.Format > 5 ? pkm.ConsoleRegion.ToString() : "N/A";
#region Extraneous
public string EC => pkm.EncryptionConstant.ToString("X8");
@ -65,9 +65,9 @@ public class Preview
public int Sheen => pkm.CNT_Sheen;
public int Markings => pkm.MarkValue;
public string NotOT => pkm.Format > 5 ? ((PK6) pkm).HT_Name : "N/A";
public string NotOT => pkm.Format > 5 ? pkm.HT_Name : "N/A";
public int AbilityNum => pkm.Format > 5 ? ((PK6) pkm).AbilityNumber : -1;
public int AbilityNum => pkm.Format > 5 ? pkm.AbilityNumber : -1;
public int GenderFlag => pkm.Gender;
public int AltForms => pkm.AltForm;
public int PKRS_Strain => pkm.PKRS_Strain;
@ -278,4 +278,4 @@ public void SetPropertyAndDirection(PropertyDescriptor descriptor, ListSortDirec
SetListSortDirection(direction);
}
}
}
}