Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-10 22:54:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add wc8 star/square pid types

Browse source
This commit is contained in:
Kurt 2019-11-28 09:46:48 -08:00
parent f5307c142b
commit 7a51e48747
2 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
PKHeX.Core/Legality/Structures/Shiny.cs
View file

@ -24,6 +24,16 @@
/// PID is randomly created and forced to be not shiny.
/// </summary>
Never = 3,
/// <summary>
/// PID is randomly created and forced to be shiny as Stars.
/// </summary>
AlwaysStar = 5,
/// <summary>
/// PID is randomly created and forced to be shiny as Stars.
/// </summary>
AlwaysSquare = 6,
}
public static partial class Extensions
@ -34,6 +44,8 @@
{
Shiny.Always => pkm.IsShiny,
Shiny.Never => !pkm.IsShiny,
Shiny.AlwaysSquare => pkm.ShinyXor == 0,
Shiny.AlwaysStar => pkm.ShinyXor == 1,
_ => true
};
}

28
PKHeX.Core/MysteryGifts/WC8.cs
View file

@ -152,19 +152,15 @@ namespace PKHeX.Core
{
get
{
switch (Data[CardStart + 0x248])
return Data[CardStart + 0x248] switch
{
case 0:
return Shiny.Never;
case 1:
return Shiny.Random;
case 2: // Fixed never shiny
case 3: // Fixed always shiny
case 4:
return Shiny.FixedValue;
default:
throw new ArgumentException();
}
0 => Shiny.Never,
1 => Shiny.Random,
2 => Shiny.AlwaysStar,
3 => Shiny.AlwaysSquare,
4 => Shiny.FixedValue,
_ => throw new ArgumentException()
};
}
}
@ -456,9 +452,13 @@ namespace PKHeX.Core
case Shiny.Random: // Random
pk.PID = Util.Rand32();
break;
case Shiny.Always: // Random Shiny
case Shiny.AlwaysStar: // Random Shiny
pk.PID = Util.Rand32();
pk.PID = (uint)(((pk.TID ^ pk.SID ^ (pk.PID & 0xFFFF)) << 16) | (pk.PID & 0xFFFF));
pk.PID = (uint)(((pk.TID ^ pk.SID ^ (pk.PID & 0xFFFF)) << 16) | (pk.PID & 0xFFFF)) ^ 1;
break;
case Shiny.AlwaysSquare: // Random Shiny
pk.PID = Util.Rand32();
pk.PID = (uint)(((pk.TID ^ pk.SID ^ (pk.PID & 0xFFFF)) << 16) | (pk.PID & 0xFFFF)) ^ 0;
break;
case Shiny.Never: // Random Nonshiny
pk.PID = Util.Rand32();