Minor tweaks

Fix ability index calc for generate & match
Fix message for mystery gift fateful encounter flag should be false
Add PA9 to GetBlank for anyone using the method via NuGet dll
This commit is contained in:
Kurt 2025-10-26 23:58:28 -05:00
parent 1c610c2054
commit 5cd6f456f0
3 changed files with 7 additions and 6 deletions

View File

@ -232,8 +232,8 @@ private static bool IsMatchIVsAndFollowing(PKM pk, in GenerateParam9a enc, Xoros
// No way to change abilities. Index must match.
int ability = enc.Ability switch
{
AbilityPermission.Any12H => (int)rand.NextInt(3) << 1,
AbilityPermission.Any12 => (int)rand.NextInt(2) << 1,
AbilityPermission.Any12H => 1 << (int)rand.NextInt(3),
AbilityPermission.Any12 => 1 << (int)rand.NextInt(2),
_ => (int)enc.Ability,
};
if (pk.AbilityNumber != ability)

View File

@ -103,8 +103,8 @@ public static bool GenerateData(PK9 pk, in GenerateParam9 enc, in EncounterCrite
int ability = enc.Ability switch
{
AbilityPermission.Any12H => (int)rand.NextInt(3) << 1,
AbilityPermission.Any12 => (int)rand.NextInt(2) << 1,
AbilityPermission.Any12H => 1 << (int)rand.NextInt(3),
AbilityPermission.Any12 => 1 << (int)rand.NextInt(2),
_ => (int)enc.Ability,
};
pk.RefreshAbility(ability >> 1);
@ -189,8 +189,8 @@ public static bool IsMatch(PKM pk, in GenerateParam9 enc, in ulong seed)
// ReSharper disable once UnusedVariable
int ability = enc.Ability switch
{
AbilityPermission.Any12H => (int)rand.NextInt(3) << 1,
AbilityPermission.Any12 => (int)rand.NextInt(2) << 1,
AbilityPermission.Any12H => 1 << (int)rand.NextInt(3),
AbilityPermission.Any12 => 1 << (int)rand.NextInt(2),
_ => (int)enc.Ability,
};

View File

@ -50,6 +50,7 @@ public static PKM GetBlank(TypeInfo type)
7 when version is GameVersion.GP or GameVersion.GE => new PB7(),
8 when version is GameVersion.BD or GameVersion.SP => new PB8(),
8 when version is GameVersion.PLA => new PA8(),
9 when version is GameVersion.ZA => new PA9(),
_ => GetBlank(gen),
};