Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

update abilityflip g5mgshiny checks

Browse source 
Closes #1269
Also adds pokewalker PID check (don't think it works correctly but close
enough for now)
This commit is contained in:
Kurt 2017-06-24 17:20:15 -07:00
parent b339ddef02
commit ac16492daa
4 changed files with 58 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
View file

@ -240,10 +240,7 @@ namespace PKHeX.Core
if (!safariSport)
foreach (var z in GetValidStaticEncounter(pkm))
{ yield return z; ++ctr; }
if (ctr != 0) yield break;
foreach (var z in GetValidFriendSafari(pkm))
{ yield return z; ++ctr; }
if (ctr != 0) yield break;
// if (ctr != 0) yield break;
foreach (var z in GetValidWildEncounters(pkm))
{ yield return z; ++ctr; }
if (ctr != 0) yield break;

42
PKHeX.Core/Legality/RNG/MethodFinder.cs
View file

@ -54,6 +54,8 @@ namespace PKHeX.Core
return pidiv;
if (GetBACDMatch(pk, pid, IVs, out pidiv))
return pidiv;
if (GetPokewalkerMatch(pk, pid, out pidiv))
return pidiv;
return new PIDIV {Type=PIDType.None, NoSeed=true}; // no match
}
@ -238,7 +240,7 @@ namespace PKHeX.Core
if (low <= 0xFF)
{
var high = pid >> 16;
if ((pk.TID ^ pk.SID ^ low) == high)
if (((pk.TID ^ pk.SID ^ low) - high & 0xFFFE) == 0)
{
pidiv = new PIDIV {NoSeed = true, Type = PIDType.G5MGShiny};
return true;
@ -386,6 +388,42 @@ namespace PKHeX.Core
pidiv = null;
return false;
}
private static bool GetPokewalkerMatch(PKM pk, uint oldpid, out PIDIV pidiv)
{
var nature = oldpid % 25;
if (nature == 24)
{
pidiv = null;
return false;
}
uint pid = (uint)((pk.TID ^ pk.SID) >> 8 ^ 0xFF) << 24; // the most significant byte of the PID is chosen so the Pokémon can never be shiny.
pid += nature - pid % 25;
uint gv = 0;
switch (pk.Gender)
{
case 0: // Male
var gr = pk.PersonalInfo.Gender + 1;
gv = (uint) (((gr - (pid & 0xFF)) / 25 + 1) * 25); // Ensures gender is set to male without affecting nature.
break;
case 1: // Female
var gr2 = pk.PersonalInfo.Gender;
gv = (uint) ((((pid & 0xFF) - gr2) / 25 + 1) * 25); // Ensures gender is set to female without affecting nature
break;
}
pid += gv;
if ((nature & 1) != (pid & 1)) // If ability does not match the chosen ability
pid -= 25; // Switches ability without affecting nature
if (pid == oldpid)
{
pidiv = new PIDIV {NoSeed = true, RNG = RNG.LCRNG, Type = PIDType.Pokewalker};
return true;
}
pidiv = null;
return false;
}
private static PIDIV AnalyzeGB(PKM pk)
{
@ -541,6 +579,8 @@ namespace PKHeX.Core
case EncounterStatic s:
if (s == Legal.SpikyEaredPichu) // nonshiny forced nature, undocumented
return val == PIDType.None;
if (s.Location == 233 && s.Gift)
return val == PIDType.Pokewalker;
return s.Shiny == true ? val == PIDType.ChainShiny : val == PIDType.Method_1;
case EncounterSlot _:
return val == PIDType.Method_1;

1
PKHeX.Core/Legality/RNG/PIDType.cs
View file

@ -64,6 +64,7 @@
// Formulaic
G5MGShiny,
Pokewalker,
// Specified
Static,

15
Tests/PKHeX.Tests/PKM/PIDIVTests.cs
View file

@ -105,6 +105,21 @@ namespace PKHeX.Tests.PKM
Assert.IsTrue(MethodFinder.GetPokeSpotSeeds(pkPS2, 2).Any(), "PokeSpot encounter info mismatch (Rare)");
}
[TestMethod]
[TestCategory(PIDIVTestCategory)]
public void PIDIVPokewalkerTest()
{
var pkPW = new[]
{
new PK4 { Species = 025, PID = 0x34000089, TID = 20790, SID = 39664}, // Pikachu
//new PK4 { Species = 025, PID = 0x7DFFFF60, TID = 30859, SID = 63760}, // Pikachu
//new PK4 { Species = 025, PID = 0x7DFFFF65, TID = 30859, SID = 63760}, // Pikachu
//new PK4 { Species = 025, PID = 0x7E000003, TID = 30859, SID = 63760}, // Pikachu
};
foreach (var pk in pkPW)
Assert.AreEqual(PIDType.Pokewalker, MethodFinder.Analyze(pk)?.Type, "Unable to match PID to Pokewalker method");
}
[TestMethod]
[TestCategory(PIDIVTestCategory)]
public void PIDIVEncounterSlotTest()