diff --git a/pk3DS/Subforms/RSTE.cs b/pk3DS/Subforms/RSTE.cs index 885c8ff..37ede5b 100644 --- a/pk3DS/Subforms/RSTE.cs +++ b/pk3DS/Subforms/RSTE.cs @@ -565,7 +565,7 @@ private void Setup() } private bool randomizing; - public static bool rPKM, rSmart, rLevel, rMove, rAbility, rDiffAI, rDiffIV, rClass, rGift, rItem, rDoRand, rTypeTheme, rTypeGymTrainers, rOnlySingles, rDMG, rSTAB; + public static bool rPKM, rSmart, rLevel, rMove, rNoMove, rAbility, rDiffAI, rDiffIV, rClass, rGift, rItem, rDoRand, rTypeTheme, rTypeGymTrainers, rOnlySingles, rDMG, rSTAB; public static bool[] rThemedClasses = { }; public static string[] rTags; public static int[] megaEvos; @@ -641,7 +641,7 @@ private void Randomize() CB_TrainerID.SelectedIndex = i; // data is loaded // Setup - checkBox_Moves.Checked = rMove || checkBox_Moves.Checked; + checkBox_Moves.Checked = rMove || (!rNoMove && checkBox_Moves.Checked); checkBox_Item.Checked = rItem || checkBox_Item.Checked; // Randomize Trainer Stats diff --git a/pk3DS/Subforms/TrainerRand.Designer.cs b/pk3DS/Subforms/TrainerRand.Designer.cs index 3026ef3..58ca952 100644 --- a/pk3DS/Subforms/TrainerRand.Designer.cs +++ b/pk3DS/Subforms/TrainerRand.Designer.cs @@ -30,7 +30,6 @@ private void InitializeComponent() { this.CHK_RandomPKM = new System.Windows.Forms.CheckBox(); this.CHK_RandomItems = new System.Windows.Forms.CheckBox(); - this.CHK_RandomMoves = new System.Windows.Forms.CheckBox(); this.CHK_RandomAbilities = new System.Windows.Forms.CheckBox(); this.CHK_RandomGift = new System.Windows.Forms.CheckBox(); this.CHK_RandomClass = new System.Windows.Forms.CheckBox(); @@ -62,6 +61,8 @@ private void InitializeComponent() this.CHK_Damage = new System.Windows.Forms.CheckBox(); this.CHK_STAB = new System.Windows.Forms.CheckBox(); this.NUD_STAB = new System.Windows.Forms.NumericUpDown(); + this.CB_Moves = new System.Windows.Forms.ComboBox(); + this.L_Moves = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.NUD_GiftPercent)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Level)).BeginInit(); this.GB_Tweak.SuspendLayout(); @@ -95,19 +96,6 @@ private void InitializeComponent() this.CHK_RandomItems.Text = "Random Held Items"; this.CHK_RandomItems.UseVisualStyleBackColor = true; // - // CHK_RandomMoves - // - this.CHK_RandomMoves.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.CHK_RandomMoves.AutoSize = true; - this.CHK_RandomMoves.Checked = true; - this.CHK_RandomMoves.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_RandomMoves.Location = new System.Drawing.Point(12, 180); - this.CHK_RandomMoves.Name = "CHK_RandomMoves"; - this.CHK_RandomMoves.Size = new System.Drawing.Size(101, 17); - this.CHK_RandomMoves.TabIndex = 5; - this.CHK_RandomMoves.Text = "Random Moves"; - this.CHK_RandomMoves.UseVisualStyleBackColor = true; - // // CHK_RandomAbilities // this.CHK_RandomAbilities.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -449,7 +437,7 @@ private void InitializeComponent() // NUD_Damage // this.NUD_Damage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.NUD_Damage.Location = new System.Drawing.Point(204, 192); + this.NUD_Damage.Location = new System.Drawing.Point(204, 198); this.NUD_Damage.Maximum = new decimal(new int[] { 4, 0, @@ -470,7 +458,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(12, 195); + this.CHK_Damage.Location = new System.Drawing.Point(12, 201); this.CHK_Damage.Name = "CHK_Damage"; this.CHK_Damage.Size = new System.Drawing.Size(192, 17); this.CHK_Damage.TabIndex = 327; @@ -483,7 +471,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(12, 210); + this.CHK_STAB.Location = new System.Drawing.Point(12, 216); this.CHK_STAB.Name = "CHK_STAB"; this.CHK_STAB.Size = new System.Drawing.Size(172, 17); this.CHK_STAB.TabIndex = 328; @@ -493,7 +481,7 @@ private void InitializeComponent() // NUD_STAB // this.NUD_STAB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.NUD_STAB.Location = new System.Drawing.Point(179, 212); + this.NUD_STAB.Location = new System.Drawing.Point(179, 218); this.NUD_STAB.Maximum = new decimal(new int[] { 4, 0, @@ -508,15 +496,36 @@ private void InitializeComponent() 0, 0}); // + // CB_Moves + // + this.CB_Moves.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_Moves.FormattingEnabled = true; + this.CB_Moves.Items.AddRange(new object[] { + "Don\'t Modify", + "Randomize All", + "Use Levelup Only"}); + this.CB_Moves.Location = new System.Drawing.Point(60, 179); + this.CB_Moves.Name = "CB_Moves"; + this.CB_Moves.Size = new System.Drawing.Size(121, 21); + this.CB_Moves.TabIndex = 330; + this.CB_Moves.SelectedIndexChanged += new System.EventHandler(this.changeMoveRandomization); + // + // L_Moves + // + this.L_Moves.AutoSize = true; + this.L_Moves.Location = new System.Drawing.Point(12, 182); + this.L_Moves.Name = "L_Moves"; + this.L_Moves.Size = new System.Drawing.Size(42, 13); + this.L_Moves.TabIndex = 331; + this.L_Moves.Text = "Moves:"; + // // TrainerRand // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(284, 377); - this.Controls.Add(this.NUD_STAB); - this.Controls.Add(this.CHK_STAB); - this.Controls.Add(this.CHK_Damage); - this.Controls.Add(this.NUD_Damage); + this.Controls.Add(this.L_Moves); + this.Controls.Add(this.CB_Moves); this.Controls.Add(this.CHK_OnlySingles); this.Controls.Add(this.GB_Tweak); this.Controls.Add(this.NUD_GiftPercent); @@ -531,10 +540,13 @@ private void InitializeComponent() this.Controls.Add(this.button2); this.Controls.Add(this.button1); this.Controls.Add(this.CHK_RandomGift); - this.Controls.Add(this.CHK_RandomMoves); this.Controls.Add(this.CHK_RandomPKM); this.Controls.Add(this.CHK_IgnoreSpecialClass); this.Controls.Add(this.CHK_RandomClass); + this.Controls.Add(this.NUD_STAB); + this.Controls.Add(this.CHK_STAB); + this.Controls.Add(this.CHK_Damage); + this.Controls.Add(this.NUD_Damage); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(300, 840); @@ -557,7 +569,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_RandomPKM; private System.Windows.Forms.CheckBox CHK_RandomItems; - private System.Windows.Forms.CheckBox CHK_RandomMoves; private System.Windows.Forms.CheckBox CHK_RandomAbilities; private System.Windows.Forms.CheckBox CHK_RandomGift; private System.Windows.Forms.CheckBox CHK_RandomClass; @@ -589,5 +600,7 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_Damage; private System.Windows.Forms.CheckBox CHK_STAB; private System.Windows.Forms.NumericUpDown NUD_STAB; + private System.Windows.Forms.ComboBox CB_Moves; + private System.Windows.Forms.Label L_Moves; } } \ No newline at end of file diff --git a/pk3DS/Subforms/TrainerRand.cs b/pk3DS/Subforms/TrainerRand.cs index 6950464..539a0e1 100644 --- a/pk3DS/Subforms/TrainerRand.cs +++ b/pk3DS/Subforms/TrainerRand.cs @@ -9,6 +9,7 @@ public partial class TrainerRand : Form public TrainerRand() { InitializeComponent(); + CB_Moves.SelectedIndex = 1; trClassnorep = new List(); foreach (string tclass in trClass) { @@ -34,8 +35,9 @@ private void B_Save_Click(object sender, EventArgs e) RSTE.rLevel = CHK_Level.Checked; RSTE.rLevelPercent = NUD_Level.Value; - RSTE.rMove = CHK_RandomMoves.Checked; - if (CHK_RandomMoves.Checked) + RSTE.rMove = CB_Moves.SelectedIndex == 1; + RSTE.rNoMove = CB_Moves.SelectedIndex == 2; + if (RSTE.rMove) { RSTE.rDMG = CHK_Damage.Checked; if (RSTE.rDMG) @@ -123,5 +125,12 @@ private void CHK_RandomClass_CheckedChanged(object sender, EventArgs e) CHK_IgnoreSpecialClass.Enabled = CHK_IgnoreSpecialClass.Checked = CHK_OnlySingles.Enabled = CHK_OnlySingles.Checked = CHK_RandomClass.Checked; } + + private void changeMoveRandomization(object sender, EventArgs e) + { + CHK_Damage.Checked = CHK_STAB.Checked = + CHK_Damage.Enabled = CHK_STAB.Enabled = + NUD_Damage.Enabled = NUD_STAB.Enabled = (CB_Moves.SelectedIndex == 1); + } } } \ No newline at end of file