Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-30 15:59:13 +00:00
Code Issues Projects Releases Packages Wiki Activity
PKHeX/PKHeX.Core/Legality/Verifiers/FormVerifier.cs

342 lines
15 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;
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
using System.Collections.Generic;
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 static PKHeX.Core.LegalityCheckStrings;
namespace PKHeX.Core
{
Misc simplifications / xmldoc
2018-07-02 02:17:37 +00:00
/// <summary>
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
/// Verifies the <see cref="PKM.Form"/> value.
Misc simplifications / xmldoc
2018-07-02 02:17:37 +00:00
/// </summary>
public sealed class FormVerifier : 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.Form;
public override void Verify(LegalityAnalysis data)
{
var pkm = data.pkm;
if (pkm.Format < 4)
return; // no forms exist
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
var result = VerifyForm(data);
data.AddLine(result);
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
if (pkm is IFormArgument f)
Minor perf improvement pass in, don't constantly fetch helps generated IL code be slightly more efficient
2020-01-13 00:49:12 +00:00
data.AddLine(VerifyFormArgument(data, f.FormArgument));
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +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
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 VALID => GetValid(LFormValid);
Respacening Style guidelines, handle a bunch of files no functional change
2018-07-27 02:34:27 +00:00
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
private CheckResult VerifyForm(LegalityAnalysis data)
{
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
var PersonalInfo = data.PersonalInfo;
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
int count = PersonalInfo.FormCount;
var form = pkm.Form;
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
if (count <= 1 && form == 0)
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
return VALID; // no forms to check
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
var species = pkm.Species;
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
var enc = data.EncounterMatch;
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
var Info = data.Info;
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
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
if (!PersonalInfo.IsFormWithinRange(form) && !FormInfo.IsValidOutOfBoundsForm(species, form, Info.Generation))
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
return GetInvalid(string.Format(LFormInvalidRange, count - 1, form));
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
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
if (enc is EncounterSlot w && w.Area.Type == SlotType.FriendSafari)
Respacening Style guidelines, handle a bunch of files no functional change
2018-07-27 02:34:27 +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
VerifyFormFriendSafari(data);
Respacening Style guidelines, handle a bunch of files no functional change
2018-07-27 02:34:27 +00:00
}
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
else if (enc is EncounterEgg)
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
{
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
if (FormInfo.IsTotemForm(species, form, data.Info.Generation))
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(LFormInvalidGame);
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
}
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
switch (species)
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
{
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Pikachu when Info.Generation == 6: // Cosplay
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
bool isStatic = enc is EncounterStatic;
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
if (isStatic != (form != 0))
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(isStatic ? LFormPikachuCosplayInvalid : LFormPikachuCosplay);
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
break;
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
Allow pk7->pk8 pikachu cap transfer
2020-02-12 04:36:10 +00:00
case (int)Species.Pikachu when Info.Generation >= 7: // Cap
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
bool validCap = enc switch
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
{
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
WC7 wc7 => wc7.Form == form,
WC8 wc => wc.Form == form,
EncounterStatic s => s.Form == form,
_ => form == 0
};
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
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
if (!validCap)
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
{
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
bool gift = enc is MysteryGift g && g.Form != form;
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
var msg = gift ? LFormPikachuEventInvalid : LFormInvalidGame;
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
return GetInvalid(msg);
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
}
break;
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
case (int)Species.Unown when Info.Generation == 2 && form >= 26:
return GetInvalid(string.Format(LFormInvalidRange, "Z", form == 26 ? "!" : "?"));
case (int)Species.Giratina when form == 1 ^ pkm.HeldItem == 112: // Giratina, Origin form only with Griseous Orb
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(LFormItemInvalid);
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Arceus:
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
{
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
int arceus = GetArceusFormFromHeldItem(pkm.HeldItem, pkm.Format);
return arceus != form ? GetInvalid(LFormItemInvalid) : GetValid(LFormItem);
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
}
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Keldeo:
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
{
Ignore keldeo resolute form check on gen8+ can mismatch in gen8+ as the form activates in battle when knowing the move; outside of battle can be either state.
2020-02-15 21:30:50 +00:00
// can mismatch in gen5 via BW tutor and transfer up
// can mismatch in gen8+ as the form activates in battle when knowing the move; outside of battle can be either state.
if (Info.Generation == 5 || pkm.Format >= 8)
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
break;
int index = Array.IndexOf(pkm.Moves, 548); // Secret Sword
bool noSword = index < 0;
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
if (form == 0 ^ noSword) // mismatch
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
Info.Moves[noSword ? 0 : index] = new CheckMoveResult(Info.Moves[noSword ? 0 : index], Severity.Invalid, LMoveKeldeoMismatch, CheckIdentifier.Move);
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
break;
}
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Genesect:
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
{
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
int genesect = GetGenesectFormFromHeldItem(pkm.HeldItem);
return genesect != form ? GetInvalid(LFormItemInvalid) : GetValid(LFormItem);
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
}
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Greninja:
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
if (form > 1) // Ash Battle Bond active
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(LFormBattle);
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
if (form != 0 && enc is not MysteryGift) // Formes are not breedable, MysteryGift already checked
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
return GetInvalid(string.Format(LFormInvalidRange, 0, form));
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
break;
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
Condense some switch expressions Should be it for now; exhaustively searched for all that made sense to change
2020-12-25 18:58:33 +00:00
case (int)Species.Scatterbug or (int)Species.Spewpa:
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
if (form > 17) // Fancy & Poké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 GetInvalid(LFormVivillonEventPre);
this is not that clearer than before, yay
2020-12-22 01:12:39 +00:00
if (pkm is not IRegionOrigin tr)
Split Country/Region/ConsoleRegion to interface
2020-07-31 18:17:31 +00:00
break;
Split VivillonTables into two classes Indicate that the content is for 3DS specific logic Reduce restriction for parameters requiring IGeoTrack => IRegionOrigin
2020-10-04 21:15:13 +00:00
if (!Vivillon3DS.IsPatternValid(form, (byte)tr.Country, (byte)tr.Region))
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
data.AddLine(Get(LFormVivillonInvalid, Severity.Fishy));
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
break;
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Vivillon:
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
if (form > 17) // Fancy & Poké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
{
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
if (enc is not MysteryGift)
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(LFormVivillonInvalid);
return GetValid(LFormVivillon);
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
}
this is not that clearer than before, yay
2020-12-22 01:12:39 +00:00
if (pkm is not IGeoTrack trv)
Split Country/Region/ConsoleRegion to interface
2020-07-31 18:17:31 +00:00
break;
Split VivillonTables into two classes Indicate that the content is for 3DS specific logic Reduce restriction for parameters requiring IGeoTrack => IRegionOrigin
2020-10-04 21:15:13 +00:00
if (!Vivillon3DS.IsPatternValid(form, (byte)trv.Country, (byte)trv.Region))
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
data.AddLine(Get(LFormVivillonInvalid, Severity.Fishy));
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
break;
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
case (int)Species.Floette when form == 5: // Floette Eternal Flower -- Never Released
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
if (enc is not MysteryGift)
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(LFormEternalInvalid);
return GetValid(LFormEternal);
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
case (int)Species.Meowstic when form != pkm.Gender:
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(LGenderInvalidNone);
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Silvally:
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
{
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
int silvally = GetSilvallyFormFromHeldItem(pkm.HeldItem);
return silvally != form ? GetInvalid(LFormItemInvalid) : GetValid(LFormItem);
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +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
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
case (int)Species.Lillipup when Info.EncounterMatch.EggEncounter && form == 1 && pkm.SM:
case (int)Species.Lycanroc when Info.EncounterMatch.EggEncounter && form == 2 && 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(LFormInvalidGame);
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
Enforce toxtricity encounters to have restricted nature
2020-02-08 23:08:12 +00:00
// Toxel encounters have already been checked for the nature-specific evolution criteria.
case (int)Species.Toxtricity when Info.EncounterMatch.Species == (int)Species.Toxtricity:
{
// The game enforces the Nature for Toxtricity encounters too!
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
if (pkm.Form != EvolutionMethod.GetAmpLowKeyResult(pkm.Nature))
Enforce toxtricity encounters to have restricted nature
2020-02-08 23:08:12 +00:00
return GetInvalid(LFormInvalidNature);
break;
}
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
// Impossible Egg forms
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
case (int)Species.Rotom when pkm.IsEgg && form != 0:
case (int)Species.Furfrou when pkm.IsEgg && form != 0:
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(LEggSpecies);
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
// Party Only Forms
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Shaymin:
case (int)Species.Furfrou:
case (int)Species.Hoopa:
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
if (form != 0 && pkm.Box > -1 && pkm.Format <= 6) // has form but stored in box
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(LFormParty);
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
break;
}
Extract battle form logic into a separate class format is included in the method call to futureproof, not currently necessary
2020-10-25 16:15:16 +00:00
var format = pkm.Format;
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
if (FormInfo.IsBattleOnlyForm(species, form, format))
Extract battle form logic into a separate class format is included in the method call to futureproof, not currently necessary
2020-10-25 16:15:16 +00:00
return GetInvalid(LFormBattle);
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
if (form == 0)
return VALID;
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
// everything below here is not Form 0, so it has a form.
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
if (format >= 7 && Info.Generation < 7)
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
{
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
if (species == 25 || Legal.AlolanOriginForms.Contains(species) || Legal.AlolanVariantEvolutions12.Contains(data.EncounterOriginal.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(LFormInvalidGame);
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
}
cache form/species/format on first get very minor perf consideration, since those values are immutable (except for cross thread shenanigans)
2020-01-17 03:23:29 +00:00
if (format >= 8 && Info.Generation < 8)
Add swsh content placeholders (#2392) placeholder content until real data is dumped
2019-09-23 23:56:47 +00:00
{
Add MrMime-1 check for past gen origin permit mime jr evolving to mr mime-1
2020-02-14 04:00:41 +00:00
var orig = data.EncounterOriginal.Species;
if (Legal.GalarOriginForms.Contains(species) || Legal.GalarVariantFormEvolutions.Contains(orig))
handle alolan meowth origin in gen8 https://projectpokemon.org/home/forums/topic/56267-checks-associated-with-events-or-forms/
2020-02-14 01:05:06 +00:00
{
if (species == (int)Species.Meowth && data.EncounterOriginal.Form != 2)
{
// We're okay here. There's also Alolan Meowth...
}
moar is or
2020-12-25 20:30:26 +00:00
else if ((orig is (int) Species.MrMime or (int)Species.MimeJr) && pkm.CurrentLevel > data.EncounterOriginal.LevelMin && Info.Generation >= 4)
Add MrMime-1 check for past gen origin permit mime jr evolving to mr mime-1
2020-02-14 04:00:41 +00:00
{
// We're okay with a Mime Jr. that has evolved via level up.
}
Use more expression return style Reduces indentation & bracketing, a bit more concise
2021-01-02 01:08:49 +00:00
else if (enc.Version != GameVersion.GO)
handle alolan meowth origin in gen8 https://projectpokemon.org/home/forums/topic/56267-checks-associated-with-events-or-forms/
2020-02-14 01:05:06 +00:00
{
return GetInvalid(LFormInvalidGame);
}
}
Add swsh content placeholders (#2392) placeholder content until real data is dumped
2019-09-23 23:56:47 +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
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
return VALID;
}
Move some static arrays closer to where they're used Split EvolutionRestrictions to its own class Can probably refine things further to clamp down access to these arrays
2020-11-02 21:11:51 +00:00
private static readonly ushort[] Arceus_PlateIDs = { 303, 306, 304, 305, 309, 308, 310, 313, 298, 299, 301, 300, 307, 302, 311, 312, 644 };
private static readonly ushort[] Arceus_ZCrystal = { 782, 785, 783, 784, 788, 787, 789, 792, 777, 778, 780, 779, 786, 781, 790, 791, 793 };
Expose item->form methods
2020-02-08 05:34:25 +00:00
public static int GetArceusFormFromHeldItem(int item, int format)
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
{
Simplify some repeated comparisons with expressions Less prone for bugs since it uses the same value for all comparisons without re-specifying
2020-12-29 08:37:59 +00:00
if (item is >= 777 and <= 793)
Move some static arrays closer to where they're used Split EvolutionRestrictions to its own class Can probably refine things further to clamp down access to these arrays
2020-11-02 21:11:51 +00:00
return Array.IndexOf(Arceus_ZCrystal, (ushort)item) + 1;
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
int form = 0;
Simplify some repeated comparisons with expressions Less prone for bugs since it uses the same value for all comparisons without re-specifying
2020-12-29 08:37:59 +00:00
if (item is >= 298 and <= 313 or 644)
Move some static arrays closer to where they're used Split EvolutionRestrictions to its own class Can probably refine things further to clamp down access to these arrays
2020-11-02 21:11:51 +00:00
form = Array.IndexOf(Arceus_PlateIDs, (ushort)item) + 1;
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
if (format == 4 && form >= 9)
return form + 1; // ??? type Form shifts everything by 1
return form;
}
Expose item->form methods
2020-02-08 05:34:25 +00:00
public static int GetSilvallyFormFromHeldItem(int item)
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
{
Fix item check for silvally (pixie plate) Remove the comparison, was a copy/paste from Arceus 3y ago https://github.com/kwsch/PKHeX/commit/a7339ae26ff4c5270483d665c15af0556781f3d2
2020-03-27 19:15:22 +00:00
if (904 <= item && item <= 920)
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
return item - 903;
return 0;
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
}
Expose item->form methods
2020-02-08 05:34:25 +00:00
public static int GetGenesectFormFromHeldItem(int item)
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
{
if (116 <= item && item <= 119)
return item - 115;
return 0;
}
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
Target type'd new
2020-12-22 01:17:56 +00:00
private static readonly HashSet<int> SafariFloette = new() { 0, 1, 3 }; // 0/1/3 - RBY
Minor clean
2019-11-19 06:48:03 +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
private void VerifyFormFriendSafari(LegalityAnalysis data)
{
var pkm = data.pkm;
switch (pkm.Species)
{
Condense some switch expressions Should be it for now; exhaustively searched for all that made sense to change
2020-12-25 18:58:33 +00:00
case (int)Species.Floette or (int)Species.Florges when!SafariFloette.Contains(pkm.Form): // Floette
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
data.AddLine(GetInvalid(LFormSafariFlorgesColor));
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
break;
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
case 710 when pkm.Form != 0: // Pumpkaboo
case (int)Species.Gourgeist when pkm.Form != 0: // Average
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
data.AddLine(GetInvalid(LFormSafariPumpkabooAverage));
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
break;
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
case (int)Species.Gastrodon when pkm.Form != 0: // West
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
data.AddLine(GetInvalid(LFormSafariFlorgesColor));
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
break;
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
case (int)Species.Sawsbuck when pkm.Form != 0: // Sawsbuck
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
data.AddLine(GetInvalid(LFormSafariSawsbuckSpring));
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
break;
}
}
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
Minor perf improvement pass in, don't constantly fetch helps generated IL code be slightly more efficient
2020-01-13 00:49:12 +00:00
private CheckResult VerifyFormArgument(LegalityAnalysis data, in uint arg)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
{
var pkm = data.pkm;
switch (data.pkm.Species)
{
default:
{
Minor perf improvement pass in, don't constantly fetch helps generated IL code be slightly more efficient
2020-01-13 00:49:12 +00:00
if (arg != 0)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentNotAllowed);
break;
}
case (int)Species.Furfrou:
{
Minor perf improvement pass in, don't constantly fetch helps generated IL code be slightly more efficient
2020-01-13 00:49:12 +00:00
if (arg > 5)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentHigh);
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
if (arg == 0 && pkm.Form != 0)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentNotAllowed);
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
if (arg != 0 && pkm.Form == 0)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentNotAllowed);
break;
}
case (int)Species.Hoopa:
{
Minor perf improvement pass in, don't constantly fetch helps generated IL code be slightly more efficient
2020-01-13 00:49:12 +00:00
if (arg > 3)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentHigh);
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
if (arg == 0 && pkm.Form != 0)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentNotAllowed);
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
if (arg != 0 && pkm.Form == 0)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentNotAllowed);
break;
}
Unify concepts with different names AltForm & Form & Forme => Form GenNumber & Generation => Generation Extract out SpeciesForm interface, and re-add IGeneration For those using PKHeX as a dependency, this should be a pretty straightforward manual replacement... GenNumber and AltForm should be quick find-replace`s.
2020-12-11 04:42:30 +00:00
case (int)Species.Yamask when pkm.Form == 1:
Add Yamask-1 max hp calc for formArg compare Closes #2632 ty @CanoeHope
2020-01-13 00:22:56 +00:00
{
if (pkm.IsEgg)
{
Minor perf improvement pass in, don't constantly fetch helps generated IL code be slightly more efficient
2020-01-13 00:49:12 +00:00
if (arg != 0)
Add Yamask-1 max hp calc for formArg compare Closes #2632 ty @CanoeHope
2020-01-13 00:22:56 +00:00
return GetInvalid(LFormArgumentNotAllowed);
}
Show all valid yamask-1 formarg values from 319 (max HP-1) to 9999 (max saved value). Causes a little bit of GUI lag when loading 10k items to the combobox; could be a number entry but meh. Lazily allocate the 10k strings; wait until it's requested.
2020-11-24 20:40:56 +00:00
if (arg > 9_999)
return GetInvalid(LFormArgumentHigh);
Add Yamask-1 max hp calc for formArg compare Closes #2632 ty @CanoeHope
2020-01-13 00:22:56 +00:00
break;
}
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
case (int)Species.Runerigus:
{
if (data.EncounterMatch.Species == (int)Species.Runerigus)
{
Minor perf improvement pass in, don't constantly fetch helps generated IL code be slightly more efficient
2020-01-13 00:49:12 +00:00
if (arg != 0)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentNotAllowed);
}
else
{
Minor perf improvement pass in, don't constantly fetch helps generated IL code be slightly more efficient
2020-01-13 00:49:12 +00:00
if (arg < 49)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentLow);
Show all valid yamask-1 formarg values from 319 (max HP-1) to 9999 (max saved value). Causes a little bit of GUI lag when loading 10k items to the combobox; could be a number entry but meh. Lazily allocate the 10k strings; wait until it's requested.
2020-11-24 20:40:56 +00:00
if (arg > 9_999)
return GetInvalid(LFormArgumentHigh);
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
}
break;
}
case (int)Species.Alcremie:
{
if (data.EncounterMatch.Species == (int)Species.Alcremie)
{
Minor perf improvement pass in, don't constantly fetch helps generated IL code be slightly more efficient
2020-01-13 00:49:12 +00:00
if (arg != 0)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentNotAllowed);
}
else
{
Minor perf improvement pass in, don't constantly fetch helps generated IL code be slightly more efficient
2020-01-13 00:49:12 +00:00
if (arg > (uint)AlcremieDecoration.Ribbon)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentHigh);
}
break;
}
}
return GetValid(LFormArgumentValid);
}
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