mirror of
https://github.com/kwsch/PKHeX
synced 2025-02-17 05:48:44 +00:00
Update handling for non-competitive set import
Gen3 item paste -> Gen3 item import => take item ID as is once parsing moves starts, break if any following lines are not move lines Closes #2412 , thanks @The-Fireplace !
This commit is contained in:
parent
d981dc57e1
commit
915c2d52b1
2 changed files with 6 additions and 0 deletions
|
@ -200,6 +200,9 @@ namespace PKHeX.Core
|
|||
continue;
|
||||
}
|
||||
|
||||
if (movectr != 0)
|
||||
break;
|
||||
|
||||
var split = line.Split(LineSplit, StringSplitOptions.None);
|
||||
var valid = split.Length == 1
|
||||
? ParseSingle(line) // Nature
|
||||
|
|
|
@ -180,6 +180,9 @@ namespace PKHeX.Core
|
|||
if (item <= 0)
|
||||
return 0;
|
||||
|
||||
if (destFormat == srcFormat)
|
||||
return item;
|
||||
|
||||
if (destFormat != srcFormat && srcFormat <= 3) // past gen items
|
||||
{
|
||||
if (destFormat > 3) // try remapping
|
||||
|
|
Loading…
Add table
Reference in a new issue