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

Move fallback pressure check to near end

Browse Source
This commit is contained in:
Kurt
2024-03-13 00:18:58 -05:00
parent 1241e6eff6
commit 10e108939b
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodJ.cs
View File

@@ -286,11 +286,6 @@ private static bool TryGetMatchNoSync<T>(in FrameCheckDetails<T> ctx, out LeadSe
{ result = new(pressure, PressureHustleSpirit); return true; }
result = default; return false;
}
if (ctx.Encounter.PressureLevel <= ctx.LevelMax) // Can be boosted, or not.
{
if (IsSlotValidHustleVital(ctx, out var pressure))
{ result = new(pressure, PressureHustleSpirit); return true; }
}
}
if (IsSlotValidRegular(ctx, out uint seed))
@@ -310,6 +305,11 @@ private static bool TryGetMatchNoSync<T>(in FrameCheckDetails<T> ctx, out LeadSe
{ result = new(seed, lead); return true; }
if (IsSlotValidIntimidate(ctx, out seed))
{ result = new(seed, IntimidateKeenEyeFail); return true; }
if (ctx.Encounter.PressureLevel <= ctx.LevelMax) // Can be boosted, or not.
{
if (IsSlotValidHustleVital(ctx, out var pressure))
{ result = new(pressure, PressureHustleSpirit); return true; }
}
if (CanRadar(ctx.Encounter))
{ result = new(ctx.Seed1, Radar); return true; }

10
PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodK.cs
View File

@@ -308,11 +308,6 @@ private static bool TryGetMatchNoSync<T>(in FrameCheckDetails<T> ctx, out LeadSe
{ result = new(pressure, PressureHustleSpirit); return true; }
result = default; return false;
}
if (ctx.Encounter.PressureLevel <= ctx.LevelMax) // Can be boosted, or not.
{
if (IsSlotValidHustleVital(ctx, out var pressure))
{ result = new(pressure, PressureHustleSpirit); return true; }
}
}
if (IsSlotValidRegular(ctx, out uint seed))
@@ -332,6 +327,11 @@ private static bool TryGetMatchNoSync<T>(in FrameCheckDetails<T> ctx, out LeadSe
{ result = new(seed, sm); return true; }
if (IsSlotValidIntimidate(ctx, out seed))
{ result = new(seed, IntimidateKeenEyeFail); return true; }
if (ctx.Encounter.PressureLevel <= ctx.LevelMax) // Can be boosted, or not.
{
if (IsSlotValidHustleVital(ctx, out var pressure))
{ result = new(pressure, PressureHustleSpirit); return true; }
}
result = default; return false;
}