Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-12-18 00:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use dppt specific rand calls

Browse source
This commit is contained in:
Kurt 2017-12-02 15:44:44 -08:00
parent ff63cf4fce
commit 15489b8a7c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
PKHeX.Core/Legality/RNG/Frame/FrameFinder.cs
View file

@ -119,7 +119,7 @@ namespace PKHeX.Core
lead = max ? LeadRequired.PressureHustleSpirit : LeadRequired.PressureHustleSpiritFail; lead = max ? LeadRequired.PressureHustleSpirit : LeadRequired.PressureHustleSpiritFail;
yield return info.GetFrame(prev2, lead, p2, p1, prev3); yield return info.GetFrame(prev2, lead, p2, p1, prev3);
// Keen Eye, Intimidate // Keen Eye, Intimidate (Not compatible with Sweet Scent)
// -2 ESV // -2 ESV
// -1 Level // -1 Level
// 0 Level Adequate Check !(Random() % 2 == 1) rejects -- rand%2==1 is adequate // 0 Level Adequate Check !(Random() % 2 == 1) rejects -- rand%2==1 is adequate
@ -196,7 +196,7 @@ namespace PKHeX.Core
// 1 Nature // 1 Nature
if (info.Gendered) if (info.Gendered)
{ {
bool cc = p0 % 3 != 0; bool cc = (info.DPPt ? p0 / 0x5556 : p0 % 3) != 0;
if (f.Lead == LeadRequired.CuteCharm) // 100% required for frame base if (f.Lead == LeadRequired.CuteCharm) // 100% required for frame base
{ {
if (!cc) yield break; if (!cc) yield break;
@ -216,12 +216,12 @@ namespace PKHeX.Core
// -1 Level (Optional) // -1 Level (Optional)
// 0 LevelMax proc (Random() & 1) // 0 LevelMax proc (Random() & 1)
// 1 Nature // 1 Nature
bool max = p0 % 2 == 1; bool max = (info.DPPt ? p0 >> 15 : p0 & 1) == 1;
lead = max ? LeadRequired.PressureHustleSpirit : LeadRequired.PressureHustleSpiritFail; lead = max ? LeadRequired.PressureHustleSpirit : LeadRequired.PressureHustleSpiritFail;
yield return info.GetFrame(prev2, lead, p1, p1, prev2); yield return info.GetFrame(prev2, lead, p1, p1, prev2);
yield return info.GetFrame(prev2, lead | LeadRequired.UsesLevelCall, p2, p1, prev3); yield return info.GetFrame(prev2, lead | LeadRequired.UsesLevelCall, p2, p1, prev3);
// Keen Eye, Intimidate // Keen Eye, Intimidate (Not compatible with Sweet Scent)
// -2 ESV // -2 ESV
// -1 Level (Optional) // -1 Level (Optional)
// 0 Level Adequate Check !(Random() % 2 == 1) rejects -- rand%2==1 is adequate // 0 Level Adequate Check !(Random() % 2 == 1) rejects -- rand%2==1 is adequate