mirror of
https://github.com/kwsch/PKHeX
synced 2024-09-22 23:32:00 +00:00
Fix non-alolan marowak/exeggutor evo check
Clarified invalid evolution message, removed unused code, and added the necessary skip option
This commit is contained in:
parent
4331d7fa84
commit
6a8c641659
2 changed files with 2 additions and 6 deletions
|
@ -500,7 +500,7 @@ namespace PKHeX.Core
|
||||||
else if (lvl < pkm.Met_Level)
|
else if (lvl < pkm.Met_Level)
|
||||||
AddLine(Severity.Invalid, "Current level is below met level.", CheckIdentifier.Level);
|
AddLine(Severity.Invalid, "Current level is below met level.", CheckIdentifier.Level);
|
||||||
else if ((pkm.WasEgg || EncounterMatch == null) && !Legal.getEvolutionValid(pkm) && pkm.Species != 350)
|
else if ((pkm.WasEgg || EncounterMatch == null) && !Legal.getEvolutionValid(pkm) && pkm.Species != 350)
|
||||||
AddLine(Severity.Invalid, "Evolution criteria not satisfied (level/trade evolution required).", CheckIdentifier.Level);
|
AddLine(Severity.Invalid, "Evolution not valid (or level/trade evolution unsatisfied).", CheckIdentifier.Level);
|
||||||
else if (lvl > pkm.Met_Level && lvl > 1 && lvl != 100 && pkm.EXP == PKX.getEXP(pkm.Stat_Level, pkm.Species))
|
else if (lvl > pkm.Met_Level && lvl > 1 && lvl != 100 && pkm.EXP == PKX.getEXP(pkm.Stat_Level, pkm.Species))
|
||||||
AddLine(Severity.Fishy, "Current experience matches level threshold.", CheckIdentifier.Level);
|
AddLine(Severity.Fishy, "Current experience matches level threshold.", CheckIdentifier.Level);
|
||||||
else
|
else
|
||||||
|
|
|
@ -77,7 +77,6 @@ namespace PKHeX.Core
|
||||||
fixEvoTreeSM();
|
fixEvoTreeSM();
|
||||||
break;
|
break;
|
||||||
case GameVersion.ORAS:
|
case GameVersion.ORAS:
|
||||||
fixEvoTreeORAS();
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -116,9 +115,6 @@ namespace PKHeX.Core
|
||||||
marowak.Form = -1; marowak.Banlist = new[] {GameVersion.SN, GameVersion.MN};
|
marowak.Form = -1; marowak.Banlist = new[] {GameVersion.SN, GameVersion.MN};
|
||||||
Lineage[105].Chain.Add(new EvolutionStage { StageEntryMethods = new List<EvolutionMethod> { marowak } });
|
Lineage[105].Chain.Add(new EvolutionStage { StageEntryMethods = new List<EvolutionMethod> { marowak } });
|
||||||
}
|
}
|
||||||
private void fixEvoTreeORAS()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getIndex(PKM pkm)
|
private int getIndex(PKM pkm)
|
||||||
{
|
{
|
||||||
|
@ -219,7 +215,7 @@ namespace PKHeX.Core
|
||||||
if (pkm.AltForm != Form)
|
if (pkm.AltForm != Form)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (Banlist.Contains((GameVersion)pkm.Version))
|
if (!skipChecks && Banlist.Contains((GameVersion)pkm.Version))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
switch (Method)
|
switch (Method)
|
||||||
|
|
Loading…
Reference in a new issue