Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-12-04 01:39:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

More strict alpha move check for statics

Browse source
This commit is contained in:
Kurt 2022-05-05 20:21:21 -07:00
parent ea87140aea
commit 4c73f1c592
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8a.cs
View file

@ -51,6 +51,8 @@ public sealed record EncounterStatic8a(GameVersion Version) : EncounterStatic(Ve
if (pk is PA8 pa) if (pk is PA8 pa)
{ {
if (IsAlpha && Moves.Count != 0)
pa.AlphaMove = (ushort)Moves[0];
if (pa.AlphaMove != 0) if (pa.AlphaMove != 0)
pk.PushMove(pa.AlphaMove); pk.PushMove(pa.AlphaMove);
pa.SetMasteryFlags(); pa.SetMasteryFlags();
@ -125,9 +127,9 @@ public sealed record EncounterStatic8a(GameVersion Version) : EncounterStatic(Ve
if (Mastery is not { } m) if (Mastery is not { } m)
return true; return true;
if (Species == (int)Core.Species.Kricketune && Level == 12) if (IsAlpha && Moves.Count != 0)
{ {
if (pkm is PA8 { AlphaMove: not (ushort)Move.FalseSwipe }) if (pkm is PA8 pa && pa.AlphaMove != Moves[0])
return false; return false;
} }
@ -151,9 +153,7 @@ public sealed record EncounterStatic8a(GameVersion Version) : EncounterStatic(Ve
private OverworldParam8a GetParams() private OverworldParam8a GetParams()
{ {
var pt = PersonalTable.LA; var gender = GetGenderRatio();
var entry = pt.GetFormEntry(Species, Form);
var gender = (byte)entry.Gender;
return new OverworldParam8a return new OverworldParam8a
{ {
IsAlpha = IsAlpha, IsAlpha = IsAlpha,
@ -163,6 +163,21 @@ public sealed record EncounterStatic8a(GameVersion Version) : EncounterStatic(Ve
GenderRatio = gender, GenderRatio = gender,
}; };
} }
private byte GetGenderRatio() => Gender switch
{
0 => PersonalInfo.RatioMagicMale,
1 => PersonalInfo.RatioMagicFemale,
2 => PersonalInfo.RatioMagicGenderless,
_ => GetGenderRatioPersonal(),
};
private byte GetGenderRatioPersonal()
{
var pt = PersonalTable.LA;
var entry = pt.GetFormEntry(Species, Form);
return (byte)entry.Gender;
}
} }
public enum EncounterStatic8aCorrelation : byte public enum EncounterStatic8aCorrelation : byte