Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-12-25 11:53:11 +00:00
Code Issues Projects Releases Packages Wiki Activity
PKHeX/PKHeX.Core/Legality/Verifiers/BallVerifier.cs

267 lines
12 KiB
C#
Raw Normal View History

Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
using System.Collections.Generic;
using static PKHeX.Core.LegalityCheckStrings;
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
using static PKHeX.Core.Ball;
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
namespace PKHeX.Core
{
Misc simplifications / xmldoc
2018-07-02 02:17:37 +00:00
/// <summary>
/// Verifies the <see cref="PKM.Ball"/> value.
/// </summary>
public sealed class BallVerifier : Verifier
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
protected override CheckIdentifier Identifier => CheckIdentifier.Ball;
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
private CheckResult NONE => GetInvalid(LBallNone);
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
public override void Verify(LegalityAnalysis data)
{
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
if (data.pkm.Format <= 2)
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
return; // no ball info saved
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
var result = VerifyBall(data);
data.AddLine(result);
}
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
private CheckResult VerifyBall(LegalityAnalysis data)
{
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
var EncounterMatch = data.EncounterMatch;
var Info = data.Info;
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
// Fixed ball cases -- can be only one ball ever
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
switch (EncounterMatch)
{
case MysteryGift g:
return VerifyBallMysteryGift(data, g);
case EncounterLink l:
return VerifyBallEquals(data, l.Ball);
case EncounterTrade t:
return VerifyBallEquals(data, t.Ball);
case EncounterStatic s when s.Gift:
return VerifyBallEquals(data, s.Ball);
}
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
// Capture / Inherit cases -- can be one of many balls
var pkm = data.pkm;
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
if (pkm.Species == 292 && Info.Generation > 3) // Shedinja. For gen3, copy the ball from Nincada
sync missing content yay rename
2018-08-26 18:29:47 +00:00
return VerifyBallEquals(data, (int)Poke); // Pokeball Only
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (pkm.Ball == (int)Heavy && Legal.AlolanCaptureNoHeavyBall.Contains(EncounterMatch.Species) && !EncounterMatch.EggEncounter && pkm.SM)
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallHeavy); // Heavy Ball, can inherit if from egg (USUM fixed catch rate calc)
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
switch (EncounterMatch)
{
case EncounterStatic e:
return VerifyBallStatic(data, e);
case EncounterSlot w:
return VerifyBallWild(data, w);
case EncounterEgg _:
return VerifyBallEgg(data);
Ignore ball check for invalid encounters Defaulting to pokeball isn't entirely appropriate
2018-11-16 02:40:08 +00:00
case EncounterInvalid _:
return VerifyBallEquals(data, pkm.Ball); // ignore me
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
default:
sync missing content yay rename
2018-08-26 18:29:47 +00:00
return VerifyBallEquals(data, (int)Poke); // Pokeball
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
}
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
}
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
private CheckResult VerifyBallMysteryGift(LegalityAnalysis data, MysteryGift g)
{
Remove unnecessary properties
2018-10-06 02:57:45 +00:00
if (g.Generation == 4 && g.Species == 490 && g.Ball == 0) // there is no ball data in Manaphy Mystery Gift from Gen4
sync missing content yay rename
2018-08-26 18:29:47 +00:00
return VerifyBallEquals(data, (int)Poke); // Pokeball
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
return VerifyBallEquals(data, g.Ball);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Respacening Style guidelines, handle a bunch of files no functional change
2018-07-27 02:34:27 +00:00
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
private CheckResult VerifyBallStatic(LegalityAnalysis data, EncounterStatic s)
{
if (s.Location == 75 && s.Generation == 5) // Entree Forest (Dream World)
return VerifyBallEquals(data, Legal.DreamWorldBalls);
return VerifyBallEquals(data, Legal.GetWildBalls(data.pkm));
}
Respacening Style guidelines, handle a bunch of files no functional change
2018-07-27 02:34:27 +00:00
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
private CheckResult VerifyBallWild(LegalityAnalysis data, EncounterSlot w)
{
if (w.Location == 30016 && w.Generation == 7) // Poké Pelago
sync missing content yay rename
2018-08-26 18:29:47 +00:00
return VerifyBallEquals(data, (int)Poke); // Pokeball
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
var Info = data.Info;
// For gen3/4 Safari Zones and BCC getValidWildEncounters already filter to not return
// mixed possible encounters between safari, BCC and other encounters
// That means is the first encounter is not safari then there is no safari encounter in the array
if (3 <= Info.Generation && Info.Generation <= 4 && w.Type.IsSafariType())
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
return VerifyBallEquals(data, (int)Safari); // Safari Ball
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
if (Info.Generation == 4 && w.Type == SlotType.BugContest)
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
return VerifyBallEquals(data, (int)Sport); // Sport Ball
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
return VerifyBallEquals(data, Legal.GetWildBalls(data.pkm));
}
Respacening Style guidelines, handle a bunch of files no functional change
2018-07-27 02:34:27 +00:00
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
private CheckResult VerifyBallEgg(LegalityAnalysis data)
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
var pkm = data.pkm;
if (data.Info.Generation < 6) // No inheriting Balls
sync missing content yay rename
2018-08-26 18:29:47 +00:00
return VerifyBallEquals(data, (int)Poke); // Must be Pokéball -- no ball inheritance.
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
switch ((Ball)pkm.Ball)
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
case Poke: return GetValid(LBallEnc); // Poké Ball
case Master: return GetInvalid(LBallEggMaster); // Master Ball
case Cherish: return GetInvalid(LBallEggCherish); // Cherish Ball
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
default: return VerifyBallInherited(data);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
}
Respacening Style guidelines, handle a bunch of files no functional change
2018-07-27 02:34:27 +00:00
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
private CheckResult VerifyBallInherited(LegalityAnalysis data)
{
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
switch (data.Info.Generation)
{
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
case 6: return VerifyBallEggGen6(data); // Gen6 Inheritance Rules
case 7: return VerifyBallEggGen7(data); // Gen7 Inheritance Rules
default: return NONE;
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
}
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
private CheckResult VerifyBallEggGen6(LegalityAnalysis data)
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
var pkm = data.pkm;
Reduce linq usage reuse variables instead of re-fetching (pkm.Species) add overload for HashSet<int> contains vs ICollection merge BattleOnly to one hashset
2018-07-01 17:49:11 +00:00
int species = data.EncounterMatch.Species;
if (pkm.Gender == 2 || Legal.BreedMaleOnly.Contains(species)) // Genderless
sync missing content yay rename
2018-08-26 18:29:47 +00:00
return VerifyBallEquals(data, (int)Poke); // Must be Pokéball as ball can only pass via mother (not Ditto!)
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
Ball ball = (Ball)pkm.Ball;
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (ball == Safari) // Safari Ball
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (!Legal.Inherit_Safari.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallSpecies);
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
if (pkm.AbilityNumber == 4)
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallAbility);
return GetValid(LBallSpeciesPass);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (ball.IsApricornBall()) // Apricorn Ball
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (!Legal.Inherit_Apricorn6.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallSpecies);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
if (pkm.AbilityNumber == 4)
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallAbility);
return GetValid(LBallSpeciesPass);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (ball == Sport) // Sport Ball
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (!Legal.Inherit_Sport.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallSpecies);
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
if (pkm.AbilityNumber == 4)
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallAbility);
return GetValid(LBallSpeciesPass);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (ball == Dream) // Dream Ball
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Reduce linq usage reuse variables instead of re-fetching (pkm.Species) add overload for HashSet<int> contains vs ICollection merge BattleOnly to one hashset
2018-07-01 17:49:11 +00:00
if (pkm.AbilityNumber == 4 && Legal.Ban_DreamHidden.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallAbility);
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (Legal.Inherit_Dream.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetValid(LBallSpeciesPass);
return GetInvalid(LBallSpecies);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (Dusk <= ball && ball <= Quick) // Dusk Heal Quick
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Reduce linq usage reuse variables instead of re-fetching (pkm.Species) add overload for HashSet<int> contains vs ICollection merge BattleOnly to one hashset
2018-07-01 17:49:11 +00:00
if (!Legal.Ban_Gen4Ball_6.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetValid(LBallSpeciesPass);
return GetInvalid(LBallSpecies);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (Ultra <= ball && ball <= Premier) // Don't worry, Safari was already checked.
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Reduce linq usage reuse variables instead of re-fetching (pkm.Species) add overload for HashSet<int> contains vs ICollection merge BattleOnly to one hashset
2018-07-01 17:49:11 +00:00
if (Legal.Ban_Gen3Ball.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallSpecies);
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
if (pkm.AbilityNumber == 4 && Legal.Ban_Gen3BallHidden.Contains(pkm.SpecForm))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallAbility);
return GetValid(LBallSpeciesPass);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Reduce linq usage reuse variables instead of re-fetching (pkm.Species) add overload for HashSet<int> contains vs ICollection merge BattleOnly to one hashset
2018-07-01 17:49:11 +00:00
if (species > 650 && species != 700) // Sylveon
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Reduce linq usage reuse variables instead of re-fetching (pkm.Species) add overload for HashSet<int> contains vs ICollection merge BattleOnly to one hashset
2018-07-01 17:49:11 +00:00
if (Legal.WildPokeballs6.Contains(pkm.Ball))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetValid(LBallSpeciesPass);
return GetInvalid(LBallSpecies);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (ball >= Dream)
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallUnavailable);
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
return NONE;
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Respacening Style guidelines, handle a bunch of files no functional change
2018-07-27 02:34:27 +00:00
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
private CheckResult VerifyBallEggGen7(LegalityAnalysis data)
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
var pkm = data.pkm;
Reduce linq usage reuse variables instead of re-fetching (pkm.Species) add overload for HashSet<int> contains vs ICollection merge BattleOnly to one hashset
2018-07-01 17:49:11 +00:00
int species = data.EncounterMatch.Species;
if (722 <= species && species <= 730) // G7 Starters
sync missing content yay rename
2018-08-26 18:29:47 +00:00
return VerifyBallEquals(data, (int)Poke);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
Ball ball = (Ball)pkm.Ball;
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (ball == Safari)
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (!(Legal.Inherit_Safari.Contains(species) || Legal.Inherit_SafariMale.Contains(species)))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallSpecies);
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (pkm.AbilityNumber == 4 && Legal.Ban_SafariBallHidden_7.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallAbility);
return GetValid(LBallSpeciesPass);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (ball.IsApricornBall()) // Apricorn Ball
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (!Legal.Inherit_Apricorn7.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallSpecies);
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (pkm.AbilityNumber == 4 && Legal.Ban_NoHidden7Apricorn.Contains(species | pkm.AltForm << 11)) // lineage is 3->2->origin
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallAbility);
return GetValid(LBallSpeciesPass);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (ball == Sport) // Sport Ball
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (!Legal.Inherit_Sport.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallSpecies);
fix volbeat/illumise sport comparison #2047
2018-07-09 13:28:23 +00:00
if (pkm.AbilityNumber == 4 && (species == 313 || species == 314)) // Volbeat/Illumise
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallAbility);
return GetValid(LBallSpeciesPass);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (ball == Dream) // Dream Ball
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (Legal.Inherit_Dream.Contains(species) || Legal.Inherit_DreamMale.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetValid(LBallSpeciesPass);
return GetInvalid(LBallSpecies);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (Dusk <= ball && ball <= Quick) // Dusk Heal Quick
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (!Legal.Ban_Gen4Ball_7.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetValid(LBallSpeciesPass);
return GetInvalid(LBallSpecies);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (Ultra <= ball && ball <= Premier) // Don't worry, Safari was already checked.
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (!Legal.Ban_Gen3Ball_7.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetValid(LBallSpeciesPass);
return GetInvalid(LBallSpecies);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (ball == Beast)
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
{
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (species == 669 && pkm.AltForm == 3 && pkm.AbilityNumber == 4)
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallAbility); // Can't obtain Flabébé-Blue with Hidden Ability in wild
Add mr mime to usum additions for egg balls
2018-08-26 16:43:11 +00:00
if ((species > 731 && species <= 785) || (Legal.AlolanCaptureOffspring.Contains(species) && !Legal.PastGenAlolanNativesUncapturable.Contains(species)))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetValid(LBallSpeciesPass);
Simplify ball/catchrate lineage checks should speed up egg ball checking a bit since we've already computed the original species gen1 catch rate, just move the chain fetch there.
2018-07-01 17:13:26 +00:00
if (Legal.PastGenAlolanScans.Contains(species))
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetValid(LBallSpeciesPass);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
// next statement catches all new alolans
}
Reduce linq usage reuse variables instead of re-fetching (pkm.Species) add overload for HashSet<int> contains vs ICollection merge BattleOnly to one hashset
2018-07-01 17:49:11 +00:00
if (species > 721)
return VerifyBallEquals(data, Legal.WildPokeballs7);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
Add enum for ball; use in checks Increases readability instead of using hex IDs
2018-08-26 18:15:32 +00:00
if (ball > Beast)
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
return GetInvalid(LBallUnavailable);
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
return NONE;
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
private CheckResult VerifyBallEquals(LegalityAnalysis data, int ball) => GetResult(ball == data.pkm.Ball);
Reduce linq usage reuse variables instead of re-fetching (pkm.Species) add overload for HashSet<int> contains vs ICollection merge BattleOnly to one hashset
2018-07-01 17:49:11 +00:00
private CheckResult VerifyBallEquals(LegalityAnalysis data, HashSet<int> balls) => GetResult(balls.Contains(data.pkm.Ball));
Simplify ball check logic fetch a single result and add it to the analysis can probably remove the GetLineage call since the encountermatch stores the original species
2018-06-30 17:34:09 +00:00
private CheckResult VerifyBallEquals(LegalityAnalysis data, ICollection<int> balls) => GetResult(balls.Contains(data.pkm.Ball));
Update legality check message string style V### names weren't enjoyable to work with; use similar verbose style as the program message strings. updating the translation files with the remapped variable names shortly remap list: https://pastebin.com/jybkVDAK
2018-09-01 21:11:12 +00:00
private CheckResult GetResult(bool valid) => valid ? GetValid(LBallEnc) : GetInvalid(LBallEncMismatch);
Rework secondary check flow Checks.cs initially started out small, but over the years it has grown to handle multiple types of checks. With all these checks next to eachother, it's hard to see the overall groups. Splitting them up (potentially further?) allows for more focused maintenance & understanding. Not sure if I'm happy with the overall bandaids used (checks no longer done within LegalityAnalysis so variable repointing is excessively used), but I'm happier the way it is now compared to the huge Checks.cs
2018-06-24 05:00:01 +00:00
}
}
Reference in a new issue Copy permalink