From f8a2d341119757df5d8f95aac0c2f01763c73143 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 16 Jun 2017 02:10:10 -0400 Subject: [PATCH] Misc changes (#156) * Misc changes * Doesn't actually work --- pk3DS/Subforms/Gen6/RSTE.Designer.cs | 16 +- pk3DS/Subforms/Gen6/RSTE.cs | 2 +- pk3DS/Subforms/Gen6/RSWE.Designer.cs | 22 +- pk3DS/Subforms/Gen6/RSWE.cs | 5 +- pk3DS/Subforms/Gen6/TrainerRand.Designer.cs | 17 +- pk3DS/Subforms/Gen6/TrainerRand.cs | 3 +- pk3DS/Subforms/Gen6/XYWE.Designer.cs | 18 +- pk3DS/Subforms/Gen6/XYWE.cs | 5 +- pk3DS/Subforms/Gen7/SMTE.Designer.cs | 44 +- pk3DS/Subforms/Gen7/SMTE.cs | 6 +- pk3DS/Subforms/Gen7/SMTE.resx | 612 +++++++------------- pk3DS/Subforms/Gen7/SMWE.Designer.cs | 11 +- pk3DS/Subforms/Gen7/SMWE.cs | 10 +- 13 files changed, 289 insertions(+), 482 deletions(-) diff --git a/pk3DS/Subforms/Gen6/RSTE.Designer.cs b/pk3DS/Subforms/Gen6/RSTE.Designer.cs index 45ffcd1..f82f0fe 100644 --- a/pk3DS/Subforms/Gen6/RSTE.Designer.cs +++ b/pk3DS/Subforms/Gen6/RSTE.Designer.cs @@ -298,7 +298,7 @@ private void InitializeComponent() this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Size = new System.Drawing.Size(557, 127); this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Trainer info"; + this.tabPage1.Text = "Trainer Info"; // // checkBox_Healer // @@ -517,7 +517,7 @@ private void InitializeComponent() this.L_numPokemon.Name = "L_numPokemon"; this.L_numPokemon.Size = new System.Drawing.Size(107, 13); this.L_numPokemon.TabIndex = 22; - this.L_numPokemon.Text = "Number of Pokemon:"; + this.L_numPokemon.Text = "Number of Pokémon:"; // // CB_numPokemon // @@ -780,7 +780,7 @@ private void InitializeComponent() this.L_Pokemon_1_Pokemon.Name = "L_Pokemon_1_Pokemon"; this.L_Pokemon_1_Pokemon.Size = new System.Drawing.Size(55, 13); this.L_Pokemon_1_Pokemon.TabIndex = 22; - this.L_Pokemon_1_Pokemon.Text = "Pokemon:"; + this.L_Pokemon_1_Pokemon.Text = "Pokémon:"; // // CB_Pokemon_1_Pokemon // @@ -1036,7 +1036,7 @@ private void InitializeComponent() this.L_Pokemon_2_Pokemon.Name = "L_Pokemon_2_Pokemon"; this.L_Pokemon_2_Pokemon.Size = new System.Drawing.Size(55, 13); this.L_Pokemon_2_Pokemon.TabIndex = 22; - this.L_Pokemon_2_Pokemon.Text = "Pokemon:"; + this.L_Pokemon_2_Pokemon.Text = "Pokémon:"; // // CB_Pokemon_2_Pokemon // @@ -1292,7 +1292,7 @@ private void InitializeComponent() this.L_Pokemon_3_Pokemon.Name = "L_Pokemon_3_Pokemon"; this.L_Pokemon_3_Pokemon.Size = new System.Drawing.Size(55, 13); this.L_Pokemon_3_Pokemon.TabIndex = 22; - this.L_Pokemon_3_Pokemon.Text = "Pokemon:"; + this.L_Pokemon_3_Pokemon.Text = "Pokémon:"; // // CB_Pokemon_3_Pokemon // @@ -1548,7 +1548,7 @@ private void InitializeComponent() this.L_Pokemon_4_Pokemon.Name = "L_Pokemon_4_Pokemon"; this.L_Pokemon_4_Pokemon.Size = new System.Drawing.Size(55, 13); this.L_Pokemon_4_Pokemon.TabIndex = 22; - this.L_Pokemon_4_Pokemon.Text = "Pokemon:"; + this.L_Pokemon_4_Pokemon.Text = "Pokémon:"; // // CB_Pokemon_4_Pokemon // @@ -1804,7 +1804,7 @@ private void InitializeComponent() this.L_Pokemon_5_Pokemon.Name = "L_Pokemon_5_Pokemon"; this.L_Pokemon_5_Pokemon.Size = new System.Drawing.Size(55, 13); this.L_Pokemon_5_Pokemon.TabIndex = 22; - this.L_Pokemon_5_Pokemon.Text = "Pokemon:"; + this.L_Pokemon_5_Pokemon.Text = "Pokémon:"; // // CB_Pokemon_5_Pokemon // @@ -2060,7 +2060,7 @@ private void InitializeComponent() this.L_Pokemon_6_Pokemon.Name = "L_Pokemon_6_Pokemon"; this.L_Pokemon_6_Pokemon.Size = new System.Drawing.Size(55, 13); this.L_Pokemon_6_Pokemon.TabIndex = 22; - this.L_Pokemon_6_Pokemon.Text = "Pokemon:"; + this.L_Pokemon_6_Pokemon.Text = "Pokémon:"; // // CB_Pokemon_6_Pokemon // diff --git a/pk3DS/Subforms/Gen6/RSTE.cs b/pk3DS/Subforms/Gen6/RSTE.cs index 266e5c4..c6d1f3d 100644 --- a/pk3DS/Subforms/Gen6/RSTE.cs +++ b/pk3DS/Subforms/Gen6/RSTE.cs @@ -770,7 +770,7 @@ private void Randomize() } randomizing = false; CB_TrainerID.SelectedIndex = 1; - Util.Alert("Randomized all trainers according to specification!", "Press the Dump to .TXT button to view the new trainer information!"); + Util.Alert("Randomized all Trainers according to specification!", "Press the Dump to .TXT button to view the new Trainer information!"); } private string[] GetTagsORAS() diff --git a/pk3DS/Subforms/Gen6/RSWE.Designer.cs b/pk3DS/Subforms/Gen6/RSWE.Designer.cs index 3f1477e..8ba7415 100644 --- a/pk3DS/Subforms/Gen6/RSWE.Designer.cs +++ b/pk3DS/Subforms/Gen6/RSWE.Designer.cs @@ -996,7 +996,7 @@ private void InitializeComponent() this.B_LevelPlus.Name = "B_LevelPlus"; this.B_LevelPlus.Size = new System.Drawing.Size(70, 23); this.B_LevelPlus.TabIndex = 277; - this.B_LevelPlus.Text = "+/- Current"; + this.B_LevelPlus.Text = "× Current"; this.B_LevelPlus.UseVisualStyleBackColor = true; this.B_LevelPlus.Click += new System.EventHandler(this.modifyLevels); // @@ -1004,10 +1004,10 @@ private void InitializeComponent() // this.NUD_LevelAmp.DecimalPlaces = 2; this.NUD_LevelAmp.Increment = new decimal(new int[] { - 2, + 5, 0, 0, - 65536}); + 131072}); this.NUD_LevelAmp.Location = new System.Drawing.Point(152, 16); this.NUD_LevelAmp.Maximum = new decimal(new int[] { 3, @@ -1023,7 +1023,7 @@ private void InitializeComponent() this.NUD_LevelAmp.Size = new System.Drawing.Size(41, 20); this.NUD_LevelAmp.TabIndex = 276; this.NUD_LevelAmp.Value = new decimal(new int[] { - 13, + 10, 0, 0, 65536}); @@ -1031,11 +1031,11 @@ private void InitializeComponent() // CHK_Level // this.CHK_Level.AutoSize = true; - this.CHK_Level.Location = new System.Drawing.Point(33, 17); + this.CHK_Level.Location = new System.Drawing.Point(18, 17); this.CHK_Level.Name = "CHK_Level"; - this.CHK_Level.Size = new System.Drawing.Size(109, 17); + this.CHK_Level.Size = new System.Drawing.Size(135, 17); this.CHK_Level.TabIndex = 279; - this.CHK_Level.Text = "Multiply All Levels"; + this.CHK_Level.Text = "Multiply PKM Levels by"; this.CHK_Level.UseVisualStyleBackColor = true; // // L_HordeC_Max @@ -25527,9 +25527,9 @@ private void InitializeComponent() this.L_TallGrass.AutoSize = true; this.L_TallGrass.Location = new System.Drawing.Point(343, 20); this.L_TallGrass.Name = "L_TallGrass"; - this.L_TallGrass.Size = new System.Drawing.Size(54, 13); + this.L_TallGrass.Size = new System.Drawing.Size(61, 13); this.L_TallGrass.TabIndex = 374; - this.L_TallGrass.Text = "Tall Grass"; + this.L_TallGrass.Text = "Long Grass"; // // label10 // @@ -25706,9 +25706,9 @@ private void InitializeComponent() this.L_Grass.AutoSize = true; this.L_Grass.Location = new System.Drawing.Point(44, 20); this.L_Grass.Name = "L_Grass"; - this.L_Grass.Size = new System.Drawing.Size(34, 13); + this.L_Grass.Size = new System.Drawing.Size(54, 13); this.L_Grass.TabIndex = 310; - this.L_Grass.Text = "Grass"; + this.L_Grass.Text = "Tall Grass"; // // NUP_GrassMax2 // diff --git a/pk3DS/Subforms/Gen6/RSWE.cs b/pk3DS/Subforms/Gen6/RSWE.cs index 680c630..852d25b 100644 --- a/pk3DS/Subforms/Gen6/RSWE.cs +++ b/pk3DS/Subforms/Gen6/RSWE.cs @@ -672,7 +672,7 @@ private void B_Randomize_Click(object sender, EventArgs e) B_Save_Click(sender, e); } Enabled = true; - Util.Alert("Randomized!"); + Util.Alert("Randomized all Wild Encounters according to specification!", "Press the Dump Tables button to view the new Wild Encounter information!"); } private int countUnique(int[] list) { @@ -771,6 +771,8 @@ private void swap(ref int a1, ref int a2) private void modifyLevels(object sender, EventArgs e) { + if (Util.Prompt(MessageBoxButtons.YesNo, "Modify all current Level ranges?", "Cannot undo.") != DialogResult.Yes) return; + // Disable Interface while modifying Enabled = false; @@ -793,6 +795,7 @@ private void modifyLevels(object sender, EventArgs e) } // Enable Interface... modification complete. Enabled = true; + Util.Alert("Modified all Level ranges according to specification!", "Press the Dump Tables button to view the new Level ranges!"); } } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen6/TrainerRand.Designer.cs b/pk3DS/Subforms/Gen6/TrainerRand.Designer.cs index 62a792c..6def68e 100644 --- a/pk3DS/Subforms/Gen6/TrainerRand.Designer.cs +++ b/pk3DS/Subforms/Gen6/TrainerRand.Designer.cs @@ -160,9 +160,9 @@ private void InitializeComponent() this.CHK_MaxDiffPKM.CheckState = System.Windows.Forms.CheckState.Checked; this.CHK_MaxDiffPKM.Location = new System.Drawing.Point(12, 294); this.CHK_MaxDiffPKM.Name = "CHK_MaxDiffPKM"; - this.CHK_MaxDiffPKM.Size = new System.Drawing.Size(161, 17); + this.CHK_MaxDiffPKM.Size = new System.Drawing.Size(64, 17); this.CHK_MaxDiffPKM.TabIndex = 8; - this.CHK_MaxDiffPKM.Text = "Max Difficulty (Pokemon IVs)"; + this.CHK_MaxDiffPKM.Text = "Max IVs"; this.CHK_MaxDiffPKM.UseVisualStyleBackColor = true; // // B_OK @@ -214,12 +214,13 @@ private void InitializeComponent() // NUD_Level // this.NUD_Level.DecimalPlaces = 2; + this.NUD_Level.Enabled = false; this.NUD_Level.Increment = new decimal(new int[] { - 2, + 5, 0, 0, - 65536}); - this.NUD_Level.Location = new System.Drawing.Point(139, 11); + 131072}); + this.NUD_Level.Location = new System.Drawing.Point(141, 11); this.NUD_Level.Maximum = new decimal(new int[] { 3, 0, @@ -234,7 +235,7 @@ private void InitializeComponent() this.NUD_Level.Size = new System.Drawing.Size(43, 20); this.NUD_Level.TabIndex = 3; this.NUD_Level.Value = new decimal(new int[] { - 13, + 10, 0, 0, 65536}); @@ -245,9 +246,9 @@ private void InitializeComponent() this.CHK_Level.AutoSize = true; this.CHK_Level.Location = new System.Drawing.Point(12, 12); this.CHK_Level.Name = "CHK_Level"; - this.CHK_Level.Size = new System.Drawing.Size(126, 17); + this.CHK_Level.Size = new System.Drawing.Size(130, 17); this.CHK_Level.TabIndex = 2; - this.CHK_Level.Text = "Level Boost Multiplier"; + this.CHK_Level.Text = "Multiply PKM Level by"; this.CHK_Level.UseVisualStyleBackColor = true; this.CHK_Level.CheckedChanged += new System.EventHandler(this.CHK_Level_CheckedChanged); // diff --git a/pk3DS/Subforms/Gen6/TrainerRand.cs b/pk3DS/Subforms/Gen6/TrainerRand.cs index 4aae92c..147f758 100644 --- a/pk3DS/Subforms/Gen6/TrainerRand.cs +++ b/pk3DS/Subforms/Gen6/TrainerRand.cs @@ -82,6 +82,8 @@ private void B_Save_Click(object sender, EventArgs e) RSTE.rThemedClasses = new bool[trClass.Length]; if (Util.Prompt(MessageBoxButtons.YesNo, "Randomize all? Cannot undo.", "Double check Randomization settings before continuing.") != DialogResult.Yes) return; + if (!CHK_IgnoreSpecialClass.Checked) + if (Util.Prompt(MessageBoxButtons.YesNo, "Ignoring Special Trainer Classes has the chance of crashing your game in some battles!", "Continue anyway?") != DialogResult.Yes) return; RSTE.rDoRand = true; Close(); } @@ -101,7 +103,6 @@ private void CHK_RandomPKM_CheckedChanged(object sender, EventArgs e) private void CHK_Level_CheckedChanged(object sender, EventArgs e) { NUD_Level.Enabled = CHK_Level.Checked; - NUD_Level.Value = CHK_Level.Checked ? 1.3m : 1m; } private void changeLevelPercent(object sender, EventArgs e) { diff --git a/pk3DS/Subforms/Gen6/XYWE.Designer.cs b/pk3DS/Subforms/Gen6/XYWE.Designer.cs index 206302e..388f28f 100644 --- a/pk3DS/Subforms/Gen6/XYWE.Designer.cs +++ b/pk3DS/Subforms/Gen6/XYWE.Designer.cs @@ -5082,9 +5082,9 @@ private void InitializeComponent() this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(44, 20); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(34, 13); + this.label2.Size = new System.Drawing.Size(54, 13); this.label2.TabIndex = 310; - this.label2.Text = "Grass"; + this.label2.Text = "Tall Grass"; // // NUP_GrassMax2 // @@ -15658,7 +15658,7 @@ private void InitializeComponent() this.B_LevelPlus.Name = "B_LevelPlus"; this.B_LevelPlus.Size = new System.Drawing.Size(70, 23); this.B_LevelPlus.TabIndex = 277; - this.B_LevelPlus.Text = "+/- Current"; + this.B_LevelPlus.Text = "× Current"; this.B_LevelPlus.UseVisualStyleBackColor = true; this.B_LevelPlus.Click += new System.EventHandler(this.modifyLevels); // @@ -15666,10 +15666,10 @@ private void InitializeComponent() // this.NUD_LevelAmp.DecimalPlaces = 2; this.NUD_LevelAmp.Increment = new decimal(new int[] { - 2, + 5, 0, 0, - 65536}); + 131072}); this.NUD_LevelAmp.Location = new System.Drawing.Point(152, 16); this.NUD_LevelAmp.Maximum = new decimal(new int[] { 3, @@ -15685,7 +15685,7 @@ private void InitializeComponent() this.NUD_LevelAmp.Size = new System.Drawing.Size(41, 20); this.NUD_LevelAmp.TabIndex = 276; this.NUD_LevelAmp.Value = new decimal(new int[] { - 13, + 10, 0, 0, 65536}); @@ -15693,11 +15693,11 @@ private void InitializeComponent() // CHK_Level // this.CHK_Level.AutoSize = true; - this.CHK_Level.Location = new System.Drawing.Point(33, 17); + this.CHK_Level.Location = new System.Drawing.Point(18, 17); this.CHK_Level.Name = "CHK_Level"; - this.CHK_Level.Size = new System.Drawing.Size(109, 17); + this.CHK_Level.Size = new System.Drawing.Size(135, 17); this.CHK_Level.TabIndex = 279; - this.CHK_Level.Text = "Multiply All Levels"; + this.CHK_Level.Text = "Multiply PKM Levels by"; this.CHK_Level.UseVisualStyleBackColor = true; // // label129 diff --git a/pk3DS/Subforms/Gen6/XYWE.cs b/pk3DS/Subforms/Gen6/XYWE.cs index 53bae63..9d985f0 100644 --- a/pk3DS/Subforms/Gen6/XYWE.cs +++ b/pk3DS/Subforms/Gen6/XYWE.cs @@ -541,7 +541,7 @@ private void B_Randomize_Click(object sender, EventArgs e) B_Save_Click(sender, e); } Enabled = true; - Util.Alert("Randomized!"); + Util.Alert("Randomized all Wild Encounters according to specification!", "Press the Dump Tables button to view the new Wild Encounter information!"); } private void setRandomForm(int slot, int species) { @@ -629,6 +629,8 @@ private string GetEncDataString() private void modifyLevels(object sender, EventArgs e) { + if (Util.Prompt(MessageBoxButtons.YesNo, "Modify all current Level ranges?", "Cannot undo.") != DialogResult.Yes) return; + // Disable Interface while modifying Enabled = false; @@ -651,6 +653,7 @@ private void modifyLevels(object sender, EventArgs e) } // Enable Interface... modification complete. Enabled = true; + Util.Alert("Modified all Level ranges according to specification!", "Press the Dump Tables button to view the new Level ranges!"); } } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen7/SMTE.Designer.cs b/pk3DS/Subforms/Gen7/SMTE.Designer.cs index 6e11db2..5dc0259 100644 --- a/pk3DS/Subforms/Gen7/SMTE.Designer.cs +++ b/pk3DS/Subforms/Gen7/SMTE.Designer.cs @@ -1599,7 +1599,7 @@ private void InitializeComponent() // L_ShinyPCT // this.L_ShinyPCT.AutoSize = true; - this.L_ShinyPCT.Location = new System.Drawing.Point(276, 55); + this.L_ShinyPCT.Location = new System.Drawing.Point(276, 57); this.L_ShinyPCT.Name = "L_ShinyPCT"; this.L_ShinyPCT.Size = new System.Drawing.Size(15, 13); this.L_ShinyPCT.TabIndex = 305; @@ -1607,7 +1607,7 @@ private void InitializeComponent() // // NUD_Shiny // - this.NUD_Shiny.Location = new System.Drawing.Point(232, 51); + this.NUD_Shiny.Location = new System.Drawing.Point(232, 53); this.NUD_Shiny.Name = "NUD_Shiny"; this.NUD_Shiny.Size = new System.Drawing.Size(43, 20); this.NUD_Shiny.TabIndex = 304; @@ -1622,7 +1622,7 @@ private void InitializeComponent() this.CHK_RandomShiny.AutoSize = true; this.CHK_RandomShiny.Checked = true; this.CHK_RandomShiny.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_RandomShiny.Location = new System.Drawing.Point(100, 52); + this.CHK_RandomShiny.Location = new System.Drawing.Point(100, 54); this.CHK_RandomShiny.Name = "CHK_RandomShiny"; this.CHK_RandomShiny.Size = new System.Drawing.Size(103, 17); this.CHK_RandomShiny.TabIndex = 303; @@ -1635,7 +1635,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(6, 115); + this.CHK_E.Location = new System.Drawing.Point(6, 117); this.CHK_E.Name = "CHK_E"; this.CHK_E.Size = new System.Drawing.Size(98, 17); this.CHK_E.TabIndex = 296; @@ -1647,7 +1647,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(6, 101); + this.CHK_L.Location = new System.Drawing.Point(6, 103); this.CHK_L.Name = "CHK_L"; this.CHK_L.Size = new System.Drawing.Size(98, 17); this.CHK_L.TabIndex = 295; @@ -1659,7 +1659,7 @@ private void InitializeComponent() this.CHK_G7.AutoSize = true; this.CHK_G7.Checked = true; this.CHK_G7.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_G7.Location = new System.Drawing.Point(6, 87); + this.CHK_G7.Location = new System.Drawing.Point(6, 89); this.CHK_G7.Name = "CHK_G7"; this.CHK_G7.Size = new System.Drawing.Size(55, 17); this.CHK_G7.TabIndex = 298; @@ -1671,7 +1671,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(6, 73); + this.CHK_G6.Location = new System.Drawing.Point(6, 75); this.CHK_G6.Name = "CHK_G6"; this.CHK_G6.Size = new System.Drawing.Size(55, 17); this.CHK_G6.TabIndex = 294; @@ -1683,7 +1683,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(6, 59); + this.CHK_G5.Location = new System.Drawing.Point(6, 61); this.CHK_G5.Name = "CHK_G5"; this.CHK_G5.Size = new System.Drawing.Size(55, 17); this.CHK_G5.TabIndex = 293; @@ -1695,7 +1695,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(6, 45); + this.CHK_G4.Location = new System.Drawing.Point(6, 47); this.CHK_G4.Name = "CHK_G4"; this.CHK_G4.Size = new System.Drawing.Size(55, 17); this.CHK_G4.TabIndex = 292; @@ -1707,7 +1707,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(6, 31); + this.CHK_G3.Location = new System.Drawing.Point(6, 33); this.CHK_G3.Name = "CHK_G3"; this.CHK_G3.Size = new System.Drawing.Size(55, 17); this.CHK_G3.TabIndex = 291; @@ -1717,17 +1717,23 @@ private void InitializeComponent() // NUD_LevelBoost // this.NUD_LevelBoost.DecimalPlaces = 2; + this.NUD_LevelBoost.Enabled = false; this.NUD_LevelBoost.Increment = new decimal(new int[] { 5, 0, 0, 131072}); - this.NUD_LevelBoost.Location = new System.Drawing.Point(232, 75); + this.NUD_LevelBoost.Location = new System.Drawing.Point(232, 77); this.NUD_LevelBoost.Maximum = new decimal(new int[] { 3, 0, 0, 0}); + this.NUD_LevelBoost.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 65536}); this.NUD_LevelBoost.Name = "NUD_LevelBoost"; this.NUD_LevelBoost.Size = new System.Drawing.Size(43, 20); this.NUD_LevelBoost.TabIndex = 301; @@ -1742,7 +1748,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(6, 17); + this.CHK_G2.Location = new System.Drawing.Point(6, 19); this.CHK_G2.Name = "CHK_G2"; this.CHK_G2.Size = new System.Drawing.Size(55, 17); this.CHK_G2.TabIndex = 290; @@ -1752,9 +1758,7 @@ private void InitializeComponent() // CHK_Level // this.CHK_Level.AutoSize = true; - this.CHK_Level.Checked = true; - this.CHK_Level.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_Level.Location = new System.Drawing.Point(100, 76); + this.CHK_Level.Location = new System.Drawing.Point(100, 78); this.CHK_Level.Name = "CHK_Level"; this.CHK_Level.Size = new System.Drawing.Size(130, 17); this.CHK_Level.TabIndex = 300; @@ -1767,7 +1771,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(6, 3); + this.CHK_G1.Location = new System.Drawing.Point(6, 5); this.CHK_G1.Name = "CHK_G1"; this.CHK_G1.Size = new System.Drawing.Size(55, 17); this.CHK_G1.TabIndex = 289; @@ -1777,7 +1781,7 @@ private void InitializeComponent() // CHK_BST // this.CHK_BST.AutoSize = true; - this.CHK_BST.Location = new System.Drawing.Point(100, 17); + this.CHK_BST.Location = new System.Drawing.Point(100, 19); this.CHK_BST.Name = "CHK_BST"; this.CHK_BST.Size = new System.Drawing.Size(117, 17); this.CHK_BST.TabIndex = 297; @@ -1789,7 +1793,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(100, 3); + this.CHK_RandomPKM.Location = new System.Drawing.Point(100, 5); this.CHK_RandomPKM.Name = "CHK_RandomPKM"; this.CHK_RandomPKM.Size = new System.Drawing.Size(114, 17); this.CHK_RandomPKM.TabIndex = 299; @@ -2055,7 +2059,7 @@ private void InitializeComponent() this.CHK_TypeTheme.AutoSize = true; this.CHK_TypeTheme.Checked = true; this.CHK_TypeTheme.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_TypeTheme.Location = new System.Drawing.Point(6, 32); + this.CHK_TypeTheme.Location = new System.Drawing.Point(6, 33); this.CHK_TypeTheme.Name = "CHK_TypeTheme"; this.CHK_TypeTheme.Size = new System.Drawing.Size(127, 17); this.CHK_TypeTheme.TabIndex = 329; @@ -2068,7 +2072,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(6, 17); + this.CHK_IgnoreSpecialClass.Location = new System.Drawing.Point(6, 18); this.CHK_IgnoreSpecialClass.Name = "CHK_IgnoreSpecialClass"; this.CHK_IgnoreSpecialClass.Size = new System.Drawing.Size(133, 17); this.CHK_IgnoreSpecialClass.TabIndex = 327; diff --git a/pk3DS/Subforms/Gen7/SMTE.cs b/pk3DS/Subforms/Gen7/SMTE.cs index 7c864db..098cb79 100644 --- a/pk3DS/Subforms/Gen7/SMTE.cs +++ b/pk3DS/Subforms/Gen7/SMTE.cs @@ -672,7 +672,7 @@ private void B_Randomize_Click(object sender, EventArgs e) } saveData(tr, i); } - Util.Alert("Randomized all trainers according to specification!", "Press the Dump to .TXT button to view the new trainer information!"); + Util.Alert("Randomized all Trainers according to specification!", "Press the Dump to .TXT button to view the new Trainer information!"); } private void B_HighAttack_Click(object sender, EventArgs e) { @@ -727,7 +727,9 @@ private void CHK_RandomPKM_CheckedChanged(object sender, EventArgs e) } private void CHK_RandomClass_CheckedChanged(object sender, EventArgs e) { - CHK_IgnoreSpecialClass.Visible = CHK_RandomClass.Checked; + CHK_IgnoreSpecialClass.Enabled = CHK_RandomClass.Checked; + if (!CHK_RandomClass.Checked) + CHK_IgnoreSpecialClass.Checked = false; } private void CHK_RandomShiny_CheckedChanged(object sender, EventArgs e) { diff --git a/pk3DS/Subforms/Gen7/SMTE.resx b/pk3DS/Subforms/Gen7/SMTE.resx index dfdc667..0161958 100644 --- a/pk3DS/Subforms/Gen7/SMTE.resx +++ b/pk3DS/Subforms/Gen7/SMTE.resx @@ -153,12 +153,210 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -177,418 +375,4 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/pk3DS/Subforms/Gen7/SMWE.Designer.cs b/pk3DS/Subforms/Gen7/SMWE.Designer.cs index 6f5b426..71ad089 100644 --- a/pk3DS/Subforms/Gen7/SMWE.Designer.cs +++ b/pk3DS/Subforms/Gen7/SMWE.Designer.cs @@ -378,11 +378,11 @@ private void InitializeComponent() // L_Location // this.L_Location.AutoSize = true; - this.L_Location.Location = new System.Drawing.Point(11, 16); + this.L_Location.Location = new System.Drawing.Point(38, 16); this.L_Location.Name = "L_Location"; - this.L_Location.Size = new System.Drawing.Size(51, 13); + this.L_Location.Size = new System.Drawing.Size(28, 13); this.L_Location.TabIndex = 419; - this.L_Location.Text = "Location:"; + this.L_Location.Text = "Loc:"; // // B_Save // @@ -893,6 +893,11 @@ private void InitializeComponent() 0, 0, 0}); + this.NUD_LevelAmp.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 65536}); this.NUD_LevelAmp.Name = "NUD_LevelAmp"; this.NUD_LevelAmp.Size = new System.Drawing.Size(48, 20); this.NUD_LevelAmp.TabIndex = 276; diff --git a/pk3DS/Subforms/Gen7/SMWE.cs b/pk3DS/Subforms/Gen7/SMWE.cs index a094dc7..7852534 100644 --- a/pk3DS/Subforms/Gen7/SMWE.cs +++ b/pk3DS/Subforms/Gen7/SMWE.cs @@ -485,6 +485,8 @@ public override string ToString() private void modifyLevels(object sender, EventArgs e) { + if (Util.Prompt(MessageBoxButtons.YesNo, "Modify all current Level ranges?", "Cannot undo.") != DialogResult.Yes) return; + // Disable Interface while modifying Enabled = false; @@ -497,6 +499,7 @@ private void modifyLevels(object sender, EventArgs e) } // Enable Interface... modification complete. Enabled = true; + Util.Alert("Modified all Level ranges according to specification!", "Press the Dump Tables button to view the new Level ranges!"); updatePanel(sender, e); } @@ -581,7 +584,7 @@ private void B_Randomize_Click(object sender, EventArgs e) } updatePanel(sender, e); Enabled = true; - Util.Alert("Randomized!"); + Util.Alert("Randomized all Wild Encounters according to specification!", "Press the Dump Tables button to view the new Wild Encounter information!"); } private uint GetRandomForme(int species) @@ -595,6 +598,8 @@ private uint GetRandomForme(int species) private void CopySOS_Click(object sender, EventArgs e) { + if (Util.Prompt(MessageBoxButtons.YesNo, "Copy initial species to SOS slots?", "Cannot undo.") != DialogResult.Yes) return; + // first table is copied to all other tables except weather (last) for (int i = 1; i < nup_spec.Length - 1; i++) { @@ -604,8 +609,7 @@ private void CopySOS_Click(object sender, EventArgs e) cb_spec[i][s].SelectedIndex = cb_spec[0][s].SelectedIndex; } } - - System.Media.SystemSounds.Asterisk.Play(); + Util.Alert("All initial species copied to SOS slots!"); } } }