Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-26 12:56:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix gen1 VC legality checking error

Browse Source 
GetGenMovesCheckOrder doesn't respect generation restrictions, while
EncounterMoves does; filter afterwards.

Add compiler flags in the Analysis file to toggle try/catch off for
easier debugging. Just uncomment the #define SUPPRESS line.

Closes #1345
This commit is contained in:
Kurt
2017-07-18 16:21:31 -07:00
parent 2d18440445
commit 3b8643bc77
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PKHeX.Core/Legality/Analysis.cs
View File

@@ -1,6 +1,7 @@
using System;
#define SUPPRESS
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using static PKHeX.Core.LegalityCheckStrings;
@@ -55,7 +56,9 @@ private IEnumerable<int> AllSuggestedRelearnMoves
public LegalityAnalysis(PKM pk)
{
#if SUPPRESS
try
#endif
{
switch (pk.Format) // prior to storing GameVersion
{
@@ -90,14 +93,16 @@ public LegalityAnalysis(PKM pk)
AddLine(Severity.Indeterminate, V188, CheckIdentifier.Fateful);
}
}
#if SUPPRESS
catch (Exception e)
{
Debug.WriteLine(e.Message);
System.Diagnostics.Debug.WriteLine(e.Message);
Valid = false;
AddLine(Severity.Invalid, V190, CheckIdentifier.Misc);
pkm = pk;
Error = true;
}
#endif
Parsed = true;
}

4
PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs
View File

@@ -256,6 +256,8 @@ private static CheckMoveResult[] ParseMoves(PKM pkm, int[] moves, int[] special,
var IncenseMovesLearned = new List<int>();
// Check moves going backwards, marking the move valid in the most current generation when it can be learned
int[] generations = GetGenMovesCheckOrder(pkm);
if (pkm.Format <= 2)
generations = generations.Where(z => z < info.EncounterMoves.LevelUpMoves.Length).ToArray();
foreach (var gen in generations)
{
var HMLearned = new int[0];
@@ -290,7 +292,7 @@ private static CheckMoveResult[] ParseMoves(PKM pkm, int[] moves, int[] special,
else if (gen == pkm.GenNumber && special.Contains(moves[m]))
res[m] = new CheckMoveResult(MoveSource.Special, gen, Severity.Valid, V175, CheckIdentifier.Move);
if (res[m] == null || gen < 3)
if (res[m] == null || gen >= 3)
continue;
if (res[m].Valid && gen == 2 && NonTradebackLvlMoves.Contains(m))