From 4bd81f04c52391ac741b6b8fb98c137e1dbe7a68 Mon Sep 17 00:00:00 2001 From: cadon Date: Sat, 21 Nov 2015 23:39:21 +0100 Subject: [PATCH] small fixes, improvements --- ARKBreedingStats/ARKBreedingStats.csproj | 2 +- ARKBreedingStats/Form1.Designer.cs | 127 +++++++++++++---------- ARKBreedingStats/Form1.cs | 33 ++++-- ARKBreedingStats/StatIO.cs | 2 +- 4 files changed, 97 insertions(+), 67 deletions(-) diff --git a/ARKBreedingStats/ARKBreedingStats.csproj b/ARKBreedingStats/ARKBreedingStats.csproj index bff8b2e1..a2213b5b 100644 --- a/ARKBreedingStats/ARKBreedingStats.csproj +++ b/ARKBreedingStats/ARKBreedingStats.csproj @@ -8,7 +8,7 @@ WinExe Properties ARKBreedingStats - ARKBreedingStats + ARKStatsExtractor v4.6 512 true diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs index 8233c876..85ef3a3a 100644 --- a/ARKBreedingStats/Form1.Designer.cs +++ b/ARKBreedingStats/Form1.Designer.cs @@ -34,6 +34,8 @@ private void InitializeComponent() this.labelHeaderD = new System.Windows.Forms.Label(); this.numericUpDownLowerTEffL = new System.Windows.Forms.NumericUpDown(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.label3 = new System.Windows.Forms.Label(); + this.numericUpDownLowerTEffU = new System.Windows.Forms.NumericUpDown(); this.label1 = new System.Windows.Forms.Label(); this.labelHBV = new System.Windows.Forms.Label(); this.numericUpDownLevel = new System.Windows.Forms.NumericUpDown(); @@ -47,8 +49,7 @@ private void InitializeComponent() this.buttonCopyClipboard = new System.Windows.Forms.Button(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.labelFootnote = new System.Windows.Forms.Label(); - this.numericUpDownLowerTEffU = new System.Windows.Forms.NumericUpDown(); - this.label3 = new System.Windows.Forms.Label(); + this.labelVersion = new System.Windows.Forms.Label(); this.statIOTorpor = new ARKBreedingStats.StatIO(); this.statIOSpeed = new ARKBreedingStats.StatIO(); this.statIODamage = new ARKBreedingStats.StatIO(); @@ -59,11 +60,11 @@ private void InitializeComponent() this.statIOHealth = new ARKBreedingStats.StatIO(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLowerTEffL)).BeginInit(); this.groupBox3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLowerTEffU)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevel)).BeginInit(); this.groupBoxLevel.SuspendLayout(); this.groupBoxPossibilities.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLowerTEffU)).BeginInit(); this.SuspendLayout(); // // buttonCalculate @@ -71,7 +72,7 @@ private void InitializeComponent() this.buttonCalculate.Location = new System.Drawing.Point(313, 115); this.buttonCalculate.Name = "buttonCalculate"; this.buttonCalculate.Size = new System.Drawing.Size(154, 89); - this.buttonCalculate.TabIndex = 4; + this.buttonCalculate.TabIndex = 11; this.buttonCalculate.Text = "Extract Level Distribution"; this.buttonCalculate.UseVisualStyleBackColor = true; this.buttonCalculate.Click += new System.EventHandler(this.buttonCalculate_Click); @@ -79,19 +80,19 @@ private void InitializeComponent() // labelHeaderW // this.labelHeaderW.AutoSize = true; - this.labelHeaderW.Location = new System.Drawing.Point(135, 41); + this.labelHeaderW.Location = new System.Drawing.Point(133, 41); this.labelHeaderW.Name = "labelHeaderW"; this.labelHeaderW.Size = new System.Drawing.Size(28, 13); - this.labelHeaderW.TabIndex = 5; + this.labelHeaderW.TabIndex = 17; this.labelHeaderW.Text = "Wild"; // // labelHeaderD // this.labelHeaderD.AutoSize = true; - this.labelHeaderD.Location = new System.Drawing.Point(180, 41); + this.labelHeaderD.Location = new System.Drawing.Point(174, 41); this.labelHeaderD.Name = "labelHeaderD"; this.labelHeaderD.Size = new System.Drawing.Size(29, 13); - this.labelHeaderD.TabIndex = 6; + this.labelHeaderD.TabIndex = 18; this.labelHeaderD.Text = "Dom"; // // numericUpDownLowerTEffL @@ -99,12 +100,13 @@ private void InitializeComponent() this.numericUpDownLowerTEffL.Location = new System.Drawing.Point(6, 19); this.numericUpDownLowerTEffL.Name = "numericUpDownLowerTEffL"; this.numericUpDownLowerTEffL.Size = new System.Drawing.Size(45, 20); - this.numericUpDownLowerTEffL.TabIndex = 10; + this.numericUpDownLowerTEffL.TabIndex = 0; this.numericUpDownLowerTEffL.Value = new decimal(new int[] { 80, 0, 0, 0}); + this.numericUpDownLowerTEffL.Enter += new System.EventHandler(this.numericUpDown_Enter); // // groupBox3 // @@ -115,26 +117,48 @@ private void InitializeComponent() this.groupBox3.Location = new System.Drawing.Point(313, 65); this.groupBox3.Name = "groupBox3"; this.groupBox3.Size = new System.Drawing.Size(154, 44); - this.groupBox3.TabIndex = 11; + this.groupBox3.TabIndex = 10; this.groupBox3.TabStop = false; this.groupBox3.Text = "TamingEfficiency Range"; // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(57, 21); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(10, 13); + this.label3.TabIndex = 1; + this.label3.Text = "-"; + // + // numericUpDownLowerTEffU + // + this.numericUpDownLowerTEffU.Location = new System.Drawing.Point(73, 19); + this.numericUpDownLowerTEffU.Name = "numericUpDownLowerTEffU"; + this.numericUpDownLowerTEffU.Size = new System.Drawing.Size(45, 20); + this.numericUpDownLowerTEffU.TabIndex = 2; + this.numericUpDownLowerTEffU.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownLowerTEffU.Enter += new System.EventHandler(this.numericUpDown_Enter); + // // label1 // this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(124, 21); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(15, 13); - this.label1.TabIndex = 11; + this.label1.TabIndex = 3; this.label1.Text = "%"; // // labelHBV // this.labelHBV.AutoSize = true; - this.labelHBV.Location = new System.Drawing.Point(215, 41); + this.labelHBV.Location = new System.Drawing.Point(213, 41); this.labelHBV.Name = "labelHBV"; this.labelHBV.Size = new System.Drawing.Size(79, 13); - this.labelHBV.TabIndex = 13; + this.labelHBV.TabIndex = 19; this.labelHBV.Text = "Breeding Value"; // // numericUpDownLevel @@ -147,12 +171,13 @@ private void InitializeComponent() 0}); this.numericUpDownLevel.Name = "numericUpDownLevel"; this.numericUpDownLevel.Size = new System.Drawing.Size(56, 20); - this.numericUpDownLevel.TabIndex = 21; + this.numericUpDownLevel.TabIndex = 0; this.numericUpDownLevel.Value = new decimal(new int[] { 1, 0, 0, 0}); + this.numericUpDownLevel.Enter += new System.EventHandler(this.numericUpDown_Enter); // // groupBoxLevel // @@ -160,17 +185,19 @@ private void InitializeComponent() this.groupBoxLevel.Location = new System.Drawing.Point(313, 12); this.groupBoxLevel.Name = "groupBoxLevel"; this.groupBoxLevel.Size = new System.Drawing.Size(70, 47); - this.groupBoxLevel.TabIndex = 22; + this.groupBoxLevel.TabIndex = 1; this.groupBoxLevel.TabStop = false; this.groupBoxLevel.Text = "Level"; // // comboBoxCreatures // + this.comboBoxCreatures.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.comboBoxCreatures.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.comboBoxCreatures.FormattingEnabled = true; this.comboBoxCreatures.Location = new System.Drawing.Point(12, 12); this.comboBoxCreatures.Name = "comboBoxCreatures"; - this.comboBoxCreatures.Size = new System.Drawing.Size(121, 21); - this.comboBoxCreatures.TabIndex = 23; + this.comboBoxCreatures.Size = new System.Drawing.Size(149, 21); + this.comboBoxCreatures.TabIndex = 0; this.comboBoxCreatures.SelectedIndexChanged += new System.EventHandler(this.comboBoxCreatures_SelectedIndexChanged); // // listBoxPossibilities @@ -180,7 +207,7 @@ private void InitializeComponent() this.listBoxPossibilities.Location = new System.Drawing.Point(3, 16); this.listBoxPossibilities.Name = "listBoxPossibilities"; this.listBoxPossibilities.Size = new System.Drawing.Size(162, 382); - this.listBoxPossibilities.TabIndex = 24; + this.listBoxPossibilities.TabIndex = 0; this.listBoxPossibilities.MouseClick += new System.Windows.Forms.MouseEventHandler(this.listBoxPossibilities_MouseClick); // // groupBoxPossibilities @@ -189,7 +216,7 @@ private void InitializeComponent() this.groupBoxPossibilities.Location = new System.Drawing.Point(473, 12); this.groupBoxPossibilities.Name = "groupBoxPossibilities"; this.groupBoxPossibilities.Size = new System.Drawing.Size(174, 420); - this.groupBoxPossibilities.TabIndex = 25; + this.groupBoxPossibilities.TabIndex = 13; this.groupBoxPossibilities.TabStop = false; this.groupBoxPossibilities.Text = "Possible Levels"; // @@ -214,7 +241,7 @@ private void InitializeComponent() this.label2.Location = new System.Drawing.Point(3, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(162, 13); - this.label2.TabIndex = 25; + this.label2.TabIndex = 1; this.label2.Text = "Wild Dom TEfficiency"; // // labelDoc @@ -222,7 +249,7 @@ private void InitializeComponent() this.labelDoc.Location = new System.Drawing.Point(313, 207); this.labelDoc.Name = "labelDoc"; this.labelDoc.Size = new System.Drawing.Size(154, 174); - this.labelDoc.TabIndex = 26; + this.labelDoc.TabIndex = 15; this.labelDoc.Text = resources.GetString("labelDoc.Text"); // // buttonCopyClipboard @@ -231,7 +258,7 @@ private void InitializeComponent() this.buttonCopyClipboard.Location = new System.Drawing.Point(313, 384); this.buttonCopyClipboard.Name = "buttonCopyClipboard"; this.buttonCopyClipboard.Size = new System.Drawing.Size(154, 45); - this.buttonCopyClipboard.TabIndex = 27; + this.buttonCopyClipboard.TabIndex = 12; this.buttonCopyClipboard.Text = "Copy retrieved Values as Table to Clipboard"; this.buttonCopyClipboard.UseVisualStyleBackColor = true; this.buttonCopyClipboard.Click += new System.EventHandler(this.buttonCopyClipboard_Click); @@ -239,10 +266,10 @@ private void InitializeComponent() // linkLabel1 // this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(573, 443); + this.linkLabel1.Location = new System.Drawing.Point(577, 438); this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.Size = new System.Drawing.Size(67, 13); - this.linkLabel1.TabIndex = 28; + this.linkLabel1.TabIndex = 14; this.linkLabel1.TabStop = true; this.linkLabel1.Text = "(c) cad 2015"; this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); @@ -251,30 +278,18 @@ private void InitializeComponent() // this.labelFootnote.Location = new System.Drawing.Point(314, 432); this.labelFootnote.Name = "labelFootnote"; - this.labelFootnote.Size = new System.Drawing.Size(253, 27); - this.labelFootnote.TabIndex = 29; + this.labelFootnote.Size = new System.Drawing.Size(216, 27); + this.labelFootnote.TabIndex = 16; this.labelFootnote.Text = "label3"; // - // numericUpDownLowerTEffU - // - this.numericUpDownLowerTEffU.Location = new System.Drawing.Point(73, 19); - this.numericUpDownLowerTEffU.Name = "numericUpDownLowerTEffU"; - this.numericUpDownLowerTEffU.Size = new System.Drawing.Size(45, 20); - this.numericUpDownLowerTEffU.TabIndex = 12; - this.numericUpDownLowerTEffU.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // label3 + // labelVersion // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(57, 21); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(10, 13); - this.label3.TabIndex = 13; - this.label3.Text = "-"; + this.labelVersion.Location = new System.Drawing.Point(536, 438); + this.labelVersion.Name = "labelVersion"; + this.labelVersion.Size = new System.Drawing.Size(35, 13); + this.labelVersion.TabIndex = 20; + this.labelVersion.Text = "ver"; + this.labelVersion.TextAlign = System.Drawing.ContentAlignment.TopRight; // // statIOTorpor // @@ -285,7 +300,7 @@ private void InitializeComponent() this.statIOTorpor.Percent = false; this.statIOTorpor.PostTame = true; this.statIOTorpor.Size = new System.Drawing.Size(295, 45); - this.statIOTorpor.TabIndex = 20; + this.statIOTorpor.TabIndex = 9; // // statIOSpeed // @@ -296,7 +311,7 @@ private void InitializeComponent() this.statIOSpeed.Percent = false; this.statIOSpeed.PostTame = true; this.statIOSpeed.Size = new System.Drawing.Size(295, 45); - this.statIOSpeed.TabIndex = 19; + this.statIOSpeed.TabIndex = 8; this.statIOSpeed.Click += new System.EventHandler(this.statIO_Click); // // statIODamage @@ -308,7 +323,7 @@ private void InitializeComponent() this.statIODamage.Percent = false; this.statIODamage.PostTame = true; this.statIODamage.Size = new System.Drawing.Size(295, 45); - this.statIODamage.TabIndex = 18; + this.statIODamage.TabIndex = 7; this.statIODamage.Click += new System.EventHandler(this.statIO_Click); // // statIOWeight @@ -320,7 +335,7 @@ private void InitializeComponent() this.statIOWeight.Percent = false; this.statIOWeight.PostTame = true; this.statIOWeight.Size = new System.Drawing.Size(295, 45); - this.statIOWeight.TabIndex = 17; + this.statIOWeight.TabIndex = 6; this.statIOWeight.Click += new System.EventHandler(this.statIO_Click); // // statIOFood @@ -332,7 +347,7 @@ private void InitializeComponent() this.statIOFood.Percent = false; this.statIOFood.PostTame = true; this.statIOFood.Size = new System.Drawing.Size(295, 45); - this.statIOFood.TabIndex = 16; + this.statIOFood.TabIndex = 5; this.statIOFood.Click += new System.EventHandler(this.statIO_Click); // // statIOOxygen @@ -344,7 +359,7 @@ private void InitializeComponent() this.statIOOxygen.Percent = false; this.statIOOxygen.PostTame = true; this.statIOOxygen.Size = new System.Drawing.Size(295, 45); - this.statIOOxygen.TabIndex = 15; + this.statIOOxygen.TabIndex = 4; this.statIOOxygen.Click += new System.EventHandler(this.statIO_Click); // // statIOStamina @@ -356,7 +371,7 @@ private void InitializeComponent() this.statIOStamina.Percent = false; this.statIOStamina.PostTame = true; this.statIOStamina.Size = new System.Drawing.Size(295, 45); - this.statIOStamina.TabIndex = 14; + this.statIOStamina.TabIndex = 3; this.statIOStamina.Click += new System.EventHandler(this.statIO_Click); // // statIOHealth @@ -368,7 +383,7 @@ private void InitializeComponent() this.statIOHealth.Percent = false; this.statIOHealth.PostTame = true; this.statIOHealth.Size = new System.Drawing.Size(295, 45); - this.statIOHealth.TabIndex = 12; + this.statIOHealth.TabIndex = 2; this.statIOHealth.Click += new System.EventHandler(this.statIO_Click); // // Form1 @@ -376,7 +391,8 @@ private void InitializeComponent() this.AcceptButton = this.buttonCalculate; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(650, 460); + this.ClientSize = new System.Drawing.Size(660, 468); + this.Controls.Add(this.labelVersion); this.Controls.Add(this.labelFootnote); this.Controls.Add(this.linkLabel1); this.Controls.Add(this.buttonCopyClipboard); @@ -403,11 +419,11 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLowerTEffL)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLowerTEffU)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevel)).EndInit(); this.groupBoxLevel.ResumeLayout(false); this.groupBoxPossibilities.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLowerTEffU)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -442,6 +458,7 @@ private void InitializeComponent() private System.Windows.Forms.Label labelFootnote; private System.Windows.Forms.Label label3; private System.Windows.Forms.NumericUpDown numericUpDownLowerTEffU; + private System.Windows.Forms.Label labelVersion; } } diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs index 0c9cecbb..af05378c 100644 --- a/ARKBreedingStats/Form1.cs +++ b/ARKBreedingStats/Form1.cs @@ -49,6 +49,7 @@ private void Form1_Load(object sender, EventArgs e) statIOs[6].Percent = true; loadFile(); comboBoxCreatures.SelectedIndex = 0; + labelVersion.Text = "v0.6"; } private void clearAll() @@ -113,7 +114,8 @@ private void buttonCalculate_Click(object sender, EventArgs e) } else { continue; } } - else { + else + { // if tamingEff < lowerBound, break, as in this loop it's getting only smaller break; } @@ -143,6 +145,7 @@ private void buttonCalculate_Click(object sender, EventArgs e) { this.numericUpDownLevel.BackColor = Color.LightSalmon; results.Clear(); + resultsValid = false; } else { @@ -159,7 +162,8 @@ private void buttonCalculate_Click(object sender, EventArgs e) { for (int erf = 0; erf < results[statWithEff[et]].Count; erf++) { - if (results[statWithEff[es]][ere][2] == results[statWithEff[et]][erf][2]) + // efficiency-calculation can be a bit off due to rounding, so treat them as equal when diff<0.002 + if (Math.Abs(results[statWithEff[es]][ere][2] - results[statWithEff[et]][erf][2]) < 0.002) { // if entry is not yet in whitelist, add it if (equalEffs1.IndexOf(ere) == -1) { equalEffs1.Add(ere); } @@ -207,6 +211,7 @@ private void buttonCalculate_Click(object sender, EventArgs e) if (maxLW2 < 0 || maxLD2 < 0) { this.numericUpDownLevel.BackColor = Color.LightSalmon; + statIOs[7].Warning = 2; results[s].Clear(); break; } @@ -215,14 +220,13 @@ private void buttonCalculate_Click(object sender, EventArgs e) } } - if (s < results.Count && results[s].Count > 0) + if (results[s].Count > 0) { - setPossibility(s, 0); - if (results[s].Count == 1) - { - statIOs[s].Warning = 0; - } - else + // display result with most levels in wild (most probable for the stats getting not unique results here) + int r = 0; + if (results[s][0][2] == 0) { r = results[s].Count - 1; } + setPossibility(s, r); + if (results[s].Count > 1) { statIOs[s].Warning = 1; } @@ -268,7 +272,7 @@ private void buttonCalculate_Click(object sender, EventArgs e) } if (!postTamed) { - labelFootnote.Text = "* Creature is not yet tamed and gets bonus-level which are added to the breeding values"; + labelFootnote.Text = "*Creature is not yet tamed and may get better values then."; } } @@ -432,5 +436,14 @@ private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs { System.Diagnostics.Process.Start(e.Link.LinkData.ToString()); } + + private void numericUpDown_Enter(object sender, EventArgs e) + { + NumericUpDown n = (NumericUpDown)sender; + if (n != null) + { + n.Select(0, n.Text.Length); + } + } } } diff --git a/ARKBreedingStats/StatIO.cs b/ARKBreedingStats/StatIO.cs index d1c7c3f4..5f9c6e28 100644 --- a/ARKBreedingStats/StatIO.cs +++ b/ARKBreedingStats/StatIO.cs @@ -86,7 +86,7 @@ public double BreedingValue { set { - if (value > 0) { this.labelBValue.Text = Math.Round((percent ? 100 : 1) * value, 1).ToString() + (percent ? " %" : "") + (postTame ? "" : "*"); } + if (value > 0) { this.labelBValue.Text = Math.Round((percent ? 100 : 1) * value, 1).ToString() + (percent ? " %" : "") + (postTame ? "" : "+*"); } else { this.labelBValue.Text = "error"; } } }