From 9b89ee09ec091c2ef00e08d16176065c9ddddddb Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 6 Jun 2020 09:00:52 -0700 Subject: [PATCH] Fix downlevel comparison (for good? pls) https://i.redd.it/7g2c4d3kisc41.png ty anubis remove GetMinimalLevel override, as it's doing the same thing as LevelMin. When regenerating the pkm, we aren't doing anything downlevel related. --- .../Encounters/EncounterStatic/EncounterStatic8N.cs | 7 +------ .../Legality/Encounters/Information/ValidEncounterMoves.cs | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8N.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8N.cs index 029040e03..752c0f0f7 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8N.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8N.cs @@ -38,10 +38,6 @@ public EncounterStatic8N(byte nestID, uint minRank, uint maxRank, byte val) 55, 60, // 4 }; - public static bool IsHighestLevelTier(int lvl) => ArrayUtil.WithinRange(lvl, 55, 60); - - protected override int GetMinimalLevel() => LevelCaps[MinRank * 2]; - protected override bool IsMatchLevel(PKM pkm, int lvl) { var met = pkm.Met_Level; @@ -61,8 +57,7 @@ public bool IsDownLeveled(PKM pkm) { var met = pkm.Met_Level; var metLevel = met - 15; - var rank = ((uint)metLevel) / 10; - return rank != MaxRank && IsDownLeveled(pkm, metLevel, met); + return met != LevelMax && IsDownLeveled(pkm, metLevel, met); } private bool IsDownLeveled(PKM pkm, int metLevel, int met) diff --git a/PKHeX.Core/Legality/Encounters/Information/ValidEncounterMoves.cs b/PKHeX.Core/Legality/Encounters/Information/ValidEncounterMoves.cs index b78201ad5..216eca83c 100644 --- a/PKHeX.Core/Legality/Encounters/Information/ValidEncounterMoves.cs +++ b/PKHeX.Core/Legality/Encounters/Information/ValidEncounterMoves.cs @@ -33,7 +33,7 @@ private static void AddEdgeCaseMoves(List moves, IEncounterable encounter, { switch (encounter) { - case EncounterStatic8N r when !EncounterStatic8N.IsHighestLevelTier(pkm.Met_Level) && r.IsDownLeveled(pkm): // Downleveled Raid can happen for shared raids and self-hosted raids. + case EncounterStatic8N r when r.IsDownLeveled(pkm): // Downleveled Raid can happen for shared raids and self-hosted raids. moves.AddRange(MoveLevelUp.GetMovesLevelUp(pkm, r.Species, -1, -1, r.LevelMax, r.Form, GameVersion.SW, false, 8)); break; }