From dbf9d8dfd50bf5049687705838751f85dba6613e Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 19 Nov 2016 22:48:12 -0800 Subject: [PATCH] Fix off by 1 error Adds volcanion back --- pk3DS/Subforms/Gen7/EggMoveEditor7.cs | 6 ++++-- pk3DS/Subforms/Gen7/LevelUpEditor7.cs | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pk3DS/Subforms/Gen7/EggMoveEditor7.cs b/pk3DS/Subforms/Gen7/EggMoveEditor7.cs index 467cfd4..4a50960 100644 --- a/pk3DS/Subforms/Gen7/EggMoveEditor7.cs +++ b/pk3DS/Subforms/Gen7/EggMoveEditor7.cs @@ -21,12 +21,14 @@ public EggMoveEditor7() specieslist[0] = movelist[0] = ""; string[] sortedspecies = (string[])specieslist.Clone(); - Array.Resize(ref sortedspecies, Main.Config.MaxSpeciesID); Array.Sort(sortedspecies); + Array.Resize(ref sortedspecies, Main.Config.MaxSpeciesID + 1); Array.Sort(sortedspecies); setupDGV(); var newlist = new List(); - for (int i = 1; i < Main.Config.MaxSpeciesID; i++) // add all species + for (int i = 1; i <= Main.Config.MaxSpeciesID; i++) // add all species newlist.Add(new Util.cbItem { Text = sortedspecies[i], Value = Array.IndexOf(specieslist, sortedspecies[i]) }); + for (int i = Main.Config.MaxSpeciesID + 1; i < specieslist.Length; i++) // add all forms + newlist.Add(new Util.cbItem { Text = specieslist[i], Value = i }); CB_Species.DisplayMember = "Text"; CB_Species.ValueMember = "Value"; diff --git a/pk3DS/Subforms/Gen7/LevelUpEditor7.cs b/pk3DS/Subforms/Gen7/LevelUpEditor7.cs index 36b962a..5fb9442 100644 --- a/pk3DS/Subforms/Gen7/LevelUpEditor7.cs +++ b/pk3DS/Subforms/Gen7/LevelUpEditor7.cs @@ -21,13 +21,13 @@ public LevelUpEditor7() specieslist[0] = movelist[0] = ""; string[] sortedspecies = (string[])specieslist.Clone(); - Array.Resize(ref sortedspecies, Main.Config.MaxSpeciesID); Array.Sort(sortedspecies); + Array.Resize(ref sortedspecies, Main.Config.MaxSpeciesID + 1); Array.Sort(sortedspecies); setupDGV(); var newlist = new List(); - for (int i = 1; i < Main.Config.MaxSpeciesID; i++) // add all species + for (int i = 1; i <= Main.Config.MaxSpeciesID; i++) // add all species newlist.Add(new Util.cbItem { Text = sortedspecies[i], Value = Array.IndexOf(specieslist, sortedspecies[i]) }); - for (int i = Main.Config.MaxSpeciesID; i < specieslist.Length; i++) // add all forms + for (int i = Main.Config.MaxSpeciesID + 1; i < specieslist.Length; i++) // add all forms newlist.Add(new Util.cbItem { Text = specieslist[i], Value = i }); CB_Species.DisplayMember = "Text";