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

Remove date restriction on HOME WC8 shiny gifts

Browse source 
Stuff back in 2020 could be shiny too (as TSV=0 was possible), so the antishiny mechanism existed from the start.
This commit is contained in:
Kurt 2023-05-10 08:32:09 -07:00
parent 8a2f1d56c2
commit 8d5672d9c4
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -91,7 +91,7 @@ public sealed class WC8 : DataMysteryGift, ILangNick, INature, IGigantamax, IDyn
public override Shiny Shiny => PIDType switch public override Shiny Shiny => PIDType switch
{ {
ShinyType8.FixedValue => FixedShinyType(DateOnly.FromDateTime(DateTime.UtcNow)), ShinyType8.FixedValue => FixedShinyType(),
ShinyType8.Random => Shiny.Random, ShinyType8.Random => Shiny.Random,
ShinyType8.Never => Shiny.Never, ShinyType8.Never => Shiny.Never,
ShinyType8.AlwaysStar => Shiny.AlwaysStar, ShinyType8.AlwaysStar => Shiny.AlwaysStar,
@ -99,7 +99,7 @@ public sealed class WC8 : DataMysteryGift, ILangNick, INature, IGigantamax, IDyn
_ => throw new ArgumentOutOfRangeException(), _ => throw new ArgumentOutOfRangeException(),
}; };
private Shiny FixedShinyType(DateOnly date) => IsHOMEGift && IsHOMEShinyPossible(date) ? Shiny.Random : GetShinyXor() switch private Shiny FixedShinyType() => IsHOMEGift && IsHOMEShinyPossible() ? Shiny.Random : GetShinyXor() switch
{ {
0 => Shiny.AlwaysSquare, 0 => Shiny.AlwaysSquare,
<= 15 => Shiny.AlwaysStar, <= 15 => Shiny.AlwaysStar,
@ -536,7 +536,7 @@ public sealed class WC8 : DataMysteryGift, ILangNick, INature, IGigantamax, IDyn
pk.Gender = criteria.GetGender(Gender, pi); pk.Gender = criteria.GetGender(Gender, pi);
var av = GetAbilityIndex(criteria); var av = GetAbilityIndex(criteria);
pk.RefreshAbility(av); pk.RefreshAbility(av);
SetPID(pk, pk.MetDate ?? DateOnly.FromDateTime(DateTime.UtcNow)); SetPID(pk);
SetIVs(pk); SetIVs(pk);
} }
@ -556,17 +556,17 @@ public sealed class WC8 : DataMysteryGift, ILangNick, INature, IGigantamax, IDyn
_ => AbilityPermission.Any12H, _ => AbilityPermission.Any12H,
}; };
private uint GetPID(ITrainerID32 tr, ShinyType8 type, DateOnly date) => type switch private uint GetPID(ITrainerID32 tr, ShinyType8 type) => type switch
{ {
ShinyType8.Never => GetAntishiny(tr), // Random, Never Shiny ShinyType8.Never => GetAntishiny(tr), // Random, Never Shiny
ShinyType8.Random => Util.Rand32(), // Random, Any ShinyType8.Random => Util.Rand32(), // Random, Any
ShinyType8.AlwaysStar => (1u ^ (PID & 0xFFFF) ^ tr.TID16 ^ tr.SID16) << 16 | (PID & 0xFFFF), // Fixed, Force Star ShinyType8.AlwaysStar => (1u ^ (PID & 0xFFFF) ^ tr.TID16 ^ tr.SID16) << 16 | (PID & 0xFFFF), // Fixed, Force Star
ShinyType8.AlwaysSquare => (0u ^ (PID & 0xFFFF) ^ tr.TID16 ^ tr.SID16) << 16 | (PID & 0xFFFF), // Fixed, Force Square ShinyType8.AlwaysSquare => (0u ^ (PID & 0xFFFF) ^ tr.TID16 ^ tr.SID16) << 16 | (PID & 0xFFFF), // Fixed, Force Square
ShinyType8.FixedValue => GetFixedPID(tr, date), ShinyType8.FixedValue => GetFixedPID(tr),
_ => throw new ArgumentOutOfRangeException(nameof(type)), _ => throw new ArgumentOutOfRangeException(nameof(type)),
}; };
private uint GetFixedPID(ITrainerID32 tr, DateOnly date) private uint GetFixedPID(ITrainerID32 tr)
{ {
var pid = PID; var pid = PID;
if (pid != 0 && ID32 != 0) if (pid != 0 && ID32 != 0)
@ -574,24 +574,24 @@ public sealed class WC8 : DataMysteryGift, ILangNick, INature, IGigantamax, IDyn
if (!tr.IsShiny(pid, 8)) if (!tr.IsShiny(pid, 8))
return pid; return pid;
if (IsHOMEGift && !IsHOMEShinyPossible(date)) if (IsHOMEGift && IsHOMEShinyPossible())
return GetAntishinyFixedHOME(tr); return ForceAntiShiny(pid);
return pid; return pid;
} }
private static uint GetAntishinyFixedHOME(ITrainerID32 tr) => tr.ID32 ^ 0x10u; private static uint ForceAntiShiny(uint pid) => pid ^ 0x1000_0000;
private static uint GetAntishiny(ITrainerID32 tr) private static uint GetAntishiny(ITrainerID32 tr)
{ {
var pid = Util.Rand32(); var pid = Util.Rand32();
if (tr.IsShiny(pid, 8)) if (tr.IsShiny(pid, 8))
return pid ^ 0x1000_0000; return ForceAntiShiny(pid);
return pid; return pid;
} }
private void SetPID(PKM pk, DateOnly date) private void SetPID(PKM pk)
{ {
pk.PID = GetPID(pk, PIDType, date); pk.PID = GetPID(pk, PIDType);
} }
private void SetIVs(PKM pk) private void SetIVs(PKM pk)
@ -663,7 +663,7 @@ public sealed class WC8 : DataMysteryGift, ILangNick, INature, IGigantamax, IDyn
} }
else // Never or Random (HOME ID specific) else // Never or Random (HOME ID specific)
{ {
if (pk.IsShiny && !IsHOMEShinyPossible(pk.MetDate ?? DateOnly.FromDateTime(DateTime.UtcNow))) if (pk.IsShiny && !IsHOMEShinyPossible())
return false; return false;
} }
} }
@ -674,7 +674,7 @@ public sealed class WC8 : DataMysteryGift, ILangNick, INature, IGigantamax, IDyn
var shinyType = Shiny; var shinyType = Shiny;
if (PIDType == ShinyType8.FixedValue) if (PIDType == ShinyType8.FixedValue)
shinyType = FixedShinyType(pk.MetDate ?? DateOnly.FromDateTime(DateTime.UtcNow)); shinyType = FixedShinyType();
if (IsEgg) if (IsEgg)
{ {
if (EggLocation != pk.Egg_Location) // traded if (EggLocation != pk.Egg_Location) // traded
@ -729,13 +729,14 @@ public sealed class WC8 : DataMysteryGift, ILangNick, INature, IGigantamax, IDyn
var type = PIDType; var type = PIDType;
if (type is ShinyType8.Never or ShinyType8.Random) if (type is ShinyType8.Never or ShinyType8.Random)
return true; return true;
return pk.PID == GetPID(pk, type, pk.MetDate ?? DateOnly.FromDateTime(DateTime.UtcNow)); return pk.PID == GetPID(pk, type);
} }
private bool IsHOMEShinyPossible(DateOnly date) private bool IsHOMEShinyPossible()
{ {
// no defined TID16/SID16 and having a fixed PID can cause the player's TID16/SID16 to match the PID's shiny calc. // no defined TID16/SID16 and having a fixed PID can cause the player's TID16/SID16 to match the PID's shiny calc.
return ID32 == 0 && PID != 0 && (CardID < 9015 && date < new DateOnly(2022, 5, 18)); // All PIDs are fixed for HOME gifts.
return ID32 == 0;
} }
public bool IsDateRestricted => IsHOMEGift; public bool IsDateRestricted => IsHOMEGift;