Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-16 09:08:02 +00:00
Code Issues Projects Releases Packages Wiki Activity
PKHeX/PKHeX.Core/Legality/Encounters/EncounterEgg.cs

144 lines
4.3 KiB
C#
Raw Normal View History

Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
using System;
Finish rough generator * handle gen6+ egg case where egg move count < 4 (cannot displace Levelup lvl1 moves) * handle minior altform case generates all species/encounters possible, yielding 144,094 pkm files (all detected as legal!)
2018-05-10 02:21:44 +00:00
using System.Linq;
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
namespace PKHeX.Core
Refactor encounter matching exercise in deferred execution/state machine, only calculate possible matches until a sufficiently valid match is obtained. Previous setup would try to calculate the 'best match' and had band-aid workarounds in cases where a subsequent check may determine it to be a false match. There's still more ways to improve speed: - precalculate relationships for Encounter Slots rather than iterating over every area - yielding individual slots instead of an entire area - group non-egg wondercards by ID in a dict/hashtable for faster retrieval reworked some internals: - EncounterMatch is always an IEncounterable instead of an object, for easy pattern matching. - Splitbreed checking is done per encounter and is stored in the EncounterEgg result - Encounter validation uses Encounter/Move/RelearnMove/Evolution to whittle to the final encounter. As a part of the encounter matching, a lazy peek is used to check if an invalid encounter should be retained instead of discarded; if another encounter has not been checked, it'll stop the invalid checks and move on. If it is the last encounter, no other valid encounters exist so it will keep the parse for the invalid encounter. If no encounters are yielded, then there is no encountermatch. An EncounterInvalid is created to store basic details, and the parse is carried out. Breaks some legality checking features for flagging invalid moves in more detail, but those can be re-added in a separate check (if splitbreed & any move invalid -> check for other split moves). Should now be easier to follow the flow & maintain :smile:
2017-05-28 04:17:53 +00:00
{
add more pkhex.core xml documentation adds a bunch of documentation useful for those unfamiliar with the core library
2017-10-24 06:12:58 +00:00
/// <summary>
/// Egg Encounter Data
/// </summary>
Rename egg game->version add more gameversions (soon)
2018-03-31 04:37:01 +00:00
public class EncounterEgg : IEncounterable, IVersion
Refactor encounter matching exercise in deferred execution/state machine, only calculate possible matches until a sufficiently valid match is obtained. Previous setup would try to calculate the 'best match' and had band-aid workarounds in cases where a subsequent check may determine it to be a false match. There's still more ways to improve speed: - precalculate relationships for Encounter Slots rather than iterating over every area - yielding individual slots instead of an entire area - group non-egg wondercards by ID in a dict/hashtable for faster retrieval reworked some internals: - EncounterMatch is always an IEncounterable instead of an object, for easy pattern matching. - Splitbreed checking is done per encounter and is stored in the EncounterEgg result - Encounter validation uses Encounter/Move/RelearnMove/Evolution to whittle to the final encounter. As a part of the encounter matching, a lazy peek is used to check if an invalid encounter should be retained instead of discarded; if another encounter has not been checked, it'll stop the invalid checks and move on. If it is the last encounter, no other valid encounters exist so it will keep the parse for the invalid encounter. If no encounters are yielded, then there is no encountermatch. An EncounterInvalid is created to store basic details, and the parse is carried out. Breaks some legality checking features for flagging invalid moves in more detail, but those can be re-added in a separate check (if splitbreed & any move invalid -> check for other split moves). Should now be easier to follow the flow & maintain :smile:
2017-05-28 04:17:53 +00:00
{
public int Species { get; set; }
public string Name => "Egg";
Add short/long name property differentiation
2019-03-18 05:19:37 +00:00
public string LongName => "Egg";
Refactor encounter matching exercise in deferred execution/state machine, only calculate possible matches until a sufficiently valid match is obtained. Previous setup would try to calculate the 'best match' and had band-aid workarounds in cases where a subsequent check may determine it to be a false match. There's still more ways to improve speed: - precalculate relationships for Encounter Slots rather than iterating over every area - yielding individual slots instead of an entire area - group non-egg wondercards by ID in a dict/hashtable for faster retrieval reworked some internals: - EncounterMatch is always an IEncounterable instead of an object, for easy pattern matching. - Splitbreed checking is done per encounter and is stored in the EncounterEgg result - Encounter validation uses Encounter/Move/RelearnMove/Evolution to whittle to the final encounter. As a part of the encounter matching, a lazy peek is used to check if an invalid encounter should be retained instead of discarded; if another encounter has not been checked, it'll stop the invalid checks and move on. If it is the last encounter, no other valid encounters exist so it will keep the parse for the invalid encounter. If no encounters are yielded, then there is no encountermatch. An EncounterInvalid is created to store basic details, and the parse is carried out. Breaks some legality checking features for flagging invalid moves in more detail, but those can be re-added in a separate check (if splitbreed & any move invalid -> check for other split moves). Should now be easier to follow the flow & maintain :smile:
2017-05-28 04:17:53 +00:00
public bool EggEncounter => true;
public int LevelMin => Level;
public int LevelMax => Level;
public int Level;
Rename egg game->version add more gameversions (soon)
2018-03-31 04:37:01 +00:00
public GameVersion Version { get; set; }
Add IEncounterable -> pkm interface method egg,slot,static,link,trade need to be implemented later remove IEncounterable from PL6
2018-03-29 03:38:07 +00:00
Update iencounterable api with new criteria arg rearrange some logic for clearer function (extract some methods)
2018-12-30 06:24:34 +00:00
public PKM ConvertToPKM(ITrainerInfo SAV) => ConvertToPKM(SAV, EncounterCriteria.Unrestricted);
public PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria)
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
{
Misc encounter->pkm generating fixes eggs for Gen1 must be generated in Gen2 gen1 wild encounter initial moves gen4 abilities have 0 for single ability mons
2018-04-28 23:30:56 +00:00
int gen = Version.GetGeneration();
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
var version = Version;
Misc encounter->pkm generating fixes eggs for Gen1 must be generated in Gen2 gen1 wild encounter initial moves gen4 abilities have 0 for single ability mons
2018-04-28 23:30:56 +00:00
if (gen < 2)
{
gen = 2;
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
version = GameVersion.C;
Misc encounter->pkm generating fixes eggs for Gen1 must be generated in Gen2 gen1 wild encounter initial moves gen4 abilities have 0 for single ability mons
2018-04-28 23:30:56 +00:00
}
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
var pk = PKMConverter.GetBlank(gen, version);
Update iencounterable api with new criteria arg rearrange some logic for clearer function (extract some methods)
2018-12-30 06:24:34 +00:00
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
SAV.ApplyToPKM(pk);
pk.Species = Species;
Extract logic from PKX Extract Species Name logic to SpeciesName Extract Language logic to Language Remove FormConverter wrapper for string[] fetch Rearrange some logic to more appropriate locations, update access modifiers / types Move some pkm array methods to arrayutil, make generic PKX.GetVCLanguage was a dupe of _K12.GuessedLanguage() so just expose the method PKX is now back to pkm data manip only
2019-09-19 02:58:23 +00:00
pk.Nickname = SpeciesName.GetSpeciesNameGeneration(Species, SAV.Language, gen);
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
pk.CurrentLevel = Level;
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
pk.Version = (int)version;
Update iencounterable api with new criteria arg rearrange some logic for clearer function (extract some methods)
2018-12-30 06:24:34 +00:00
pk.Ball = 4;
misc quality of life improvements set egg friendship allow SetRandomIVs to use a minimum fixed IV count
2018-03-29 03:56:58 +00:00
pk.OT_Friendship = pk.PersonalInfo.BaseFriendship;
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
int[] moves = SetEncounterMoves(pk, version);
SetPINGA(pk, criteria);
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
if (pk.Format <= 2 && version != GameVersion.C)
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
return pk;
Update iencounterable api with new criteria arg rearrange some logic for clearer function (extract some methods)
2018-12-30 06:24:34 +00:00
SetMetData(pk);
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
Refactoring & finish eevee test case generates a legal pk* for every possible encounter; there's likely other scenarios and more roughness to smooth out, but seems legit for now
2018-04-01 03:37:36 +00:00
if (pk.Format < 3)
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
return pk;
Refactoring add GameVersion to generation fix generating pk2 eggs relocate some logic
2018-03-30 04:00:38 +00:00
if (pk.GenNumber >= 4)
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
pk.SetEggMetData(version, (GameVersion)SAV.Game);
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
if (pk.Format < 6)
return pk;
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
if (pk.Format == 6)
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
pk.SetHatchMemory6();
Update iencounterable api with new criteria arg rearrange some logic for clearer function (extract some methods)
2018-12-30 06:24:34 +00:00
SetAltForm(pk, SAV);
pk.SetRandomEC();
pk.RelearnMoves = moves;
return pk;
}
private void SetAltForm(PKM pk, ITrainerInfo SAV)
{
Finish rough generator * handle gen6+ egg case where egg move count < 4 (cannot displace Levelup lvl1 moves) * handle minior altform case generates all species/encounters possible, yielding 144,094 pkm files (all detected as legal!)
2018-05-10 02:21:44 +00:00
switch (Species)
{
Misc clean split some methods with optional parameters=null add more xmldoc replace some magic numbers -> enum/const references consolidate common array operations (span soon maybe?)
2019-09-10 07:21:51 +00:00
case (int)Core.Species.Minior:
Finish rough generator * handle gen6+ egg case where egg move count < 4 (cannot displace Levelup lvl1 moves) * handle minior altform case generates all species/encounters possible, yielding 144,094 pkm files (all detected as legal!)
2018-05-10 02:21:44 +00:00
pk.AltForm = Util.Rand.Next(7, 14);
break;
Misc clean split some methods with optional parameters=null add more xmldoc replace some magic numbers -> enum/const references consolidate common array operations (span soon maybe?)
2019-09-10 07:21:51 +00:00
case (int)Core.Species.Scatterbug:
case (int)Core.Species.Spewpa:
case (int)Core.Species.Vivillon:
PKHeX.Core Nullable cleanup (#2401) * Handle some nullable cases Refactor MysteryGift into a second abstract class (backed by a byte array, or fake data) Make some classes have explicit constructors instead of { } initialization * Handle bits more obviously without null * Make SaveFile.BAK explicitly readonly again * merge constructor methods to have readonly fields * Inline some properties * More nullable handling * Rearrange box actions define straightforward classes to not have any null properties * Make extrabyte reference array immutable * Move tooltip creation to designer * Rearrange some logic to reduce nesting * Cache generated fonts * Split mystery gift album purpose * Handle more tooltips * Disallow null setters * Don't capture RNG object, only type enum * Unify learnset objects Now have readonly properties which are never null don't new() empty learnsets (>800 Learnset objects no longer created, total of 2400 objects since we also new() a move & level array) optimize g1/2 reader for early abort case * Access rewrite Initialize blocks in a separate object, and get via that object removes a couple hundred "might be null" warnings since blocks are now readonly getters some block references have been relocated, but interfaces should expose all that's needed put HoF6 controls in a groupbox, and disable * Readonly personal data * IVs non nullable for mystery gift * Explicitly initialize forced encounter moves * Make shadow objects readonly & non-null Put murkrow fix in binary data resource, instead of on startup * Assign dex form fetch on constructor Fixes legality parsing edge cases also handle cxd parse for valid; exit before exception is thrown in FrameGenerator * Remove unnecessary null checks * Keep empty value until init SetPouch sets the value to an actual one during load, but whatever * Readonly team lock data * Readonly locks Put locked encounters at bottom (favor unlocked) * Mail readonly data / offset Rearrange some call flow and pass defaults Add fake classes for SaveDataEditor mocking Always party size, no need to check twice in stat editor use a fake save file as initial data for savedata editor, and for gamedata (wow i found a usage) constrain eventwork editor to struct variable types (uint, int, etc), thus preventing null assignment errors
2019-10-17 01:47:31 +00:00
pk.AltForm = Legal.GetVivillonPattern((byte)SAV.Country, (byte)SAV.SubRegion);
Finish rough generator * handle gen6+ egg case where egg move count < 4 (cannot displace Levelup lvl1 moves) * handle minior altform case generates all species/encounters possible, yielding 144,094 pkm files (all detected as legal!)
2018-05-10 02:21:44 +00:00
break;
}
Update iencounterable api with new criteria arg rearrange some logic for clearer function (extract some methods)
2018-12-30 06:24:34 +00:00
}
Finish rough generator * handle gen6+ egg case where egg move count < 4 (cannot displace Levelup lvl1 moves) * handle minior altform case generates all species/encounters possible, yielding 144,094 pkm files (all detected as legal!)
2018-05-10 02:21:44 +00:00
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
private static void SetPINGA(PKM pk, EncounterCriteria criteria)
Update iencounterable api with new criteria arg rearrange some logic for clearer function (extract some methods)
2018-12-30 06:24:34 +00:00
{
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
pk.SetRandomIVs(flawless: 3);
if (pk.Format <= 2)
return;
Update iencounterable api with new criteria arg rearrange some logic for clearer function (extract some methods)
2018-12-30 06:24:34 +00:00
int gender = criteria.GetGender(-1, pk.PersonalInfo);
int nature = (int)criteria.GetNature(Nature.Random);
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
Update iencounterable api with new criteria arg rearrange some logic for clearer function (extract some methods)
2018-12-30 06:24:34 +00:00
if (pk.Format <= 5)
{
pk.SetPIDGender(gender);
pk.Gender = gender;
pk.SetPIDNature(nature);
pk.Nature = nature;
pk.RefreshAbility(pk.PIDAbility);
}
else
{
pk.PID = Util.Rand32();
pk.Nature = nature;
pk.Gender = gender;
pk.RefreshAbility(Util.Rand.Next(2));
}
}
private static void SetMetData(PKM pk)
{
pk.Met_Level = EncounterSuggestion.GetSuggestedEncounterEggMetLevel(pk);
pk.Met_Location = Math.Max(0, EncounterSuggestion.GetSuggestedEggMetLocation(pk));
Add egg converter & test only tested for gen7 egg->pkm (not to eventual set) pretty sure a good chunk of the egg generation logic can be pulled out for reuse in other IEncounterable generators (IEncounterable extensions?)
2018-03-29 03:40:07 +00:00
}
Finish rough generator * handle gen6+ egg case where egg move count < 4 (cannot displace Levelup lvl1 moves) * handle minior altform case generates all species/encounters possible, yielding 144,094 pkm files (all detected as legal!)
2018-05-10 02:21:44 +00:00
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
private int[] SetEncounterMoves(PKM pk, GameVersion version)
{
int[] moves = GetCurrentEggMoves(pk, version);
pk.Moves = moves;
pk.SetMaximumPPCurrent(moves);
return moves;
}
private int[] GetCurrentEggMoves(PKM pk, GameVersion version)
Finish rough generator * handle gen6+ egg case where egg move count < 4 (cannot displace Levelup lvl1 moves) * handle minior altform case generates all species/encounters possible, yielding 144,094 pkm files (all detected as legal!)
2018-05-10 02:21:44 +00:00
{
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
var moves = MoveEgg.GetEggMoves(pk, Species, pk.AltForm, version);
Finish rough generator * handle gen6+ egg case where egg move count < 4 (cannot displace Levelup lvl1 moves) * handle minior altform case generates all species/encounters possible, yielding 144,094 pkm files (all detected as legal!)
2018-05-10 02:21:44 +00:00
if (moves.Length == 0)
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
return MoveLevelUp.GetEncounterMoves(pk, Level, version);
Misc cleanup
2018-07-23 00:14:22 +00:00
if (moves.Length >= 4 || pk.Format < 6)
return moves;
// Sprinkle in some default level up moves
Refactoring iencounterable->pkm SetPINGA{S}(pk, criteria) -> pid,iv, nature, gender, ability (stats future?) memes aside, this is where criteria data is forced Split N encounterstatic (has fixed PID and special flag) from EncounterStaticPID
2019-02-09 19:37:20 +00:00
var lvl = Legal.GetBaseEggMoves(pk, Species, version, Level);
Misc cleanup
2018-07-23 00:14:22 +00:00
return lvl.Concat(moves).ToArray();
Finish rough generator * handle gen6+ egg case where egg move count < 4 (cannot displace Levelup lvl1 moves) * handle minior altform case generates all species/encounters possible, yielding 144,094 pkm files (all detected as legal!)
2018-05-10 02:21:44 +00:00
}
Refactor encounter matching exercise in deferred execution/state machine, only calculate possible matches until a sufficiently valid match is obtained. Previous setup would try to calculate the 'best match' and had band-aid workarounds in cases where a subsequent check may determine it to be a false match. There's still more ways to improve speed: - precalculate relationships for Encounter Slots rather than iterating over every area - yielding individual slots instead of an entire area - group non-egg wondercards by ID in a dict/hashtable for faster retrieval reworked some internals: - EncounterMatch is always an IEncounterable instead of an object, for easy pattern matching. - Splitbreed checking is done per encounter and is stored in the EncounterEgg result - Encounter validation uses Encounter/Move/RelearnMove/Evolution to whittle to the final encounter. As a part of the encounter matching, a lazy peek is used to check if an invalid encounter should be retained instead of discarded; if another encounter has not been checked, it'll stop the invalid checks and move on. If it is the last encounter, no other valid encounters exist so it will keep the parse for the invalid encounter. If no encounters are yielded, then there is no encountermatch. An EncounterInvalid is created to store basic details, and the parse is carried out. Breaks some legality checking features for flagging invalid moves in more detail, but those can be re-added in a separate check (if splitbreed & any move invalid -> check for other split moves). Should now be easier to follow the flow & maintain :smile:
2017-05-28 04:17:53 +00:00
}
Misc simplifications cache splitbreed species as another class reduce linq usage in evolution validity check reuse egg hatch method
2018-07-04 16:15:20 +00:00
Update iencounterable api with new criteria arg rearrange some logic for clearer function (extract some methods)
2018-12-30 06:24:34 +00:00
public sealed class EncounterEggSplit : EncounterEgg
Misc simplifications cache splitbreed species as another class reduce linq usage in evolution validity check reuse egg hatch method
2018-07-04 16:15:20 +00:00
{
public int OtherSpecies;
}
Refactor encounter matching exercise in deferred execution/state machine, only calculate possible matches until a sufficiently valid match is obtained. Previous setup would try to calculate the 'best match' and had band-aid workarounds in cases where a subsequent check may determine it to be a false match. There's still more ways to improve speed: - precalculate relationships for Encounter Slots rather than iterating over every area - yielding individual slots instead of an entire area - group non-egg wondercards by ID in a dict/hashtable for faster retrieval reworked some internals: - EncounterMatch is always an IEncounterable instead of an object, for easy pattern matching. - Splitbreed checking is done per encounter and is stored in the EncounterEgg result - Encounter validation uses Encounter/Move/RelearnMove/Evolution to whittle to the final encounter. As a part of the encounter matching, a lazy peek is used to check if an invalid encounter should be retained instead of discarded; if another encounter has not been checked, it'll stop the invalid checks and move on. If it is the last encounter, no other valid encounters exist so it will keep the parse for the invalid encounter. If no encounters are yielded, then there is no encountermatch. An EncounterInvalid is created to store basic details, and the parse is carried out. Breaks some legality checking features for flagging invalid moves in more detail, but those can be re-added in a separate check (if splitbreed & any move invalid -> check for other split moves). Should now be easier to follow the flow & maintain :smile:
2017-05-28 04:17:53 +00:00
}
Reference in a new issue Copy permalink