Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-01 07:16:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Gen1/Gen2 Level loading (closes #312)

Browse Source
This commit is contained in:
Michael Scire
2016-10-09 16:39:31 -07:00
parent f9a72abb4c
commit 241b367c0b
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX/MainWindow/Main.cs
View File

@@ -1885,7 +1885,7 @@ private void clickMoves(object sender, EventArgs e)
private bool changingFields;
private void updateEXPLevel(object sender, EventArgs e)
{
if (changingFields) return;
if (changingFields || !fieldsInitialized) return;
changingFields = true;
if (sender == TB_EXP)
@@ -1917,7 +1917,7 @@ private void updateEXPLevel(object sender, EventArgs e)
{
pkm.EXP = Util.ToUInt32(TB_EXP.Text);
if (SAV.Generation < 3)
pkm.Stat_Level = Util.ToInt32(TB_Level.Text);
pkm.Stat_Level = Util.ToInt32((MT_Level.Focused ? MT_Level : TB_Level).Text);
}
updateStats();
updateLegality();

6
PKHeX/MainWindow/MainPK1.cs
View File

@@ -11,11 +11,13 @@ private void populateFieldsPK1()
return;
// Do first
pk1.Stat_Level = PKX.getLevel(pk1.Species, pk1.EXP);
if (pk1.Stat_Level == 100)
pk1.Stat_Level = HaX ? pk1.Stat_Level : PKX.getLevel(pk1.Species, pk1.EXP);
if (!HaX && pk1.Stat_Level == 100)
pk1.EXP = PKX.getEXP(pk1.Stat_Level, pk1.Species);
CB_Species.SelectedValue = pk1.Species;
if (HaX)
MT_Level.Text = pk1.Stat_Level.ToString();
TB_Level.Text = pk1.Stat_Level.ToString();
TB_EXP.Text = pk1.EXP.ToString();

6
PKHeX/MainWindow/MainPK2.cs
View File

@@ -12,11 +12,13 @@ private void populateFieldsPK2()
return;
// Do first
pk2.Stat_Level = PKX.getLevel(pk2.Species, pk2.EXP);
if (pk2.Stat_Level == 100)
pk2.Stat_Level = HaX ? pk2.Stat_Level : PKX.getLevel(pk2.Species, pk2.EXP);
if (!HaX && pk2.Stat_Level == 100)
pk2.EXP = PKX.getEXP(pk2.Stat_Level, pk2.Species);
CB_Species.SelectedValue = pk2.Species;
if (HaX)
MT_Level.Text = pk2.Stat_Level.ToString();
TB_Level.Text = pk2.Stat_Level.ToString();
TB_EXP.Text = pk2.EXP.ToString();
CB_HeldItem.SelectedValue = pk2.G2Item;