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

GO: handle min IV for trades with brand new friends

Browse Source
This commit is contained in:
sora10pls
2026-09-27 08:13:11 -04:00
parent 17157eb180
commit 09e7f18fbb
4 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/Templates/GO/EncounterSlot7GO.cs
View File

@@ -23,6 +23,7 @@ public sealed record EncounterSlot7GO(ushort DayStart, ushort DayEnd, ushort Spe
public byte LevelMax => EncountersGO.MAX_LEVEL;
public bool IsLocalDayStart => Flags.HasFlag(PogoFlags.LocalDateStart);
public bool IsLocalDayEnd => Flags.HasFlag(PogoFlags.LocalDateEnd);
public bool IsAlwaysSpecialTrade => Flags.HasFlag(PogoFlags.AlwaysSpecialTrade);
public string Name => $"GO Encounter ({Version})";
public string LongName
@@ -164,4 +165,5 @@ public enum PogoFlags : byte
LocalDateStart = 1 << 0,
LocalDateEnd = 1 << 1,
FeaturedWildArea = 1 << 2,
AlwaysSpecialTrade = 1 << 4,
}

5
PKHeX.Core/Legality/Encounters/Templates/GO/EncounterSlot8GO.cs
View File

@@ -22,6 +22,7 @@ public sealed record EncounterSlot8GO(ushort DayStart, ushort DayEnd, ushort Spe
public byte LevelMax => EncountersGO.MAX_LEVEL;
public bool IsLocalDayStart => Flags.HasFlag(PogoFlags.LocalDateStart);
public bool IsLocalDayEnd => Flags.HasFlag(PogoFlags.LocalDateEnd);
public bool IsAlwaysSpecialTrade => Flags.HasFlag(PogoFlags.AlwaysSpecialTrade);
public string Name => $"GO Encounter ({Version})";
public string LongName
@@ -249,8 +250,6 @@ public EncounterMatchRating GetMatchRating(PKM pk)
return EncounterMatchRating.DeferredErrors;
if (pk is ITeraType ro && IsTeraTypeMismatch(ro.TeraTypeOriginal, PersonalTable.SV[Species, Form]))
return EncounterMatchRating.DeferredErrors;
if (!this.GetIVsValid(pk))
return EncounterMatchRating.Deferred;
return EncounterMatchRating.Match;
}
@@ -294,7 +293,7 @@ private bool IsMatchPartial(PKM pk)
{
if (!IsWithinDistributionWindow(pk))
return true;
if (!this.GetIVsAboveMinimum(pk))
if (!this.GetIVsValid(pk))
return true;
// Eevee & Glaceon have different base friendships. Make sure if it is invalid that we yield the other encounter before.

16
PKHeX.Core/Legality/Encounters/Templates/GO/IPogoSlot.cs
View File

@@ -16,6 +16,9 @@ public interface IPogoSlot : IPogoDateRange
/// <summary> Minimum IV value for the encounter. </summary>
byte MinimumIV { get; }
/// <summary> If trading this Pokémon always results in a Special Trade. </summary>
bool IsAlwaysSpecialTrade { get; }
}
/// <summary>
@@ -42,9 +45,20 @@ private static bool GetIVsAboveMinimum(PKM pk, int min)
public static bool GetIVsValid(this IPogoSlot slot, PKM pk)
{
if (!slot.GetIVsAboveMinimum(pk))
if (!slot.GetIVsAboveMinimum(pk) && slot.IsAlwaysSpecialTrade)
return false;
// when trading with new friends, the IV floor is 0 before reaching Good Friends, as long as it is not a Special Trade
if (slot.MinimumIV == 1 && (pk.IV_HP == 1 || (pk.IV_ATK == 1 && pk.IV_SPA == 1) || (pk.IV_DEF == 1 && pk.IV_SPD == 1)))
{
if (pk.IsShiny)
return false;
if (SpeciesCategory.IsSpecialPokemon(pk.Species))
return false;
if (slot.Type.IsShadow)
return false;
}
// HP * 2 | 1 -> HP
// ATK * 2 | 1 -> ATK&SPA
// DEF * 2 | 1 -> DEF&SPD

11
PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs
View File

@@ -77,6 +77,13 @@ or PogoType.RaidShadow
or PogoType.RaidShadowMythical
or PogoType.RaidShadowUltraBeast;
public bool IsShadow => type is PogoType.Shadow
or PogoType.ShadowMythical
or PogoType.ShadowUltraBeast
or PogoType.RaidShadow
or PogoType.RaidShadowMythical
or PogoType.RaidShadowUltraBeast;
public bool IsMaxBattle => type is PogoType.MaxBattle
or PogoType.MaxBattleMythical
or PogoType.MaxBattleUltraBeast
@@ -119,8 +126,8 @@ public bool IsSafariBallUsable(PogoType type, PogoFlags flags)
{
if (ball is PogoBallRestriction.OnlySafari)
return true;
if (!flags.HasFlag(PogoFlags.FeaturedWildArea) && (type.IsRaid || type.IsMaxBattle))
return false;
if (type.IsRaid || type.IsMaxBattle)
return flags.HasFlag(PogoFlags.FeaturedWildArea);
return type switch
{