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

Revise Manaphy PIDIV checks for antishiny+egg

Browse Source 
Handles all permutations correctly
set correct version value for blank DP save (not valid saved ver, need to fall back to D)
This commit is contained in:
Kurt
2025-01-06 00:27:46 -06:00
parent e1773e83b9
commit c60efc7d14
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
PKHeX.Core/MysteryGifts/PGT.cs
View File

@@ -289,7 +289,7 @@ private static void SetDefaultManaphyEggDetails(PK4 pk4, ITrainerInfo trainer)
pk4.Ability = (int)Core.Ability.Hydration;
pk4.FatefulEncounter = true;
pk4.Ball = (int)Core.Ball.Poke;
pk4.Version = GameVersion.Gen4.Contains(trainer.Version) ? trainer.Version : GameVersion.D;
pk4.Version = trainer.Version.IsValidSavedVersion() && GameVersion.Gen4.Contains(trainer.Version) ? trainer.Version : GameVersion.D;
var lang = trainer.Language is < (int)LanguageID.Korean and not (int)LanguageID.Korean ? trainer.Language : (int)LanguageID.English;
pk4.Language = lang;
@@ -432,18 +432,29 @@ public PIDType GetSuggestedCorrelation()
private static bool IsG4ManaphyPIDValid(PIDType val, PKM pk)
{
// Unhatched: Can't trigger ARNG, so it must always be Method 1
if (pk.IsEgg)
return val == PIDType.Method_1;
// Hatching: Code checks if the TID/SID yield a shiny, and re-roll until not shiny.
// However, the TID/SID reference is stale (original OT, not hatching OT), so it's fallible.
// Hatched: Can't be shiny for an un-traded egg.
if (val == PIDType.Method_1)
// Can trigger ARNG immediately on receipt, but only if it was shiny.
// Can trigger ARNG on hatch, but only if it was un-traded.
if (val is PIDType.Method_1)
{
if (pk.IsEgg)
return !pk.IsShiny;
return pk.WasTradedEgg || !pk.IsShiny;
}
// Hatched when the egg was shiny: PID needs to be from the ARNG.
return val == PIDType.G4MGAntiShiny;
if (val is not PIDType.G4MGAntiShiny)
return false;
// Un-hatched Traded eggs will retain the recipient OT data, and must still match.
// Hatched Traded eggs can be disassociated from the original trainer data.
if (pk is { IsEgg: false, WasTradedEgg: true })
return true; // don't bother checking if it is shiny or not; game doesn't re-roll if it was traded.
// To be anti-shiny, it must be shiny for the current OT, or a traded egg.
var pid = pk.PID;
pid = ARNG.Prev(pid);
var tsv = (pk.TID16 ^ pk.SID16) >> 3;
var psv = ((pid & 0xFFFF) ^ (pid >> 16)) >> 3;
return tsv == psv;
}
}