g9 raid beldum moves, g9 shiny trades, g7 kchart

Beldum: Default moves
Gen9 trades were defaulting to Random, not Never
KChart: >= instead of >
This commit is contained in:
Kurt 2023-12-26 22:30:40 -08:00
parent 807b9031b1
commit 572b5e98e0
3 changed files with 7 additions and 3 deletions

View file

@ -200,7 +200,11 @@ public sealed record EncounterTera9
ID32 = tr.ID32,
};
SetPINGA(pk, criteria, pi);
pk.SetMoves(Moves);
if (Moves.HasMoves)
pk.SetMoves(Moves);
else // Beldum
EncounterUtil1.SetEncounterMoves(pk, Version, LevelMin);
pk.ResetPartyStats();
return pk;

View file

@ -11,7 +11,7 @@ public sealed record EncounterTrade9
public int Generation => 9;
public EntityContext Context => EntityContext.Gen9;
public int Location => Locations.LinkTrade6NPC;
public Shiny Shiny { get; init; }
public Shiny Shiny { get; init; } = Shiny.Never;
public bool EggEncounter => false;
public Ball FixedBall { get; init; }
public bool IsShiny => false;

View file

@ -107,7 +107,7 @@ public partial class KChart : Form
private static bool IsAlolanNative(ushort species)
{
if (species > 721)
if (species >= 721)
return true;
if (species == 720)
return false;