Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-26 22:10:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pass parse result list to encounter info fetch ctor

Browse source 
Old: when an encounter is found, we copied the contents of the list into our analysis list.
Since we stop when we find a suitable encounter, the old list is useless. By sharing the same list, there's no consequence. Reduces allocation by ~56B each analysis object!

Simplification reduces the amount of method calls by 1
This commit is contained in:
Kurt 2021-08-05 17:16:13 -07:00
parent 59d480c834
commit 4e669468c3
2 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
PKHeX.Core/Legality/LegalityAnalysis.cs
View file

@ -20,7 +20,7 @@ namespace PKHeX.Core
/// <remarks>We store this rather than re-fetching, as some games that use the same <see cref="PKM"/> format have different values.</remarks>
internal readonly PersonalInfo PersonalInfo;
private readonly List<CheckResult> Parse = new();
private readonly List<CheckResult> Parse = new(8);
/// <summary>
/// Parse result list allowing view of the legality parse.
@ -94,7 +94,7 @@ namespace PKHeX.Core
if (pkm.Format <= 2) // prior to storing GameVersion
pkm.TradebackStatus = GBRestrictions.GetTradebackStatusInitial(pkm);
Info = new LegalInfo(pkm);
Info = new LegalInfo(pkm, Parse);
#if SUPPRESS
try
#endif
@ -104,17 +104,11 @@ namespace PKHeX.Core
AddLine(Severity.Invalid, LEncConditionBadSpecies, CheckIdentifier.GameOrigin);
GetParseMethod()();
if (Parse.Count == 0) // shouldn't ever happen as at least one is yielded above.
{
AddLine(Severity.Invalid, L_AError, CheckIdentifier.Misc);
return;
}
Valid = Parse.All(chk => chk.Valid)
&& Info.Moves.All(m => m.Valid)
&& Info.Relearn.All(m => m.Valid);
if (!Valid && pkm.FatefulEncounter && Info.Relearn.Any(chk => !chk.Valid) && EncounterMatch is EncounterInvalid)
if (!Valid && IsPotentiallyMysteryGift(Info, pkm))
AddLine(Severity.Indeterminate, LFatefulGiftMissing, CheckIdentifier.Fateful);
Parsed = true;
}
@ -143,6 +137,21 @@ namespace PKHeX.Core
#endif
}
private static bool IsPotentiallyMysteryGift(LegalInfo info, PKM pk)
{
if (info.EncounterOriginal is not EncounterInvalid enc)
return false;
if (enc.Generation <= 3)
return true;
if (!pk.FatefulEncounter)
return false;
if (enc.Generation < 6)
return true;
if (info.Relearn.Any(chk => !chk.Valid))
return true;
return false;
}
private Action GetParseMethod()
{
if (pkm.Format <= 2) // prior to storing GameVersion
@ -170,7 +179,6 @@ namespace PKHeX.Core
private void ParsePK1()
{
UpdateInfo();
if (pkm.TradebackStatus == TradebackType.Any && Info.Generation != pkm.Format)
pkm.TradebackStatus = TradebackType.WasTradeback; // Example: GSC Pokemon with only possible encounters in RBY, like the legendary birds
@ -185,7 +193,6 @@ namespace PKHeX.Core
private void ParsePK3()
{
UpdateInfo();
UpdateChecks();
if (pkm.Format > 3)
Transfer.VerifyTransferLegalityG3(this);
@ -202,7 +209,6 @@ namespace PKHeX.Core
private void ParsePK4()
{
UpdateInfo();
UpdateChecks();
if (pkm.Format > 4)
Transfer.VerifyTransferLegalityG4(this);
@ -212,7 +218,6 @@ namespace PKHeX.Core
private void ParsePK5()
{
UpdateInfo();
UpdateChecks();
NHarmonia.Verify(this);
if (pkm.Format >= 8)
@ -221,7 +226,6 @@ namespace PKHeX.Core
private void ParsePK6()
{
UpdateInfo();
UpdateChecks();
if (pkm.Format >= 8)
Transfer.VerifyTransferLegalityG8(this);
@ -229,7 +233,6 @@ namespace PKHeX.Core
private void ParsePK7()
{
UpdateInfo();
if (pkm.VC)
UpdateVCTransferInfo();
UpdateChecks();
@ -239,7 +242,6 @@ namespace PKHeX.Core
private void ParsePK8()
{
UpdateInfo();
UpdateChecks();
Transfer.VerifyTransferLegalityG8(this);
}
@ -272,11 +274,6 @@ namespace PKHeX.Core
Transfer.VerifyTransferLegalityG12(this);
}
private void UpdateInfo()
{
Parse.AddRange(Info.Parse);
}
private void UpdateChecks()
{
PIDEC.Verify(this);
@ -296,15 +293,15 @@ namespace PKHeX.Core
Contest.Verify(this);
var format = pkm.Format;
if (format is 4 or 5 or 6)
Gen4GroundTile.Verify(this); // Gen 6->7 transfer deletes encounter type data
if (format is 4 or 5 or 6) // Gen 6->7 transfer removes this property.
Gen4GroundTile.Verify(this);
if (format < 6)
return;
History.Verify(this);
if (format < 8)
ConsoleRegion.Verify(this); // Gen 7->8 transfer deletes geolocation tracking data
if (format < 8) // Gen 7->8 transfer removes these properties.
ConsoleRegion.Verify(this);
if (pkm is ITrainerMemories)
Memory.Verify(this);

5
PKHeX.Core/Legality/Structures/LegalInfo.cs
View file

@ -42,7 +42,7 @@ namespace PKHeX.Core
private IEncounterable _match = EncounterInvalid.Default;
/// <summary>Top level Legality Check result list for the <see cref="EncounterMatch"/>.</summary>
internal readonly List<CheckResult> Parse = new();
internal readonly List<CheckResult> Parse;
public readonly CheckResult[] Relearn = new CheckResult[4];
public CheckMoveResult[] Moves { get; internal set; } = new CheckMoveResult[4];
@ -74,9 +74,10 @@ namespace PKHeX.Core
/// <remarks>This boolean is true until all valid <see cref="Frame"/> entries are tested for all possible <see cref="EncounterSlot"/> matches, after which it is false.</remarks>
public bool FrameMatches { get; internal set; } = true;
public LegalInfo(PKM pk)
public LegalInfo(PKM pk, List<CheckResult> parse)
{
pkm = pk;
Parse = parse;
// Store repeatedly accessed values
Game = (GameVersion)pkm.Version;