diff --git a/ARKBreedingStats/Creature.cs b/ARKBreedingStats/Creature.cs index ab81c23f..a82ca643 100644 --- a/ARKBreedingStats/Creature.cs +++ b/ARKBreedingStats/Creature.cs @@ -53,7 +53,7 @@ public Creature() { } - public Creature(string species, string name, string owner, Gender gender, int[] levelsWild, int[] levelsDom = null, double tamingEff = 0, bool isBred = false) + public Creature(string species, string name, string owner, Gender gender, int[] levelsWild, int[] levelsDom = null, double tamingEff = 0, bool isBred = false, double imprinting = 0) { this.species = species; this.name = name; @@ -66,6 +66,7 @@ public Creature(string species, string name, string owner, Gender gender, int[] else this.tamingEff = tamingEff; this.isBred = isBred; + imprintingBonus = imprinting; this.status = CreatureStatus.Available; calculateLevelFound(); } diff --git a/ARKBreedingStats/Extraction.cs b/ARKBreedingStats/Extraction.cs index 84835123..9ad143e5 100644 --- a/ARKBreedingStats/Extraction.cs +++ b/ARKBreedingStats/Extraction.cs @@ -19,7 +19,7 @@ class Extraction public int[] levelDomFromTorporAndTotalRange = new int[] { 0, 0 }, levelWildFromTorporRange = new int[] { 0, 0 }; // 0: min, 1: max public int[] lowerBoundWilds = new int[8], lowerBoundDoms = new int[8], upperBoundDoms = new int[8]; public int wildFreeMax = 0, domFreeMin = 0, domFreeMax = 0; // unassigned levels - public double imprintingBonusMin, imprintingBonusMax; + public double imprintingBonus; public Extraction() { @@ -54,8 +54,7 @@ public void Clear() } validResults = false; statsWithEff.Clear(); - imprintingBonusMax = 0; - imprintingBonusMin = 0; + imprintingBonus = 0; } public double uniqueTE() @@ -163,16 +162,7 @@ public int filterResultsByFixed(int dontFix = -1) return -1; // -1 is good for this function. A value >=0 means that stat is faulty } - public double ImprintingBonus - { - set - { - imprintingBonusMin = Math.Round(value) - .5; - imprintingBonusMax = Math.Round(value) + .5; - } - } - - public void extractLevels(int speciesI, int level, List statIOs, double lowerTEBound, double upperTEBound, bool autoDetectTamed, bool tamed, bool justTamed, bool bred, double imprintingBonus, double imprintingBonusMultiplier) + public void extractLevels(int speciesI, int level, List statIOs, double lowerTEBound, double upperTEBound, bool autoDetectTamed, bool tamed, bool justTamed, bool bred, double imprintingBonusRounded, double imprintingBonusMultiplier) { validResults = true; if (autoDetectTamed) @@ -188,8 +178,11 @@ public void extractLevels(int speciesI, int level, List statIOs, double // needed to handle Torpor-bug this.justTamed = justTamed; - imprintingBonusMin = 0;// imprintingBonus - .005; //TODO add handling of imprinting - imprintingBonusMax = 0;// imprintingBonus + .005; + if (Values.V.species[speciesI].breeding != null) + imprintingBonus = Math.Round(imprintingBonusRounded * Values.V.species[speciesI].breeding.maturationTimeAdjusted / 14400) * 14400 / Values.V.species[speciesI].breeding.maturationTimeAdjusted; + else + imprintingBonus = 0; + double imprintingMultiplier = (1 + imprintingBonus * imprintingBonusMultiplier * .2); // Torpor-bug: if bonus levels are added due to taming-effectiveness, torpor is too high // instead of giving only the TE-bonus, the original wild levels W are added a second time to the torporlevels @@ -209,8 +202,8 @@ public void extractLevels(int speciesI, int level, List statIOs, double torporLevelTamingMultMax = (2 + upperTEBound) / (4 + upperTEBound); torporLevelTamingMultMin = (2 + lowerTEBound) / (4 + lowerTEBound); } - levelWildFromTorporRange[0] = (int)Math.Round((statIOs[7].Input - (postTamed ? Values.V.species[speciesI].stats[7].AddWhenTamed : 0) - Values.V.species[speciesI].stats[7].BaseValue) * torporLevelTamingMultMin / (Values.V.species[speciesI].stats[7].BaseValue * Values.V.species[speciesI].stats[7].IncPerWildLevel), 0); - levelWildFromTorporRange[1] = (int)Math.Round((statIOs[7].Input - (postTamed ? Values.V.species[speciesI].stats[7].AddWhenTamed : 0) - Values.V.species[speciesI].stats[7].BaseValue) * torporLevelTamingMultMax / (Values.V.species[speciesI].stats[7].BaseValue * Values.V.species[speciesI].stats[7].IncPerWildLevel), 0); + levelWildFromTorporRange[0] = (int)Math.Round((statIOs[7].Input / imprintingMultiplier - (postTamed ? Values.V.species[speciesI].stats[7].AddWhenTamed : 0) - Values.V.species[speciesI].stats[7].BaseValue) * torporLevelTamingMultMin / (Values.V.species[speciesI].stats[7].BaseValue * Values.V.species[speciesI].stats[7].IncPerWildLevel), 0); + levelWildFromTorporRange[1] = (int)Math.Round((statIOs[7].Input / imprintingMultiplier - (postTamed ? Values.V.species[speciesI].stats[7].AddWhenTamed : 0) - Values.V.species[speciesI].stats[7].BaseValue) * torporLevelTamingMultMax / (Values.V.species[speciesI].stats[7].BaseValue * Values.V.species[speciesI].stats[7].IncPerWildLevel), 0); if (!runTorporRangeAgain && !justTamed && levelWildFromTorporRange[0] > level) { justTamed = true; @@ -267,7 +260,8 @@ public void extractLevels(int speciesI, int level, List statIOs, double for (int w = 0; w < maxLW + 1; w++) { - valueWODom = Values.V.species[speciesI].stats[s].BaseValue * (1 + Values.V.species[speciesI].stats[s].IncPerWildLevel * w) * (1 + imprintingBonusMin * imprintingBonusMultiplier * .2) + (postTamed ? Values.V.species[speciesI].stats[s].AddWhenTamed : 0); + // imprinting bonus is applied to all stats except stamina (s==1) and oxygen (s==2) + valueWODom = Values.V.species[speciesI].stats[s].BaseValue * (1 + Values.V.species[speciesI].stats[s].IncPerWildLevel * w) * (s == 1 || s == 2 ? 1 : imprintingMultiplier) + (postTamed ? Values.V.species[speciesI].stats[s].AddWhenTamed : 0); for (int d = 0; d < maxLD + 1; d++) { if (withTEff) diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs index d3c34120..e6bc0835 100644 --- a/ARKBreedingStats/Form1.Designer.cs +++ b/ARKBreedingStats/Form1.Designer.cs @@ -107,43 +107,24 @@ private void InitializeComponent() this.tabPageStatTesting = new System.Windows.Forms.TabPage(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.labelTesterTotalLevel = new System.Windows.Forms.Label(); - this.statTestingHealth = new ARKBreedingStats.StatIO(); this.labelDomLevelSum = new System.Windows.Forms.Label(); - this.statTestingStamina = new ARKBreedingStats.StatIO(); - this.statTestingOxygen = new ARKBreedingStats.StatIO(); this.labelNotTamedNoteTesting = new System.Windows.Forms.Label(); - this.statTestingFood = new ARKBreedingStats.StatIO(); this.label10 = new System.Windows.Forms.Label(); - this.statTestingWeight = new ARKBreedingStats.StatIO(); - this.statTestingDamage = new ARKBreedingStats.StatIO(); - this.statTestingSpeed = new ARKBreedingStats.StatIO(); - this.statTestingTorpor = new ARKBreedingStats.StatIO(); this.groupBox5 = new System.Windows.Forms.GroupBox(); this.labelCurrentTesterCreature = new System.Windows.Forms.Label(); this.labelTestingInfo = new System.Windows.Forms.Label(); - this.creatureInfoInputTester = new ARKBreedingStats.CreatureInfoInput(); this.tabPageExtractor = new System.Windows.Forms.TabPage(); this.groupBoxTamingInfo = new System.Windows.Forms.GroupBox(); this.labelTamingInfo = new System.Windows.Forms.Label(); this.button2TamingCalc = new System.Windows.Forms.Button(); - this.label6 = new System.Windows.Forms.Label(); this.labelImprintingBonus = new System.Windows.Forms.Label(); this.numericUpDownImprintingBonusExtractor = new System.Windows.Forms.NumericUpDown(); this.btnReadValuesFromArk = new System.Windows.Forms.Button(); this.groupBox7 = new System.Windows.Forms.GroupBox(); - this.statIOHealth = new ARKBreedingStats.StatIO(); - this.statIODamage = new ARKBreedingStats.StatIO(); - this.statIOTorpor = new ARKBreedingStats.StatIO(); - this.statIOWeight = new ARKBreedingStats.StatIO(); - this.statIOSpeed = new ARKBreedingStats.StatIO(); - this.statIOFood = new ARKBreedingStats.StatIO(); - this.statIOOxygen = new ARKBreedingStats.StatIO(); - this.statIOStamina = new ARKBreedingStats.StatIO(); this.buttonExtract = new System.Windows.Forms.Button(); this.checkBoxQuickWildCheck = new System.Windows.Forms.CheckBox(); this.buttonHelp = new System.Windows.Forms.Button(); this.labelErrorHelp = new System.Windows.Forms.Label(); - this.creatureInfoInputExtractor = new ARKBreedingStats.CreatureInfoInput(); this.tabPageLibrary = new System.Windows.Forms.TabPage(); this.tableLayoutPanelLibrary = new System.Windows.Forms.TableLayoutPanel(); this.tabControlLibFilter = new System.Windows.Forms.TabControl(); @@ -194,21 +175,17 @@ private void InitializeComponent() this.editAllSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItemRemove = new System.Windows.Forms.ToolStripMenuItem(); - this.creatureBoxListView = new ARKBreedingStats.CreatureBox(); this.tabPageBreedingPlan = new System.Windows.Forms.TabPage(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.listViewSpeciesBP = new System.Windows.Forms.ListView(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.breedingPlan1 = new ARKBreedingStats.BreedingPlan(); this.buttonDetBestBreeding = new System.Windows.Forms.Button(); this.groupBox4 = new System.Windows.Forms.GroupBox(); this.radioButtonBPTopStatsCn = new System.Windows.Forms.RadioButton(); this.radioButtonBPHighStats = new System.Windows.Forms.RadioButton(); this.radioButtonBPTopStats = new System.Windows.Forms.RadioButton(); - this.statWeighting1 = new ARKBreedingStats.StatWeighting(); this.tabPagePedigree = new System.Windows.Forms.TabPage(); - this.pedigree1 = new ARKBreedingStats.Pedigree(); this.TabPageOCR = new System.Windows.Forms.TabPage(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.OCRDebugLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); @@ -220,11 +197,8 @@ private void InitializeComponent() this.txtOCROutput = new System.Windows.Forms.TextBox(); this.btnTestOCR = new System.Windows.Forms.Button(); this.tabPageTimer = new System.Windows.Forms.TabPage(); - this.timerList1 = new ARKBreedingStats.TimerList(); this.tabPagePlayerTribes = new System.Windows.Forms.TabPage(); - this.tribesControl1 = new ARKBreedingStats.TribesControl(); this.tabPageTaming = new System.Windows.Forms.TabPage(); - this.tamingControl1 = new ARKBreedingStats.TamingControl(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripProgressBar1 = new System.Windows.Forms.ToolStripProgressBar(); this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -242,6 +216,32 @@ private void InitializeComponent() this.toolStripButtonExtract = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonAddPlayer = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonAddTribe = new System.Windows.Forms.ToolStripButton(); + this.labelImprintingFailInfo = new System.Windows.Forms.Label(); + this.statTestingHealth = new ARKBreedingStats.StatIO(); + this.statTestingStamina = new ARKBreedingStats.StatIO(); + this.statTestingOxygen = new ARKBreedingStats.StatIO(); + this.statTestingFood = new ARKBreedingStats.StatIO(); + this.statTestingWeight = new ARKBreedingStats.StatIO(); + this.statTestingDamage = new ARKBreedingStats.StatIO(); + this.statTestingSpeed = new ARKBreedingStats.StatIO(); + this.statTestingTorpor = new ARKBreedingStats.StatIO(); + this.creatureInfoInputTester = new ARKBreedingStats.CreatureInfoInput(); + this.statIOHealth = new ARKBreedingStats.StatIO(); + this.statIODamage = new ARKBreedingStats.StatIO(); + this.statIOTorpor = new ARKBreedingStats.StatIO(); + this.statIOWeight = new ARKBreedingStats.StatIO(); + this.statIOSpeed = new ARKBreedingStats.StatIO(); + this.statIOFood = new ARKBreedingStats.StatIO(); + this.statIOOxygen = new ARKBreedingStats.StatIO(); + this.statIOStamina = new ARKBreedingStats.StatIO(); + this.creatureInfoInputExtractor = new ARKBreedingStats.CreatureInfoInput(); + this.creatureBoxListView = new ARKBreedingStats.CreatureBox(); + this.breedingPlan1 = new ARKBreedingStats.BreedingPlan(); + this.statWeighting1 = new ARKBreedingStats.StatWeighting(); + this.pedigree1 = new ARKBreedingStats.Pedigree(); + this.timerList1 = new ARKBreedingStats.TimerList(); + this.tribesControl1 = new ARKBreedingStats.TribesControl(); + this.tamingControl1 = new ARKBreedingStats.TamingControl(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownImprintingBonusTester)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NumericUpDownTestingTE)).BeginInit(); @@ -321,7 +321,7 @@ private void InitializeComponent() this.checkBoxJustTamed.Location = new System.Drawing.Point(321, 195); this.checkBoxJustTamed.Name = "checkBoxJustTamed"; this.checkBoxJustTamed.Size = new System.Drawing.Size(177, 17); - this.checkBoxJustTamed.TabIndex = 7; + this.checkBoxJustTamed.TabIndex = 9; this.checkBoxJustTamed.Text = "Since Taming no Server-Restart"; this.checkBoxJustTamed.UseVisualStyleBackColor = true; this.checkBoxJustTamed.CheckedChanged += new System.EventHandler(this.checkBoxJustTamed_CheckedChanged); @@ -450,7 +450,7 @@ private void InitializeComponent() // this.labelImprintingTester.AutoSize = true; this.labelImprintingTester.Enabled = false; - this.labelImprintingTester.Location = new System.Drawing.Point(72, 70); + this.labelImprintingTester.Location = new System.Drawing.Point(76, 70); this.labelImprintingTester.Name = "labelImprintingTester"; this.labelImprintingTester.Size = new System.Drawing.Size(96, 13); this.labelImprintingTester.TabIndex = 5; @@ -458,11 +458,11 @@ private void InitializeComponent() // // numericUpDownImprintingBonusTester // - this.numericUpDownImprintingBonusTester.DecimalPlaces = 2; + this.numericUpDownImprintingBonusTester.DecimalPlaces = 3; this.numericUpDownImprintingBonusTester.Enabled = false; this.numericUpDownImprintingBonusTester.Location = new System.Drawing.Point(6, 68); this.numericUpDownImprintingBonusTester.Name = "numericUpDownImprintingBonusTester"; - this.numericUpDownImprintingBonusTester.Size = new System.Drawing.Size(60, 20); + this.numericUpDownImprintingBonusTester.Size = new System.Drawing.Size(64, 20); this.numericUpDownImprintingBonusTester.TabIndex = 4; this.numericUpDownImprintingBonusTester.ValueChanged += new System.EventHandler(this.numericUpDownImprintingBonusTester_ValueChanged); // @@ -681,7 +681,7 @@ private void InitializeComponent() this.labelDoc.Location = new System.Drawing.Point(556, 341); this.labelDoc.Name = "labelDoc"; this.labelDoc.Size = new System.Drawing.Size(177, 172); - this.labelDoc.TabIndex = 12; + this.labelDoc.TabIndex = 15; this.labelDoc.Text = resources.GetString("labelDoc.Text"); // // labelFootnote @@ -949,7 +949,7 @@ private void InitializeComponent() this.panelWildTamedAuto.Location = new System.Drawing.Point(321, 164); this.panelWildTamedAuto.Name = "panelWildTamedAuto"; this.panelWildTamedAuto.Size = new System.Drawing.Size(180, 25); - this.panelWildTamedAuto.TabIndex = 6; + this.panelWildTamedAuto.TabIndex = 8; // // radioButtonTamed // @@ -1042,24 +1042,6 @@ private void InitializeComponent() this.labelTesterTotalLevel.TabIndex = 49; this.labelTesterTotalLevel.Text = "Total Level"; // - // statTestingHealth - // - this.statTestingHealth.BackColor = System.Drawing.Color.Transparent; - this.statTestingHealth.BreedingValue = 0D; - this.statTestingHealth.DomLevelZero = false; - this.statTestingHealth.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingHealth.Input = 100D; - this.statTestingHealth.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingHealth.LevelDom = 0; - this.statTestingHealth.LevelWild = 0; - this.statTestingHealth.Location = new System.Drawing.Point(6, 32); - this.statTestingHealth.Name = "statTestingHealth"; - this.statTestingHealth.Percent = false; - this.statTestingHealth.Size = new System.Drawing.Size(295, 50); - this.statTestingHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingHealth.TabIndex = 0; - this.statTestingHealth.Unknown = false; - // // labelDomLevelSum // this.labelDomLevelSum.AutoSize = true; @@ -1069,42 +1051,6 @@ private void InitializeComponent() this.labelDomLevelSum.TabIndex = 46; this.labelDomLevelSum.Text = "Dom Levels"; // - // statTestingStamina - // - this.statTestingStamina.BackColor = System.Drawing.Color.Transparent; - this.statTestingStamina.BreedingValue = 0D; - this.statTestingStamina.DomLevelZero = false; - this.statTestingStamina.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingStamina.Input = 100D; - this.statTestingStamina.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingStamina.LevelDom = 0; - this.statTestingStamina.LevelWild = 0; - this.statTestingStamina.Location = new System.Drawing.Point(6, 82); - this.statTestingStamina.Name = "statTestingStamina"; - this.statTestingStamina.Percent = false; - this.statTestingStamina.Size = new System.Drawing.Size(295, 50); - this.statTestingStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingStamina.TabIndex = 1; - this.statTestingStamina.Unknown = false; - // - // statTestingOxygen - // - this.statTestingOxygen.BackColor = System.Drawing.Color.Transparent; - this.statTestingOxygen.BreedingValue = 0D; - this.statTestingOxygen.DomLevelZero = false; - this.statTestingOxygen.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingOxygen.Input = 100D; - this.statTestingOxygen.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingOxygen.LevelDom = 0; - this.statTestingOxygen.LevelWild = 0; - this.statTestingOxygen.Location = new System.Drawing.Point(6, 132); - this.statTestingOxygen.Name = "statTestingOxygen"; - this.statTestingOxygen.Percent = false; - this.statTestingOxygen.Size = new System.Drawing.Size(295, 50); - this.statTestingOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingOxygen.TabIndex = 2; - this.statTestingOxygen.Unknown = false; - // // labelNotTamedNoteTesting // this.labelNotTamedNoteTesting.Location = new System.Drawing.Point(6, 469); @@ -1114,24 +1060,6 @@ private void InitializeComponent() this.labelNotTamedNoteTesting.Text = "*Creature is not yet tamed and may get better values then."; this.labelNotTamedNoteTesting.Visible = false; // - // statTestingFood - // - this.statTestingFood.BackColor = System.Drawing.Color.Transparent; - this.statTestingFood.BreedingValue = 0D; - this.statTestingFood.DomLevelZero = false; - this.statTestingFood.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingFood.Input = 100D; - this.statTestingFood.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingFood.LevelDom = 0; - this.statTestingFood.LevelWild = 0; - this.statTestingFood.Location = new System.Drawing.Point(6, 182); - this.statTestingFood.Name = "statTestingFood"; - this.statTestingFood.Percent = false; - this.statTestingFood.Size = new System.Drawing.Size(295, 50); - this.statTestingFood.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingFood.TabIndex = 3; - this.statTestingFood.Unknown = false; - // // label10 // this.label10.AutoSize = true; @@ -1141,78 +1069,6 @@ private void InitializeComponent() this.label10.TabIndex = 36; this.label10.Text = "Current Value"; // - // statTestingWeight - // - this.statTestingWeight.BackColor = System.Drawing.Color.Transparent; - this.statTestingWeight.BreedingValue = 0D; - this.statTestingWeight.DomLevelZero = false; - this.statTestingWeight.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingWeight.Input = 100D; - this.statTestingWeight.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingWeight.LevelDom = 0; - this.statTestingWeight.LevelWild = 0; - this.statTestingWeight.Location = new System.Drawing.Point(6, 232); - this.statTestingWeight.Name = "statTestingWeight"; - this.statTestingWeight.Percent = false; - this.statTestingWeight.Size = new System.Drawing.Size(295, 50); - this.statTestingWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingWeight.TabIndex = 4; - this.statTestingWeight.Unknown = false; - // - // statTestingDamage - // - this.statTestingDamage.BackColor = System.Drawing.Color.Transparent; - this.statTestingDamage.BreedingValue = 0D; - this.statTestingDamage.DomLevelZero = false; - this.statTestingDamage.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingDamage.Input = 100D; - this.statTestingDamage.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingDamage.LevelDom = 0; - this.statTestingDamage.LevelWild = 0; - this.statTestingDamage.Location = new System.Drawing.Point(6, 282); - this.statTestingDamage.Name = "statTestingDamage"; - this.statTestingDamage.Percent = false; - this.statTestingDamage.Size = new System.Drawing.Size(295, 50); - this.statTestingDamage.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingDamage.TabIndex = 5; - this.statTestingDamage.Unknown = false; - // - // statTestingSpeed - // - this.statTestingSpeed.BackColor = System.Drawing.Color.Transparent; - this.statTestingSpeed.BreedingValue = 0D; - this.statTestingSpeed.DomLevelZero = false; - this.statTestingSpeed.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingSpeed.Input = 100D; - this.statTestingSpeed.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingSpeed.LevelDom = 0; - this.statTestingSpeed.LevelWild = 0; - this.statTestingSpeed.Location = new System.Drawing.Point(6, 332); - this.statTestingSpeed.Name = "statTestingSpeed"; - this.statTestingSpeed.Percent = false; - this.statTestingSpeed.Size = new System.Drawing.Size(295, 50); - this.statTestingSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingSpeed.TabIndex = 6; - this.statTestingSpeed.Unknown = false; - // - // statTestingTorpor - // - this.statTestingTorpor.BackColor = System.Drawing.Color.Transparent; - this.statTestingTorpor.BreedingValue = 0D; - this.statTestingTorpor.DomLevelZero = false; - this.statTestingTorpor.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingTorpor.Input = 100D; - this.statTestingTorpor.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingTorpor.LevelDom = 0; - this.statTestingTorpor.LevelWild = 0; - this.statTestingTorpor.Location = new System.Drawing.Point(6, 382); - this.statTestingTorpor.Name = "statTestingTorpor"; - this.statTestingTorpor.Percent = false; - this.statTestingTorpor.Size = new System.Drawing.Size(295, 50); - this.statTestingTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingTorpor.TabIndex = 7; - this.statTestingTorpor.Unknown = false; - // // groupBox5 // this.groupBox5.Controls.Add(this.labelCurrentTesterCreature); @@ -1242,33 +1098,12 @@ private void InitializeComponent() this.labelTestingInfo.Text = "Insert Numbers to see what value the creature will have.\r\nChoose Edit in the cont" + "ext-menu of a creature to insert its numbers here. You can also save it back aft" + "er changing."; - // - // creatureInfoInputTester - // - this.creatureInfoInputTester.Cooldown = new System.DateTime(((long)(0))); - this.creatureInfoInputTester.CreatureGender = ARKBreedingStats.Gender.Unknown; - this.creatureInfoInputTester.CreatureName = ""; - this.creatureInfoInputTester.CreatureNote = ""; - this.creatureInfoInputTester.CreatureOwner = ""; - this.creatureInfoInputTester.CreatureStatus = ARKBreedingStats.CreatureStatus.Available; - this.creatureInfoInputTester.domesticatedAt = new System.DateTime(2016, 7, 5, 13, 11, 41, 997); - this.creatureInfoInputTester.father = null; - this.creatureInfoInputTester.Grown = new System.DateTime(((long)(0))); - this.creatureInfoInputTester.Location = new System.Drawing.Point(321, 305); - this.creatureInfoInputTester.mother = null; - this.creatureInfoInputTester.Name = "creatureInfoInputTester"; - this.creatureInfoInputTester.Neutered = false; - this.creatureInfoInputTester.Size = new System.Drawing.Size(229, 245); - this.creatureInfoInputTester.TabIndex = 4; - this.creatureInfoInputTester.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInputTester_Add2Library_Clicked); - this.creatureInfoInputTester.Save2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Save2LibraryClickedEventHandler(this.creatureInfoInputTester_Save2Library_Clicked); - this.creatureInfoInputTester.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); // // tabPageExtractor // + this.tabPageExtractor.Controls.Add(this.labelImprintingFailInfo); this.tabPageExtractor.Controls.Add(this.groupBoxTamingInfo); this.tabPageExtractor.Controls.Add(this.button2TamingCalc); - this.tabPageExtractor.Controls.Add(this.label6); this.tabPageExtractor.Controls.Add(this.labelImprintingBonus); this.tabPageExtractor.Controls.Add(this.numericUpDownImprintingBonusExtractor); this.tabPageExtractor.Controls.Add(this.btnReadValuesFromArk); @@ -1318,42 +1153,31 @@ private void InitializeComponent() this.button2TamingCalc.Location = new System.Drawing.Point(556, 32); this.button2TamingCalc.Name = "button2TamingCalc"; this.button2TamingCalc.Size = new System.Drawing.Size(177, 23); - this.button2TamingCalc.TabIndex = 46; + this.button2TamingCalc.TabIndex = 13; this.button2TamingCalc.Text = "Taming Calculator"; this.button2TamingCalc.UseVisualStyleBackColor = true; this.button2TamingCalc.Visible = false; this.button2TamingCalc.Click += new System.EventHandler(this.button2TamingCalc_Click); - // - // label6 - // - this.label6.ForeColor = System.Drawing.Color.Maroon; - this.label6.Location = new System.Drawing.Point(321, 252); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(229, 59); - this.label6.TabIndex = 45; - this.label6.Text = "The Imprinting-Bonus cannot be handled by this tool yet. Extract the values of yo" + - "ur creatures before you start the imprinting-process."; // // labelImprintingBonus // this.labelImprintingBonus.AutoSize = true; - this.labelImprintingBonus.Enabled = false; - this.labelImprintingBonus.Location = new System.Drawing.Point(374, 140); + this.labelImprintingBonus.Location = new System.Drawing.Point(391, 140); this.labelImprintingBonus.Name = "labelImprintingBonus"; this.labelImprintingBonus.Size = new System.Drawing.Size(96, 13); - this.labelImprintingBonus.TabIndex = 44; + this.labelImprintingBonus.TabIndex = 7; this.labelImprintingBonus.Text = "% Imprinting Bonus"; this.labelImprintingBonus.Visible = false; // // numericUpDownImprintingBonusExtractor // - this.numericUpDownImprintingBonusExtractor.DecimalPlaces = 2; - this.numericUpDownImprintingBonusExtractor.Enabled = false; + this.numericUpDownImprintingBonusExtractor.DecimalPlaces = 3; this.numericUpDownImprintingBonusExtractor.Location = new System.Drawing.Point(321, 138); this.numericUpDownImprintingBonusExtractor.Name = "numericUpDownImprintingBonusExtractor"; - this.numericUpDownImprintingBonusExtractor.Size = new System.Drawing.Size(47, 20); - this.numericUpDownImprintingBonusExtractor.TabIndex = 43; + this.numericUpDownImprintingBonusExtractor.Size = new System.Drawing.Size(64, 20); + this.numericUpDownImprintingBonusExtractor.TabIndex = 6; this.numericUpDownImprintingBonusExtractor.Visible = false; + this.numericUpDownImprintingBonusExtractor.Enter += new System.EventHandler(this.numericUpDown_Enter); // // btnReadValuesFromArk // @@ -1387,174 +1211,23 @@ private void InitializeComponent() this.groupBox7.TabStop = false; this.groupBox7.Text = "Stats"; // - // statIOHealth + // buttonExtract // - this.statIOHealth.BackColor = System.Drawing.Color.Transparent; - this.statIOHealth.BreedingValue = 0D; - this.statIOHealth.DomLevelZero = false; - this.statIOHealth.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOHealth.Input = 100D; - this.statIOHealth.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOHealth.LevelDom = 0; - this.statIOHealth.LevelWild = 0; - this.statIOHealth.Location = new System.Drawing.Point(6, 32); - this.statIOHealth.Name = "statIOHealth"; - this.statIOHealth.Percent = false; - this.statIOHealth.Size = new System.Drawing.Size(295, 50); - this.statIOHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOHealth.TabIndex = 0; - this.statIOHealth.Unknown = false; - this.statIOHealth.Click += new System.EventHandler(this.statIO_Click); + this.buttonExtract.Location = new System.Drawing.Point(321, 218); + this.buttonExtract.Name = "buttonExtract"; + this.buttonExtract.Size = new System.Drawing.Size(229, 31); + this.buttonExtract.TabIndex = 10; + this.buttonExtract.Text = "Extract Level Distribution"; + this.buttonExtract.UseVisualStyleBackColor = true; + this.buttonExtract.Click += new System.EventHandler(this.buttonExtract_Click); // - // statIODamage - // - this.statIODamage.BackColor = System.Drawing.Color.Transparent; - this.statIODamage.BreedingValue = 0D; - this.statIODamage.DomLevelZero = false; - this.statIODamage.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIODamage.Input = 100D; - this.statIODamage.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIODamage.LevelDom = 0; - this.statIODamage.LevelWild = 0; - this.statIODamage.Location = new System.Drawing.Point(6, 282); - this.statIODamage.Name = "statIODamage"; - this.statIODamage.Percent = false; - this.statIODamage.Size = new System.Drawing.Size(295, 50); - this.statIODamage.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIODamage.TabIndex = 5; - this.statIODamage.Unknown = false; - this.statIODamage.Click += new System.EventHandler(this.statIO_Click); - // - // statIOTorpor - // - this.statIOTorpor.BackColor = System.Drawing.Color.Transparent; - this.statIOTorpor.BreedingValue = 0D; - this.statIOTorpor.DomLevelZero = false; - this.statIOTorpor.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOTorpor.Input = 100D; - this.statIOTorpor.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOTorpor.LevelDom = 0; - this.statIOTorpor.LevelWild = 0; - this.statIOTorpor.Location = new System.Drawing.Point(6, 382); - this.statIOTorpor.Name = "statIOTorpor"; - this.statIOTorpor.Percent = false; - this.statIOTorpor.Size = new System.Drawing.Size(295, 50); - this.statIOTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOTorpor.TabIndex = 7; - this.statIOTorpor.Unknown = false; - // - // statIOWeight - // - this.statIOWeight.BackColor = System.Drawing.Color.Transparent; - this.statIOWeight.BreedingValue = 0D; - this.statIOWeight.DomLevelZero = false; - this.statIOWeight.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOWeight.Input = 100D; - this.statIOWeight.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOWeight.LevelDom = 0; - this.statIOWeight.LevelWild = 0; - this.statIOWeight.Location = new System.Drawing.Point(6, 232); - this.statIOWeight.Name = "statIOWeight"; - this.statIOWeight.Percent = false; - this.statIOWeight.Size = new System.Drawing.Size(295, 50); - this.statIOWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOWeight.TabIndex = 4; - this.statIOWeight.Unknown = false; - this.statIOWeight.Click += new System.EventHandler(this.statIO_Click); - // - // statIOSpeed - // - this.statIOSpeed.BackColor = System.Drawing.Color.Transparent; - this.statIOSpeed.BreedingValue = 0D; - this.statIOSpeed.DomLevelZero = false; - this.statIOSpeed.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOSpeed.Input = 100D; - this.statIOSpeed.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOSpeed.LevelDom = 0; - this.statIOSpeed.LevelWild = 0; - this.statIOSpeed.Location = new System.Drawing.Point(6, 332); - this.statIOSpeed.Name = "statIOSpeed"; - this.statIOSpeed.Percent = false; - this.statIOSpeed.Size = new System.Drawing.Size(295, 50); - this.statIOSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOSpeed.TabIndex = 6; - this.statIOSpeed.Unknown = false; - this.statIOSpeed.Click += new System.EventHandler(this.statIO_Click); - // - // statIOFood - // - this.statIOFood.BackColor = System.Drawing.Color.Transparent; - this.statIOFood.BreedingValue = 0D; - this.statIOFood.DomLevelZero = false; - this.statIOFood.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOFood.Input = 100D; - this.statIOFood.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOFood.LevelDom = 0; - this.statIOFood.LevelWild = 0; - this.statIOFood.Location = new System.Drawing.Point(6, 182); - this.statIOFood.Name = "statIOFood"; - this.statIOFood.Percent = false; - this.statIOFood.Size = new System.Drawing.Size(295, 50); - this.statIOFood.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOFood.TabIndex = 3; - this.statIOFood.Unknown = false; - this.statIOFood.Click += new System.EventHandler(this.statIO_Click); - // - // statIOOxygen - // - this.statIOOxygen.BackColor = System.Drawing.Color.Transparent; - this.statIOOxygen.BreedingValue = 0D; - this.statIOOxygen.DomLevelZero = false; - this.statIOOxygen.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOOxygen.Input = 100D; - this.statIOOxygen.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOOxygen.LevelDom = 0; - this.statIOOxygen.LevelWild = 0; - this.statIOOxygen.Location = new System.Drawing.Point(6, 132); - this.statIOOxygen.Name = "statIOOxygen"; - this.statIOOxygen.Percent = false; - this.statIOOxygen.Size = new System.Drawing.Size(295, 50); - this.statIOOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOOxygen.TabIndex = 2; - this.statIOOxygen.Unknown = false; - this.statIOOxygen.Click += new System.EventHandler(this.statIO_Click); - // - // statIOStamina - // - this.statIOStamina.BackColor = System.Drawing.Color.Transparent; - this.statIOStamina.BreedingValue = 0D; - this.statIOStamina.DomLevelZero = false; - this.statIOStamina.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOStamina.Input = 100D; - this.statIOStamina.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOStamina.LevelDom = 0; - this.statIOStamina.LevelWild = 0; - this.statIOStamina.Location = new System.Drawing.Point(6, 82); - this.statIOStamina.Name = "statIOStamina"; - this.statIOStamina.Percent = false; - this.statIOStamina.Size = new System.Drawing.Size(295, 50); - this.statIOStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOStamina.TabIndex = 1; - this.statIOStamina.Unknown = false; - this.statIOStamina.Click += new System.EventHandler(this.statIO_Click); - // - // buttonExtract - // - this.buttonExtract.Location = new System.Drawing.Point(321, 218); - this.buttonExtract.Name = "buttonExtract"; - this.buttonExtract.Size = new System.Drawing.Size(229, 31); - this.buttonExtract.TabIndex = 8; - this.buttonExtract.Text = "Extract Level Distribution"; - this.buttonExtract.UseVisualStyleBackColor = true; - this.buttonExtract.Click += new System.EventHandler(this.buttonExtract_Click); - // - // checkBoxQuickWildCheck + // checkBoxQuickWildCheck // this.checkBoxQuickWildCheck.AutoSize = true; this.checkBoxQuickWildCheck.Location = new System.Drawing.Point(556, 8); this.checkBoxQuickWildCheck.Name = "checkBoxQuickWildCheck"; this.checkBoxQuickWildCheck.Size = new System.Drawing.Size(155, 17); - this.checkBoxQuickWildCheck.TabIndex = 13; + this.checkBoxQuickWildCheck.TabIndex = 12; this.checkBoxQuickWildCheck.Text = "Quick Wild-Creature Check"; this.checkBoxQuickWildCheck.UseVisualStyleBackColor = true; this.checkBoxQuickWildCheck.CheckedChanged += new System.EventHandler(this.checkBoxQuickWildCheck_CheckedChanged); @@ -1564,7 +1237,7 @@ private void InitializeComponent() this.buttonHelp.Location = new System.Drawing.Point(559, 531); this.buttonHelp.Name = "buttonHelp"; this.buttonHelp.Size = new System.Drawing.Size(202, 30); - this.buttonHelp.TabIndex = 10; + this.buttonHelp.TabIndex = 14; this.buttonHelp.Text = "Stat-boxes are red: Online-Help"; this.buttonHelp.UseVisualStyleBackColor = true; this.buttonHelp.Visible = false; @@ -1578,26 +1251,6 @@ private void InitializeComponent() this.labelErrorHelp.TabIndex = 40; this.labelErrorHelp.Text = resources.GetString("labelErrorHelp.Text"); // - // creatureInfoInputExtractor - // - this.creatureInfoInputExtractor.Cooldown = new System.DateTime(((long)(0))); - this.creatureInfoInputExtractor.CreatureGender = ARKBreedingStats.Gender.Unknown; - this.creatureInfoInputExtractor.CreatureName = ""; - this.creatureInfoInputExtractor.CreatureNote = ""; - this.creatureInfoInputExtractor.CreatureOwner = ""; - this.creatureInfoInputExtractor.CreatureStatus = ARKBreedingStats.CreatureStatus.Available; - this.creatureInfoInputExtractor.domesticatedAt = new System.DateTime(2016, 7, 5, 13, 12, 15, 968); - this.creatureInfoInputExtractor.father = null; - this.creatureInfoInputExtractor.Grown = new System.DateTime(((long)(0))); - this.creatureInfoInputExtractor.Location = new System.Drawing.Point(321, 314); - this.creatureInfoInputExtractor.mother = null; - this.creatureInfoInputExtractor.Name = "creatureInfoInputExtractor"; - this.creatureInfoInputExtractor.Neutered = false; - this.creatureInfoInputExtractor.Size = new System.Drawing.Size(229, 245); - this.creatureInfoInputExtractor.TabIndex = 9; - this.creatureInfoInputExtractor.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInput1_Add2Library_Clicked); - this.creatureInfoInputExtractor.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); - // // tabPageLibrary // this.tabPageLibrary.Controls.Add(this.tableLayoutPanelLibrary); @@ -1666,7 +1319,7 @@ private void InitializeComponent() this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(187, 0); + this.tabPage2.Size = new System.Drawing.Size(187, 164); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Owner"; this.tabPage2.UseVisualStyleBackColor = true; @@ -1678,7 +1331,7 @@ private void InitializeComponent() this.checkedListBoxOwner.FormattingEnabled = true; this.checkedListBoxOwner.Location = new System.Drawing.Point(3, 3); this.checkedListBoxOwner.Name = "checkedListBoxOwner"; - this.checkedListBoxOwner.Size = new System.Drawing.Size(181, 0); + this.checkedListBoxOwner.Size = new System.Drawing.Size(181, 158); this.checkedListBoxOwner.TabIndex = 0; this.checkedListBoxOwner.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.checkedListBoxOwner_ItemCheck); // @@ -1688,7 +1341,7 @@ private void InitializeComponent() this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(187, 0); + this.tabPage3.Size = new System.Drawing.Size(187, 164); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "Stats"; this.tabPage3.UseVisualStyleBackColor = true; @@ -1707,7 +1360,7 @@ private void InitializeComponent() this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(181, 0); + this.tableLayoutPanel2.Size = new System.Drawing.Size(181, 158); this.tableLayoutPanel2.TabIndex = 0; // // checkedListBoxConsiderStatTop @@ -1726,13 +1379,13 @@ private void InitializeComponent() "Torpor"}); this.checkedListBoxConsiderStatTop.Location = new System.Drawing.Point(3, 35); this.checkedListBoxConsiderStatTop.Name = "checkedListBoxConsiderStatTop"; - this.checkedListBoxConsiderStatTop.Size = new System.Drawing.Size(175, 1); + this.checkedListBoxConsiderStatTop.Size = new System.Drawing.Size(175, 91); this.checkedListBoxConsiderStatTop.TabIndex = 3; // // buttonRecalculateTops // this.buttonRecalculateTops.Dock = System.Windows.Forms.DockStyle.Fill; - this.buttonRecalculateTops.Location = new System.Drawing.Point(3, -25); + this.buttonRecalculateTops.Location = new System.Drawing.Point(3, 132); this.buttonRecalculateTops.Name = "buttonRecalculateTops"; this.buttonRecalculateTops.Size = new System.Drawing.Size(175, 23); this.buttonRecalculateTops.TabIndex = 2; @@ -1757,7 +1410,7 @@ private void InitializeComponent() this.tabPage4.Location = new System.Drawing.Point(4, 22); this.tabPage4.Name = "tabPage4"; this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(187, 0); + this.tabPage4.Size = new System.Drawing.Size(187, 164); this.tabPage4.TabIndex = 3; this.tabPage4.Text = "Other"; this.tabPage4.UseVisualStyleBackColor = true; @@ -2065,15 +1718,6 @@ private void InitializeComponent() this.toolStripMenuItemRemove.Text = "Remove..."; this.toolStripMenuItemRemove.Click += new System.EventHandler(this.toolStripMenuItemRemove_Click); // - // creatureBoxListView - // - this.creatureBoxListView.Location = new System.Drawing.Point(3, 3); - this.creatureBoxListView.Name = "creatureBoxListView"; - this.creatureBoxListView.Size = new System.Drawing.Size(195, 390); - this.creatureBoxListView.TabIndex = 0; - this.creatureBoxListView.Changed += new ARKBreedingStats.CreatureBox.ChangedEventHandler(this.updateCreatureValues); - this.creatureBoxListView.GiveParents += new ARKBreedingStats.CreatureBox.EventHandler(this.creatureBoxListView_FindParents); - // // tabPageBreedingPlan // this.tabPageBreedingPlan.Controls.Add(this.tableLayoutPanel3); @@ -2140,16 +1784,6 @@ private void InitializeComponent() this.columnHeader1.Text = "Species"; this.columnHeader1.Width = 178; // - // breedingPlan1 - // - this.breedingPlan1.AutoScroll = true; - this.breedingPlan1.Dock = System.Windows.Forms.DockStyle.Fill; - this.breedingPlan1.Location = new System.Drawing.Point(203, 3); - this.breedingPlan1.Name = "breedingPlan1"; - this.tableLayoutPanel3.SetRowSpan(this.breedingPlan1, 3); - this.breedingPlan1.Size = new System.Drawing.Size(704, 586); - this.breedingPlan1.TabIndex = 2; - // // buttonDetBestBreeding // this.tableLayoutPanel3.SetColumnSpan(this.buttonDetBestBreeding, 2); @@ -2209,22 +1843,6 @@ private void InitializeComponent() this.radioButtonBPTopStats.Text = "Top Stats Lc"; this.radioButtonBPTopStats.UseVisualStyleBackColor = true; this.radioButtonBPTopStats.CheckedChanged += new System.EventHandler(this.radioButtonBPTopStats_CheckedChanged); - // - // statWeighting1 - // - this.statWeighting1.CustomWeightings = ((System.Collections.Generic.Dictionary)(resources.GetObject("statWeighting1.CustomWeightings"))); - this.statWeighting1.Location = new System.Drawing.Point(3, 358); - this.statWeighting1.Name = "statWeighting1"; - this.statWeighting1.Size = new System.Drawing.Size(94, 201); - this.statWeighting1.TabIndex = 7; - this.statWeighting1.Values = new double[] { - 1D, - 1D, - 1D, - 1D, - 1D, - 1D, - 1D}; // // tabPagePedigree // @@ -2237,15 +1855,6 @@ private void InitializeComponent() this.tabPagePedigree.Text = "Pedigree"; this.tabPagePedigree.UseVisualStyleBackColor = true; // - // pedigree1 - // - this.pedigree1.AutoScroll = true; - this.pedigree1.Dock = System.Windows.Forms.DockStyle.Fill; - this.pedigree1.Location = new System.Drawing.Point(3, 3); - this.pedigree1.Name = "pedigree1"; - this.pedigree1.Size = new System.Drawing.Size(910, 592); - this.pedigree1.TabIndex = 0; - // // TabPageOCR // this.TabPageOCR.Controls.Add(this.tableLayoutPanel4); @@ -2371,15 +1980,6 @@ private void InitializeComponent() this.tabPageTimer.Text = "Timer"; this.tabPageTimer.UseVisualStyleBackColor = true; // - // timerList1 - // - this.timerList1.Dock = System.Windows.Forms.DockStyle.Fill; - this.timerList1.Location = new System.Drawing.Point(3, 3); - this.timerList1.Name = "timerList1"; - this.timerList1.Size = new System.Drawing.Size(910, 592); - this.timerList1.TabIndex = 0; - this.timerList1.UpdateTimes = false; - // // tabPagePlayerTribes // this.tabPagePlayerTribes.Controls.Add(this.tribesControl1); @@ -2391,14 +1991,6 @@ private void InitializeComponent() this.tabPagePlayerTribes.Text = "Player"; this.tabPagePlayerTribes.UseVisualStyleBackColor = true; // - // tribesControl1 - // - this.tribesControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tribesControl1.Location = new System.Drawing.Point(3, 3); - this.tribesControl1.Name = "tribesControl1"; - this.tribesControl1.Size = new System.Drawing.Size(910, 592); - this.tribesControl1.TabIndex = 0; - // // tabPageTaming // this.tabPageTaming.Controls.Add(this.tamingControl1); @@ -2410,14 +2002,6 @@ private void InitializeComponent() this.tabPageTaming.Text = "Taming"; this.tabPageTaming.UseVisualStyleBackColor = true; // - // tamingControl1 - // - this.tamingControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tamingControl1.Location = new System.Drawing.Point(3, 3); - this.tamingControl1.Name = "tamingControl1"; - this.tamingControl1.Size = new System.Drawing.Size(910, 592); - this.tamingControl1.TabIndex = 0; - // // statusStrip1 // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2591,6 +2175,424 @@ private void InitializeComponent() this.toolStripButtonAddTribe.Visible = false; this.toolStripButtonAddTribe.Click += new System.EventHandler(this.toolStripButtonAddTribe_Click); // + // labelImprintingFailInfo + // + this.labelImprintingFailInfo.BackColor = System.Drawing.Color.MistyRose; + this.labelImprintingFailInfo.ForeColor = System.Drawing.Color.Maroon; + this.labelImprintingFailInfo.Location = new System.Drawing.Point(321, 252); + this.labelImprintingFailInfo.Name = "labelImprintingFailInfo"; + this.labelImprintingFailInfo.Size = new System.Drawing.Size(229, 70); + this.labelImprintingFailInfo.TabIndex = 49; + this.labelImprintingFailInfo.Text = "If the creature is imprinted the extraction may fail because the game sometimes \"" + + "forgets\" to increase some stat-values during the imprinting-process. Usually it " + + "works after a server-restart."; + this.labelImprintingFailInfo.Visible = false; + // + // statTestingHealth + // + this.statTestingHealth.BackColor = System.Drawing.Color.Transparent; + this.statTestingHealth.BreedingValue = 0D; + this.statTestingHealth.DomLevelZero = false; + this.statTestingHealth.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingHealth.Input = 100D; + this.statTestingHealth.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingHealth.LevelDom = 0; + this.statTestingHealth.LevelWild = 0; + this.statTestingHealth.Location = new System.Drawing.Point(6, 32); + this.statTestingHealth.Name = "statTestingHealth"; + this.statTestingHealth.Percent = false; + this.statTestingHealth.Size = new System.Drawing.Size(295, 50); + this.statTestingHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingHealth.TabIndex = 0; + this.statTestingHealth.Unknown = false; + // + // statTestingStamina + // + this.statTestingStamina.BackColor = System.Drawing.Color.Transparent; + this.statTestingStamina.BreedingValue = 0D; + this.statTestingStamina.DomLevelZero = false; + this.statTestingStamina.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingStamina.Input = 100D; + this.statTestingStamina.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingStamina.LevelDom = 0; + this.statTestingStamina.LevelWild = 0; + this.statTestingStamina.Location = new System.Drawing.Point(6, 82); + this.statTestingStamina.Name = "statTestingStamina"; + this.statTestingStamina.Percent = false; + this.statTestingStamina.Size = new System.Drawing.Size(295, 50); + this.statTestingStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingStamina.TabIndex = 1; + this.statTestingStamina.Unknown = false; + // + // statTestingOxygen + // + this.statTestingOxygen.BackColor = System.Drawing.Color.Transparent; + this.statTestingOxygen.BreedingValue = 0D; + this.statTestingOxygen.DomLevelZero = false; + this.statTestingOxygen.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingOxygen.Input = 100D; + this.statTestingOxygen.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingOxygen.LevelDom = 0; + this.statTestingOxygen.LevelWild = 0; + this.statTestingOxygen.Location = new System.Drawing.Point(6, 132); + this.statTestingOxygen.Name = "statTestingOxygen"; + this.statTestingOxygen.Percent = false; + this.statTestingOxygen.Size = new System.Drawing.Size(295, 50); + this.statTestingOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingOxygen.TabIndex = 2; + this.statTestingOxygen.Unknown = false; + // + // statTestingFood + // + this.statTestingFood.BackColor = System.Drawing.Color.Transparent; + this.statTestingFood.BreedingValue = 0D; + this.statTestingFood.DomLevelZero = false; + this.statTestingFood.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingFood.Input = 100D; + this.statTestingFood.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingFood.LevelDom = 0; + this.statTestingFood.LevelWild = 0; + this.statTestingFood.Location = new System.Drawing.Point(6, 182); + this.statTestingFood.Name = "statTestingFood"; + this.statTestingFood.Percent = false; + this.statTestingFood.Size = new System.Drawing.Size(295, 50); + this.statTestingFood.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingFood.TabIndex = 3; + this.statTestingFood.Unknown = false; + // + // statTestingWeight + // + this.statTestingWeight.BackColor = System.Drawing.Color.Transparent; + this.statTestingWeight.BreedingValue = 0D; + this.statTestingWeight.DomLevelZero = false; + this.statTestingWeight.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingWeight.Input = 100D; + this.statTestingWeight.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingWeight.LevelDom = 0; + this.statTestingWeight.LevelWild = 0; + this.statTestingWeight.Location = new System.Drawing.Point(6, 232); + this.statTestingWeight.Name = "statTestingWeight"; + this.statTestingWeight.Percent = false; + this.statTestingWeight.Size = new System.Drawing.Size(295, 50); + this.statTestingWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingWeight.TabIndex = 4; + this.statTestingWeight.Unknown = false; + // + // statTestingDamage + // + this.statTestingDamage.BackColor = System.Drawing.Color.Transparent; + this.statTestingDamage.BreedingValue = 0D; + this.statTestingDamage.DomLevelZero = false; + this.statTestingDamage.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingDamage.Input = 100D; + this.statTestingDamage.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingDamage.LevelDom = 0; + this.statTestingDamage.LevelWild = 0; + this.statTestingDamage.Location = new System.Drawing.Point(6, 282); + this.statTestingDamage.Name = "statTestingDamage"; + this.statTestingDamage.Percent = false; + this.statTestingDamage.Size = new System.Drawing.Size(295, 50); + this.statTestingDamage.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingDamage.TabIndex = 5; + this.statTestingDamage.Unknown = false; + // + // statTestingSpeed + // + this.statTestingSpeed.BackColor = System.Drawing.Color.Transparent; + this.statTestingSpeed.BreedingValue = 0D; + this.statTestingSpeed.DomLevelZero = false; + this.statTestingSpeed.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingSpeed.Input = 100D; + this.statTestingSpeed.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingSpeed.LevelDom = 0; + this.statTestingSpeed.LevelWild = 0; + this.statTestingSpeed.Location = new System.Drawing.Point(6, 332); + this.statTestingSpeed.Name = "statTestingSpeed"; + this.statTestingSpeed.Percent = false; + this.statTestingSpeed.Size = new System.Drawing.Size(295, 50); + this.statTestingSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingSpeed.TabIndex = 6; + this.statTestingSpeed.Unknown = false; + // + // statTestingTorpor + // + this.statTestingTorpor.BackColor = System.Drawing.Color.Transparent; + this.statTestingTorpor.BreedingValue = 0D; + this.statTestingTorpor.DomLevelZero = false; + this.statTestingTorpor.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingTorpor.Input = 100D; + this.statTestingTorpor.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingTorpor.LevelDom = 0; + this.statTestingTorpor.LevelWild = 0; + this.statTestingTorpor.Location = new System.Drawing.Point(6, 382); + this.statTestingTorpor.Name = "statTestingTorpor"; + this.statTestingTorpor.Percent = false; + this.statTestingTorpor.Size = new System.Drawing.Size(295, 50); + this.statTestingTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingTorpor.TabIndex = 7; + this.statTestingTorpor.Unknown = false; + // + // creatureInfoInputTester + // + this.creatureInfoInputTester.Cooldown = new System.DateTime(((long)(0))); + this.creatureInfoInputTester.CreatureGender = ARKBreedingStats.Gender.Unknown; + this.creatureInfoInputTester.CreatureName = ""; + this.creatureInfoInputTester.CreatureNote = ""; + this.creatureInfoInputTester.CreatureOwner = ""; + this.creatureInfoInputTester.CreatureStatus = ARKBreedingStats.CreatureStatus.Available; + this.creatureInfoInputTester.domesticatedAt = new System.DateTime(2016, 7, 5, 13, 11, 41, 997); + this.creatureInfoInputTester.father = null; + this.creatureInfoInputTester.Grown = new System.DateTime(((long)(0))); + this.creatureInfoInputTester.Location = new System.Drawing.Point(321, 305); + this.creatureInfoInputTester.mother = null; + this.creatureInfoInputTester.Name = "creatureInfoInputTester"; + this.creatureInfoInputTester.Neutered = false; + this.creatureInfoInputTester.Size = new System.Drawing.Size(229, 245); + this.creatureInfoInputTester.TabIndex = 4; + this.creatureInfoInputTester.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInputTester_Add2Library_Clicked); + this.creatureInfoInputTester.Save2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Save2LibraryClickedEventHandler(this.creatureInfoInputTester_Save2Library_Clicked); + this.creatureInfoInputTester.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); + // + // statIOHealth + // + this.statIOHealth.BackColor = System.Drawing.Color.Transparent; + this.statIOHealth.BreedingValue = 0D; + this.statIOHealth.DomLevelZero = false; + this.statIOHealth.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOHealth.Input = 100D; + this.statIOHealth.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOHealth.LevelDom = 0; + this.statIOHealth.LevelWild = 0; + this.statIOHealth.Location = new System.Drawing.Point(6, 32); + this.statIOHealth.Name = "statIOHealth"; + this.statIOHealth.Percent = false; + this.statIOHealth.Size = new System.Drawing.Size(295, 50); + this.statIOHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOHealth.TabIndex = 0; + this.statIOHealth.Unknown = false; + this.statIOHealth.Click += new System.EventHandler(this.statIO_Click); + // + // statIODamage + // + this.statIODamage.BackColor = System.Drawing.Color.Transparent; + this.statIODamage.BreedingValue = 0D; + this.statIODamage.DomLevelZero = false; + this.statIODamage.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIODamage.Input = 100D; + this.statIODamage.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIODamage.LevelDom = 0; + this.statIODamage.LevelWild = 0; + this.statIODamage.Location = new System.Drawing.Point(6, 282); + this.statIODamage.Name = "statIODamage"; + this.statIODamage.Percent = false; + this.statIODamage.Size = new System.Drawing.Size(295, 50); + this.statIODamage.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIODamage.TabIndex = 5; + this.statIODamage.Unknown = false; + this.statIODamage.Click += new System.EventHandler(this.statIO_Click); + // + // statIOTorpor + // + this.statIOTorpor.BackColor = System.Drawing.Color.Transparent; + this.statIOTorpor.BreedingValue = 0D; + this.statIOTorpor.DomLevelZero = false; + this.statIOTorpor.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOTorpor.Input = 100D; + this.statIOTorpor.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOTorpor.LevelDom = 0; + this.statIOTorpor.LevelWild = 0; + this.statIOTorpor.Location = new System.Drawing.Point(6, 382); + this.statIOTorpor.Name = "statIOTorpor"; + this.statIOTorpor.Percent = false; + this.statIOTorpor.Size = new System.Drawing.Size(295, 50); + this.statIOTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOTorpor.TabIndex = 7; + this.statIOTorpor.Unknown = false; + // + // statIOWeight + // + this.statIOWeight.BackColor = System.Drawing.Color.Transparent; + this.statIOWeight.BreedingValue = 0D; + this.statIOWeight.DomLevelZero = false; + this.statIOWeight.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOWeight.Input = 100D; + this.statIOWeight.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOWeight.LevelDom = 0; + this.statIOWeight.LevelWild = 0; + this.statIOWeight.Location = new System.Drawing.Point(6, 232); + this.statIOWeight.Name = "statIOWeight"; + this.statIOWeight.Percent = false; + this.statIOWeight.Size = new System.Drawing.Size(295, 50); + this.statIOWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOWeight.TabIndex = 4; + this.statIOWeight.Unknown = false; + this.statIOWeight.Click += new System.EventHandler(this.statIO_Click); + // + // statIOSpeed + // + this.statIOSpeed.BackColor = System.Drawing.Color.Transparent; + this.statIOSpeed.BreedingValue = 0D; + this.statIOSpeed.DomLevelZero = false; + this.statIOSpeed.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOSpeed.Input = 100D; + this.statIOSpeed.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOSpeed.LevelDom = 0; + this.statIOSpeed.LevelWild = 0; + this.statIOSpeed.Location = new System.Drawing.Point(6, 332); + this.statIOSpeed.Name = "statIOSpeed"; + this.statIOSpeed.Percent = false; + this.statIOSpeed.Size = new System.Drawing.Size(295, 50); + this.statIOSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOSpeed.TabIndex = 6; + this.statIOSpeed.Unknown = false; + this.statIOSpeed.Click += new System.EventHandler(this.statIO_Click); + // + // statIOFood + // + this.statIOFood.BackColor = System.Drawing.Color.Transparent; + this.statIOFood.BreedingValue = 0D; + this.statIOFood.DomLevelZero = false; + this.statIOFood.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOFood.Input = 100D; + this.statIOFood.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOFood.LevelDom = 0; + this.statIOFood.LevelWild = 0; + this.statIOFood.Location = new System.Drawing.Point(6, 182); + this.statIOFood.Name = "statIOFood"; + this.statIOFood.Percent = false; + this.statIOFood.Size = new System.Drawing.Size(295, 50); + this.statIOFood.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOFood.TabIndex = 3; + this.statIOFood.Unknown = false; + this.statIOFood.Click += new System.EventHandler(this.statIO_Click); + // + // statIOOxygen + // + this.statIOOxygen.BackColor = System.Drawing.Color.Transparent; + this.statIOOxygen.BreedingValue = 0D; + this.statIOOxygen.DomLevelZero = false; + this.statIOOxygen.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOOxygen.Input = 100D; + this.statIOOxygen.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOOxygen.LevelDom = 0; + this.statIOOxygen.LevelWild = 0; + this.statIOOxygen.Location = new System.Drawing.Point(6, 132); + this.statIOOxygen.Name = "statIOOxygen"; + this.statIOOxygen.Percent = false; + this.statIOOxygen.Size = new System.Drawing.Size(295, 50); + this.statIOOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOOxygen.TabIndex = 2; + this.statIOOxygen.Unknown = false; + this.statIOOxygen.Click += new System.EventHandler(this.statIO_Click); + // + // statIOStamina + // + this.statIOStamina.BackColor = System.Drawing.Color.Transparent; + this.statIOStamina.BreedingValue = 0D; + this.statIOStamina.DomLevelZero = false; + this.statIOStamina.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOStamina.Input = 100D; + this.statIOStamina.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOStamina.LevelDom = 0; + this.statIOStamina.LevelWild = 0; + this.statIOStamina.Location = new System.Drawing.Point(6, 82); + this.statIOStamina.Name = "statIOStamina"; + this.statIOStamina.Percent = false; + this.statIOStamina.Size = new System.Drawing.Size(295, 50); + this.statIOStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOStamina.TabIndex = 1; + this.statIOStamina.Unknown = false; + this.statIOStamina.Click += new System.EventHandler(this.statIO_Click); + // + // creatureInfoInputExtractor + // + this.creatureInfoInputExtractor.Cooldown = new System.DateTime(((long)(0))); + this.creatureInfoInputExtractor.CreatureGender = ARKBreedingStats.Gender.Unknown; + this.creatureInfoInputExtractor.CreatureName = ""; + this.creatureInfoInputExtractor.CreatureNote = ""; + this.creatureInfoInputExtractor.CreatureOwner = ""; + this.creatureInfoInputExtractor.CreatureStatus = ARKBreedingStats.CreatureStatus.Available; + this.creatureInfoInputExtractor.domesticatedAt = new System.DateTime(2016, 7, 5, 13, 12, 15, 968); + this.creatureInfoInputExtractor.father = null; + this.creatureInfoInputExtractor.Grown = new System.DateTime(((long)(0))); + this.creatureInfoInputExtractor.Location = new System.Drawing.Point(321, 325); + this.creatureInfoInputExtractor.mother = null; + this.creatureInfoInputExtractor.Name = "creatureInfoInputExtractor"; + this.creatureInfoInputExtractor.Neutered = false; + this.creatureInfoInputExtractor.Size = new System.Drawing.Size(229, 245); + this.creatureInfoInputExtractor.TabIndex = 11; + this.creatureInfoInputExtractor.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInput1_Add2Library_Clicked); + this.creatureInfoInputExtractor.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); + // + // creatureBoxListView + // + this.creatureBoxListView.Location = new System.Drawing.Point(3, 3); + this.creatureBoxListView.Name = "creatureBoxListView"; + this.creatureBoxListView.Size = new System.Drawing.Size(195, 390); + this.creatureBoxListView.TabIndex = 0; + this.creatureBoxListView.Changed += new ARKBreedingStats.CreatureBox.ChangedEventHandler(this.updateCreatureValues); + this.creatureBoxListView.GiveParents += new ARKBreedingStats.CreatureBox.EventHandler(this.creatureBoxListView_FindParents); + // + // breedingPlan1 + // + this.breedingPlan1.AutoScroll = true; + this.breedingPlan1.Dock = System.Windows.Forms.DockStyle.Fill; + this.breedingPlan1.Location = new System.Drawing.Point(203, 3); + this.breedingPlan1.Name = "breedingPlan1"; + this.tableLayoutPanel3.SetRowSpan(this.breedingPlan1, 3); + this.breedingPlan1.Size = new System.Drawing.Size(704, 586); + this.breedingPlan1.TabIndex = 2; + // + // statWeighting1 + // + this.statWeighting1.CustomWeightings = ((System.Collections.Generic.Dictionary)(resources.GetObject("statWeighting1.CustomWeightings"))); + this.statWeighting1.Location = new System.Drawing.Point(3, 358); + this.statWeighting1.Name = "statWeighting1"; + this.statWeighting1.Size = new System.Drawing.Size(94, 201); + this.statWeighting1.TabIndex = 7; + this.statWeighting1.Values = new double[] { + 1D, + 1D, + 1D, + 1D, + 1D, + 1D, + 1D}; + // + // pedigree1 + // + this.pedigree1.AutoScroll = true; + this.pedigree1.Dock = System.Windows.Forms.DockStyle.Fill; + this.pedigree1.Location = new System.Drawing.Point(3, 3); + this.pedigree1.Name = "pedigree1"; + this.pedigree1.Size = new System.Drawing.Size(910, 592); + this.pedigree1.TabIndex = 0; + // + // timerList1 + // + this.timerList1.Dock = System.Windows.Forms.DockStyle.Fill; + this.timerList1.Location = new System.Drawing.Point(3, 3); + this.timerList1.Name = "timerList1"; + this.timerList1.Size = new System.Drawing.Size(910, 592); + this.timerList1.TabIndex = 0; + this.timerList1.UpdateTimes = false; + // + // tribesControl1 + // + this.tribesControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tribesControl1.Location = new System.Drawing.Point(3, 3); + this.tribesControl1.Name = "tribesControl1"; + this.tribesControl1.Size = new System.Drawing.Size(910, 592); + this.tribesControl1.TabIndex = 0; + // + // tamingControl1 + // + this.tamingControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tamingControl1.Location = new System.Drawing.Point(3, 3); + this.tamingControl1.Name = "tamingControl1"; + this.tamingControl1.Size = new System.Drawing.Size(910, 592); + this.tamingControl1.TabIndex = 0; + // // Form1 // this.AcceptButton = this.buttonExtract; @@ -2864,7 +2866,6 @@ private void InitializeComponent() private System.Windows.Forms.Label labelImprintingTester; private System.Windows.Forms.NumericUpDown numericUpDownImprintingBonusTester; private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label6; private System.Windows.Forms.ToolStripMenuItem exportToClipboardToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem forSpreadsheetToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem forARKChatToolStripMenuItem; @@ -2883,5 +2884,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox checkBoxToggleOverlay; private System.Windows.Forms.ColumnHeader columnHeaderAdded; private System.Windows.Forms.CheckBox checkBoxShowNeuteredCreatures; + private System.Windows.Forms.Label labelImprintingFailInfo; } } diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs index 922f286e..67656441 100644 --- a/ARKBreedingStats/Form1.cs +++ b/ARKBreedingStats/Form1.cs @@ -214,17 +214,19 @@ private void Form1_Load(object sender, EventArgs e) checkForUpdates(true); //// TODO: debug-numbers - //statIOs[0].Input = 2430.1; - //statIOs[1].Input = 738; - //statIOs[2].Input = 1558; - //statIOs[3].Input = 7600; - //statIOs[4].Input = 426; - //statIOs[5].Input = 2.308; - //statIOs[6].Input = 1.7; - //statIOs[7].Input = 6566.5; - //comboBoxSpeciesExtractor.SelectedIndex = Values.V.speciesNames.IndexOf("Castoroides"); - //numericUpDownLevel.Value = 178; - //tabControlMain.SelectedTab = tabPageExtractor; + //statIOs[0].Input = 3263.2; + //statIOs[1].Input = 2625; + //statIOs[2].Input = 525; + //statIOs[3].Input = 5811; + //statIOs[4].Input = 625.8; + //statIOs[5].Input = 3.171; + //statIOs[6].Input = 1.118; + //statIOs[7].Input = 8234.3; + //comboBoxSpeciesExtractor.SelectedIndex = Values.V.speciesNames.IndexOf("Argentavis"); + //numericUpDownLevel.Value = 189; + //checkBoxAlreadyBred.Checked = true; + //numericUpDownImprintingBonusExtractor.Value = 59; + tabControlMain.SelectedTab = tabPageExtractor; if (!Properties.Settings.Default.OCR) { @@ -281,6 +283,7 @@ private void clearAll() updateTorporInTester = true; buttonHelp.Visible = false; labelErrorHelp.Visible = false; + labelImprintingFailInfo.Visible = false; groupBoxPossibilities.Visible = false; labelDoc.Visible = false; button2TamingCalc.Visible = checkBoxQuickWildCheck.Checked; @@ -310,6 +313,7 @@ private bool extractLevels() (double)numericUpDownImprintingBonusExtractor.Value / 100, creatureCollection.imprintingMultiplier); checkBoxJustTamed.Checked = Extraction.E.justTamed; + numericUpDownImprintingBonusExtractor.Value = (decimal)Extraction.E.imprintingBonus * 100; // remove all results that require a total wild-level higher than the max if (!checkBoxAlreadyBred.Checked @@ -475,6 +479,8 @@ private void extractionFailed() labelErrorHelp.Visible = true; groupBoxPossibilities.Visible = false; labelDoc.Visible = false; + if (numericUpDownImprintingBonusExtractor.Value > 0) + labelImprintingFailInfo.Visible = true; } private void setUniqueTE() @@ -825,8 +831,8 @@ private void checkBoxAlreadyBred_CheckedChanged(object sender, EventArgs e) groupBoxTE.Enabled = !checkBoxAlreadyBred.Checked; checkBoxJustTamed.Checked = checkBoxJustTamed.Checked && !checkBoxAlreadyBred.Checked; panelWildTamedAuto.Enabled = !checkBoxAlreadyBred.Checked; - numericUpDownImprintingBonusExtractor.Enabled = checkBoxAlreadyBred.Checked; - labelImprintingBonus.Enabled = checkBoxAlreadyBred.Checked; + numericUpDownImprintingBonusExtractor.Visible = checkBoxAlreadyBred.Checked; + labelImprintingBonus.Visible = checkBoxAlreadyBred.Checked; } private void checkBoxJustTamed_CheckedChanged(object sender, EventArgs e) @@ -887,7 +893,7 @@ private void add2Lib(bool fromExtractor = true) { CreatureInfoInput input; bool bred; - double te; + double te, imprinting; string species; if (fromExtractor) { @@ -895,6 +901,7 @@ private void add2Lib(bool fromExtractor = true) species = Values.V.speciesNames[sE]; bred = checkBoxAlreadyBred.Checked; te = Extraction.E.uniqueTE(); + imprinting = Extraction.E.imprintingBonus; } else { @@ -902,9 +909,10 @@ private void add2Lib(bool fromExtractor = true) species = Values.V.speciesNames[cbbStatTestingSpecies.SelectedIndex]; bred = checkBoxStatTestingBred.Checked; te = (double)NumericUpDownTestingTE.Value / 100; + imprinting = (double)numericUpDownImprintingBonusTester.Value / 100; } - Creature creature = new Creature(species, input.CreatureName, input.CreatureOwner, input.CreatureGender, getCurrentWildLevels(fromExtractor), getCurrentDomLevels(fromExtractor), te, bred); + Creature creature = new Creature(species, input.CreatureName, input.CreatureOwner, input.CreatureGender, getCurrentWildLevels(fromExtractor), getCurrentDomLevels(fromExtractor), te, bred, imprinting); // set parents creature.Mother = input.mother; diff --git a/ARKBreedingStats/Form1.resx b/ARKBreedingStats/Form1.resx index c8f596da..3db421e9 100644 --- a/ARKBreedingStats/Form1.resx +++ b/ARKBreedingStats/Form1.resx @@ -276,7 +276,7 @@ The TE can differ 0.1% due to ingame-rounding. - 46 + 25 diff --git a/ARKBreedingStats/Pedigree.cs b/ARKBreedingStats/Pedigree.cs index 52633c2e..926499b2 100644 --- a/ARKBreedingStats/Pedigree.cs +++ b/ARKBreedingStats/Pedigree.cs @@ -43,8 +43,10 @@ protected override void OnPaint(PaintEventArgs e) public void drawLines(Graphics g) { + // lines contains all the coordinates the arrows should be drawn: x1,y1,x2,y2,red/green,mutated/equal System.Drawing.Pen myPen = new System.Drawing.Pen(System.Drawing.Color.Green, 3); myPen.EndCap = System.Drawing.Drawing2D.LineCap.ArrowAnchor; + g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; foreach (int[] line in lines[0]) { @@ -54,6 +56,12 @@ public void drawLines(Graphics g) myPen.Color = Color.Green; else myPen.Color = Color.LightGray; + if (line[5] > 0) + { + // if stat is mutated + int mutationBoxWidth = 14; + g.FillEllipse(Brushes.LightGreen, (line[0] + line[2] - mutationBoxWidth) / 2, (line[1] + line[3] - mutationBoxWidth) / 2, mutationBoxWidth, mutationBoxWidth); + } g.DrawLine(myPen, line[0], line[1], line[2], line[3]); } myPen.Color = Color.DarkGray; @@ -125,7 +133,7 @@ public void createPedigree() for (int s = 0; s < 7; s++) { if (creature.levelsWild[s] >= 0 && creature.levelsWild[s] == c.levelsWild[s]) - lines[0].Add(new int[] { 10 + 38 + 28 * s, 200 + 35 * row + 6, 10 + 38 + 28 * s, 200 + 35 * row + 15, 0 }); + lines[0].Add(new int[] { 10 + 38 + 28 * s, 200 + 35 * row + 6, 10 + 38 + 28 * s, 200 + 35 * row + 15, 0, 0 }); } pc.CreatureClicked += new PedigreeCreature.CreatureChangedEventHandler(CreatureClicked); pc.CreatureEdit += new PedigreeCreature.CreatureEditEventHandler(CreatureEdit); @@ -198,13 +206,14 @@ private bool createParentsChild(Creature creature, int x, int y, bool drawWithNo else if (creature.Mother.levelsWild[s] > creature.Father.levelsWild[s]) better = 1; } - if (creature.Mother != null && creature.levelsWild[s] >= 0 && creature.levelsWild[s] == creature.Mother.levelsWild[s]) + // offspring can have stats that are up to 2 levels higher due to mutations. currently there are no decreasing levels due to mutations + if (creature.Mother != null && creature.levelsWild[s] >= 0 && (creature.levelsWild[s] >= creature.Mother.levelsWild[s] && creature.levelsWild[s] < creature.Mother.levelsWild[s] + 3)) { - lines[0].Add(new int[] { 38 + x + 28 * s, y + 33, 38 + x + 28 * s, y + 42, (better == -1 ? 1 : 2) }); + lines[0].Add(new int[] { 38 + x + 28 * s, y + 33, 38 + x + 28 * s, y + 42, (better == -1 ? 1 : 2), (creature.levelsWild[s] > creature.Mother.levelsWild[s] ? 1 : 0) }); } - if (creature.Father != null && creature.levelsWild[s] >= 0 && creature.levelsWild[s] == creature.Father.levelsWild[s]) + if (creature.Father != null && creature.levelsWild[s] >= 0 && (creature.levelsWild[s] >= creature.Father.levelsWild[s] && creature.levelsWild[s] < creature.Father.levelsWild[s] + 3)) { - lines[0].Add(new int[] { 38 + x + 28 * s, y + 83, 38 + x + 28 * s, y + 74, (better == 1 ? 1 : 2) }); + lines[0].Add(new int[] { 38 + x + 28 * s, y + 83, 38 + x + 28 * s, y + 74, (better == 1 ? 1 : 2), (creature.levelsWild[s] > creature.Father.levelsWild[s] ? 1 : 0) }); } } return true; diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs index 7e738baa..9643161d 100644 --- a/ARKBreedingStats/Properties/AssemblyInfo.cs +++ b/ARKBreedingStats/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("0.20.7.1")] +[assembly: AssemblyFileVersion("0.20.8.0")] diff --git a/ARKBreedingStats/ver.txt b/ARKBreedingStats/ver.txt index f4e78c8f..e81a20e9 100644 --- a/ARKBreedingStats/ver.txt +++ b/ARKBreedingStats/ver.txt @@ -1 +1 @@ -2530000,0.20.7.1 \ No newline at end of file +2530000,0.20.8.0 \ No newline at end of file