Determine shiny as square if fateful && shiny

regardless of xor value result
gotta make those shinies pop ;)
ty anubis
This commit is contained in:
Kurt 2020-02-13 16:51:14 -08:00
parent 3ce590aca8
commit e8759ee538
2 changed files with 8 additions and 3 deletions

View file

@ -90,7 +90,7 @@ namespace PKHeX.Drawing
private static Image GetSprite(PKM pk, bool isBoxBGRed = false)
{
var img = GetSprite(pk.Species, pk.AltForm, pk.Gender, pk.SpriteItem, pk.IsEgg, pk.IsShiny, pk.Format, isBoxBGRed, pk.Format >= 8 && pk.ShinyXor == 0);
var img = GetSprite(pk.Species, pk.AltForm, pk.Gender, pk.SpriteItem, pk.IsEgg, pk.IsShiny, pk.Format, isBoxBGRed, pk.Format >= 8 && (pk.ShinyXor == 0 || pk.FatefulEncounter));
if (pk is IShadowPKM s && s.Purification > 0)
{
const int Lugia = 249;

View file

@ -430,11 +430,16 @@ namespace PKHeX.WinForms.Controls
// Set the Controls
BTN_Shinytize.Visible = BTN_Shinytize.Enabled = !isShiny;
Label_IsShiny.Visible = Label_IsShiny2.Visible = false;
if (Entity.Format > 7 && Entity.ShinyXor == 0)
if (Entity.Format >= 8 && (Entity.ShinyXor == 0 || Entity.FatefulEncounter))
{
Label_IsShiny.Visible = false;
Label_IsShiny2.Visible = isShiny;
}
else
{
Label_IsShiny.Visible = isShiny;
Label_IsShiny2.Visible = false;
}
// Refresh Markings (for Shiny Star if applicable)
SetMarkings();