From 62d0125cc27ee5b37819afcb7845b6475a1d917e Mon Sep 17 00:00:00 2001 From: cadon Date: Sun, 20 Mar 2016 13:27:46 +0100 Subject: [PATCH] Creatures can be marked as dead (not considered in topcreatures anymore etc). --- ARKBreedingStats/Creature.cs | 10 +- ARKBreedingStats/CreatureBox.Designer.cs | 27 +- ARKBreedingStats/CreatureBox.cs | 12 +- ARKBreedingStats/Form1.Designer.cs | 796 ++++++++++---------- ARKBreedingStats/Form1.cs | 42 +- ARKBreedingStats/PedigreeCreature.cs | 15 +- ARKBreedingStats/Properties/AssemblyInfo.cs | 2 +- 7 files changed, 496 insertions(+), 408 deletions(-) diff --git a/ARKBreedingStats/Creature.cs b/ARKBreedingStats/Creature.cs index 791ffc63..0645d455 100644 --- a/ARKBreedingStats/Creature.cs +++ b/ARKBreedingStats/Creature.cs @@ -10,6 +10,7 @@ public class Creature public string species; public string name; public Gender gender; + public CreatureStatus status; // order of the stats is Health, Stamina, Oxygen, Food, Weight, MeleeDamage, Speed, Torpor public int[] levelsWild; public int[] levelsDom; @@ -52,6 +53,7 @@ public Creature(string species, string name, string owner, Gender gender, int[] else this.tamingEff = tamingEff; this.isBred = isBred; + this.status = CreatureStatus.Alive; initVars(); } @@ -118,6 +120,12 @@ public enum Gender { Unknown = 0, Male = 1, - Female = 2, + Female = 2 + }; + + public enum CreatureStatus + { + Alive, + Dead }; } \ No newline at end of file diff --git a/ARKBreedingStats/CreatureBox.Designer.cs b/ARKBreedingStats/CreatureBox.Designer.cs index e40ab415..04b4e3c3 100644 --- a/ARKBreedingStats/CreatureBox.Designer.cs +++ b/ARKBreedingStats/CreatureBox.Designer.cs @@ -30,7 +30,6 @@ private void InitializeComponent() { this.groupBox1 = new System.Windows.Forms.GroupBox(); this.panel1 = new System.Windows.Forms.Panel(); - this.labelEditGender = new System.Windows.Forms.Label(); this.checkBoxIsBred = new System.Windows.Forms.CheckBox(); this.numericUpDown7 = new System.Windows.Forms.NumericUpDown(); this.numericUpDown6 = new System.Windows.Forms.NumericUpDown(); @@ -74,6 +73,7 @@ private void InitializeComponent() this.statDisplayOx = new ARKBreedingStats.StatDisplay(); this.statDisplaySt = new ARKBreedingStats.StatDisplay(); this.statDisplayHP = new ARKBreedingStats.StatDisplay(); + this.checkBoxDead = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown7)).BeginInit(); @@ -112,7 +112,7 @@ private void InitializeComponent() // // panel1 // - this.panel1.Controls.Add(this.labelEditGender); + this.panel1.Controls.Add(this.checkBoxDead); this.panel1.Controls.Add(this.checkBoxIsBred); this.panel1.Controls.Add(this.numericUpDown7); this.panel1.Controls.Add(this.numericUpDown6); @@ -144,15 +144,6 @@ private void InitializeComponent() this.panel1.TabIndex = 15; this.panel1.Visible = false; // - // labelEditGender - // - this.labelEditGender.AutoSize = true; - this.labelEditGender.Location = new System.Drawing.Point(31, 210); - this.labelEditGender.Name = "labelEditGender"; - this.labelEditGender.Size = new System.Drawing.Size(42, 13); - this.labelEditGender.TabIndex = 46; - this.labelEditGender.Text = "Gender"; - // // checkBoxIsBred // this.checkBoxIsBred.AutoSize = true; @@ -383,7 +374,7 @@ private void InitializeComponent() // // buttonGender // - this.buttonGender.Location = new System.Drawing.Point(3, 207); + this.buttonGender.Location = new System.Drawing.Point(6, 205); this.buttonGender.Name = "buttonGender"; this.buttonGender.Size = new System.Drawing.Size(28, 19); this.buttonGender.TabIndex = 33; @@ -554,6 +545,16 @@ private void InitializeComponent() this.statDisplayHP.Size = new System.Drawing.Size(183, 20); this.statDisplayHP.TabIndex = 0; // + // checkBoxDead + // + this.checkBoxDead.AutoSize = true; + this.checkBoxDead.Location = new System.Drawing.Point(40, 207); + this.checkBoxDead.Name = "checkBoxDead"; + this.checkBoxDead.Size = new System.Drawing.Size(31, 17); + this.checkBoxDead.TabIndex = 47; + this.checkBoxDead.Text = "†"; + this.checkBoxDead.UseVisualStyleBackColor = true; + // // CreatureBox // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -623,8 +624,8 @@ private void InitializeComponent() private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label labelStatNames; - private System.Windows.Forms.Label labelEditGender; private System.Windows.Forms.CheckBox checkBoxIsBred; private System.Windows.Forms.Label labelNotes; + private System.Windows.Forms.CheckBox checkBoxDead; } } diff --git a/ARKBreedingStats/CreatureBox.cs b/ARKBreedingStats/CreatureBox.cs index d8f54545..936380b7 100644 --- a/ARKBreedingStats/CreatureBox.cs +++ b/ARKBreedingStats/CreatureBox.cs @@ -15,7 +15,7 @@ public partial class CreatureBox : UserControl Creature creature; private StatDisplay[] stats; private NumericUpDown[] numUDLevelsDom; - public delegate void ChangedEventHandler(object sender, int listViewIndex, Creature creature); + public delegate void ChangedEventHandler(object sender, int listViewIndex, Creature creature, bool creatureStatusChanged); public event ChangedEventHandler Changed; public delegate void EventHandler(object sender, Creature creature); public event EventHandler NeedParents; @@ -63,6 +63,8 @@ private void initializeVars() tt.SetToolTip(comboBoxFather, "Father"); tt.SetToolTip(textBoxNote, "Note"); tt.SetToolTip(labelParents, "Mother and Father (if bred and choosen)"); + tt.SetToolTip(buttonGender, "Gender"); + tt.SetToolTip(checkBoxDead, "Has the creature passed away?"); } public void setCreature(Creature creature) @@ -187,6 +189,7 @@ private void updateLabel() } for (int s = 0; s < 8; s++) { updateStat(s); } labelNotes.Text = creature.note; + checkBoxDead.Checked = (creature.status == CreatureStatus.Dead); } private void closeSettings(bool save) @@ -227,7 +230,11 @@ private void closeSettings(bool save) creature.levelsDom[s] = (int)numUDLevelsDom[s].Value; } creature.note = textBoxNote.Text; - Changed(this, indexInListView, creature); + CreatureStatus newStatus = (checkBoxDead.Checked ? CreatureStatus.Dead : CreatureStatus.Alive); + bool creatureStatusChanged = (creature.status != newStatus); + creature.status = newStatus; + + Changed(this, indexInListView, creature, creatureStatusChanged); updateLabel(); ResumeLayout(); } @@ -242,6 +249,7 @@ public void Clear() closeSettings(false); labelGender.Text = ""; groupBox1.Text = ""; + checkBoxDead.Checked = false; creature = null; for (int s = 0; s < 8; s++) { diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs index d5981379..61a94988 100644 --- a/ARKBreedingStats/Form1.Designer.cs +++ b/ARKBreedingStats/Form1.Designer.cs @@ -101,13 +101,31 @@ private void InitializeComponent() this.radioButtonWild = new System.Windows.Forms.RadioButton(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPageStatTesting = new System.Windows.Forms.TabPage(); + this.creatureInfoInputTester = new ARKBreedingStats.CreatureInfoInput(); this.labelNotTamedNoteTesting = new System.Windows.Forms.Label(); this.labelTestingInfo = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); + this.statTestingTorpor = new ARKBreedingStats.StatIO(); + this.statTestingSpeed = new ARKBreedingStats.StatIO(); + this.statTestingDamage = new ARKBreedingStats.StatIO(); + this.statTestingWeight = new ARKBreedingStats.StatIO(); + this.statTestingFood = new ARKBreedingStats.StatIO(); + this.statTestingOxygen = new ARKBreedingStats.StatIO(); + this.statTestingStamina = new ARKBreedingStats.StatIO(); + this.statTestingHealth = new ARKBreedingStats.StatIO(); this.tabPageExtractor = new System.Windows.Forms.TabPage(); + this.creatureInfoInput1 = new ARKBreedingStats.CreatureInfoInput(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.checkBoxQuickWildCheck = new System.Windows.Forms.CheckBox(); this.buttonExtractor2Tester = new System.Windows.Forms.Button(); + this.statIOStamina = new ARKBreedingStats.StatIO(); + this.statIOOxygen = new ARKBreedingStats.StatIO(); + this.statIOHealth = new ARKBreedingStats.StatIO(); + this.statIOFood = new ARKBreedingStats.StatIO(); + this.statIOSpeed = new ARKBreedingStats.StatIO(); + this.statIOWeight = new ARKBreedingStats.StatIO(); + this.statIOTorpor = new ARKBreedingStats.StatIO(); + this.statIODamage = new ARKBreedingStats.StatIO(); this.tabPageLibrary = new System.Windows.Forms.TabPage(); this.tableLayoutPanelLibrary = new System.Windows.Forms.TableLayoutPanel(); this.tabControlLibFilter = new System.Windows.Forms.TabControl(); @@ -135,32 +153,16 @@ private void InitializeComponent() this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader9 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader10 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.creatureBoxListView = new ARKBreedingStats.CreatureBox(); this.tabPagePedigree = new System.Windows.Forms.TabPage(); + this.pedigree1 = new ARKBreedingStats.Pedigree(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripProgressBar1 = new System.Windows.Forms.ToolStripProgressBar(); this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.buttonTester2Extractor = new System.Windows.Forms.Button(); this.statTestingTamingEfficiency = new System.Windows.Forms.NumericUpDown(); - this.creatureInfoInputTester = new ARKBreedingStats.CreatureInfoInput(); - this.statTestingTorpor = new ARKBreedingStats.StatIO(); - this.statTestingSpeed = new ARKBreedingStats.StatIO(); - this.statTestingDamage = new ARKBreedingStats.StatIO(); - this.statTestingWeight = new ARKBreedingStats.StatIO(); - this.statTestingFood = new ARKBreedingStats.StatIO(); - this.statTestingOxygen = new ARKBreedingStats.StatIO(); - this.statTestingStamina = new ARKBreedingStats.StatIO(); - this.statTestingHealth = new ARKBreedingStats.StatIO(); - this.creatureInfoInput1 = new ARKBreedingStats.CreatureInfoInput(); - this.statIOStamina = new ARKBreedingStats.StatIO(); - this.statIOOxygen = new ARKBreedingStats.StatIO(); - this.statIOHealth = new ARKBreedingStats.StatIO(); - this.statIOFood = new ARKBreedingStats.StatIO(); - this.statIOSpeed = new ARKBreedingStats.StatIO(); - this.statIOWeight = new ARKBreedingStats.StatIO(); - this.statIOTorpor = new ARKBreedingStats.StatIO(); - this.statIODamage = new ARKBreedingStats.StatIO(); - this.creatureBoxListView = new ARKBreedingStats.CreatureBox(); - this.pedigree1 = new ARKBreedingStats.Pedigree(); + this.tabPage4 = new System.Windows.Forms.TabPage(); + this.checkBoxShowDead = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NumericUpDownTestingTE)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.statTestingDinoLevel)).BeginInit(); @@ -188,6 +190,7 @@ private void InitializeComponent() this.tabPagePedigree.SuspendLayout(); this.statusStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.statTestingTamingEfficiency)).BeginInit(); + this.tabPage4.SuspendLayout(); this.SuspendLayout(); // // aboutToolStripMenuItem @@ -937,6 +940,15 @@ private void InitializeComponent() this.tabPageStatTesting.Text = "Stat Testing"; this.tabPageStatTesting.UseVisualStyleBackColor = true; // + // creatureInfoInputTester + // + this.creatureInfoInputTester.Location = new System.Drawing.Point(310, 306); + this.creatureInfoInputTester.Name = "creatureInfoInputTester"; + this.creatureInfoInputTester.Size = new System.Drawing.Size(230, 165); + this.creatureInfoInputTester.TabIndex = 42; + this.creatureInfoInputTester.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInputTester_Add2Library_Clicked); + this.creatureInfoInputTester.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); + // // labelNotTamedNoteTesting // this.labelNotTamedNoteTesting.Location = new System.Drawing.Point(3, 459); @@ -965,6 +977,150 @@ private void InitializeComponent() this.label10.TabIndex = 36; this.label10.Text = "Current Value"; // + // statTestingTorpor + // + this.statTestingTorpor.BackColor = System.Drawing.SystemColors.Control; + 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, 408); + this.statTestingTorpor.Name = "statTestingTorpor"; + this.statTestingTorpor.Percent = false; + this.statTestingTorpor.Size = new System.Drawing.Size(295, 45); + this.statTestingTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingTorpor.TabIndex = 35; + this.statTestingTorpor.Unknown = false; + // + // statTestingSpeed + // + this.statTestingSpeed.BackColor = System.Drawing.SystemColors.Control; + 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, 357); + this.statTestingSpeed.Name = "statTestingSpeed"; + this.statTestingSpeed.Percent = false; + this.statTestingSpeed.Size = new System.Drawing.Size(295, 45); + this.statTestingSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingSpeed.TabIndex = 7; + this.statTestingSpeed.Unknown = false; + // + // statTestingDamage + // + this.statTestingDamage.BackColor = System.Drawing.SystemColors.Control; + 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, 306); + this.statTestingDamage.Name = "statTestingDamage"; + this.statTestingDamage.Percent = false; + this.statTestingDamage.Size = new System.Drawing.Size(295, 45); + this.statTestingDamage.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingDamage.TabIndex = 6; + this.statTestingDamage.Unknown = false; + // + // statTestingWeight + // + this.statTestingWeight.BackColor = System.Drawing.SystemColors.Control; + 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, 255); + this.statTestingWeight.Name = "statTestingWeight"; + this.statTestingWeight.Percent = false; + this.statTestingWeight.Size = new System.Drawing.Size(295, 45); + this.statTestingWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingWeight.TabIndex = 5; + this.statTestingWeight.Unknown = false; + // + // statTestingFood + // + this.statTestingFood.BackColor = System.Drawing.SystemColors.Control; + 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, 204); + this.statTestingFood.Name = "statTestingFood"; + this.statTestingFood.Percent = false; + this.statTestingFood.Size = new System.Drawing.Size(295, 45); + this.statTestingFood.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingFood.TabIndex = 4; + this.statTestingFood.Unknown = false; + // + // statTestingOxygen + // + this.statTestingOxygen.BackColor = System.Drawing.SystemColors.Control; + 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, 153); + this.statTestingOxygen.Name = "statTestingOxygen"; + this.statTestingOxygen.Percent = false; + this.statTestingOxygen.Size = new System.Drawing.Size(295, 45); + this.statTestingOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingOxygen.TabIndex = 3; + this.statTestingOxygen.Unknown = false; + // + // statTestingStamina + // + this.statTestingStamina.BackColor = System.Drawing.SystemColors.Control; + 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, 102); + this.statTestingStamina.Name = "statTestingStamina"; + this.statTestingStamina.Percent = false; + this.statTestingStamina.Size = new System.Drawing.Size(295, 45); + this.statTestingStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingStamina.TabIndex = 2; + this.statTestingStamina.Unknown = false; + // + // statTestingHealth + // + this.statTestingHealth.BackColor = System.Drawing.SystemColors.Control; + 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, 51); + this.statTestingHealth.Name = "statTestingHealth"; + this.statTestingHealth.Percent = false; + this.statTestingHealth.Size = new System.Drawing.Size(295, 45); + this.statTestingHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingHealth.TabIndex = 1; + this.statTestingHealth.Unknown = false; + // // tabPageExtractor // this.tabPageExtractor.Controls.Add(this.creatureInfoInput1); @@ -1003,6 +1159,15 @@ private void InitializeComponent() this.tabPageExtractor.Text = "Extractor"; this.tabPageExtractor.UseVisualStyleBackColor = true; // + // creatureInfoInput1 + // + this.creatureInfoInput1.Location = new System.Drawing.Point(499, 345); + this.creatureInfoInput1.Name = "creatureInfoInput1"; + this.creatureInfoInput1.Size = new System.Drawing.Size(230, 165); + this.creatureInfoInput1.TabIndex = 45; + this.creatureInfoInput1.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInput1_Add2Library_Clicked); + this.creatureInfoInput1.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); + // // groupBox2 // this.groupBox2.Controls.Add(this.buttonCopyClipboard); @@ -1035,45 +1200,197 @@ private void InitializeComponent() this.buttonExtractor2Tester.UseVisualStyleBackColor = true; this.buttonExtractor2Tester.Click += new System.EventHandler(this.buttonExtractor2Tester_Click); // - // tabPageLibrary - // - this.tabPageLibrary.Controls.Add(this.tableLayoutPanelLibrary); - this.tabPageLibrary.Location = new System.Drawing.Point(4, 22); - this.tabPageLibrary.Name = "tabPageLibrary"; - this.tabPageLibrary.Padding = new System.Windows.Forms.Padding(3); - this.tabPageLibrary.Size = new System.Drawing.Size(737, 516); - this.tabPageLibrary.TabIndex = 2; - this.tabPageLibrary.Text = "Library"; - this.tabPageLibrary.UseVisualStyleBackColor = true; - // - // tableLayoutPanelLibrary + // statIOStamina // - this.tableLayoutPanelLibrary.ColumnCount = 2; - this.tableLayoutPanelLibrary.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 201F)); - this.tableLayoutPanelLibrary.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanelLibrary.Controls.Add(this.tabControlLibFilter, 0, 1); - this.tableLayoutPanelLibrary.Controls.Add(this.listViewLibrary, 1, 0); - this.tableLayoutPanelLibrary.Controls.Add(this.creatureBoxListView, 0, 0); - this.tableLayoutPanelLibrary.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanelLibrary.Location = new System.Drawing.Point(3, 3); - this.tableLayoutPanelLibrary.Name = "tableLayoutPanelLibrary"; - this.tableLayoutPanelLibrary.RowCount = 2; - this.tableLayoutPanelLibrary.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 263F)); - this.tableLayoutPanelLibrary.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanelLibrary.Size = new System.Drawing.Size(731, 510); - this.tableLayoutPanelLibrary.TabIndex = 4; + this.statIOStamina.BackColor = System.Drawing.SystemColors.Control; + 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, 102); + this.statIOStamina.Name = "statIOStamina"; + this.statIOStamina.Percent = false; + this.statIOStamina.Size = new System.Drawing.Size(295, 45); + this.statIOStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOStamina.TabIndex = 3; + this.statIOStamina.Unknown = false; + this.statIOStamina.Click += new System.EventHandler(this.statIO_Click); // - // tabControlLibFilter + // statIOOxygen // - this.tabControlLibFilter.Controls.Add(this.tabPage1); - this.tabControlLibFilter.Controls.Add(this.tabPage2); - this.tabControlLibFilter.Controls.Add(this.tabPage3); - this.tabControlLibFilter.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlLibFilter.Location = new System.Drawing.Point(3, 266); - this.tabControlLibFilter.Name = "tabControlLibFilter"; - this.tabControlLibFilter.SelectedIndex = 0; - this.tabControlLibFilter.Size = new System.Drawing.Size(195, 241); - this.tabControlLibFilter.TabIndex = 5; + this.statIOOxygen.BackColor = System.Drawing.SystemColors.Control; + 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, 153); + this.statIOOxygen.Name = "statIOOxygen"; + this.statIOOxygen.Percent = false; + this.statIOOxygen.Size = new System.Drawing.Size(295, 45); + this.statIOOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOOxygen.TabIndex = 4; + this.statIOOxygen.Unknown = false; + this.statIOOxygen.Click += new System.EventHandler(this.statIO_Click); + // + // statIOHealth + // + this.statIOHealth.BackColor = System.Drawing.SystemColors.Control; + 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, 51); + this.statIOHealth.Name = "statIOHealth"; + this.statIOHealth.Percent = false; + this.statIOHealth.Size = new System.Drawing.Size(295, 45); + this.statIOHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOHealth.TabIndex = 2; + this.statIOHealth.Unknown = false; + this.statIOHealth.Click += new System.EventHandler(this.statIO_Click); + // + // statIOFood + // + this.statIOFood.BackColor = System.Drawing.SystemColors.Control; + 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, 204); + this.statIOFood.Name = "statIOFood"; + this.statIOFood.Percent = false; + this.statIOFood.Size = new System.Drawing.Size(295, 45); + this.statIOFood.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOFood.TabIndex = 5; + this.statIOFood.Unknown = false; + this.statIOFood.Click += new System.EventHandler(this.statIO_Click); + // + // statIOSpeed + // + this.statIOSpeed.BackColor = System.Drawing.SystemColors.Control; + 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, 357); + this.statIOSpeed.Name = "statIOSpeed"; + this.statIOSpeed.Percent = false; + this.statIOSpeed.Size = new System.Drawing.Size(295, 45); + this.statIOSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOSpeed.TabIndex = 8; + this.statIOSpeed.Unknown = false; + this.statIOSpeed.Click += new System.EventHandler(this.statIO_Click); + // + // statIOWeight + // + this.statIOWeight.BackColor = System.Drawing.SystemColors.Control; + 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, 255); + this.statIOWeight.Name = "statIOWeight"; + this.statIOWeight.Percent = false; + this.statIOWeight.Size = new System.Drawing.Size(295, 45); + this.statIOWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOWeight.TabIndex = 6; + this.statIOWeight.Unknown = false; + this.statIOWeight.Click += new System.EventHandler(this.statIO_Click); + // + // statIOTorpor + // + this.statIOTorpor.BackColor = System.Drawing.SystemColors.Control; + 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, 408); + this.statIOTorpor.Name = "statIOTorpor"; + this.statIOTorpor.Percent = false; + this.statIOTorpor.Size = new System.Drawing.Size(295, 45); + this.statIOTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOTorpor.TabIndex = 9; + this.statIOTorpor.Unknown = false; + // + // statIODamage + // + this.statIODamage.BackColor = System.Drawing.SystemColors.Control; + 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, 306); + this.statIODamage.Name = "statIODamage"; + this.statIODamage.Percent = false; + this.statIODamage.Size = new System.Drawing.Size(295, 45); + this.statIODamage.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIODamage.TabIndex = 7; + this.statIODamage.Unknown = false; + this.statIODamage.Click += new System.EventHandler(this.statIO_Click); + // + // tabPageLibrary + // + this.tabPageLibrary.Controls.Add(this.tableLayoutPanelLibrary); + this.tabPageLibrary.Location = new System.Drawing.Point(4, 22); + this.tabPageLibrary.Name = "tabPageLibrary"; + this.tabPageLibrary.Padding = new System.Windows.Forms.Padding(3); + this.tabPageLibrary.Size = new System.Drawing.Size(737, 516); + this.tabPageLibrary.TabIndex = 2; + this.tabPageLibrary.Text = "Library"; + this.tabPageLibrary.UseVisualStyleBackColor = true; + // + // tableLayoutPanelLibrary + // + this.tableLayoutPanelLibrary.ColumnCount = 2; + this.tableLayoutPanelLibrary.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 201F)); + this.tableLayoutPanelLibrary.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanelLibrary.Controls.Add(this.tabControlLibFilter, 0, 1); + this.tableLayoutPanelLibrary.Controls.Add(this.listViewLibrary, 1, 0); + this.tableLayoutPanelLibrary.Controls.Add(this.creatureBoxListView, 0, 0); + this.tableLayoutPanelLibrary.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanelLibrary.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanelLibrary.Name = "tableLayoutPanelLibrary"; + this.tableLayoutPanelLibrary.RowCount = 2; + this.tableLayoutPanelLibrary.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 263F)); + this.tableLayoutPanelLibrary.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanelLibrary.Size = new System.Drawing.Size(731, 510); + this.tableLayoutPanelLibrary.TabIndex = 4; + // + // tabControlLibFilter + // + this.tabControlLibFilter.Controls.Add(this.tabPage1); + this.tabControlLibFilter.Controls.Add(this.tabPage2); + this.tabControlLibFilter.Controls.Add(this.tabPage3); + this.tabControlLibFilter.Controls.Add(this.tabPage4); + this.tabControlLibFilter.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlLibFilter.Location = new System.Drawing.Point(3, 266); + this.tabControlLibFilter.Name = "tabControlLibFilter"; + this.tabControlLibFilter.SelectedIndex = 0; + this.tabControlLibFilter.Size = new System.Drawing.Size(195, 241); + this.tabControlLibFilter.TabIndex = 5; // // tabPage1 // @@ -1308,6 +1625,15 @@ private void InitializeComponent() this.columnHeader10.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.columnHeader10.Width = 30; // + // creatureBoxListView + // + this.creatureBoxListView.Location = new System.Drawing.Point(3, 3); + this.creatureBoxListView.Name = "creatureBoxListView"; + this.creatureBoxListView.Size = new System.Drawing.Size(195, 257); + this.creatureBoxListView.TabIndex = 0; + this.creatureBoxListView.Changed += new ARKBreedingStats.CreatureBox.ChangedEventHandler(this.creatureBoxListView_Changed); + this.creatureBoxListView.NeedParents += new ARKBreedingStats.CreatureBox.EventHandler(this.creatureBoxListView_FindParents); + // // tabPagePedigree // this.tabPagePedigree.Controls.Add(this.pedigree1); @@ -1319,6 +1645,15 @@ 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(731, 510); + this.pedigree1.TabIndex = 0; + // // statusStrip1 // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1365,336 +1700,27 @@ private void InitializeComponent() 0, 0}); // - // creatureInfoInputTester - // - this.creatureInfoInputTester.Location = new System.Drawing.Point(310, 306); - this.creatureInfoInputTester.Name = "creatureInfoInputTester"; - this.creatureInfoInputTester.Size = new System.Drawing.Size(230, 165); - this.creatureInfoInputTester.TabIndex = 42; - this.creatureInfoInputTester.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInputTester_Add2Library_Clicked); - this.creatureInfoInputTester.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); - // - // statTestingTorpor - // - this.statTestingTorpor.BackColor = System.Drawing.SystemColors.Control; - 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, 408); - this.statTestingTorpor.Name = "statTestingTorpor"; - this.statTestingTorpor.Percent = false; - this.statTestingTorpor.Size = new System.Drawing.Size(295, 45); - this.statTestingTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingTorpor.TabIndex = 35; - this.statTestingTorpor.Unknown = false; - // - // statTestingSpeed - // - this.statTestingSpeed.BackColor = System.Drawing.SystemColors.Control; - 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, 357); - this.statTestingSpeed.Name = "statTestingSpeed"; - this.statTestingSpeed.Percent = false; - this.statTestingSpeed.Size = new System.Drawing.Size(295, 45); - this.statTestingSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingSpeed.TabIndex = 7; - this.statTestingSpeed.Unknown = false; - // - // statTestingDamage + // tabPage4 // - this.statTestingDamage.BackColor = System.Drawing.SystemColors.Control; - 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, 306); - this.statTestingDamage.Name = "statTestingDamage"; - this.statTestingDamage.Percent = false; - this.statTestingDamage.Size = new System.Drawing.Size(295, 45); - this.statTestingDamage.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingDamage.TabIndex = 6; - this.statTestingDamage.Unknown = false; + this.tabPage4.Controls.Add(this.checkBoxShowDead); + 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, 215); + this.tabPage4.TabIndex = 3; + this.tabPage4.Text = "Other"; + this.tabPage4.UseVisualStyleBackColor = true; // - // statTestingWeight + // checkBoxShowDead // - this.statTestingWeight.BackColor = System.Drawing.SystemColors.Control; - 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, 255); - this.statTestingWeight.Name = "statTestingWeight"; - this.statTestingWeight.Percent = false; - this.statTestingWeight.Size = new System.Drawing.Size(295, 45); - this.statTestingWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingWeight.TabIndex = 5; - this.statTestingWeight.Unknown = false; - // - // statTestingFood - // - this.statTestingFood.BackColor = System.Drawing.SystemColors.Control; - 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, 204); - this.statTestingFood.Name = "statTestingFood"; - this.statTestingFood.Percent = false; - this.statTestingFood.Size = new System.Drawing.Size(295, 45); - this.statTestingFood.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingFood.TabIndex = 4; - this.statTestingFood.Unknown = false; - // - // statTestingOxygen - // - this.statTestingOxygen.BackColor = System.Drawing.SystemColors.Control; - 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, 153); - this.statTestingOxygen.Name = "statTestingOxygen"; - this.statTestingOxygen.Percent = false; - this.statTestingOxygen.Size = new System.Drawing.Size(295, 45); - this.statTestingOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingOxygen.TabIndex = 3; - this.statTestingOxygen.Unknown = false; - // - // statTestingStamina - // - this.statTestingStamina.BackColor = System.Drawing.SystemColors.Control; - 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, 102); - this.statTestingStamina.Name = "statTestingStamina"; - this.statTestingStamina.Percent = false; - this.statTestingStamina.Size = new System.Drawing.Size(295, 45); - this.statTestingStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingStamina.TabIndex = 2; - this.statTestingStamina.Unknown = false; - // - // statTestingHealth - // - this.statTestingHealth.BackColor = System.Drawing.SystemColors.Control; - 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, 51); - this.statTestingHealth.Name = "statTestingHealth"; - this.statTestingHealth.Percent = false; - this.statTestingHealth.Size = new System.Drawing.Size(295, 45); - this.statTestingHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingHealth.TabIndex = 1; - this.statTestingHealth.Unknown = false; - // - // creatureInfoInput1 - // - this.creatureInfoInput1.Location = new System.Drawing.Point(499, 345); - this.creatureInfoInput1.Name = "creatureInfoInput1"; - this.creatureInfoInput1.Size = new System.Drawing.Size(230, 165); - this.creatureInfoInput1.TabIndex = 45; - this.creatureInfoInput1.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInput1_Add2Library_Clicked); - this.creatureInfoInput1.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); - // - // statIOStamina - // - this.statIOStamina.BackColor = System.Drawing.SystemColors.Control; - 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, 102); - this.statIOStamina.Name = "statIOStamina"; - this.statIOStamina.Percent = false; - this.statIOStamina.Size = new System.Drawing.Size(295, 45); - this.statIOStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOStamina.TabIndex = 3; - this.statIOStamina.Unknown = false; - this.statIOStamina.Click += new System.EventHandler(this.statIO_Click); - // - // statIOOxygen - // - this.statIOOxygen.BackColor = System.Drawing.SystemColors.Control; - 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, 153); - this.statIOOxygen.Name = "statIOOxygen"; - this.statIOOxygen.Percent = false; - this.statIOOxygen.Size = new System.Drawing.Size(295, 45); - this.statIOOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOOxygen.TabIndex = 4; - this.statIOOxygen.Unknown = false; - this.statIOOxygen.Click += new System.EventHandler(this.statIO_Click); - // - // statIOHealth - // - this.statIOHealth.BackColor = System.Drawing.SystemColors.Control; - 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, 51); - this.statIOHealth.Name = "statIOHealth"; - this.statIOHealth.Percent = false; - this.statIOHealth.Size = new System.Drawing.Size(295, 45); - this.statIOHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOHealth.TabIndex = 2; - this.statIOHealth.Unknown = false; - this.statIOHealth.Click += new System.EventHandler(this.statIO_Click); - // - // statIOFood - // - this.statIOFood.BackColor = System.Drawing.SystemColors.Control; - 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, 204); - this.statIOFood.Name = "statIOFood"; - this.statIOFood.Percent = false; - this.statIOFood.Size = new System.Drawing.Size(295, 45); - this.statIOFood.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOFood.TabIndex = 5; - this.statIOFood.Unknown = false; - this.statIOFood.Click += new System.EventHandler(this.statIO_Click); - // - // statIOSpeed - // - this.statIOSpeed.BackColor = System.Drawing.SystemColors.Control; - 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, 357); - this.statIOSpeed.Name = "statIOSpeed"; - this.statIOSpeed.Percent = false; - this.statIOSpeed.Size = new System.Drawing.Size(295, 45); - this.statIOSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOSpeed.TabIndex = 8; - this.statIOSpeed.Unknown = false; - this.statIOSpeed.Click += new System.EventHandler(this.statIO_Click); - // - // statIOWeight - // - this.statIOWeight.BackColor = System.Drawing.SystemColors.Control; - 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, 255); - this.statIOWeight.Name = "statIOWeight"; - this.statIOWeight.Percent = false; - this.statIOWeight.Size = new System.Drawing.Size(295, 45); - this.statIOWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOWeight.TabIndex = 6; - this.statIOWeight.Unknown = false; - this.statIOWeight.Click += new System.EventHandler(this.statIO_Click); - // - // statIOTorpor - // - this.statIOTorpor.BackColor = System.Drawing.SystemColors.Control; - 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, 408); - this.statIOTorpor.Name = "statIOTorpor"; - this.statIOTorpor.Percent = false; - this.statIOTorpor.Size = new System.Drawing.Size(295, 45); - this.statIOTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOTorpor.TabIndex = 9; - this.statIOTorpor.Unknown = false; - // - // statIODamage - // - this.statIODamage.BackColor = System.Drawing.SystemColors.Control; - 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, 306); - this.statIODamage.Name = "statIODamage"; - this.statIODamage.Percent = false; - this.statIODamage.Size = new System.Drawing.Size(295, 45); - this.statIODamage.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIODamage.TabIndex = 7; - this.statIODamage.Unknown = false; - this.statIODamage.Click += new System.EventHandler(this.statIO_Click); - // - // creatureBoxListView - // - this.creatureBoxListView.Location = new System.Drawing.Point(3, 3); - this.creatureBoxListView.Name = "creatureBoxListView"; - this.creatureBoxListView.Size = new System.Drawing.Size(195, 257); - this.creatureBoxListView.TabIndex = 0; - this.creatureBoxListView.Changed += new ARKBreedingStats.CreatureBox.ChangedEventHandler(this.creatureBoxListView_Changed); - this.creatureBoxListView.NeedParents += new ARKBreedingStats.CreatureBox.EventHandler(this.creatureBoxListView_FindParents); - // - // 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(731, 510); - this.pedigree1.TabIndex = 0; + this.checkBoxShowDead.AutoSize = true; + this.checkBoxShowDead.Location = new System.Drawing.Point(6, 6); + this.checkBoxShowDead.Name = "checkBoxShowDead"; + this.checkBoxShowDead.Size = new System.Drawing.Size(130, 17); + this.checkBoxShowDead.TabIndex = 0; + this.checkBoxShowDead.Text = "Show Dead Creatures"; + this.checkBoxShowDead.UseVisualStyleBackColor = true; + this.checkBoxShowDead.CheckedChanged += new System.EventHandler(this.checkBoxShowDead_CheckedChanged); // // Form1 // @@ -1749,6 +1775,8 @@ private void InitializeComponent() this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.statTestingTamingEfficiency)).EndInit(); + this.tabPage4.ResumeLayout(false); + this.tabPage4.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1887,5 +1915,7 @@ private void InitializeComponent() private CreatureInfoInput creatureInfoInputTester; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem loadMultipliersfileToolStripMenuItem; + private System.Windows.Forms.TabPage tabPage4; + private System.Windows.Forms.CheckBox checkBoxShowDead; } } diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs index 0dd163c1..72d1f3a4 100644 --- a/ARKBreedingStats/Form1.cs +++ b/ARKBreedingStats/Form1.cs @@ -1334,12 +1334,22 @@ private void showCreaturesInListView(List creatures) listViewLibrary.EndUpdate(); } - private void creatureBoxListView_Changed(object sender, int index, Creature cr) + private void creatureBoxListView_Changed(object sender, int index, Creature cr, bool creatureStatusChanged) { // data of the selected creature changed, update listview recalculateCreatureValues(cr); - // int listViewLibrary replace old row with new one - listViewLibrary.Items[index] = createCreatureLVItem(cr, listViewLibrary.Items[index].Group); + + // if creaturestatus (dead/alive) changed, recalculate topstats (dead creatures are not considered there) + if (creatureStatusChanged) + { + calculateTopStats(creatureCollection.creatures.Where(c => c.species == cr.species).ToList()); + filterLib(); + } + else + { + // int listViewLibrary replace old row with new one + listViewLibrary.Items[index] = createCreatureLVItem(cr, listViewLibrary.Items[index].Group); + } // recreate ownerlist createOwnerList(); setCollectionChanged(true); @@ -1349,7 +1359,7 @@ private ListViewItem createCreatureLVItem(Creature cr, ListViewGroup g) { int topStatsCount = cr.topStatsCount; string gender = (cr.gender == Gender.Female ? "♀" : (cr.gender == Gender.Male ? "♂" : "?")); - string[] subItems = (new string[] { cr.name, cr.owner, gender, (cr.topness / 10).ToString(), topStatsCount.ToString(), cr.generation.ToString() }).Concat(cr.levelsWild.Select(x => x.ToString()).ToArray()).ToArray(); + string[] subItems = (new string[] { cr.name + (cr.status == CreatureStatus.Dead ? " (†)" : ""), cr.owner, gender, cr.topness.ToString(), topStatsCount.ToString(), cr.generation.ToString() }).Concat(cr.levelsWild.Select(x => x.ToString()).ToArray()).ToArray(); ListViewItem lvi = new ListViewItem(subItems, g); for (int s = 0; s < 8; s++) { @@ -1363,6 +1373,12 @@ private ListViewItem createCreatureLVItem(Creature cr, ListViewGroup g) lvi.SubItems[s + 6].BackColor = Utils.getColorFromPercent((int)(cr.levelsWild[s] * (s == 7 ? .357 : 2.5)), (considerStatHighlight[s] ? (cr.topBreedingStats[s] ? 0.2 : 0.7) : 0.93)); } lvi.SubItems[2].BackColor = (cr.gender == Gender.Female ? Color.FromArgb(255, 230, 255) : cr.gender == Gender.Male ? Color.FromArgb(220, 235, 255) : SystemColors.Window); + if (cr.status == CreatureStatus.Dead) + { + lvi.SubItems[0].ForeColor = SystemColors.GrayText; + lvi.BackColor = Color.FromArgb(255, 240, 220); + } + lvi.UseItemStyleForSubItems = false; // color for top-stats-nr @@ -1377,7 +1393,7 @@ private ListViewItem createCreatureLVItem(Creature cr, ListViewGroup g) lvi.SubItems[4].ForeColor = Color.LightGray; } // color for topness - lvi.SubItems[3].BackColor = Utils.getColorFromPercent(cr.topness / 5 - 100, 0.8); // topness is in permille. gradient from 500-1000 + lvi.SubItems[3].BackColor = Utils.getColorFromPercent(cr.topness * 2 - 100, 0.8); // topness is in percent. gradient from 50-100 // color for generation if (cr.generation == 0) @@ -1550,6 +1566,11 @@ private void listViewLibrary_SelectedIndexChanged(object sender, EventArgs e) } } + private void checkBoxShowDead_CheckedChanged(object sender, EventArgs e) + { + filterLib(); + } + private void treeViewCreatureLib_AfterSelect(object sender, TreeViewEventArgs e) { filterLib(); @@ -1585,6 +1606,10 @@ private void filterLib(int invertIndex = -1) bool showWOOwner = showOwnedBy.Contains("n/a"); // show creatures without owner filteredList = filteredList.Where(c => showOwnedBy.Contains(c.owner) || (showWOOwner && (c.owner == null || c.owner == ""))); + // show also dead creatures? + if (!checkBoxShowDead.Checked) + filteredList = filteredList.Where(c => c.status == CreatureStatus.Alive); + // display new results showCreaturesInListView(filteredList.OrderBy(c => c.name).ToList()); } @@ -1618,6 +1643,7 @@ private void calculateTopStats(List creatures) toolStripProgressBar1.Value = 0; toolStripProgressBar1.Maximum = speciesNames.Count(); toolStripProgressBar1.Visible = true; + Int32[] bestStat; List[] bestCreatures; bool noCreaturesInThisSpecies; @@ -1639,6 +1665,10 @@ private void calculateTopStats(List creatures) c.topBreedingStats = new bool[8]; c.topBreedingCreature = false; + // if dead, continue + if (c.status == CreatureStatus.Dead) + continue; + for (int s = 0; s < Enum.GetNames(typeof(StatName)).Count(); s++) { if (c.levelsWild[s] == bestStat[s] && c.levelsWild[s] > 0) @@ -1684,7 +1714,7 @@ private void calculateTopStats(List creatures) if (considerStatHighlight[s]) sumCreatureLevels += c.levelsWild[s]; } - c.topness = (Int16)(1000 * sumCreatureLevels / sumTopLevels); + c.topness = (Int16)(100 * sumCreatureLevels / sumTopLevels); } } diff --git a/ARKBreedingStats/PedigreeCreature.cs b/ARKBreedingStats/PedigreeCreature.cs index f4ab76ab..a9597255 100644 --- a/ARKBreedingStats/PedigreeCreature.cs +++ b/ARKBreedingStats/PedigreeCreature.cs @@ -16,6 +16,7 @@ public partial class PedigreeCreature : UserControl private Creature creature; public event Pedigree.CreatureChangedEventHandler CreatureChanged; private List