Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-29 10:23:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc tweaks

Browse Source 
Fixes default moves being in inverse order
This commit is contained in:
Kurt
2025-12-15 15:28:26 -06:00
parent 6cefac2656
commit d45cdcb9e0
5 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/Templates/Gen9a/EncounterGift9a.cs
View File

@@ -135,7 +135,7 @@ private void SetMoves(PA9 pk, PersonalInfo9ZA pi, byte level)
if (!IsAlpha)
{
learn.SetEncounterMoves(level, moves);
learn.SetEncounterMovesBackwards(level, moves, sameDescend: false);
PlusRecordApplicator.SetPlusFlagsEncounter(pk, pi, plus, level);
}
else

2
PKHeX.Core/Legality/Encounters/Templates/Gen9a/EncounterSlot9a.cs
View File

@@ -82,7 +82,7 @@ private void SetMoves(PA9 pk, PersonalInfo9ZA pi, byte level)
Span<ushort> moves = stackalloc ushort[4];
if (!IsAlpha)
{
learn.SetEncounterMoves(level, moves);
learn.SetEncounterMovesBackwards(level, moves, sameDescend: false);
PlusRecordApplicator.SetPlusFlagsEncounter(pk, pi, plus, level);
}
else

30
PKHeX.Core/Legality/Encounters/Templates/Gen9a/EncounterStatic9a.cs
View File

@@ -35,7 +35,8 @@ public sealed record EncounterStatic9a(ushort Species, byte Form, byte Level, by
ushort ILocation.Location => Location;
private bool HyperspaceShinyPossible => Shiny != Shiny.Never && Location == EncounterArea9a.LocationHyperspace;
private bool IsHyperspace => Location == EncounterArea9a.LocationHyperspace;
private bool IsHyperspaceShinyPossible => Shiny != Shiny.Never && IsHyperspace;
public string Name => "Static Encounter";
public string LongName => Name;
@@ -84,7 +85,8 @@ private void SetPINGA(PA9 pk, EncounterCriteria criteria, PersonalInfo9ZA pi)
if (IVs.IsSpecified || Correlation is LumioseCorrelation.ReApplyIVs)
generate = criteria.WithoutIVs();
var param = GetParams(pi);
bool shinyPlease = criteria.Shiny.IsShiny();
var param = GetParams(pi, shinyPlease, shinyPlease);
ulong init = Util.Rand.Rand64();
var success = this.TryApply64(pk, init, param, generate);
if (!success && !this.TryApply64(pk, init, param, generate.WithoutIVs()))
@@ -110,7 +112,7 @@ private void SetMoves(PA9 pk, PersonalInfo9ZA pi, byte level)
if (!IsAlpha)
{
learn.SetEncounterMoves(level, moves);
learn.SetEncounterMovesBackwards(level, moves, sameDescend: false);
PlusRecordApplicator.SetPlusFlagsEncounter(pk, pi, plus, level);
}
else
@@ -195,15 +197,17 @@ private bool IsMatchPartial(PKM pk)
public SeedCorrelationResult TryGetSeed(PKM pk, out ulong seed)
{
// Try with 1 shiny roll, since all encounters besides the hyperspace sublegends are.
var param = GetParams(PersonalTable.ZA[Species, Form]);
if (param.TryGetSeed(pk, out seed))
return SeedCorrelationResult.Success;
if (!HyperspaceShinyPossible)
if (!IsHyperspaceShinyPossible)
return SeedCorrelationResult.Invalid;
if (pk.IsShiny && !LumioseSolver.SearchShiny1 || !LumioseSolver.SearchShinyN)
return SeedCorrelationResult.Ignore;
param = param with { RollCount = 7 };
// Assume any combination of shiny charm and donut boost is active.
param = param with { RollCount = 1 + ShinyCharm + ShinyHyperspace };
if (param.TryGetSeed(pk, out seed))
return SeedCorrelationResult.Success;
return SeedCorrelationResult.Invalid;
@@ -221,9 +225,21 @@ public LumioseCorrelation Correlation
}
}
public GenerateParam9a GetParams(PersonalInfo9ZA pi)
private const byte ShinyCharm = 3;
private const byte ShinyHyperspace = 3;
public GenerateParam9a GetParams(PersonalInfo9ZA pi) => GetParams(pi, shinyCharm: false, activeShinyPower: false);
public GenerateParam9a GetParams(PersonalInfo9ZA pi, bool shinyCharm, bool activeShinyPower)
{
byte rollCount = HyperspaceShinyPossible ? (byte)7 : (byte)1;
byte rollCount = 1;
if (IsHyperspaceShinyPossible)
{
if (shinyCharm)
rollCount += ShinyCharm;
if (activeShinyPower)
rollCount += ShinyHyperspace;
}
var gender = Gender switch
{
0 => PersonalInfo.RatioMagicMale,

2
PKHeX.Core/Legality/Encounters/Templates/Gen9a/EncounterTrade9a.cs
View File

@@ -138,7 +138,7 @@ private void SetMoves(PA9 pk, PersonalInfo9ZA pi, byte level)
if (!IsAlpha)
{
learn.SetEncounterMoves(level, moves);
learn.SetEncounterMovesBackwards(level, moves, sameDescend: false);
PlusRecordApplicator.SetPlusFlagsEncounter(pk, pi, plus, level);
}
else

2
PKHeX.Core/Legality/Verifiers/LegendsZAVerifier.cs
View File

@@ -118,7 +118,7 @@ private static void GetInitialMoves(IEncounter9a enc, PA9 pa9, Span<ushort> move
var learn = LearnSource9ZA.Instance.GetLearnset(enc.Species, enc.Form);
if (!enc.IsAlpha)
{
learn.SetEncounterMoves(level, moves);
learn.SetEncounterMovesBackwards(level, moves, sameDescend: false);
return;
}
learn.SetEncounterMovesBackwards(level, moves, sameDescend: false);