Mirror handler check to bulk checks

This commit is contained in:
Kurt
2024-05-13 18:16:26 -05:00
parent bbfec1fb29
commit 0836d3c670
2 changed files with 27 additions and 13 deletions

View File

@@ -1,5 +1,6 @@
using System;
using static PKHeX.Core.CheckIdentifier;
using static PKHeX.Core.LegalityCheckStrings;
namespace PKHeX.Core.Bulk;
@@ -16,33 +17,45 @@ private static void CheckHandlerFlag(BulkAnalysis input)
{
for (var i = 0; i < input.AllData.Count; i++)
{
if (!input.AllAnalysis[i].Valid)
var la = input.AllAnalysis[i];
if (!la.Valid)
continue;
var cs = input.AllData[i];
Verify(input, cs);
Verify(input, cs, la);
}
}
private static void Verify(BulkAnalysis input, SlotCache cs)
private static void Verify(BulkAnalysis input, SlotCache cs, LegalityAnalysis la)
{
var pk = cs.Entity;
var tr = cs.SAV;
var withOT = tr.IsFromTrainer(pk);
var flag = pk.CurrentHandler;
var expect = withOT ? 0 : 1;
if (flag != expect)
input.AddLine(cs, LegalityCheckStrings.LTransferCurrentHandlerInvalid, Trainer);
var current = pk.CurrentHandler;
if (flag != 1)
return;
var shouldBe0 = tr.IsFromTrainer(pk);
byte expect = shouldBe0 ? (byte)0 : (byte)1;
if (!HistoryVerifier.IsHandlerStateCorrect(la.EncounterOriginal, pk, current, expect))
input.AddLine(cs, LTransferCurrentHandlerInvalid, Trainer);
if (current == 1)
CheckHandlingTrainerEquals(input, pk, tr, cs);
}
/// <summary> <see cref="HistoryVerifier.CheckHandlingTrainerEquals"/> </summary>
private static void CheckHandlingTrainerEquals(BulkAnalysis data, PKM pk, SaveFile tr, SlotCache cs)
{
Span<char> ht = stackalloc char[pk.TrashCharCountTrainer];
var len = pk.LoadString(pk.HandlingTrainerTrash, ht);
ht = ht[..len];
if (!ht.SequenceEqual(tr.OT))
input.AddLine(cs, LegalityCheckStrings.LTransferHTMismatchName, Trainer);
data.AddLine(cs, LTransferHTMismatchName, Trainer);
if (pk.HandlingTrainerGender != tr.Gender)
data.AddLine(cs, LTransferHTMismatchGender, Trainer);
// If the format exposes a language, check if it matches.
// Can be mismatched as the game only checks OT/Gender equivalence -- if it matches, don't update everything else.
// Statistically unlikely that players will play in different languages, but it's technically possible.
if (pk is IHandlerLanguage h && h.HandlingTrainerLanguage != tr.Language)
input.AddLine(cs, LegalityCheckStrings.LTransferHTMismatchLanguage, Trainer);
data.AddLine(cs, LTransferHTMismatchLanguage, Trainer, Severity.Fishy);
}
}

View File

@@ -77,7 +77,7 @@ private void VerifyHandlerState(LegalityAnalysis data, bool neverOT)
data.AddLine(GetInvalid(LTransferCurrentHandlerInvalid));
}
private static bool IsHandlerStateCorrect(IEncounterTemplate enc, PKM pk, byte current, byte expect)
public static bool IsHandlerStateCorrect(IEncounterTemplate enc, PKM pk, byte current, byte expect)
{
if (current == expect)
return true;
@@ -87,6 +87,7 @@ private static bool IsHandlerStateCorrect(IEncounterTemplate enc, PKM pk, byte c
return false; // HT [1] should be OT [0].
}
/// <summary> <see cref="Bulk.HandlerChecker.CheckHandlingTrainerEquals"/> </summary>
private void CheckHandlingTrainerEquals(LegalityAnalysis data, PKM pk, ITrainerInfo tr)
{
Span<char> ht = stackalloc char[pk.TrashCharCountTrainer];