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

351 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>
/// Verifies the <see cref="PKM.AltForm"/> value.
/// </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;
int count = PersonalInfo.FormeCount;
if (count <= 1 && pkm.AltForm == 0)
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
return VALID; // no forms to check
var EncounterMatch = data.EncounterMatch;
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
if (!PersonalInfo.IsFormeWithinRange(pkm.AltForm) && !FormConverter.IsValidOutOfBoundsForme(pkm.Species, pkm.AltForm, 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(string.Format(LFormInvalidRange, count - 1, pkm.AltForm));
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 (EncounterMatch is EncounterSlot w && w.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
}
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
else if (EncounterMatch is EncounterEgg)
{
if (FormConverter.IsTotemForm(pkm.Species, pkm.AltForm))
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
}
switch (pkm.Species)
{
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Pikachu when Info.Generation == 6: // Cosplay
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
bool isStatic = EncounterMatch is EncounterStatic;
if (isStatic != (pkm.AltForm != 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
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Pikachu when Info.Generation == 7: // Cap
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
bool IsValidPikachuCap()
{
Use some c#8 sugar static local functions switch expressions using usings :) nullable next?
2019-10-08 01:40:09 +00:00
return EncounterMatch 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 some c#8 sugar static local functions switch expressions using usings :) nullable next?
2019-10-08 01:40:09 +00:00
WC7 wc7 => (wc7.Form == pkm.AltForm),
EncounterStatic s => (s.Form == pkm.AltForm),
_ => (pkm.AltForm == 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
}
if (!IsValidPikachuCap())
{
bool gift = EncounterMatch is WC7 g && g.Form != pkm.AltForm;
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;
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Unown when Info.Generation == 2 && pkm.AltForm >= 26:
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(string.Format(LFormInvalidRange, "Z", pkm.AltForm == 26 ? "!" : "?"));
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Giratina when pkm.AltForm == 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
{
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
int form = GetArceusFormFromHeldItem(pkm.HeldItem, pkm.Format);
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 form != pkm.AltForm ? 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
{
if (pkm.Gen5) // can mismatch in gen5 via BW tutor and transfer up
break;
int index = Array.IndexOf(pkm.Moves, 548); // Secret Sword
bool noSword = index < 0;
if (pkm.AltForm == 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
{
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
int form = GetGenesectFormFromHeldItem(pkm.HeldItem);
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 form != pkm.AltForm ? 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:
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
if (pkm.AltForm > 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);
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.AltForm != 0 && !(EncounterMatch is MysteryGift)) // Formes are not breedable, MysteryGift already checked
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(string.Format(LFormInvalidRange, 0, pkm.AltForm));
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
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Scatterbug:
case (int)Species.Spewpa:
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.AltForm > 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);
PKHeX.Core Nullable cleanup (#2401) * Handle some nullable cases Refactor MysteryGift into a second abstract class (backed by a byte array, or fake data) Make some classes have explicit constructors instead of { } initialization * Handle bits more obviously without null * Make SaveFile.BAK explicitly readonly again * merge constructor methods to have readonly fields * Inline some properties * More nullable handling * Rearrange box actions define straightforward classes to not have any null properties * Make extrabyte reference array immutable * Move tooltip creation to designer * Rearrange some logic to reduce nesting * Cache generated fonts * Split mystery gift album purpose * Handle more tooltips * Disallow null setters * Don't capture RNG object, only type enum * Unify learnset objects Now have readonly properties which are never null don't new() empty learnsets (>800 Learnset objects no longer created, total of 2400 objects since we also new() a move & level array) optimize g1/2 reader for early abort case * Access rewrite Initialize blocks in a separate object, and get via that object removes a couple hundred "might be null" warnings since blocks are now readonly getters some block references have been relocated, but interfaces should expose all that's needed put HoF6 controls in a groupbox, and disable * Readonly personal data * IVs non nullable for mystery gift * Explicitly initialize forced encounter moves * Make shadow objects readonly & non-null Put murkrow fix in binary data resource, instead of on startup * Assign dex form fetch on constructor Fixes legality parsing edge cases also handle cxd parse for valid; exit before exception is thrown in FrameGenerator * Remove unnecessary null checks * Keep empty value until init SetPouch sets the value to an actual one during load, but whatever * Readonly team lock data * Readonly locks Put locked encounters at bottom (favor unlocked) * Mail readonly data / offset Rearrange some call flow and pass defaults Add fake classes for SaveDataEditor mocking Always party size, no need to check twice in stat editor use a fake save file as initial data for savedata editor, and for gamedata (wow i found a usage) constrain eventwork editor to struct variable types (uint, int, etc), thus preventing null assignment errors
2019-10-17 01:47:31 +00:00
if (!Legal.CheckVivillonPattern(pkm.AltForm, (byte)pkm.Country, (byte)pkm.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:
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.AltForm > 17) // Fancy & Pokéball
{
if (!(EncounterMatch is 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
}
PKHeX.Core Nullable cleanup (#2401) * Handle some nullable cases Refactor MysteryGift into a second abstract class (backed by a byte array, or fake data) Make some classes have explicit constructors instead of { } initialization * Handle bits more obviously without null * Make SaveFile.BAK explicitly readonly again * merge constructor methods to have readonly fields * Inline some properties * More nullable handling * Rearrange box actions define straightforward classes to not have any null properties * Make extrabyte reference array immutable * Move tooltip creation to designer * Rearrange some logic to reduce nesting * Cache generated fonts * Split mystery gift album purpose * Handle more tooltips * Disallow null setters * Don't capture RNG object, only type enum * Unify learnset objects Now have readonly properties which are never null don't new() empty learnsets (>800 Learnset objects no longer created, total of 2400 objects since we also new() a move & level array) optimize g1/2 reader for early abort case * Access rewrite Initialize blocks in a separate object, and get via that object removes a couple hundred "might be null" warnings since blocks are now readonly getters some block references have been relocated, but interfaces should expose all that's needed put HoF6 controls in a groupbox, and disable * Readonly personal data * IVs non nullable for mystery gift * Explicitly initialize forced encounter moves * Make shadow objects readonly & non-null Put murkrow fix in binary data resource, instead of on startup * Assign dex form fetch on constructor Fixes legality parsing edge cases also handle cxd parse for valid; exit before exception is thrown in FrameGenerator * Remove unnecessary null checks * Keep empty value until init SetPouch sets the value to an actual one during load, but whatever * Readonly team lock data * Readonly locks Put locked encounters at bottom (favor unlocked) * Mail readonly data / offset Rearrange some call flow and pass defaults Add fake classes for SaveDataEditor mocking Always party size, no need to check twice in stat editor use a fake save file as initial data for savedata editor, and for gamedata (wow i found a usage) constrain eventwork editor to struct variable types (uint, int, etc), thus preventing null assignment errors
2019-10-17 01:47:31 +00:00
if (!Legal.CheckVivillonPattern(pkm.AltForm, (byte)pkm.Country, (byte)pkm.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.Floette when pkm.AltForm == 5: // Floette Eternal Flower -- Never Released
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
if (!(EncounterMatch is 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);
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Meowstic when pkm.AltForm != 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
{
int form = GetSilvallyFormFromHeldItem(pkm.HeldItem);
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 form != pkm.AltForm ? 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
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Lillipup when Info.EncounterMatch.EggEncounter && pkm.AltForm == 1 && pkm.SM:
case (int)Species.Lycanroc when Info.EncounterMatch.EggEncounter && pkm.AltForm == 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
// Impossible Egg forms
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Rotom when pkm.IsEgg && pkm.AltForm != 0:
case (int)Species.Furfrou when pkm.IsEgg && pkm.AltForm != 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:
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.AltForm != 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;
// Battle only Forms with other legal forms allowed
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Zygarde when pkm.AltForm >= 4: // Zygarde Complete
case (int)Species.Minior when pkm.AltForm < 7: // Minior Shield
case (int)Species.Necrozma when pkm.AltForm == 3: // Ultra Necrozma
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 some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Necrozma when pkm.AltForm < 3: // Necrozma Fused forms & default
case (int)Species.Mimikyu when pkm.AltForm == 2: // Totem disguise Mimikyu
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
return VALID;
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.Format >= 7 && Info.Generation < 7 && pkm.AltForm != 0)
{
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
if (pkm.Species == 25 || Legal.AlolanOriginForms.Contains(pkm.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
}
Add swsh content placeholders (#2392) placeholder content until real data is dumped
2019-09-23 23:56:47 +00:00
if (pkm.Format >= 8 && Info.Generation < 8 && pkm.AltForm != 0)
{
if (pkm.Species == 25 || Legal.GalarOriginForms.Contains(pkm.Species) || Legal.GalarVariantFormEvolutions.Contains(data.EncounterOriginal.Species))
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
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.AltForm != 0 && BattleOnly.Contains(pkm.Species))
Sword/Shield Update
2019-11-16 01:34:18 +00:00
{
Minor clean
2019-11-19 06:48:03 +00:00
if (pkm.Species == (int) Species.Darmanitan && pkm.AltForm == 2 && pkm.Format >= 8)
{
// this one is OK, Galarian non-Zen
Minor clean move Text.cs manual Courier new() to the designer, have it dispose when form is disposed. Set it as the numericupdown's font and just reuse that :)
2020-01-06 02:46:30 +00:00
}
Minor clean
2019-11-19 06:48:03 +00:00
else
{
return GetInvalid(LFormBattle);
}
Sword/Shield Update
2019-11-16 01:34:18 +00:00
}
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
return VALID;
}
private static int GetArceusFormFromHeldItem(int item, int format)
{
if (777 <= item && item <= 793)
Fix arceus held item compare https://projectpokemon.org/home/forums/topic/52771-bug-report-pkhex-20190515-arceus-forms-error/
2019-05-15 16:46:52 +00:00
return Array.IndexOf(Legal.Arceus_ZCrystal, (ushort)item) + 1;
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
int form = 0;
if ((298 <= item && item <= 313) || item == 644)
Fix arceus held item compare https://projectpokemon.org/home/forums/topic/52771-bug-report-pkhex-20190515-arceus-forms-error/
2019-05-15 16:46:52 +00:00
form = Array.IndexOf(Legal.Arceus_Plate, (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;
}
private static int GetSilvallyFormFromHeldItem(int item)
{
if ((904 <= item && item <= 920) || item == 644)
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
}
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
private static int GetGenesectFormFromHeldItem(int item)
{
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
Minor clean
2019-11-19 06:48:03 +00:00
private static readonly HashSet<int> BattleOnly = GetBattleFormSet();
Respacening Style guidelines, handle a bunch of files no functional change
2018-07-27 02:34:27 +00:00
Minor clean
2019-11-19 06:48:03 +00:00
private static HashSet<int> GetBattleFormSet()
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
{
Minor clean
2019-11-19 06:48:03 +00:00
var hs = new HashSet<int>();
hs.UnionWith(Legal.BattleForms);
hs.UnionWith(Legal.BattleMegas);
hs.UnionWith(Legal.BattlePrimals);
return hs;
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
}
Refactoring Simplify some verifier logic
2018-06-30 22:01:16 +00:00
Minor clean
2019-11-19 06:48:03 +00:00
private static readonly HashSet<int> SafariFloette = new HashSet<int> { 0, 1, 3 }; // 0/1/3 - RBY
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)
{
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Floette when !SafariFloette.Contains(pkm.AltForm): // Floette
case (int)Species.Florges when !SafariFloette.Contains(pkm.AltForm): // Florges
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;
case 710 when pkm.AltForm != 0: // Pumpkaboo
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Gourgeist when pkm.AltForm != 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;
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Gastrodon when pkm.AltForm != 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;
use some explicit dex numbers as enum
2019-06-01 17:22:49 +00:00
case (int)Species.Sawsbuck when pkm.AltForm != 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);
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 && pkm.AltForm != 0)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentNotAllowed);
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 && pkm.AltForm == 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);
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 && pkm.AltForm != 0)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentNotAllowed);
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 && pkm.AltForm == 0)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentNotAllowed);
break;
}
Add Yamask-1 max hp calc for formArg compare Closes #2632 ty @CanoeHope
2020-01-13 00:22:56 +00:00
case (int)Species.Yamask when pkm.AltForm == 1:
{
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);
break;
}
var hp_max = GetYamask1MaxHP(pkm);
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 > hp_max)
Add Yamask-1 max hp calc for formArg compare Closes #2632 ty @CanoeHope
2020-01-13 00:22:56 +00:00
return GetInvalid(LFormArgumentHigh);
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);
Add Yamask-1 max hp calc for formArg compare Closes #2632 ty @CanoeHope
2020-01-13 00:22:56 +00:00
var hp_max = GetYamask1MaxHP(pkm);
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 > hp_max)
Add form argument legality checks Closes #2611 (Alcremie) Closes #2604 (Runerigus)
2020-01-11 00:33:40 +00:00
return GetInvalid(LFormArgumentHigh);
}
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);
}
Add Yamask-1 max hp calc for formArg compare Closes #2632 ty @CanoeHope
2020-01-13 00:22:56 +00:00
private static int GetYamask1MaxHP(PKM pkm)
{
var lvl = pkm.CurrentLevel; // assume it was evolved at the current level (no further level ups)
var iv_hp = pkm is IHyperTrain ht && ht.HT_HP ? 31 : pkm.IV_HP;
const int base_hp = 38;
const int ev_hp = 252; // account for full EVs then removed
// Manually calculate the stat of Galarian Yamask under the most favorable conditions
return ((iv_hp + (2 * base_hp) + (ev_hp / 4) + 100) * lvl / 100) + 10;
}
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