From ffc9b69b7b5039b15b27494a1d2bfe23fc4f562b Mon Sep 17 00:00:00 2001 From: sora10pls Date: Sat, 30 Dec 2017 21:40:59 -0500 Subject: [PATCH] Add force fully evolved for RSTE --- pk3DS/Subforms/Gen6/RSTE.cs | 21 +++- pk3DS/Subforms/Gen6/TrainerRand.Designer.cs | 124 ++++++++++++-------- pk3DS/Subforms/Gen6/TrainerRand.cs | 2 + 3 files changed, 97 insertions(+), 50 deletions(-) diff --git a/pk3DS/Subforms/Gen6/RSTE.cs b/pk3DS/Subforms/Gen6/RSTE.cs index adb9f81..3eebe25 100644 --- a/pk3DS/Subforms/Gen6/RSTE.cs +++ b/pk3DS/Subforms/Gen6/RSTE.cs @@ -25,6 +25,7 @@ public RSTE(byte[][] trc, byte[][] trd, byte[][] trp) MegaDictionary = GiftEditor6.GetMegaDictionary(Main.Config); rModelRestricted = Main.Config.ORAS ? Legal.Model_AO : Legal.Model_XY; rTrainerClasses = Legal.TrainerClasses_AO; + rFinalEvo = Legal.FinalEvolutions_6; InitializeComponent(); // String Fetching @@ -510,7 +511,7 @@ private void Setup() CB_Battle_Type.Items.Add("Double"); CB_Battle_Type.Items.Add("Triple"); CB_Battle_Type.Items.Add("Rotation"); - CB_Battle_Type.Items.Add("Horde"); + if (Main.Config.ORAS) CB_Battle_Type.Items.Add("Horde"); megaEvos = Main.Config.ORAS ? new[] { 15, 18, 80, 208, 254, 260, 302, 319, 323, 334, 362, 373, 376, 380, 381, 428, 475, 531, 719, 3, 6, 9, 65, 94, 115, 127, 130, 142, 150, 181, 212, 214, 229, 248, 257, 282, 303, 306, 308, 310, 354, 359, 445, 448, 460 } : new[] { 3, 6, 9, 65, 94, 115, 127, 130, 142, 150, 181, 212, 214, 229, 248, 257, 282, 303, 306, 308, 310, 354, 359, 445, 448, 460 }; @@ -522,7 +523,7 @@ private void Setup() public static bool rPKM, rSmart, rLevel, rMove, rNoMove, rAbility, rDiffAI, rDiffIV, rClass, rGift, rItem, rDoRand, rRandomMegas, rGymE4Only, - rTypeTheme, rTypeGymTrainers, rOnlySingles, rDMG, rSTAB, r6PKM; + rTypeTheme, rTypeGymTrainers, rOnlySingles, rDMG, rSTAB, r6PKM, rForceFullyEvolved; public static bool rNoFixedDamage; internal static bool[] rThemedClasses = { }; private static string[] rTags; @@ -532,15 +533,17 @@ private void Setup() private int[] mEvoTypes; private static int[] rModelRestricted; private static int[] rTrainerClasses; + private static int[] rFinalEvo; private string[] rImportant; private readonly List Tags = new List(); private readonly Dictionary TagTypes = new Dictionary(); public static int[] sL; // Random Species List - public static decimal rGiftPercent, rLevelMultiplier; + public static decimal rGiftPercent, rLevelMultiplier, rForceFullyEvolvedLevel; private void B_Randomize_Click(object sender, EventArgs e) { rPKM = rMove = rAbility = rDiffAI = rDiffIV = rClass = rGift = rItem = rDoRand = false; // init to false - rGiftPercent = 0; // 0 + rGiftPercent = 0; + rForceFullyEvolvedLevel = 0; new TrainerRand().ShowDialog(); // Open Randomizer Config to get config vals if (rDoRand) Randomize(); @@ -699,6 +702,16 @@ private static void RandomizeTeam(trdata6 t, MoveRandomizer move, LearnsetRandom for (int m = 0; m < 4; m++) pk.Moves[m] = (ushort)pkMoves[m]; } + + if (rForceFullyEvolved && pk.Level >= rForceFullyEvolvedLevel) + { + if (!rFinalEvo.Contains(pk.Species)) + { + int randFinalEvo() => (int)(Util.rnd32() % rFinalEvo.Length); + pk.Species = (ushort)rFinalEvo[randFinalEvo()]; + pk.Form = (ushort)Randomizer.GetRandomForme(pk.Species, rRandomMegas, true, Main.SpeciesStat); + } + } } } private static void InitializeTrainerTeamInfo(trdata6 t, bool important) diff --git a/pk3DS/Subforms/Gen6/TrainerRand.Designer.cs b/pk3DS/Subforms/Gen6/TrainerRand.Designer.cs index c4819b7..f550289 100644 --- a/pk3DS/Subforms/Gen6/TrainerRand.Designer.cs +++ b/pk3DS/Subforms/Gen6/TrainerRand.Designer.cs @@ -66,11 +66,14 @@ private void InitializeComponent() this.CB_Moves = new System.Windows.Forms.ComboBox(); this.L_Moves = new System.Windows.Forms.Label(); this.CHK_NoFixedDamage = new System.Windows.Forms.CheckBox(); + this.NUD_Force = new System.Windows.Forms.NumericUpDown(); + this.CHK_ForceFullyEvolved = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.NUD_GiftPercent)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Level)).BeginInit(); this.GB_Tweak.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Damage)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_STAB)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_Force)).BeginInit(); this.SuspendLayout(); // // CHK_RandomPKM @@ -78,7 +81,7 @@ private void InitializeComponent() this.CHK_RandomPKM.AutoSize = true; this.CHK_RandomPKM.Checked = true; this.CHK_RandomPKM.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_RandomPKM.Location = new System.Drawing.Point(12, 31); + this.CHK_RandomPKM.Location = new System.Drawing.Point(12, 26); this.CHK_RandomPKM.Name = "CHK_RandomPKM"; this.CHK_RandomPKM.Size = new System.Drawing.Size(114, 17); this.CHK_RandomPKM.TabIndex = 0; @@ -92,7 +95,7 @@ private void InitializeComponent() this.CHK_RandomItems.AutoSize = true; this.CHK_RandomItems.Checked = true; this.CHK_RandomItems.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_RandomItems.Location = new System.Drawing.Point(21, 295); + this.CHK_RandomItems.Location = new System.Drawing.Point(21, 314); this.CHK_RandomItems.Name = "CHK_RandomItems"; this.CHK_RandomItems.Size = new System.Drawing.Size(119, 17); this.CHK_RandomItems.TabIndex = 6; @@ -105,7 +108,7 @@ private void InitializeComponent() this.CHK_RandomAbilities.AutoSize = true; this.CHK_RandomAbilities.Checked = true; this.CHK_RandomAbilities.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_RandomAbilities.Location = new System.Drawing.Point(21, 310); + this.CHK_RandomAbilities.Location = new System.Drawing.Point(21, 329); this.CHK_RandomAbilities.Name = "CHK_RandomAbilities"; this.CHK_RandomAbilities.Size = new System.Drawing.Size(193, 17); this.CHK_RandomAbilities.TabIndex = 7; @@ -118,7 +121,7 @@ private void InitializeComponent() this.CHK_RandomGift.AutoSize = true; this.CHK_RandomGift.Checked = true; this.CHK_RandomGift.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_RandomGift.Location = new System.Drawing.Point(21, 389); + this.CHK_RandomGift.Location = new System.Drawing.Point(21, 408); this.CHK_RandomGift.Name = "CHK_RandomGift"; this.CHK_RandomGift.Size = new System.Drawing.Size(145, 17); this.CHK_RandomGift.TabIndex = 10; @@ -132,7 +135,7 @@ private void InitializeComponent() this.CHK_RandomClass.AutoSize = true; this.CHK_RandomClass.Checked = true; this.CHK_RandomClass.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_RandomClass.Location = new System.Drawing.Point(21, 342); + this.CHK_RandomClass.Location = new System.Drawing.Point(21, 361); this.CHK_RandomClass.Name = "CHK_RandomClass"; this.CHK_RandomClass.Size = new System.Drawing.Size(141, 17); this.CHK_RandomClass.TabIndex = 9; @@ -146,7 +149,7 @@ private void InitializeComponent() this.CHK_MaxDiffAI.AutoSize = true; this.CHK_MaxDiffAI.Checked = true; this.CHK_MaxDiffAI.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_MaxDiffAI.Location = new System.Drawing.Point(21, 404); + this.CHK_MaxDiffAI.Location = new System.Drawing.Point(21, 423); this.CHK_MaxDiffAI.Name = "CHK_MaxDiffAI"; this.CHK_MaxDiffAI.Size = new System.Drawing.Size(95, 17); this.CHK_MaxDiffAI.TabIndex = 13; @@ -159,7 +162,7 @@ private void InitializeComponent() this.CHK_MaxDiffPKM.AutoSize = true; this.CHK_MaxDiffPKM.Checked = true; this.CHK_MaxDiffPKM.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_MaxDiffPKM.Location = new System.Drawing.Point(21, 325); + this.CHK_MaxDiffPKM.Location = new System.Drawing.Point(21, 344); this.CHK_MaxDiffPKM.Name = "CHK_MaxDiffPKM"; this.CHK_MaxDiffPKM.Size = new System.Drawing.Size(64, 17); this.CHK_MaxDiffPKM.TabIndex = 8; @@ -169,7 +172,7 @@ private void InitializeComponent() // B_OK // this.B_OK.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.B_OK.Location = new System.Drawing.Point(250, 374); + this.B_OK.Location = new System.Drawing.Point(250, 385); this.B_OK.Name = "B_OK"; this.B_OK.Size = new System.Drawing.Size(50, 23); this.B_OK.TabIndex = 14; @@ -180,7 +183,7 @@ private void InitializeComponent() // B_Cancel // this.B_Cancel.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.B_Cancel.Location = new System.Drawing.Point(250, 396); + this.B_Cancel.Location = new System.Drawing.Point(250, 407); this.B_Cancel.Name = "B_Cancel"; this.B_Cancel.Size = new System.Drawing.Size(50, 23); this.B_Cancel.TabIndex = 15; @@ -191,7 +194,7 @@ private void InitializeComponent() // NUD_GiftPercent // this.NUD_GiftPercent.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.NUD_GiftPercent.Location = new System.Drawing.Point(166, 386); + this.NUD_GiftPercent.Location = new System.Drawing.Point(166, 405); this.NUD_GiftPercent.Name = "NUD_GiftPercent"; this.NUD_GiftPercent.Size = new System.Drawing.Size(43, 20); this.NUD_GiftPercent.TabIndex = 11; @@ -206,7 +209,7 @@ private void InitializeComponent() // this.label1.Anchor = System.Windows.Forms.AnchorStyles.Bottom; this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(211, 388); + this.label1.Location = new System.Drawing.Point(211, 407); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(15, 13); this.label1.TabIndex = 12; @@ -221,7 +224,7 @@ private void InitializeComponent() 0, 0, 131072}); - this.NUD_Level.Location = new System.Drawing.Point(141, 11); + this.NUD_Level.Location = new System.Drawing.Point(141, 6); this.NUD_Level.Maximum = new decimal(new int[] { 3, 0, @@ -245,7 +248,7 @@ private void InitializeComponent() // CHK_Level // this.CHK_Level.AutoSize = true; - this.CHK_Level.Location = new System.Drawing.Point(12, 12); + this.CHK_Level.Location = new System.Drawing.Point(12, 7); this.CHK_Level.Name = "CHK_Level"; this.CHK_Level.Size = new System.Drawing.Size(130, 17); this.CHK_Level.TabIndex = 2; @@ -257,11 +260,12 @@ private void InitializeComponent() // this.GB_Tweak.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); + this.GB_Tweak.Controls.Add(this.NUD_Force); this.GB_Tweak.Controls.Add(this.CHK_GymE4Only); - this.GB_Tweak.Controls.Add(this.CHK_RandomMegaForm); - this.GB_Tweak.Controls.Add(this.CHK_6PKM); + this.GB_Tweak.Controls.Add(this.CHK_ForceFullyEvolved); this.GB_Tweak.Controls.Add(this.CHK_GymTrainers); this.GB_Tweak.Controls.Add(this.CHK_StoryMEvos); + this.GB_Tweak.Controls.Add(this.CHK_RandomMegaForm); this.GB_Tweak.Controls.Add(this.CHK_TypeTheme); this.GB_Tweak.Controls.Add(this.CHK_BST); this.GB_Tweak.Controls.Add(this.CHK_E); @@ -272,9 +276,9 @@ private void InitializeComponent() this.GB_Tweak.Controls.Add(this.CHK_G3); this.GB_Tweak.Controls.Add(this.CHK_G2); this.GB_Tweak.Controls.Add(this.CHK_G1); - this.GB_Tweak.Location = new System.Drawing.Point(12, 54); + this.GB_Tweak.Location = new System.Drawing.Point(12, 49); this.GB_Tweak.Name = "GB_Tweak"; - this.GB_Tweak.Size = new System.Drawing.Size(270, 150); + this.GB_Tweak.Size = new System.Drawing.Size(270, 163); this.GB_Tweak.TabIndex = 323; this.GB_Tweak.TabStop = false; this.GB_Tweak.Text = "Options"; @@ -284,7 +288,7 @@ private void InitializeComponent() this.CHK_GymE4Only.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.CHK_GymE4Only.AutoSize = true; this.CHK_GymE4Only.Enabled = false; - this.CHK_GymE4Only.Location = new System.Drawing.Point(141, 126); + this.CHK_GymE4Only.Location = new System.Drawing.Point(141, 134); this.CHK_GymE4Only.Name = "CHK_GymE4Only"; this.CHK_GymE4Only.Size = new System.Drawing.Size(125, 17); this.CHK_GymE4Only.TabIndex = 295; @@ -295,7 +299,7 @@ private void InitializeComponent() // this.CHK_RandomMegaForm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.CHK_RandomMegaForm.AutoSize = true; - this.CHK_RandomMegaForm.Location = new System.Drawing.Point(9, 79); + this.CHK_RandomMegaForm.Location = new System.Drawing.Point(9, 81); this.CHK_RandomMegaForm.Name = "CHK_RandomMegaForm"; this.CHK_RandomMegaForm.Size = new System.Drawing.Size(127, 17); this.CHK_RandomMegaForm.TabIndex = 294; @@ -306,11 +310,11 @@ private void InitializeComponent() // this.CHK_6PKM.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.CHK_6PKM.AutoSize = true; - this.CHK_6PKM.Location = new System.Drawing.Point(141, 72); + this.CHK_6PKM.Location = new System.Drawing.Point(21, 215); this.CHK_6PKM.Name = "CHK_6PKM"; - this.CHK_6PKM.Size = new System.Drawing.Size(111, 30); + this.CHK_6PKM.Size = new System.Drawing.Size(183, 17); this.CHK_6PKM.TabIndex = 293; - this.CHK_6PKM.Text = "Have 6 PKM for \r\nImportant Trainers"; + this.CHK_6PKM.Text = "6 Pokémon for Important Trainers"; this.CHK_6PKM.UseVisualStyleBackColor = true; this.CHK_6PKM.CheckedChanged += new System.EventHandler(this.CHK_6PKM_CheckedChanged); // @@ -319,7 +323,7 @@ private void InitializeComponent() this.CHK_GymTrainers.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.CHK_GymTrainers.AutoSize = true; this.CHK_GymTrainers.Enabled = false; - this.CHK_GymTrainers.Location = new System.Drawing.Point(9, 126); + this.CHK_GymTrainers.Location = new System.Drawing.Point(9, 134); this.CHK_GymTrainers.Name = "CHK_GymTrainers"; this.CHK_GymTrainers.Size = new System.Drawing.Size(124, 17); this.CHK_GymTrainers.TabIndex = 292; @@ -332,18 +336,18 @@ private void InitializeComponent() this.CHK_StoryMEvos.AutoSize = true; this.CHK_StoryMEvos.Checked = true; this.CHK_StoryMEvos.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_StoryMEvos.Location = new System.Drawing.Point(141, 110); + this.CHK_StoryMEvos.Location = new System.Drawing.Point(9, 63); this.CHK_StoryMEvos.Name = "CHK_StoryMEvos"; - this.CHK_StoryMEvos.Size = new System.Drawing.Size(122, 17); + this.CHK_StoryMEvos.Size = new System.Drawing.Size(168, 17); this.CHK_StoryMEvos.TabIndex = 291; - this.CHK_StoryMEvos.Text = "Ensure Story MEvos"; + this.CHK_StoryMEvos.Text = "Ensure Story Mega Evolutions"; this.CHK_StoryMEvos.UseVisualStyleBackColor = true; // // CHK_TypeTheme // this.CHK_TypeTheme.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.CHK_TypeTheme.AutoSize = true; - this.CHK_TypeTheme.Location = new System.Drawing.Point(9, 110); + this.CHK_TypeTheme.Location = new System.Drawing.Point(9, 118); this.CHK_TypeTheme.Name = "CHK_TypeTheme"; this.CHK_TypeTheme.Size = new System.Drawing.Size(127, 17); this.CHK_TypeTheme.TabIndex = 289; @@ -354,7 +358,7 @@ private void InitializeComponent() // CHK_BST // this.CHK_BST.AutoSize = true; - this.CHK_BST.Location = new System.Drawing.Point(141, 51); + this.CHK_BST.Location = new System.Drawing.Point(141, 46); this.CHK_BST.Name = "CHK_BST"; this.CHK_BST.Size = new System.Drawing.Size(117, 17); this.CHK_BST.TabIndex = 288; @@ -366,7 +370,7 @@ private void InitializeComponent() this.CHK_E.AutoSize = true; this.CHK_E.Checked = true; this.CHK_E.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_E.Location = new System.Drawing.Point(141, 36); + this.CHK_E.Location = new System.Drawing.Point(141, 31); this.CHK_E.Name = "CHK_E"; this.CHK_E.Size = new System.Drawing.Size(98, 17); this.CHK_E.TabIndex = 287; @@ -378,7 +382,7 @@ private void InitializeComponent() this.CHK_L.AutoSize = true; this.CHK_L.Checked = true; this.CHK_L.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_L.Location = new System.Drawing.Point(141, 21); + this.CHK_L.Location = new System.Drawing.Point(141, 16); this.CHK_L.Name = "CHK_L"; this.CHK_L.Size = new System.Drawing.Size(98, 17); this.CHK_L.TabIndex = 286; @@ -390,7 +394,7 @@ private void InitializeComponent() this.CHK_G6.AutoSize = true; this.CHK_G6.Checked = true; this.CHK_G6.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_G6.Location = new System.Drawing.Point(75, 51); + this.CHK_G6.Location = new System.Drawing.Point(75, 46); this.CHK_G6.Name = "CHK_G6"; this.CHK_G6.Size = new System.Drawing.Size(55, 17); this.CHK_G6.TabIndex = 285; @@ -402,7 +406,7 @@ private void InitializeComponent() this.CHK_G5.AutoSize = true; this.CHK_G5.Checked = true; this.CHK_G5.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_G5.Location = new System.Drawing.Point(75, 36); + this.CHK_G5.Location = new System.Drawing.Point(75, 31); this.CHK_G5.Name = "CHK_G5"; this.CHK_G5.Size = new System.Drawing.Size(55, 17); this.CHK_G5.TabIndex = 284; @@ -414,7 +418,7 @@ private void InitializeComponent() this.CHK_G4.AutoSize = true; this.CHK_G4.Checked = true; this.CHK_G4.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_G4.Location = new System.Drawing.Point(75, 21); + this.CHK_G4.Location = new System.Drawing.Point(75, 16); this.CHK_G4.Name = "CHK_G4"; this.CHK_G4.Size = new System.Drawing.Size(55, 17); this.CHK_G4.TabIndex = 283; @@ -426,7 +430,7 @@ private void InitializeComponent() this.CHK_G3.AutoSize = true; this.CHK_G3.Checked = true; this.CHK_G3.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_G3.Location = new System.Drawing.Point(9, 51); + this.CHK_G3.Location = new System.Drawing.Point(9, 46); this.CHK_G3.Name = "CHK_G3"; this.CHK_G3.Size = new System.Drawing.Size(55, 17); this.CHK_G3.TabIndex = 282; @@ -438,7 +442,7 @@ private void InitializeComponent() this.CHK_G2.AutoSize = true; this.CHK_G2.Checked = true; this.CHK_G2.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_G2.Location = new System.Drawing.Point(9, 36); + this.CHK_G2.Location = new System.Drawing.Point(9, 31); this.CHK_G2.Name = "CHK_G2"; this.CHK_G2.Size = new System.Drawing.Size(55, 17); this.CHK_G2.TabIndex = 281; @@ -450,7 +454,7 @@ private void InitializeComponent() this.CHK_G1.AutoSize = true; this.CHK_G1.Checked = true; this.CHK_G1.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_G1.Location = new System.Drawing.Point(9, 21); + this.CHK_G1.Location = new System.Drawing.Point(9, 16); this.CHK_G1.Name = "CHK_G1"; this.CHK_G1.Size = new System.Drawing.Size(55, 17); this.CHK_G1.TabIndex = 280; @@ -463,7 +467,7 @@ private void InitializeComponent() this.CHK_IgnoreSpecialClass.AutoSize = true; this.CHK_IgnoreSpecialClass.Checked = true; this.CHK_IgnoreSpecialClass.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_IgnoreSpecialClass.Location = new System.Drawing.Point(40, 358); + this.CHK_IgnoreSpecialClass.Location = new System.Drawing.Point(40, 377); this.CHK_IgnoreSpecialClass.Name = "CHK_IgnoreSpecialClass"; this.CHK_IgnoreSpecialClass.Size = new System.Drawing.Size(133, 17); this.CHK_IgnoreSpecialClass.TabIndex = 324; @@ -476,7 +480,7 @@ private void InitializeComponent() this.CHK_OnlySingles.AutoSize = true; this.CHK_OnlySingles.Checked = true; this.CHK_OnlySingles.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_OnlySingles.Location = new System.Drawing.Point(40, 372); + this.CHK_OnlySingles.Location = new System.Drawing.Point(40, 391); this.CHK_OnlySingles.Name = "CHK_OnlySingles"; this.CHK_OnlySingles.Size = new System.Drawing.Size(114, 17); this.CHK_OnlySingles.TabIndex = 325; @@ -486,7 +490,7 @@ private void InitializeComponent() // NUD_Damage // this.NUD_Damage.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.NUD_Damage.Location = new System.Drawing.Point(213, 254); + this.NUD_Damage.Location = new System.Drawing.Point(213, 275); this.NUD_Damage.Maximum = new decimal(new int[] { 4, 0, @@ -507,7 +511,7 @@ private void InitializeComponent() this.CHK_Damage.AutoSize = true; this.CHK_Damage.Checked = true; this.CHK_Damage.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_Damage.Location = new System.Drawing.Point(21, 256); + this.CHK_Damage.Location = new System.Drawing.Point(21, 276); this.CHK_Damage.Name = "CHK_Damage"; this.CHK_Damage.Size = new System.Drawing.Size(192, 17); this.CHK_Damage.TabIndex = 327; @@ -520,7 +524,7 @@ private void InitializeComponent() this.CHK_STAB.AutoSize = true; this.CHK_STAB.Checked = true; this.CHK_STAB.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_STAB.Location = new System.Drawing.Point(21, 275); + this.CHK_STAB.Location = new System.Drawing.Point(21, 295); this.CHK_STAB.Name = "CHK_STAB"; this.CHK_STAB.Size = new System.Drawing.Size(172, 17); this.CHK_STAB.TabIndex = 328; @@ -530,7 +534,7 @@ private void InitializeComponent() // NUD_STAB // this.NUD_STAB.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.NUD_STAB.Location = new System.Drawing.Point(213, 275); + this.NUD_STAB.Location = new System.Drawing.Point(213, 296); this.NUD_STAB.Maximum = new decimal(new int[] { 4, 0, @@ -554,7 +558,7 @@ private void InitializeComponent() "Don\'t Modify", "Randomize All", "Use Levelup Only"}); - this.CB_Moves.Location = new System.Drawing.Point(67, 210); + this.CB_Moves.Location = new System.Drawing.Point(67, 251); this.CB_Moves.Name = "CB_Moves"; this.CB_Moves.Size = new System.Drawing.Size(121, 21); this.CB_Moves.TabIndex = 330; @@ -564,7 +568,7 @@ private void InitializeComponent() // this.L_Moves.Anchor = System.Windows.Forms.AnchorStyles.Bottom; this.L_Moves.AutoSize = true; - this.L_Moves.Location = new System.Drawing.Point(19, 213); + this.L_Moves.Location = new System.Drawing.Point(19, 254); this.L_Moves.Name = "L_Moves"; this.L_Moves.Size = new System.Drawing.Size(42, 13); this.L_Moves.TabIndex = 331; @@ -575,20 +579,45 @@ private void InitializeComponent() this.CHK_NoFixedDamage.AutoSize = true; this.CHK_NoFixedDamage.Checked = true; this.CHK_NoFixedDamage.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_NoFixedDamage.Location = new System.Drawing.Point(21, 237); + this.CHK_NoFixedDamage.Location = new System.Drawing.Point(21, 231); this.CHK_NoFixedDamage.Name = "CHK_NoFixedDamage"; this.CHK_NoFixedDamage.Size = new System.Drawing.Size(281, 17); this.CHK_NoFixedDamage.TabIndex = 332; this.CHK_NoFixedDamage.Text = "No Fixed Damage Moves (Dragon Rage/Sonic Boom)"; this.CHK_NoFixedDamage.UseVisualStyleBackColor = true; // + // NUD_Force + // + this.NUD_Force.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.NUD_Force.Location = new System.Drawing.Point(169, 98); + this.NUD_Force.Name = "NUD_Force"; + this.NUD_Force.Size = new System.Drawing.Size(43, 20); + this.NUD_Force.TabIndex = 334; + this.NUD_Force.Value = new decimal(new int[] { + 50, + 0, + 0, + 0}); + // + // CHK_ForceFullyEvolved + // + this.CHK_ForceFullyEvolved.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.CHK_ForceFullyEvolved.AutoSize = true; + this.CHK_ForceFullyEvolved.Location = new System.Drawing.Point(9, 99); + this.CHK_ForceFullyEvolved.Name = "CHK_ForceFullyEvolved"; + this.CHK_ForceFullyEvolved.Size = new System.Drawing.Size(160, 17); + this.CHK_ForceFullyEvolved.TabIndex = 333; + this.CHK_ForceFullyEvolved.Text = "Force Fully Evolved at Level"; + this.CHK_ForceFullyEvolved.UseVisualStyleBackColor = true; + // // TrainerRand // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(304, 431); + this.ClientSize = new System.Drawing.Size(304, 447); this.Controls.Add(this.CHK_NoFixedDamage); this.Controls.Add(this.L_Moves); + this.Controls.Add(this.CHK_6PKM); this.Controls.Add(this.CB_Moves); this.Controls.Add(this.CHK_OnlySingles); this.Controls.Add(this.GB_Tweak); @@ -623,6 +652,7 @@ private void InitializeComponent() this.GB_Tweak.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Damage)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_STAB)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_Force)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -668,5 +698,7 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_RandomMegaForm; private System.Windows.Forms.CheckBox CHK_GymE4Only; private System.Windows.Forms.CheckBox CHK_NoFixedDamage; + private System.Windows.Forms.NumericUpDown NUD_Force; + private System.Windows.Forms.CheckBox CHK_ForceFullyEvolved; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen6/TrainerRand.cs b/pk3DS/Subforms/Gen6/TrainerRand.cs index b73ed2d..6b334a4 100644 --- a/pk3DS/Subforms/Gen6/TrainerRand.cs +++ b/pk3DS/Subforms/Gen6/TrainerRand.cs @@ -72,6 +72,8 @@ private void B_Save_Click(object sender, EventArgs e) RSTE.rGymE4Only = CHK_GymE4Only.Checked; RSTE.r6PKM = CHK_6PKM.Checked; RSTE.rRandomMegas = CHK_RandomMegaForm.Checked; + RSTE.rForceFullyEvolved = CHK_ForceFullyEvolved.Checked; + RSTE.rForceFullyEvolvedLevel = NUD_Force.Value; if (CHK_StoryMEvos.Checked) {