Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-24 04:53:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Fix -X-X moves => X-X-, now XX--"

Browse source 
This reverts commit b03c106599.
This commit is contained in:
Kaphotics 2016-02-28 22:10:35 -08:00
parent b03c106599
commit 1817c52baa
1 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Misc/PK6.cs
View file

@ -441,17 +441,6 @@ namespace PKHeX
if (value.Length > 3) Move4 = value[3];
}
}
public int[] RelearnMoves
{
get { return new[] { RelearnMove1, RelearnMove2, RelearnMove3, RelearnMove4 }; }
set
{
if (value.Length > 0) RelearnMove1 = value[0];
if (value.Length > 1) RelearnMove2 = value[1];
if (value.Length > 2) RelearnMove3 = value[2];
if (value.Length > 3) RelearnMove4 = value[3];
}
}
public int CurrentLevel => getLevel(Species, EXP);
// Complex Generated Attributes
@ -543,17 +532,45 @@ namespace PKHeX
// General User-error Fixes
public void FixMoves()
{
int[] moves = new int[4]; int ctr = 0;
for (int i = 0; i < moves.Length; i++)
if (Moves[i] != 0) moves[ctr++] = Moves[i];
Moves = moves;
if (Move4 != 0 && Move3 == 0)
{
Move3 = Move4;
Move3_PP = Move4_PP;
Move3_PPUps = Move4_PPUps;
Move4 = Move4_PP = Move4_PPUps = 0;
}
if (Move3 != 0 && Move2 == 0)
{
Move2 = Move3;
Move2_PP = Move3_PP;
Move2_PPUps = Move3_PPUps;
Move3 = Move3_PP = Move3_PPUps = 0;
}
if (Move2 != 0 && Move1 == 0)
{
Move1 = Move2;
Move1_PP = Move2_PP;
Move1_PPUps = Move2_PPUps;
Move2 = Move2_PP = Move2_PPUps = 0;
}
}
public void FixRelearn()
{
int[] moves = new int[4]; int ctr = 0;
for (int i = 0; i < moves.Length; i++)
if (RelearnMoves[i] != 0) moves[ctr++] = RelearnMoves[i];
RelearnMoves = moves;
if (RelearnMove4 != 0 && RelearnMove3 == 0)
{
RelearnMove3 = RelearnMove4;
RelearnMove4 = 0;
}
if (RelearnMove3 != 0 && RelearnMove2 == 0)
{
RelearnMove2 = RelearnMove3;
RelearnMove3 = 0;
}
if (RelearnMove2 != 0 && RelearnMove1 == 0)
{
RelearnMove1 = RelearnMove2;
RelearnMove2 = 0;
}
}
public void FixMemories()
{