Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-30 03:46:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only allow checking if lvl60 when lvl<60

Browse Source
This commit is contained in:
Kurt
2020-11-05 21:17:13 -08:00
parent b2ec677b09
commit 227efc1fc3
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Legality/Areas/EncounterArea8.cs
View File

@@ -67,7 +67,9 @@ private IEnumerable<EncounterSlot> GetBoostedMatches(IReadOnlyList<EvoCriteria>
if (slot.Species != evo.Species)
continue;
// Ignore met level comparison; we already know it is permissible to boost to level 60.
// Ignore max met level comparison; we already know it is permissible to boost to level 60.
if (slot.LevelMin > 60)
break; // Can't downlevel, only boost to 60.
if (slot.Form != evo.Form && !AltFormInfo.WildChangeFormAfter.Contains(evo.Species))
break;

5
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs
View File

@@ -12,9 +12,10 @@ public class EncounterStatic8 : EncounterStatic, IDynamaxLevel, IGigantamax, IRe
protected override bool IsMatchLevel(PKM pkm, DexLevel evo)
{
var met = pkm.Met_Level;
if (met == Level)
var lvl = Level;
if (met == lvl)
return true;
if (EncounterArea8.IsBoostedArea60(Location))
if (lvl < 60 && EncounterArea8.IsBoostedArea60(Location))
return met == 60;
return false;
}