mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-30 15:59:13 +00:00
1e86fdcea8
## Issue We want to discard-but-remember any slots that aren't a perfect fit, on the off chance that a better one exists later in the search space. If there's no better match, then we gotta go with what we got. ## Example: Wurmple exists in area `X`, and also has a more rare slot for Silcoon, with the same level for both slots. * We have a Silcoon that we've leveled up a few times. Was our Silcoon originally a Wurmple, or was it caught as a Silcoon? * To be sure, we have to check the EC/PID if the Wurmple wouldn't evolve into Cascoon instead. * We don't want to wholly reject that Wurmple slot, as maybe the Met Level isn't within Silcoon's slot range. --- Existing implementation would store "deferred" matches in a list; we only need to keep 1 of these matches around (less allocation!). We also want to differentiate between a "good" deferral and a "bad" deferral; I don't think this is necessary but it's currently used by Mystery Gift matching (implemented for the Eeveelution mystery gifts which matter for evolution moves). The existing logic didn't use inheritance, and instead had static methods being reused across generations. Quite kludgy. Also, the existing logic was a pain to modify the master encounter yield methods, as one generation's quirks had to not impact all other generations that used the method. --- The new implementation splits out the encounter yielding methods to be separate for each generation / subset. Now, things don't have to check `WasLink` for Gen7 origin, because Pokémon Link wasn't a thing in Gen7. --- ## Future Maybe refactoring yielders into "GameCores" that expose yielding behaviors / properties, rather than the static logic. As more generations and side-gamegroups get added (thanks LGPE/GO/GameCube), all this switch stuff gets annoying to maintain instead of just overriding/inheritance. ## Conclusion This shouldn't impact any legality results negatively; if you notice any regressions, report them! This should reduce false flags where we didn't defer-discard an encounter when we should have (wild area mons being confused with raids).
91 lines
2.6 KiB
C#
91 lines
2.6 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
|
|
namespace PKHeX.Core
|
|
{
|
|
/// <summary>
|
|
/// Event data for Generation 1
|
|
/// </summary>
|
|
/// <inheritdoc cref="EncounterStatic1"/>
|
|
public sealed record EncounterStatic1E : EncounterStatic1, IFixedGBLanguage
|
|
{
|
|
public EncounterGBLanguage Language { get; init; } = EncounterGBLanguage.Japanese;
|
|
|
|
/// <summary> Trainer name for the event. </summary>
|
|
public string OT_Name { get; init; } = string.Empty;
|
|
|
|
public IReadOnlyList<string> OT_Names { get; init; } = Array.Empty<string>();
|
|
|
|
/// <summary> Trainer ID for the event. </summary>
|
|
public int TID { get; init; } = -1;
|
|
|
|
public EncounterStatic1E(int species, int level, GameVersion game) : base(species, level, game)
|
|
{
|
|
}
|
|
|
|
public override bool IsMatchExact(PKM pkm, DexLevel evo)
|
|
{
|
|
if (!base.IsMatchExact(pkm, evo))
|
|
return false;
|
|
|
|
if (Language != EncounterGBLanguage.Any && pkm.Japanese != (Language == EncounterGBLanguage.Japanese))
|
|
return false;
|
|
|
|
// EC/PID check doesn't exist for these, so check Shiny state here.
|
|
if (!IsShinyValid(pkm))
|
|
return false;
|
|
|
|
if (TID != -1 && pkm.TID != TID)
|
|
return false;
|
|
|
|
if (OT_Name.Length != 0)
|
|
{
|
|
if (pkm.OT_Name != OT_Name)
|
|
return false;
|
|
}
|
|
else if (OT_Names.Count != 0)
|
|
{
|
|
if (!OT_Names.Contains(pkm.OT_Name))
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
private bool IsShinyValid(PKM pkm) => Shiny switch
|
|
{
|
|
Shiny.Never => !pkm.IsShiny,
|
|
Shiny.Always => pkm.IsShiny,
|
|
_ => true
|
|
};
|
|
|
|
protected override void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteria, PKM pk)
|
|
{
|
|
base.ApplyDetails(sav, criteria, pk);
|
|
|
|
if (TID != -1)
|
|
pk.TID = TID;
|
|
|
|
if (OT_Name.Length != 0)
|
|
pk.OT_Name = OT_Name;
|
|
else if (OT_Names.Count != 0)
|
|
pk.OT_Name = OT_Names[Util.Rand.Next(OT_Names.Count)];
|
|
}
|
|
}
|
|
|
|
public interface IFixedGBLanguage
|
|
{
|
|
EncounterGBLanguage Language { get; }
|
|
}
|
|
|
|
/// <summary>
|
|
/// Generations 1 & 2 cannot communicate between Japanese & International versions.
|
|
/// </summary>
|
|
public enum EncounterGBLanguage
|
|
{
|
|
Japanese,
|
|
International,
|
|
Any,
|
|
}
|
|
}
|