From 623866da065e1f899fb1432a7f620000fec7b080 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 13 Mar 2016 19:58:23 -0700 Subject: [PATCH] Fix prevo check leveling current level can be the evolution threshold, so decrement prevo level afterwards. --- Legality/Core.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Legality/Core.cs b/Legality/Core.cs index 6a02cf5ab..4710a900d 100644 --- a/Legality/Core.cs +++ b/Legality/Core.cs @@ -245,15 +245,14 @@ private static IEnumerable getSlots(PK6 pk6, IEnumerable getValidPreEvolutions(PK6 pk6) { var evos = Evolves[pk6.Species].Evos; - int dec = 0; List dl = new List { new DexLevel { Species = pk6.Species, Level = pk6.CurrentLevel } }; + int lvl = pk6.CurrentLevel; foreach (DexLevel evo in evos) { - if (evo.Level > 0) // Level Up (from previous level) - dec++; - int lvl = pk6.CurrentLevel - dec; - if (lvl >= pk6.Met_Level && lvl > evo.Level) + if (lvl >= pk6.Met_Level && lvl <= evo.Level) dl.Add(new DexLevel { Species = evo.Species, Level = lvl }); + if (evo.Level > 0) // Level Up (from previous level) + lvl--; } return dl; }