Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-01 11:06:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tighten met level check with hasoriginal

Browse Source 
#1261
This commit is contained in:
Kurt
2017-06-21 20:47:07 -07:00
parent 3c07f1d0e2
commit a1b66ab11d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Legality/Checks.cs
View File

@@ -354,7 +354,7 @@ private void VerifyEVs()
}
// Only one of the following can be true: 0, 508, and x%6!=0
if (sum == 0 && !EncounterMatch.IsWithinRange(pkm.CurrentLevel))
if (sum == 0 && !EncounterMatch.IsWithinRange(pkm))
AddLine(Severity.Fishy, V23, CheckIdentifier.EVs);
else if (sum == 508)
AddLine(Severity.Fishy, V24, CheckIdentifier.EVs);
@@ -635,7 +635,7 @@ private void VerifyLevel()
int lvl = pkm.CurrentLevel;
if (lvl < pkm.Met_Level)
AddLine(Severity.Invalid, V85, CheckIdentifier.Level);
else if (!EncounterMatch.IsWithinRange(lvl) && lvl != 100 && pkm.EXP == PKX.GetEXP(lvl, pkm.Species))
else if (!EncounterMatch.IsWithinRange(pkm) && lvl != 100 && pkm.EXP == PKX.GetEXP(lvl, pkm.Species))
AddLine(Severity.Fishy, V87, CheckIdentifier.Level);
else
AddLine(Severity.Valid, V88, CheckIdentifier.Level);

8
PKHeX.Core/Legality/Structures/IEncounterable.cs
View File

@@ -11,9 +11,15 @@ public interface IEncounterable
public static partial class Extensions
{
public static bool IsWithinRange(this IEncounterable encounter, int lvl)
private static bool IsWithinRange(this IEncounterable encounter, int lvl)
{
return encounter.LevelMin <= lvl && lvl <= encounter.LevelMax;
}
public static bool IsWithinRange(this IEncounterable encounter, PKM pkm)
{
if (pkm.HasOriginalMetLocation)
return pkm.CurrentLevel == pkm.Met_Level;
return encounter.IsWithinRange(pkm.CurrentLevel);
}
}
}