Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-02 14:36:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix downlevel comparison

Browse Source 
(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.
This commit is contained in:
Kurt
2020-06-06 09:00:52 -07:00
parent c3215083c2
commit 9b89ee09ec
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8N.cs
View File

@@ -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)

2
PKHeX.Core/Legality/Encounters/Information/ValidEncounterMoves.cs
View File

@@ -33,7 +33,7 @@ private static void AddEdgeCaseMoves(List<int> 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;
}