From 4c5f88b43af2bc7837618c57d2e57e7bdfb429eb Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 7 Dec 2016 23:08:03 -0800 Subject: [PATCH] Fix personalinfo writing setting individual array entry doesn't call the setter; just assign the array in one go closes #51 --- pk3DS/Subforms/Gen6/PersonalEditor6.cs | 15 ++++----------- pk3DS/Subforms/Gen7/PersonalEditor7.cs | 15 ++++----------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/pk3DS/Subforms/Gen6/PersonalEditor6.cs b/pk3DS/Subforms/Gen6/PersonalEditor6.cs index 29e258b..283bb6e 100644 --- a/pk3DS/Subforms/Gen6/PersonalEditor6.cs +++ b/pk3DS/Subforms/Gen6/PersonalEditor6.cs @@ -290,22 +290,15 @@ private void savePersonal() pkm.CatchRate = Convert.ToByte(TB_CatchRate.Text); pkm.EvoStage = Convert.ToByte(TB_Stage.Text); - pkm.Types[0] = (byte) CB_Type1.SelectedIndex; - pkm.Types[1] = (byte) CB_Type2.SelectedIndex; - pkm.Items[0] = (ushort) CB_HeldItem1.SelectedIndex; - pkm.Items[1] = (ushort) CB_HeldItem2.SelectedIndex; - pkm.Items[2] = (ushort) CB_HeldItem3.SelectedIndex; + pkm.Types = new[] { CB_Type1.SelectedIndex, CB_Type2.SelectedIndex }; + pkm.Items = new[] { CB_HeldItem1.SelectedIndex, CB_HeldItem2.SelectedIndex, CB_HeldItem3.SelectedIndex }; pkm.Gender = Convert.ToByte(TB_Gender.Text); pkm.HatchCycles = Convert.ToByte(TB_HatchCycles.Text); pkm.BaseFriendship = Convert.ToByte(TB_Friendship.Text); pkm.EXPGrowth = (byte) CB_EXPGroup.SelectedIndex; - pkm.EggGroups[0] = (byte) CB_EggGroup1.SelectedIndex; - pkm.EggGroups[1] = (byte) CB_EggGroup2.SelectedIndex; - - pkm.Abilities[0] = (byte) CB_Ability1.SelectedIndex; - pkm.Abilities[1] = (byte) CB_Ability2.SelectedIndex; - pkm.Abilities[2] = (byte) CB_Ability3.SelectedIndex; + pkm.EggGroups = new[] { CB_EggGroup1.SelectedIndex, CB_EggGroup2.SelectedIndex }; + pkm.Abilities = new[] { CB_Ability1.SelectedIndex, CB_Ability2.SelectedIndex, CB_Ability3.SelectedIndex }; pkm.FormeSprite = Convert.ToUInt16(TB_FormeSprite.Text); pkm.FormeCount = Convert.ToByte(TB_FormeCount.Text); diff --git a/pk3DS/Subforms/Gen7/PersonalEditor7.cs b/pk3DS/Subforms/Gen7/PersonalEditor7.cs index 80da14d..334c141 100644 --- a/pk3DS/Subforms/Gen7/PersonalEditor7.cs +++ b/pk3DS/Subforms/Gen7/PersonalEditor7.cs @@ -225,22 +225,15 @@ private void savePersonal() pkm.CatchRate = Convert.ToByte(TB_CatchRate.Text); pkm.EvoStage = Convert.ToByte(TB_Stage.Text); - pkm.Types[0] = (byte) CB_Type1.SelectedIndex; - pkm.Types[1] = (byte) CB_Type2.SelectedIndex; - pkm.Items[0] = (ushort) CB_HeldItem1.SelectedIndex; - pkm.Items[1] = (ushort) CB_HeldItem2.SelectedIndex; - pkm.Items[2] = (ushort) CB_HeldItem3.SelectedIndex; + pkm.Types = new[] {CB_Type1.SelectedIndex, CB_Type2.SelectedIndex}; + pkm.Items = new[] {CB_HeldItem1.SelectedIndex, CB_HeldItem2.SelectedIndex, CB_HeldItem3.SelectedIndex}; pkm.Gender = Convert.ToByte(TB_Gender.Text); pkm.HatchCycles = Convert.ToByte(TB_HatchCycles.Text); pkm.BaseFriendship = Convert.ToByte(TB_Friendship.Text); pkm.EXPGrowth = (byte) CB_EXPGroup.SelectedIndex; - pkm.EggGroups[0] = (byte) CB_EggGroup1.SelectedIndex; - pkm.EggGroups[1] = (byte) CB_EggGroup2.SelectedIndex; - - pkm.Abilities[0] = (byte) CB_Ability1.SelectedIndex; - pkm.Abilities[1] = (byte) CB_Ability2.SelectedIndex; - pkm.Abilities[2] = (byte) CB_Ability3.SelectedIndex; + pkm.EggGroups = new[] {CB_EggGroup1.SelectedIndex, CB_EggGroup2.SelectedIndex}; + pkm.Abilities = new[] {CB_Ability1.SelectedIndex, CB_Ability2.SelectedIndex, CB_Ability3.SelectedIndex}; pkm.FormeSprite = Convert.ToUInt16(TB_FormeSprite.Text); pkm.FormeCount = Convert.ToByte(TB_FormeCount.Text);