From c4a13fe2a3ac2875b57a98d7ab987e52f8c39dc3 Mon Sep 17 00:00:00 2001 From: cadon Date: Tue, 16 May 2023 23:28:55 +0200 Subject: [PATCH 1/4] option to display raising timers in overlay. option for overlay font size --- ARKBreedingStats/ARKOverlay.cs | 132 ++- ARKBreedingStats/App.config | 3 + ARKBreedingStats/Form1.Designer.cs | 882 +++++++++--------- ARKBreedingStats/Form1.cs | 57 +- ARKBreedingStats/Form1.l10n.cs | 2 +- ARKBreedingStats/Form1.resx | 248 ++--- ARKBreedingStats/IncubationTimerEntry.cs | 1 + .../Properties/Settings.Designer.cs | 12 + ARKBreedingStats/Properties/Settings.settings | 3 + ARKBreedingStats/TimerControl.cs | 2 +- ARKBreedingStats/library/Creature.cs | 2 + .../raising/RaisingControl.Designer.cs | 96 +- ARKBreedingStats/raising/RaisingControl.cs | 16 + .../settings/Settings.Designer.cs | 99 +- ARKBreedingStats/settings/Settings.cs | 2 + 15 files changed, 879 insertions(+), 678 deletions(-) diff --git a/ARKBreedingStats/ARKOverlay.cs b/ARKBreedingStats/ARKOverlay.cs index fb9bcdc61..b853d147c 100644 --- a/ARKBreedingStats/ARKOverlay.cs +++ b/ARKBreedingStats/ARKOverlay.cs @@ -1,5 +1,4 @@ using ARKBreedingStats.ocr; -using ARKBreedingStats.species; using System; using System.Collections.Generic; using System.Drawing; @@ -18,7 +17,9 @@ public partial class ARKOverlay : Form public Form1 ExtractorForm; private bool _ocrPossible; private bool _OCRing; - public List timers; + public TimerListEntry[] timers; + public List CreatureTimers; + public List IncubationTimers; private string _notes; public static ARKOverlay theOverlay; private DateTime _infoShownAt; @@ -26,25 +27,37 @@ public partial class ARKOverlay : Form private bool _currentlyInInventory; public bool checkInventoryStats; private bool _toggleInventoryCheck; // check inventory only every other time + private Dictionary _initialFontSizes; public ARKOverlay() { InitializeComponent(); FormBorderStyle = FormBorderStyle.None; ShowInTaskbar = false; + Win32API.SetHitTestVisibility(this.Handle, false); TopMost = true; parentInheritance1.ForeColor = Color.FromArgb(1, 1, 1); // so it's not transparent (black == TransparencyKey) - Win32API.SetHitTestVisibility(this.Handle, false); _infoShownAt = DateTime.Now.AddMinutes(-10); _labels = new[] { lblHealth, lblStamina, lblOxygen, lblFood, lblWeight, lblMeleeDamage, lblMovementSpeed, lblLevel }; + // save initial font sizes for later adjustment + _initialFontSizes = new Dictionary(); + foreach (Label l in _labels) + { l.Text = string.Empty; + _initialFontSizes[l] = l.Font.Size; + } lblStatus.Text = string.Empty; labelTimer.Text = string.Empty; labelInfo.Text = string.Empty; + _initialFontSizes[lblStatus] = lblStatus.Font.Size; + _initialFontSizes[labelTimer] = labelTimer.Font.Size; + _initialFontSizes[labelInfo] = labelInfo.Font.Size; + + Size = ArkOcr.Ocr.GetScreenshotOfProcess()?.Size ?? default; if (Size == default) Size = new Size(Screen.PrimaryScreen.Bounds.Width, Screen.PrimaryScreen.Bounds.Height); @@ -56,20 +69,19 @@ public ARKOverlay() _ocrPossible = ArkOcr.Ocr.ocrConfig != null && ArkOcr.Ocr.CheckResolutionSupportedByOcr(); - SetInfoPositions(); + SetInfoPositionsAndFontSize(); _notes = string.Empty; SetInheritanceCreatures(); - SetLocatlizations(); + SetLocalizations(); InfoDuration = 10; - - Location = new Point(0, 0); } - public void SetInfoPositions() + public void SetInfoPositionsAndFontSize() { labelTimer.Location = Properties.Settings.Default.OverlayTimerPosition; labelInfo.Location = new Point(Size.Width - labelInfo.Width - Properties.Settings.Default.OverlayInfoPosition.X, Properties.Settings.Default.OverlayInfoPosition.Y); + SetLabelFontSize(Properties.Settings.Default.OverlayRelativeFontSize); } public void InitLabelPositions() @@ -177,14 +189,15 @@ internal void SetInfoText(string infoText, Color textColor) /// private void SetTimerAndNotesText() { - StringBuilder sb = new StringBuilder(); + var sb = new StringBuilder(); if (timers?.Any() ?? false) { - bool timerListChanged = false; + var timerListChanged = false; foreach (TimerListEntry tle in timers) { - int secLeft = (int)tle.time.Subtract(DateTime.Now).TotalSeconds + 1; + var timeLeft = tle.time.Subtract(DateTime.Now); + int secLeft = (int)timeLeft.TotalSeconds + 1; if (secLeft < 10) { if (!Properties.Settings.Default.KeepExpiredTimersInOverlay && secLeft < -20) @@ -195,10 +208,53 @@ private void SetTimerAndNotesText() } sb.Append("expired "); } - sb.AppendLine($"{Utils.TimeLeft(tle.time)} : {tle.name}"); + sb.AppendLine($"{Utils.Duration(timeLeft)} : {tle.name}"); } if (timerListChanged) - timers = timers.Where(t => t.showInOverlay).ToList(); + timers = timers.Where(t => t.showInOverlay).ToArray(); + } + if (IncubationTimers?.Any() ?? false) + { + sb.AppendLine(); + sb.AppendLine(Loc.S("Incubation")); + foreach (var it in IncubationTimers) + { + var timeLeft = it.incubationEnd.Subtract(DateTime.Now); + int secLeft = (int)timeLeft.TotalSeconds + 1; + if (secLeft < 10) + { + if (!Properties.Settings.Default.KeepExpiredTimersInOverlay && secLeft < -20) + { + it.ShowInOverlay = false; + RemoveTimer(it); + continue; + } + sb.Append("incubated "); + } + sb.AppendLine($"{Utils.Duration(timeLeft)} : {(it.Mother?.Species ?? it.Father?.Species)?.DescriptiveName ?? "unknown species"}"); + } + } + if (CreatureTimers?.Any() ?? false) + { + sb.AppendLine(); + sb.AppendLine(Loc.S("Maturation")); + foreach (var c in CreatureTimers) + { + var timeLeft = c.growingUntil?.Subtract(DateTime.Now); + int secLeft = timeLeft == null ? -100 : (int)timeLeft.Value.TotalSeconds + 1; + if (secLeft < 10) + { + if (!Properties.Settings.Default.KeepExpiredTimersInOverlay && secLeft < -20) + { + c.ShowInOverlay = false; + RemoveTimer(c); + continue; + } + + timeLeft = null; + } + sb.AppendLine($"{(timeLeft == null ? "grown" : Utils.Duration(timeLeft.Value))} : {c.name} ({c.Species.DescriptiveName})"); + } } sb.Append(_notes); labelTimer.Text = sb.ToString(); @@ -212,7 +268,55 @@ internal void SetNotes(string notes) internal void SetInheritanceCreatures(Creature creature = null, Creature mother = null, Creature father = null) => parentInheritance1.SetCreatures(creature, mother, father); - internal void SetLocatlizations() + public static void AddTimer(Creature creature) + { + creature.ShowInOverlay = true; + + if (theOverlay == null) + return; + + if (theOverlay.CreatureTimers == null) + theOverlay.CreatureTimers = new List { creature }; + else theOverlay.CreatureTimers.Add(creature); + } + + public static void RemoveTimer(Creature creature) + { + creature.ShowInOverlay = false; + if (theOverlay?.CreatureTimers == null) return; + theOverlay.CreatureTimers.Remove(creature); + if (!theOverlay.CreatureTimers.Any()) + theOverlay.CreatureTimers = null; + } + + public static void AddTimer(IncubationTimerEntry incubationTimer) + { + incubationTimer.ShowInOverlay = true; + + if (theOverlay == null) + return; + + if (theOverlay.IncubationTimers == null) + theOverlay.IncubationTimers = new List { incubationTimer }; + else theOverlay.IncubationTimers.Add(incubationTimer); + } + + public static void RemoveTimer(IncubationTimerEntry incubationTimer) + { + incubationTimer.ShowInOverlay = false; + if (theOverlay?.IncubationTimers == null) return; + theOverlay.IncubationTimers.Remove(incubationTimer); + if (!theOverlay.IncubationTimers.Any()) + theOverlay.IncubationTimers = null; + } + + public void SetLabelFontSize(float relativeSize) + { + foreach (var l in _initialFontSizes) + l.Key.Font = new Font(l.Key.Font.FontFamily, l.Value * relativeSize, l.Key.Font.Style); + } + + internal void SetLocalizations() { parentInheritance1.SetLocalizations(); } diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config index fdd9247ea..013a710f7 100644 --- a/ARKBreedingStats/App.config +++ b/ARKBreedingStats/App.config @@ -493,6 +493,9 @@ + + 1 + diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs index b4fb6093c..2f26a67c0 100644 --- a/ARKBreedingStats/Form1.Designer.cs +++ b/ARKBreedingStats/Form1.Designer.cs @@ -58,6 +58,8 @@ private void InitializeComponent() this.groupBox1 = new System.Windows.Forms.GroupBox(); this.lbImprintedCount = new System.Windows.Forms.Label(); this.labelImprintingTester = new System.Windows.Forms.Label(); + this.numericUpDownImprintingBonusTester = new ARKBreedingStats.uiControls.Nud(); + this.NumericUpDownTestingTE = new ARKBreedingStats.uiControls.Nud(); this.labelTesterTE = new System.Windows.Forms.Label(); this.groupBoxPossibilities = new System.Windows.Forms.GroupBox(); this.listViewPossibilities = new System.Windows.Forms.ListView(); @@ -70,11 +72,14 @@ private void InitializeComponent() this.cbExactlyImprinting = new System.Windows.Forms.CheckBox(); this.labelImprintingBonus = new System.Windows.Forms.Label(); this.lbImprintingCuddleCountExtractor = new System.Windows.Forms.Label(); + this.numericUpDownImprintingBonusExtractor = new ARKBreedingStats.uiControls.Nud(); this.panelExtrTE = new System.Windows.Forms.Panel(); this.labelTE = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.numericUpDownUpperTEffBound = new ARKBreedingStats.uiControls.Nud(); this.label3 = new System.Windows.Forms.Label(); + this.numericUpDownLowerTEffBound = new ARKBreedingStats.uiControls.Nud(); this.lbLevel = new System.Windows.Forms.Label(); this.lbBreedingValueTester = new System.Windows.Forms.Label(); this.lbTesterWildLevel = new System.Windows.Forms.Label(); @@ -148,7 +153,9 @@ private void InitializeComponent() this.tabControlMain = new System.Windows.Forms.TabControl(); this.tabPageStatTesting = new System.Windows.Forms.TabPage(); this.pictureBoxColorRegionsTester = new System.Windows.Forms.PictureBox(); + this.statPotentials1 = new ARKBreedingStats.uiControls.StatPotentials(); this.gbStatChart = new System.Windows.Forms.GroupBox(); + this.radarChart1 = new ARKBreedingStats.RadarChart(); this.panelWildTamedBredTester = new System.Windows.Forms.Panel(); this.rbBredTester = new System.Windows.Forms.RadioButton(); this.rbTamedTester = new System.Windows.Forms.RadioButton(); @@ -167,12 +174,15 @@ private void InitializeComponent() this.lbCurrentCreature = new System.Windows.Forms.Label(); this.labelCurrentTesterCreature = new System.Windows.Forms.Label(); this.lbTestingInfo = new System.Windows.Forms.Label(); + this.creatureInfoInputTester = new ARKBreedingStats.CreatureInfoInput(); this.tabPageExtractor = new System.Windows.Forms.TabPage(); + this.creatureAnalysis1 = new ARKBreedingStats.uiControls.CreatureAnalysis(); this.LbBlueprintPath = new System.Windows.Forms.Label(); this.BtCopyIssueDumpToClipboard = new System.Windows.Forms.Button(); this.llOnlineHelpExtractionIssues = new System.Windows.Forms.LinkLabel(); this.PbCreatureColorsExtractor = new System.Windows.Forms.PictureBox(); this.groupBoxRadarChartExtractor = new System.Windows.Forms.GroupBox(); + this.radarChartExtractor = new ARKBreedingStats.RadarChart(); this.lbImprintingFailInfo = new System.Windows.Forms.Label(); this.groupBoxTamingInfo = new System.Windows.Forms.GroupBox(); this.labelTamingInfo = new System.Windows.Forms.Label(); @@ -184,6 +194,9 @@ private void InitializeComponent() this.btExtractLevels = new System.Windows.Forms.Button(); this.cbQuickWildCheck = new System.Windows.Forms.CheckBox(); this.labelErrorHelp = new System.Windows.Forms.Label(); + this.parentInheritanceExtractor = new ARKBreedingStats.uiControls.ParentInheritance(); + this.numericUpDownLevel = new ARKBreedingStats.uiControls.Nud(); + this.creatureInfoInputExtractor = new ARKBreedingStats.CreatureInfoInput(); this.tabPageLibrary = new System.Windows.Forms.TabPage(); this.tableLayoutPanelLibrary = new System.Windows.Forms.TableLayoutPanel(); this.listViewLibrary = new System.Windows.Forms.ListView(); @@ -270,21 +283,34 @@ private void InitializeComponent() this.buttonRecalculateTops = new System.Windows.Forms.Button(); this.label17 = new System.Windows.Forms.Label(); this.tabPageLibRadarChart = new System.Windows.Forms.TabPage(); + this.radarChartLibrary = new ARKBreedingStats.RadarChart(); + this.creatureBoxListView = new ARKBreedingStats.CreatureBox(); this.tabPageLibraryInfo = new System.Windows.Forms.TabPage(); this.tlpLibraryInfo = new System.Windows.Forms.TableLayoutPanel(); this.CbLibraryInfoUseFilter = new System.Windows.Forms.CheckBox(); this.BtCopyLibraryColorToClipboard = new System.Windows.Forms.Button(); this.tabPagePedigree = new System.Windows.Forms.TabPage(); + this.pedigree1 = new ARKBreedingStats.Pedigree.PedigreeControl(); this.tabPageTaming = new System.Windows.Forms.TabPage(); + this.tamingControl1 = new ARKBreedingStats.TamingControl(); this.tabPageBreedingPlan = new System.Windows.Forms.TabPage(); + this.breedingPlan1 = new ARKBreedingStats.BreedingPlanning.BreedingPlan(); this.tabPageHatching = new System.Windows.Forms.TabPage(); + this.hatching1 = new ARKBreedingStats.uiControls.Hatching(); this.tabPageRaising = new System.Windows.Forms.TabPage(); + this.raisingControl1 = new ARKBreedingStats.raising.RaisingControl(); this.tabPageTimer = new System.Windows.Forms.TabPage(); + this.timerList1 = new ARKBreedingStats.TimerControl(); this.tabPagePlayerTribes = new System.Windows.Forms.TabPage(); + this.tribesControl1 = new ARKBreedingStats.TribesControl(); this.tabPageNotes = new System.Windows.Forms.TabPage(); + this.notesControl1 = new ARKBreedingStats.NotesControl(); this.TabPageOCR = new System.Windows.Forms.TabPage(); + this.ocrControl1 = new ARKBreedingStats.ocr.OCRControl(); this.tabPageExtractionTests = new System.Windows.Forms.TabPage(); + this.extractionTestControl1 = new ARKBreedingStats.testCases.ExtractionTestControl(); this.tabPageMultiplierTesting = new System.Windows.Forms.TabPage(); + this.statsMultiplierTesting1 = new ARKBreedingStats.multiplierTesting.StatsMultiplierTesting(); this.btReadValuesFromArk = new System.Windows.Forms.Button(); this.cbEventMultipliers = new System.Windows.Forms.CheckBox(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); @@ -322,6 +348,7 @@ private void InitializeComponent() this.panelToolBar = new System.Windows.Forms.Panel(); this.btImportLastExported = new System.Windows.Forms.Button(); this.pbSpecies = new System.Windows.Forms.PictureBox(); + this.tbSpeciesGlobal = new ARKBreedingStats.uiControls.TextBoxSuggest(); this.cbGuessSpecies = new System.Windows.Forms.CheckBox(); this.cbToggleOverlay = new System.Windows.Forms.CheckBox(); this.lbListening = new System.Windows.Forms.Label(); @@ -329,39 +356,17 @@ private void InitializeComponent() this.lbLibrarySelectionInfo = new System.Windows.Forms.Label(); this.contextMenuStripLibraryHeader = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItemResetLibraryColumnWidths = new System.Windows.Forms.ToolStripMenuItem(); - this.statPotentials1 = new ARKBreedingStats.uiControls.StatPotentials(); - this.radarChart1 = new ARKBreedingStats.RadarChart(); - this.numericUpDownImprintingBonusTester = new ARKBreedingStats.uiControls.Nud(); - this.NumericUpDownTestingTE = new ARKBreedingStats.uiControls.Nud(); - this.creatureInfoInputTester = new ARKBreedingStats.CreatureInfoInput(); - this.creatureAnalysis1 = new ARKBreedingStats.uiControls.CreatureAnalysis(); - this.radarChartExtractor = new ARKBreedingStats.RadarChart(); - this.numericUpDownImprintingBonusExtractor = new ARKBreedingStats.uiControls.Nud(); - this.numericUpDownUpperTEffBound = new ARKBreedingStats.uiControls.Nud(); - this.numericUpDownLowerTEffBound = new ARKBreedingStats.uiControls.Nud(); - this.parentInheritanceExtractor = new ARKBreedingStats.uiControls.ParentInheritance(); - this.numericUpDownLevel = new ARKBreedingStats.uiControls.Nud(); - this.creatureInfoInputExtractor = new ARKBreedingStats.CreatureInfoInput(); - this.radarChartLibrary = new ARKBreedingStats.RadarChart(); - this.creatureBoxListView = new ARKBreedingStats.CreatureBox(); - this.pedigree1 = new ARKBreedingStats.Pedigree.PedigreeControl(); - this.tamingControl1 = new ARKBreedingStats.TamingControl(); - this.breedingPlan1 = new ARKBreedingStats.BreedingPlanning.BreedingPlan(); - this.hatching1 = new ARKBreedingStats.uiControls.Hatching(); - this.raisingControl1 = new ARKBreedingStats.raising.RaisingControl(); - this.timerList1 = new ARKBreedingStats.TimerControl(); - this.tribesControl1 = new ARKBreedingStats.TribesControl(); - this.notesControl1 = new ARKBreedingStats.NotesControl(); - this.ocrControl1 = new ARKBreedingStats.ocr.OCRControl(); - this.extractionTestControl1 = new ARKBreedingStats.testCases.ExtractionTestControl(); - this.statsMultiplierTesting1 = new ARKBreedingStats.multiplierTesting.StatsMultiplierTesting(); this.speciesSelector1 = new ARKBreedingStats.SpeciesSelector(); - this.tbSpeciesGlobal = new ARKBreedingStats.uiControls.TextBoxSuggest(); this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownImprintingBonusTester)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NumericUpDownTestingTE)).BeginInit(); this.groupBoxPossibilities.SuspendLayout(); this.groupBoxDetailsExtractor.SuspendLayout(); this.panelExtrImpr.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownImprintingBonusExtractor)).BeginInit(); this.panelExtrTE.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownUpperTEffBound)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLowerTEffBound)).BeginInit(); this.menuStrip1.SuspendLayout(); this.panelSums.SuspendLayout(); this.panelWildTamedBred.SuspendLayout(); @@ -369,6 +374,7 @@ private void InitializeComponent() this.tabPageStatTesting.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxColorRegionsTester)).BeginInit(); this.gbStatChart.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radarChart1)).BeginInit(); this.panelWildTamedBredTester.SuspendLayout(); this.groupBox2.SuspendLayout(); this.flowLayoutPanelStatIOsTester.SuspendLayout(); @@ -378,10 +384,12 @@ private void InitializeComponent() this.tabPageExtractor.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.PbCreatureColorsExtractor)).BeginInit(); this.groupBoxRadarChartExtractor.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radarChartExtractor)).BeginInit(); this.groupBoxTamingInfo.SuspendLayout(); this.gbStatsExtractor.SuspendLayout(); this.flowLayoutPanelStatIOsExtractor.SuspendLayout(); this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevel)).BeginInit(); this.tabPageLibrary.SuspendLayout(); this.tableLayoutPanelLibrary.SuspendLayout(); this.contextMenuStripLibrary.SuspendLayout(); @@ -391,6 +399,7 @@ private void InitializeComponent() this.tabPage3.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.tabPageLibRadarChart.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radarChartLibrary)).BeginInit(); this.tabPageLibraryInfo.SuspendLayout(); this.tlpLibraryInfo.SuspendLayout(); this.tabPagePedigree.SuspendLayout(); @@ -409,15 +418,6 @@ private void InitializeComponent() this.panelToolBar.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbSpecies)).BeginInit(); this.contextMenuStripLibraryHeader.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.radarChart1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownImprintingBonusTester)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NumericUpDownTestingTE)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.radarChartExtractor)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownImprintingBonusExtractor)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownUpperTEffBound)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLowerTEffBound)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevel)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.radarChartLibrary)).BeginInit(); this.SuspendLayout(); // // aboutToolStripMenuItem @@ -607,6 +607,47 @@ private void InitializeComponent() this.labelImprintingTester.TabIndex = 5; this.labelImprintingTester.Text = "% Imprinting Bonus"; // + // numericUpDownImprintingBonusTester + // + this.numericUpDownImprintingBonusTester.DecimalPlaces = 5; + this.numericUpDownImprintingBonusTester.Enabled = false; + this.numericUpDownImprintingBonusTester.ForeColor = System.Drawing.SystemColors.GrayText; + this.numericUpDownImprintingBonusTester.Location = new System.Drawing.Point(6, 45); + this.numericUpDownImprintingBonusTester.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownImprintingBonusTester.Name = "numericUpDownImprintingBonusTester"; + this.numericUpDownImprintingBonusTester.NeutralNumber = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.numericUpDownImprintingBonusTester.Size = new System.Drawing.Size(75, 20); + this.numericUpDownImprintingBonusTester.TabIndex = 4; + this.numericUpDownImprintingBonusTester.ValueChanged += new System.EventHandler(this.numericUpDownImprintingBonusTester_ValueChanged); + // + // NumericUpDownTestingTE + // + this.NumericUpDownTestingTE.DecimalPlaces = 2; + this.NumericUpDownTestingTE.ForeColor = System.Drawing.SystemColors.WindowText; + this.NumericUpDownTestingTE.Location = new System.Drawing.Point(6, 19); + this.NumericUpDownTestingTE.Name = "NumericUpDownTestingTE"; + this.NumericUpDownTestingTE.NeutralNumber = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.NumericUpDownTestingTE.Size = new System.Drawing.Size(60, 20); + this.NumericUpDownTestingTE.TabIndex = 0; + this.NumericUpDownTestingTE.Value = new decimal(new int[] { + 80, + 0, + 0, + 0}); + this.NumericUpDownTestingTE.ValueChanged += new System.EventHandler(this.NumericUpDownTestingTE_ValueChanged); + // // labelTesterTE // this.labelTesterTE.AutoSize = true; @@ -718,6 +759,27 @@ private void InitializeComponent() this.lbImprintingCuddleCountExtractor.TabIndex = 50; this.lbImprintingCuddleCountExtractor.Text = "(0×)"; // + // numericUpDownImprintingBonusExtractor + // + this.numericUpDownImprintingBonusExtractor.DecimalPlaces = 5; + this.numericUpDownImprintingBonusExtractor.ForeColor = System.Drawing.SystemColors.GrayText; + this.numericUpDownImprintingBonusExtractor.Location = new System.Drawing.Point(3, 3); + this.numericUpDownImprintingBonusExtractor.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownImprintingBonusExtractor.Name = "numericUpDownImprintingBonusExtractor"; + this.numericUpDownImprintingBonusExtractor.NeutralNumber = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.numericUpDownImprintingBonusExtractor.Size = new System.Drawing.Size(77, 20); + this.numericUpDownImprintingBonusExtractor.TabIndex = 6; + this.numericUpDownImprintingBonusExtractor.ValueChanged += new System.EventHandler(this.numericUpDownImprintingBonusExtractor_ValueChanged); + this.numericUpDownImprintingBonusExtractor.Enter += new System.EventHandler(this.numericUpDown_Enter); + // // panelExtrTE // this.panelExtrTE.Controls.Add(this.labelTE); @@ -757,6 +819,25 @@ private void InitializeComponent() this.label1.TabIndex = 5; this.label1.Text = "%"; // + // numericUpDownUpperTEffBound + // + this.numericUpDownUpperTEffBound.ForeColor = System.Drawing.SystemColors.WindowText; + this.numericUpDownUpperTEffBound.Location = new System.Drawing.Point(147, 3); + this.numericUpDownUpperTEffBound.Name = "numericUpDownUpperTEffBound"; + this.numericUpDownUpperTEffBound.NeutralNumber = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.numericUpDownUpperTEffBound.Size = new System.Drawing.Size(45, 20); + this.numericUpDownUpperTEffBound.TabIndex = 3; + this.numericUpDownUpperTEffBound.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownUpperTEffBound.Enter += new System.EventHandler(this.numericUpDown_Enter); + // // label3 // this.label3.AutoSize = true; @@ -766,6 +847,25 @@ private void InitializeComponent() this.label3.TabIndex = 2; this.label3.Text = "-"; // + // numericUpDownLowerTEffBound + // + this.numericUpDownLowerTEffBound.ForeColor = System.Drawing.SystemColors.WindowText; + this.numericUpDownLowerTEffBound.Location = new System.Drawing.Point(80, 3); + this.numericUpDownLowerTEffBound.Name = "numericUpDownLowerTEffBound"; + this.numericUpDownLowerTEffBound.NeutralNumber = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.numericUpDownLowerTEffBound.Size = new System.Drawing.Size(45, 20); + this.numericUpDownLowerTEffBound.TabIndex = 1; + this.numericUpDownLowerTEffBound.Value = new decimal(new int[] { + 80, + 0, + 0, + 0}); + this.numericUpDownLowerTEffBound.Enter += new System.EventHandler(this.numericUpDown_Enter); + // // lbLevel // this.lbLevel.AutoSize = true; @@ -1398,6 +1498,13 @@ private void InitializeComponent() this.pictureBoxColorRegionsTester.TabStop = false; this.pictureBoxColorRegionsTester.Click += new System.EventHandler(this.pictureBoxColorRegionsTester_Click); // + // statPotentials1 + // + this.statPotentials1.Location = new System.Drawing.Point(808, 9); + this.statPotentials1.Name = "statPotentials1"; + this.statPotentials1.Size = new System.Drawing.Size(293, 433); + this.statPotentials1.TabIndex = 12; + // // gbStatChart // this.gbStatChart.Controls.Add(this.radarChart1); @@ -1408,6 +1515,16 @@ private void InitializeComponent() this.gbStatChart.TabStop = false; this.gbStatChart.Text = "Stat-Chart"; // + // radarChart1 + // + this.radarChart1.Image = ((System.Drawing.Image)(resources.GetObject("radarChart1.Image"))); + this.radarChart1.Location = new System.Drawing.Point(6, 19); + this.radarChart1.Name = "radarChart1"; + this.radarChart1.Size = new System.Drawing.Size(200, 200); + this.radarChart1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.radarChart1.TabIndex = 10; + this.radarChart1.TabStop = false; + // // panelWildTamedBredTester // this.panelWildTamedBredTester.Controls.Add(this.rbBredTester); @@ -1594,6 +1711,42 @@ private void InitializeComponent() this.lbTestingInfo.TabIndex = 37; this.lbTestingInfo.Text = "Preview or edit levels of a creature."; // + // creatureInfoInputTester + // + this.creatureInfoInputTester.ColorIdsAlsoPossible = null; + this.creatureInfoInputTester.CooldownUntil = null; + this.creatureInfoInputTester.CreatureFlags = ARKBreedingStats.Library.CreatureFlags.None; + this.creatureInfoInputTester.CreatureName = ""; + this.creatureInfoInputTester.CreatureNote = ""; + this.creatureInfoInputTester.CreatureOwner = ""; + this.creatureInfoInputTester.CreatureServer = ""; + this.creatureInfoInputTester.CreatureSex = ARKBreedingStats.Library.Sex.Unknown; + this.creatureInfoInputTester.CreatureStatus = ARKBreedingStats.Library.CreatureStatus.Available; + this.creatureInfoInputTester.CreatureTribe = ""; + this.creatureInfoInputTester.DomesticatedAt = new System.DateTime(2014, 12, 31, 0, 0, 0, 0); + this.creatureInfoInputTester.Father = null; + this.creatureInfoInputTester.GrowingUntil = null; + this.creatureInfoInputTester.Location = new System.Drawing.Point(321, 184); + this.creatureInfoInputTester.LockServer = false; + this.creatureInfoInputTester.Mother = null; + this.creatureInfoInputTester.MutationCounterFather = 0; + this.creatureInfoInputTester.MutationCounterMother = 0; + this.creatureInfoInputTester.Name = "creatureInfoInputTester"; + this.creatureInfoInputTester.OwnerLock = false; + this.creatureInfoInputTester.RegionColors = new byte[] { + ((byte)(0)), + ((byte)(0)), + ((byte)(0)), + ((byte)(0)), + ((byte)(0)), + ((byte)(0))}; + this.creatureInfoInputTester.Size = new System.Drawing.Size(262, 590); + this.creatureInfoInputTester.TabIndex = 4; + this.creatureInfoInputTester.TribeLock = false; + this.creatureInfoInputTester.Add2LibraryClicked += new System.Action(this.creatureInfoInputTester_Add2Library_Clicked); + this.creatureInfoInputTester.Save2LibraryClicked += new System.Action(this.creatureInfoInputTester_Save2Library_Clicked); + this.creatureInfoInputTester.ParentListRequested += new System.Action(this.CreatureInfoInput_ParentListRequested); + // // tabPageExtractor // this.tabPageExtractor.AutoScroll = true; @@ -1626,6 +1779,13 @@ private void InitializeComponent() this.tabPageExtractor.Text = "Extractor"; this.tabPageExtractor.UseVisualStyleBackColor = true; // + // creatureAnalysis1 + // + this.creatureAnalysis1.Location = new System.Drawing.Point(851, 265); + this.creatureAnalysis1.Name = "creatureAnalysis1"; + this.creatureAnalysis1.Size = new System.Drawing.Size(346, 199); + this.creatureAnalysis1.TabIndex = 55; + // // LbBlueprintPath // this.LbBlueprintPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -1678,6 +1838,17 @@ private void InitializeComponent() this.groupBoxRadarChartExtractor.TabStop = false; this.groupBoxRadarChartExtractor.Text = "Stat-Chart"; // + // radarChartExtractor + // + this.radarChartExtractor.Dock = System.Windows.Forms.DockStyle.Fill; + this.radarChartExtractor.Image = ((System.Drawing.Image)(resources.GetObject("radarChartExtractor.Image"))); + this.radarChartExtractor.Location = new System.Drawing.Point(3, 16); + this.radarChartExtractor.Name = "radarChartExtractor"; + this.radarChartExtractor.Size = new System.Drawing.Size(144, 144); + this.radarChartExtractor.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.radarChartExtractor.TabIndex = 10; + this.radarChartExtractor.TabStop = false; + // // lbImprintingFailInfo // this.lbImprintingFailInfo.BackColor = System.Drawing.Color.MistyRose; @@ -1794,18 +1965,84 @@ private void InitializeComponent() this.labelErrorHelp.TabIndex = 40; this.labelErrorHelp.Text = resources.GetString("labelErrorHelp.Text"); // - // 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(1870, 749); - this.tabPageLibrary.TabIndex = 2; - this.tabPageLibrary.Text = "Library"; - this.tabPageLibrary.UseVisualStyleBackColor = true; - // - // tableLayoutPanelLibrary + // parentInheritanceExtractor + // + this.parentInheritanceExtractor.Location = new System.Drawing.Point(851, 470); + this.parentInheritanceExtractor.Name = "parentInheritanceExtractor"; + this.parentInheritanceExtractor.Size = new System.Drawing.Size(337, 182); + this.parentInheritanceExtractor.TabIndex = 52; + // + // numericUpDownLevel + // + this.numericUpDownLevel.ForeColor = System.Drawing.SystemColors.WindowText; + this.numericUpDownLevel.Location = new System.Drawing.Point(244, 9); + this.numericUpDownLevel.Maximum = new decimal(new int[] { + 100000, + 0, + 0, + 0}); + this.numericUpDownLevel.Name = "numericUpDownLevel"; + this.numericUpDownLevel.NeutralNumber = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.numericUpDownLevel.Size = new System.Drawing.Size(56, 20); + this.numericUpDownLevel.TabIndex = 2; + this.numericUpDownLevel.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownLevel.Enter += new System.EventHandler(this.numericUpDown_Enter); + // + // creatureInfoInputExtractor + // + this.creatureInfoInputExtractor.ColorIdsAlsoPossible = null; + this.creatureInfoInputExtractor.CooldownUntil = null; + this.creatureInfoInputExtractor.CreatureFlags = ARKBreedingStats.Library.CreatureFlags.None; + this.creatureInfoInputExtractor.CreatureName = ""; + this.creatureInfoInputExtractor.CreatureNote = ""; + this.creatureInfoInputExtractor.CreatureOwner = ""; + this.creatureInfoInputExtractor.CreatureServer = ""; + this.creatureInfoInputExtractor.CreatureSex = ARKBreedingStats.Library.Sex.Unknown; + this.creatureInfoInputExtractor.CreatureStatus = ARKBreedingStats.Library.CreatureStatus.Available; + this.creatureInfoInputExtractor.CreatureTribe = ""; + this.creatureInfoInputExtractor.DomesticatedAt = new System.DateTime(2014, 12, 31, 0, 0, 0, 0); + this.creatureInfoInputExtractor.Father = null; + this.creatureInfoInputExtractor.GrowingUntil = null; + this.creatureInfoInputExtractor.Location = new System.Drawing.Point(321, 184); + this.creatureInfoInputExtractor.LockServer = false; + this.creatureInfoInputExtractor.Mother = null; + this.creatureInfoInputExtractor.MutationCounterFather = 0; + this.creatureInfoInputExtractor.MutationCounterMother = 0; + this.creatureInfoInputExtractor.Name = "creatureInfoInputExtractor"; + this.creatureInfoInputExtractor.OwnerLock = false; + this.creatureInfoInputExtractor.RegionColors = new byte[] { + ((byte)(0)), + ((byte)(0)), + ((byte)(0)), + ((byte)(0)), + ((byte)(0)), + ((byte)(0))}; + this.creatureInfoInputExtractor.Size = new System.Drawing.Size(262, 590); + this.creatureInfoInputExtractor.TabIndex = 7; + this.creatureInfoInputExtractor.TribeLock = false; + this.creatureInfoInputExtractor.Add2LibraryClicked += new System.Action(this.creatureInfoInputExtractor_Add2Library_Clicked); + this.creatureInfoInputExtractor.ParentListRequested += new System.Action(this.CreatureInfoInput_ParentListRequested); + // + // 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(1870, 749); + 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()); @@ -2513,6 +2750,27 @@ private void InitializeComponent() this.tabPageLibRadarChart.Text = "Chart"; this.tabPageLibRadarChart.UseVisualStyleBackColor = true; // + // radarChartLibrary + // + this.radarChartLibrary.Dock = System.Windows.Forms.DockStyle.Top; + this.radarChartLibrary.Image = ((System.Drawing.Image)(resources.GetObject("radarChartLibrary.Image"))); + this.radarChartLibrary.Location = new System.Drawing.Point(3, 3); + this.radarChartLibrary.Name = "radarChartLibrary"; + this.radarChartLibrary.Size = new System.Drawing.Size(175, 287); + this.radarChartLibrary.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.radarChartLibrary.TabIndex = 0; + this.radarChartLibrary.TabStop = false; + // + // creatureBoxListView + // + this.creatureBoxListView.Location = new System.Drawing.Point(3, 3); + this.creatureBoxListView.Name = "creatureBoxListView"; + this.creatureBoxListView.Size = new System.Drawing.Size(189, 406); + this.creatureBoxListView.TabIndex = 0; + this.creatureBoxListView.Changed += new System.Action(this.UpdateDisplayedCreatureValues); + this.creatureBoxListView.GiveParents += new System.Action(this.CreatureBoxListView_FindParents); + this.creatureBoxListView.SelectCreature += new System.Action(this.SelectCreatureInLibrary); + // // tabPageLibraryInfo // this.tabPageLibraryInfo.Controls.Add(this.tlpLibraryInfo); @@ -2572,6 +2830,16 @@ 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.LeftColumnWidth = 203; + this.pedigree1.Location = new System.Drawing.Point(3, 3); + this.pedigree1.Name = "pedigree1"; + this.pedigree1.Size = new System.Drawing.Size(1864, 743); + this.pedigree1.TabIndex = 0; + // // tabPageTaming // this.tabPageTaming.Controls.Add(this.tamingControl1); @@ -2583,6 +2851,24 @@ private void InitializeComponent() this.tabPageTaming.Text = "Taming"; this.tabPageTaming.UseVisualStyleBackColor = true; // + // tamingControl1 + // + this.tamingControl1.AutoScroll = true; + 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(1864, 743); + this.tamingControl1.TabIndex = 0; + this.tamingControl1.WeaponDamages = new double[] { + 100D, + 100D, + 100D, + 100D, + 100D, + 100D, + 100D}; + this.tamingControl1.WeaponDamagesEnabled = 3; + // // tabPageBreedingPlan // this.tabPageBreedingPlan.Controls.Add(this.breedingPlan1); @@ -2594,6 +2880,17 @@ private void InitializeComponent() this.tabPageBreedingPlan.Text = "Breeding Plan"; this.tabPageBreedingPlan.UseVisualStyleBackColor = true; // + // breedingPlan1 + // + this.breedingPlan1.AutoScroll = true; + this.breedingPlan1.CurrentSpecies = null; + this.breedingPlan1.Dock = System.Windows.Forms.DockStyle.Fill; + this.breedingPlan1.Location = new System.Drawing.Point(3, 3); + this.breedingPlan1.MutationLimit = 0; + this.breedingPlan1.Name = "breedingPlan1"; + this.breedingPlan1.Size = new System.Drawing.Size(1864, 743); + this.breedingPlan1.TabIndex = 0; + // // tabPageHatching // this.tabPageHatching.Controls.Add(this.hatching1); @@ -2605,6 +2902,14 @@ private void InitializeComponent() this.tabPageHatching.Text = "Hatching"; this.tabPageHatching.UseVisualStyleBackColor = true; // + // hatching1 + // + this.hatching1.Dock = System.Windows.Forms.DockStyle.Fill; + this.hatching1.Location = new System.Drawing.Point(3, 3); + this.hatching1.Name = "hatching1"; + this.hatching1.Size = new System.Drawing.Size(1864, 743); + this.hatching1.TabIndex = 0; + // // tabPageRaising // this.tabPageRaising.Controls.Add(this.raisingControl1); @@ -2616,6 +2921,15 @@ private void InitializeComponent() this.tabPageRaising.Text = "Raising"; this.tabPageRaising.UseVisualStyleBackColor = true; // + // raisingControl1 + // + this.raisingControl1.AutoScroll = true; + this.raisingControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.raisingControl1.Location = new System.Drawing.Point(3, 3); + this.raisingControl1.Name = "raisingControl1"; + this.raisingControl1.Size = new System.Drawing.Size(1864, 743); + this.raisingControl1.TabIndex = 0; + // // tabPageTimer // this.tabPageTimer.Controls.Add(this.timerList1); @@ -2627,6 +2941,15 @@ 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(1864, 743); + this.timerList1.TabIndex = 0; + this.timerList1.TimerAlertsCSV = ""; + // // tabPagePlayerTribes // this.tabPagePlayerTribes.Controls.Add(this.tribesControl1); @@ -2638,6 +2961,14 @@ 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(1864, 743); + this.tribesControl1.TabIndex = 0; + // // tabPageNotes // this.tabPageNotes.Controls.Add(this.notesControl1); @@ -2649,6 +2980,14 @@ private void InitializeComponent() this.tabPageNotes.Text = "Notes"; this.tabPageNotes.UseVisualStyleBackColor = true; // + // notesControl1 + // + this.notesControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.notesControl1.Location = new System.Drawing.Point(3, 3); + this.notesControl1.Name = "notesControl1"; + this.notesControl1.Size = new System.Drawing.Size(1864, 743); + this.notesControl1.TabIndex = 0; + // // TabPageOCR // this.TabPageOCR.Controls.Add(this.ocrControl1); @@ -2660,6 +2999,14 @@ private void InitializeComponent() this.TabPageOCR.Text = "Experimental OCR"; this.TabPageOCR.UseVisualStyleBackColor = true; // + // ocrControl1 + // + this.ocrControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ocrControl1.Location = new System.Drawing.Point(3, 3); + this.ocrControl1.Name = "ocrControl1"; + this.ocrControl1.Size = new System.Drawing.Size(1864, 743); + this.ocrControl1.TabIndex = 2; + // // tabPageExtractionTests // this.tabPageExtractionTests.Controls.Add(this.extractionTestControl1); @@ -2671,6 +3018,14 @@ private void InitializeComponent() this.tabPageExtractionTests.Text = "Extraction Tests"; this.tabPageExtractionTests.UseVisualStyleBackColor = true; // + // extractionTestControl1 + // + this.extractionTestControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.extractionTestControl1.Location = new System.Drawing.Point(3, 3); + this.extractionTestControl1.Name = "extractionTestControl1"; + this.extractionTestControl1.Size = new System.Drawing.Size(1864, 743); + this.extractionTestControl1.TabIndex = 0; + // // tabPageMultiplierTesting // this.tabPageMultiplierTesting.Controls.Add(this.statsMultiplierTesting1); @@ -2682,6 +3037,14 @@ private void InitializeComponent() this.tabPageMultiplierTesting.Text = "Multiplier Testing"; this.tabPageMultiplierTesting.UseVisualStyleBackColor = true; // + // statsMultiplierTesting1 + // + this.statsMultiplierTesting1.Dock = System.Windows.Forms.DockStyle.Fill; + this.statsMultiplierTesting1.Location = new System.Drawing.Point(3, 3); + this.statsMultiplierTesting1.Name = "statsMultiplierTesting1"; + this.statsMultiplierTesting1.Size = new System.Drawing.Size(1864, 743); + this.statsMultiplierTesting1.TabIndex = 0; + // // btReadValuesFromArk // this.btReadValuesFromArk.Location = new System.Drawing.Point(262, 3); @@ -3054,6 +3417,18 @@ private void InitializeComponent() this.pbSpecies.TabStop = false; this.pbSpecies.Click += new System.EventHandler(this.pbSpecies_Click); // + // tbSpeciesGlobal + // + this.tbSpeciesGlobal.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append; + this.tbSpeciesGlobal.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource; + this.tbSpeciesGlobal.Location = new System.Drawing.Point(104, 3); + this.tbSpeciesGlobal.Name = "tbSpeciesGlobal"; + this.tbSpeciesGlobal.Size = new System.Drawing.Size(152, 20); + this.tbSpeciesGlobal.TabIndex = 8; + this.tbSpeciesGlobal.Click += new System.EventHandler(this.tbSpeciesGlobal_Click); + this.tbSpeciesGlobal.Enter += new System.EventHandler(this.tbSpeciesGlobal_Enter); + this.tbSpeciesGlobal.KeyUp += new System.Windows.Forms.KeyEventHandler(this.TbSpeciesGlobal_KeyUp); + // // cbGuessSpecies // this.cbGuessSpecies.AutoSize = true; @@ -3122,392 +3497,17 @@ private void InitializeComponent() this.toolStripMenuItemResetLibraryColumnWidths.Text = "Reset column width"; this.toolStripMenuItemResetLibraryColumnWidths.Click += new System.EventHandler(this.toolStripMenuItemResetLibraryColumnWidths_Click); // - // statPotentials1 - // - this.statPotentials1.Location = new System.Drawing.Point(808, 9); - this.statPotentials1.Name = "statPotentials1"; - this.statPotentials1.Size = new System.Drawing.Size(293, 433); - this.statPotentials1.TabIndex = 12; - // - // radarChart1 + // speciesSelector1 // - this.radarChart1.Image = ((System.Drawing.Image)(resources.GetObject("radarChart1.Image"))); - this.radarChart1.Location = new System.Drawing.Point(6, 19); - this.radarChart1.Name = "radarChart1"; - this.radarChart1.Size = new System.Drawing.Size(200, 200); - this.radarChart1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.radarChart1.TabIndex = 10; - this.radarChart1.TabStop = false; + this.speciesSelector1.Dock = System.Windows.Forms.DockStyle.Fill; + this.speciesSelector1.LastSpecies = new string[0]; + this.speciesSelector1.Location = new System.Drawing.Point(0, 103); + this.speciesSelector1.Name = "speciesSelector1"; + this.speciesSelector1.Size = new System.Drawing.Size(1878, 775); + this.speciesSelector1.SplitterDistance = 500; + this.speciesSelector1.TabIndex = 0; // - // numericUpDownImprintingBonusTester - // - this.numericUpDownImprintingBonusTester.DecimalPlaces = 5; - this.numericUpDownImprintingBonusTester.Enabled = false; - this.numericUpDownImprintingBonusTester.ForeColor = System.Drawing.SystemColors.GrayText; - this.numericUpDownImprintingBonusTester.Location = new System.Drawing.Point(6, 45); - this.numericUpDownImprintingBonusTester.Maximum = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.numericUpDownImprintingBonusTester.Name = "numericUpDownImprintingBonusTester"; - this.numericUpDownImprintingBonusTester.NeutralNumber = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.numericUpDownImprintingBonusTester.Size = new System.Drawing.Size(75, 20); - this.numericUpDownImprintingBonusTester.TabIndex = 4; - this.numericUpDownImprintingBonusTester.ValueChanged += new System.EventHandler(this.numericUpDownImprintingBonusTester_ValueChanged); - // - // NumericUpDownTestingTE - // - this.NumericUpDownTestingTE.DecimalPlaces = 2; - this.NumericUpDownTestingTE.ForeColor = System.Drawing.SystemColors.WindowText; - this.NumericUpDownTestingTE.Location = new System.Drawing.Point(6, 19); - this.NumericUpDownTestingTE.Name = "NumericUpDownTestingTE"; - this.NumericUpDownTestingTE.NeutralNumber = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.NumericUpDownTestingTE.Size = new System.Drawing.Size(60, 20); - this.NumericUpDownTestingTE.TabIndex = 0; - this.NumericUpDownTestingTE.Value = new decimal(new int[] { - 80, - 0, - 0, - 0}); - this.NumericUpDownTestingTE.ValueChanged += new System.EventHandler(this.NumericUpDownTestingTE_ValueChanged); - // - // creatureInfoInputTester - // - this.creatureInfoInputTester.ColorIdsAlsoPossible = null; - this.creatureInfoInputTester.CooldownUntil = null; - this.creatureInfoInputTester.CreatureFlags = ARKBreedingStats.Library.CreatureFlags.None; - this.creatureInfoInputTester.CreatureName = ""; - this.creatureInfoInputTester.CreatureNote = ""; - this.creatureInfoInputTester.CreatureOwner = ""; - this.creatureInfoInputTester.CreatureServer = ""; - this.creatureInfoInputTester.CreatureSex = ARKBreedingStats.Library.Sex.Unknown; - this.creatureInfoInputTester.CreatureStatus = ARKBreedingStats.Library.CreatureStatus.Available; - this.creatureInfoInputTester.CreatureTribe = ""; - this.creatureInfoInputTester.DomesticatedAt = new System.DateTime(2014, 12, 31, 0, 0, 0, 0); - this.creatureInfoInputTester.Father = null; - this.creatureInfoInputTester.GrowingUntil = null; - this.creatureInfoInputTester.Location = new System.Drawing.Point(321, 184); - this.creatureInfoInputTester.LockServer = false; - this.creatureInfoInputTester.Mother = null; - this.creatureInfoInputTester.MutationCounterFather = 0; - this.creatureInfoInputTester.MutationCounterMother = 0; - this.creatureInfoInputTester.Name = "creatureInfoInputTester"; - this.creatureInfoInputTester.OwnerLock = false; - this.creatureInfoInputTester.RegionColors = new byte[] { - ((byte)(0)), - ((byte)(0)), - ((byte)(0)), - ((byte)(0)), - ((byte)(0)), - ((byte)(0))}; - this.creatureInfoInputTester.Size = new System.Drawing.Size(262, 590); - this.creatureInfoInputTester.TabIndex = 4; - this.creatureInfoInputTester.TribeLock = false; - this.creatureInfoInputTester.Add2LibraryClicked += new System.Action(this.creatureInfoInputTester_Add2Library_Clicked); - this.creatureInfoInputTester.Save2LibraryClicked += new System.Action(this.creatureInfoInputTester_Save2Library_Clicked); - this.creatureInfoInputTester.ParentListRequested += new System.Action(this.CreatureInfoInput_ParentListRequested); - // - // creatureAnalysis1 - // - this.creatureAnalysis1.Location = new System.Drawing.Point(851, 265); - this.creatureAnalysis1.Name = "creatureAnalysis1"; - this.creatureAnalysis1.Size = new System.Drawing.Size(346, 199); - this.creatureAnalysis1.TabIndex = 55; - // - // radarChartExtractor - // - this.radarChartExtractor.Dock = System.Windows.Forms.DockStyle.Fill; - this.radarChartExtractor.Image = ((System.Drawing.Image)(resources.GetObject("radarChartExtractor.Image"))); - this.radarChartExtractor.Location = new System.Drawing.Point(3, 16); - this.radarChartExtractor.Name = "radarChartExtractor"; - this.radarChartExtractor.Size = new System.Drawing.Size(144, 144); - this.radarChartExtractor.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.radarChartExtractor.TabIndex = 10; - this.radarChartExtractor.TabStop = false; - // - // numericUpDownImprintingBonusExtractor - // - this.numericUpDownImprintingBonusExtractor.DecimalPlaces = 5; - this.numericUpDownImprintingBonusExtractor.ForeColor = System.Drawing.SystemColors.GrayText; - this.numericUpDownImprintingBonusExtractor.Location = new System.Drawing.Point(3, 3); - this.numericUpDownImprintingBonusExtractor.Maximum = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.numericUpDownImprintingBonusExtractor.Name = "numericUpDownImprintingBonusExtractor"; - this.numericUpDownImprintingBonusExtractor.NeutralNumber = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.numericUpDownImprintingBonusExtractor.Size = new System.Drawing.Size(77, 20); - this.numericUpDownImprintingBonusExtractor.TabIndex = 6; - this.numericUpDownImprintingBonusExtractor.ValueChanged += new System.EventHandler(this.numericUpDownImprintingBonusExtractor_ValueChanged); - this.numericUpDownImprintingBonusExtractor.Enter += new System.EventHandler(this.numericUpDown_Enter); - // - // numericUpDownUpperTEffBound - // - this.numericUpDownUpperTEffBound.ForeColor = System.Drawing.SystemColors.WindowText; - this.numericUpDownUpperTEffBound.Location = new System.Drawing.Point(147, 3); - this.numericUpDownUpperTEffBound.Name = "numericUpDownUpperTEffBound"; - this.numericUpDownUpperTEffBound.NeutralNumber = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.numericUpDownUpperTEffBound.Size = new System.Drawing.Size(45, 20); - this.numericUpDownUpperTEffBound.TabIndex = 3; - this.numericUpDownUpperTEffBound.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.numericUpDownUpperTEffBound.Enter += new System.EventHandler(this.numericUpDown_Enter); - // - // numericUpDownLowerTEffBound - // - this.numericUpDownLowerTEffBound.ForeColor = System.Drawing.SystemColors.WindowText; - this.numericUpDownLowerTEffBound.Location = new System.Drawing.Point(80, 3); - this.numericUpDownLowerTEffBound.Name = "numericUpDownLowerTEffBound"; - this.numericUpDownLowerTEffBound.NeutralNumber = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.numericUpDownLowerTEffBound.Size = new System.Drawing.Size(45, 20); - this.numericUpDownLowerTEffBound.TabIndex = 1; - this.numericUpDownLowerTEffBound.Value = new decimal(new int[] { - 80, - 0, - 0, - 0}); - this.numericUpDownLowerTEffBound.Enter += new System.EventHandler(this.numericUpDown_Enter); - // - // parentInheritanceExtractor - // - this.parentInheritanceExtractor.Location = new System.Drawing.Point(851, 470); - this.parentInheritanceExtractor.Name = "parentInheritanceExtractor"; - this.parentInheritanceExtractor.Size = new System.Drawing.Size(337, 182); - this.parentInheritanceExtractor.TabIndex = 52; - // - // numericUpDownLevel - // - this.numericUpDownLevel.ForeColor = System.Drawing.SystemColors.WindowText; - this.numericUpDownLevel.Location = new System.Drawing.Point(244, 9); - this.numericUpDownLevel.Maximum = new decimal(new int[] { - 100000, - 0, - 0, - 0}); - this.numericUpDownLevel.Name = "numericUpDownLevel"; - this.numericUpDownLevel.NeutralNumber = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.numericUpDownLevel.Size = new System.Drawing.Size(56, 20); - this.numericUpDownLevel.TabIndex = 2; - this.numericUpDownLevel.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDownLevel.Enter += new System.EventHandler(this.numericUpDown_Enter); - // - // creatureInfoInputExtractor - // - this.creatureInfoInputExtractor.ColorIdsAlsoPossible = null; - this.creatureInfoInputExtractor.CooldownUntil = null; - this.creatureInfoInputExtractor.CreatureFlags = ARKBreedingStats.Library.CreatureFlags.None; - this.creatureInfoInputExtractor.CreatureName = ""; - this.creatureInfoInputExtractor.CreatureNote = ""; - this.creatureInfoInputExtractor.CreatureOwner = ""; - this.creatureInfoInputExtractor.CreatureServer = ""; - this.creatureInfoInputExtractor.CreatureSex = ARKBreedingStats.Library.Sex.Unknown; - this.creatureInfoInputExtractor.CreatureStatus = ARKBreedingStats.Library.CreatureStatus.Available; - this.creatureInfoInputExtractor.CreatureTribe = ""; - this.creatureInfoInputExtractor.DomesticatedAt = new System.DateTime(2014, 12, 31, 0, 0, 0, 0); - this.creatureInfoInputExtractor.Father = null; - this.creatureInfoInputExtractor.GrowingUntil = null; - this.creatureInfoInputExtractor.Location = new System.Drawing.Point(321, 184); - this.creatureInfoInputExtractor.LockServer = false; - this.creatureInfoInputExtractor.Mother = null; - this.creatureInfoInputExtractor.MutationCounterFather = 0; - this.creatureInfoInputExtractor.MutationCounterMother = 0; - this.creatureInfoInputExtractor.Name = "creatureInfoInputExtractor"; - this.creatureInfoInputExtractor.OwnerLock = false; - this.creatureInfoInputExtractor.RegionColors = new byte[] { - ((byte)(0)), - ((byte)(0)), - ((byte)(0)), - ((byte)(0)), - ((byte)(0)), - ((byte)(0))}; - this.creatureInfoInputExtractor.Size = new System.Drawing.Size(262, 590); - this.creatureInfoInputExtractor.TabIndex = 7; - this.creatureInfoInputExtractor.TribeLock = false; - this.creatureInfoInputExtractor.Add2LibraryClicked += new System.Action(this.creatureInfoInputExtractor_Add2Library_Clicked); - this.creatureInfoInputExtractor.ParentListRequested += new System.Action(this.CreatureInfoInput_ParentListRequested); - // - // radarChartLibrary - // - this.radarChartLibrary.Dock = System.Windows.Forms.DockStyle.Top; - this.radarChartLibrary.Image = ((System.Drawing.Image)(resources.GetObject("radarChartLibrary.Image"))); - this.radarChartLibrary.Location = new System.Drawing.Point(3, 3); - this.radarChartLibrary.Name = "radarChartLibrary"; - this.radarChartLibrary.Size = new System.Drawing.Size(175, 287); - this.radarChartLibrary.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.radarChartLibrary.TabIndex = 0; - this.radarChartLibrary.TabStop = false; - // - // creatureBoxListView - // - this.creatureBoxListView.Location = new System.Drawing.Point(3, 3); - this.creatureBoxListView.Name = "creatureBoxListView"; - this.creatureBoxListView.Size = new System.Drawing.Size(189, 406); - this.creatureBoxListView.TabIndex = 0; - this.creatureBoxListView.Changed += new System.Action(this.UpdateDisplayedCreatureValues); - this.creatureBoxListView.GiveParents += new System.Action(this.CreatureBoxListView_FindParents); - this.creatureBoxListView.SelectCreature += new System.Action(this.SelectCreatureInLibrary); - // - // pedigree1 - // - this.pedigree1.AutoScroll = true; - this.pedigree1.Dock = System.Windows.Forms.DockStyle.Fill; - this.pedigree1.LeftColumnWidth = 203; - this.pedigree1.Location = new System.Drawing.Point(3, 3); - this.pedigree1.Name = "pedigree1"; - this.pedigree1.Size = new System.Drawing.Size(1864, 743); - this.pedigree1.TabIndex = 0; - // - // tamingControl1 - // - this.tamingControl1.AutoScroll = true; - 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(1864, 743); - this.tamingControl1.TabIndex = 0; - this.tamingControl1.WeaponDamages = new double[] { - 100D, - 100D, - 100D, - 100D, - 100D, - 100D, - 100D}; - this.tamingControl1.WeaponDamagesEnabled = 3; - // - // breedingPlan1 - // - this.breedingPlan1.AutoScroll = true; - this.breedingPlan1.CurrentSpecies = null; - this.breedingPlan1.Dock = System.Windows.Forms.DockStyle.Fill; - this.breedingPlan1.Location = new System.Drawing.Point(3, 3); - this.breedingPlan1.MutationLimit = 0; - this.breedingPlan1.Name = "breedingPlan1"; - this.breedingPlan1.Size = new System.Drawing.Size(1864, 743); - this.breedingPlan1.TabIndex = 0; - // - // hatching1 - // - this.hatching1.Dock = System.Windows.Forms.DockStyle.Fill; - this.hatching1.Location = new System.Drawing.Point(3, 3); - this.hatching1.Name = "hatching1"; - this.hatching1.Size = new System.Drawing.Size(1864, 743); - this.hatching1.TabIndex = 0; - // - // raisingControl1 - // - this.raisingControl1.AutoScroll = true; - this.raisingControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.raisingControl1.Location = new System.Drawing.Point(3, 3); - this.raisingControl1.Name = "raisingControl1"; - this.raisingControl1.Size = new System.Drawing.Size(1864, 743); - this.raisingControl1.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(1864, 743); - this.timerList1.TabIndex = 0; - this.timerList1.TimerAlertsCSV = ""; - // - // 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(1864, 743); - this.tribesControl1.TabIndex = 0; - // - // notesControl1 - // - this.notesControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.notesControl1.Location = new System.Drawing.Point(3, 3); - this.notesControl1.Name = "notesControl1"; - this.notesControl1.Size = new System.Drawing.Size(1864, 743); - this.notesControl1.TabIndex = 0; - // - // ocrControl1 - // - this.ocrControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ocrControl1.Location = new System.Drawing.Point(3, 3); - this.ocrControl1.Name = "ocrControl1"; - this.ocrControl1.Size = new System.Drawing.Size(1864, 743); - this.ocrControl1.TabIndex = 2; - // - // extractionTestControl1 - // - this.extractionTestControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.extractionTestControl1.Location = new System.Drawing.Point(3, 3); - this.extractionTestControl1.Name = "extractionTestControl1"; - this.extractionTestControl1.Size = new System.Drawing.Size(1864, 743); - this.extractionTestControl1.TabIndex = 0; - // - // statsMultiplierTesting1 - // - this.statsMultiplierTesting1.Dock = System.Windows.Forms.DockStyle.Fill; - this.statsMultiplierTesting1.Location = new System.Drawing.Point(3, 3); - this.statsMultiplierTesting1.Name = "statsMultiplierTesting1"; - this.statsMultiplierTesting1.Size = new System.Drawing.Size(1864, 743); - this.statsMultiplierTesting1.TabIndex = 0; - // - // speciesSelector1 - // - this.speciesSelector1.Dock = System.Windows.Forms.DockStyle.Fill; - this.speciesSelector1.LastSpecies = new string[0]; - this.speciesSelector1.Location = new System.Drawing.Point(0, 103); - this.speciesSelector1.Name = "speciesSelector1"; - this.speciesSelector1.Size = new System.Drawing.Size(1878, 775); - this.speciesSelector1.SplitterDistance = 500; - this.speciesSelector1.TabIndex = 0; - // - // tbSpeciesGlobal - // - this.tbSpeciesGlobal.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append; - this.tbSpeciesGlobal.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource; - this.tbSpeciesGlobal.Location = new System.Drawing.Point(104, 3); - this.tbSpeciesGlobal.Name = "tbSpeciesGlobal"; - this.tbSpeciesGlobal.Size = new System.Drawing.Size(152, 20); - this.tbSpeciesGlobal.TabIndex = 8; - this.tbSpeciesGlobal.Click += new System.EventHandler(this.tbSpeciesGlobal_Click); - this.tbSpeciesGlobal.Enter += new System.EventHandler(this.tbSpeciesGlobal_Enter); - this.tbSpeciesGlobal.KeyUp += new System.Windows.Forms.KeyEventHandler(this.TbSpeciesGlobal_KeyUp); - // - // Form1 + // Form1 // this.AcceptButton = this.btExtractLevels; this.AllowDrop = true; @@ -3534,12 +3534,17 @@ private void InitializeComponent() this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownImprintingBonusTester)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NumericUpDownTestingTE)).EndInit(); this.groupBoxPossibilities.ResumeLayout(false); this.groupBoxDetailsExtractor.ResumeLayout(false); this.panelExtrImpr.ResumeLayout(false); this.panelExtrImpr.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownImprintingBonusExtractor)).EndInit(); this.panelExtrTE.ResumeLayout(false); this.panelExtrTE.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownUpperTEffBound)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLowerTEffBound)).EndInit(); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); this.panelSums.ResumeLayout(false); @@ -3550,6 +3555,7 @@ private void InitializeComponent() this.tabPageStatTesting.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxColorRegionsTester)).EndInit(); this.gbStatChart.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.radarChart1)).EndInit(); this.panelWildTamedBredTester.ResumeLayout(false); this.panelWildTamedBredTester.PerformLayout(); this.groupBox2.ResumeLayout(false); @@ -3564,11 +3570,13 @@ private void InitializeComponent() this.tabPageExtractor.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.PbCreatureColorsExtractor)).EndInit(); this.groupBoxRadarChartExtractor.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.radarChartExtractor)).EndInit(); this.groupBoxTamingInfo.ResumeLayout(false); this.gbStatsExtractor.ResumeLayout(false); this.flowLayoutPanelStatIOsExtractor.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevel)).EndInit(); this.tabPageLibrary.ResumeLayout(false); this.tableLayoutPanelLibrary.ResumeLayout(false); this.contextMenuStripLibrary.ResumeLayout(false); @@ -3579,6 +3587,7 @@ private void InitializeComponent() this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); this.tabPageLibRadarChart.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.radarChartLibrary)).EndInit(); this.tabPageLibraryInfo.ResumeLayout(false); this.tlpLibraryInfo.ResumeLayout(false); this.tlpLibraryInfo.PerformLayout(); @@ -3601,15 +3610,6 @@ private void InitializeComponent() this.panelToolBar.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbSpecies)).EndInit(); this.contextMenuStripLibraryHeader.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.radarChart1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownImprintingBonusTester)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NumericUpDownTestingTE)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.radarChartExtractor)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownImprintingBonusExtractor)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownUpperTEffBound)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLowerTEffBound)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevel)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.radarChartLibrary)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs index 25a3bc71c..03a9cf0b8 100644 --- a/ARKBreedingStats/Form1.cs +++ b/ARKBreedingStats/Form1.cs @@ -18,6 +18,7 @@ using ARKBreedingStats.NamePatterns; using ARKBreedingStats.utils; using static ARKBreedingStats.settings.Settings; +using Color = System.Drawing.Color; namespace ARKBreedingStats { @@ -1977,7 +1978,7 @@ private void OpenSettingsDialog(SettingsTabPages page = SettingsTabPages.Unknown SetupExportFileWatcher(); InitializeSpeechRecognition(); - _overlay?.SetInfoPositions(); + _overlay?.SetInfoPositionsAndFontSize(); if (Properties.Settings.Default.DevTools) statsMultiplierTesting1.CheckIfMultipliersAreEqualToSettings(); devToolStripMenuItem.Visible = Properties.Settings.Default.DevTools; @@ -2354,7 +2355,11 @@ private List DetermineSpeciesFromStats(double[] stats, string speciesNa private void chkbToggleOverlay_CheckedChanged(object sender, EventArgs e) { - if (_overlay == null) + var enableOverlay = cbToggleOverlay.Checked; + + cbToggleOverlay.BackColor = enableOverlay ? Color.LightGreen : SystemColors.ButtonFace; + + if (enableOverlay && (_overlay == null || _overlay.IsDisposed)) { _overlay = new ARKOverlay { @@ -2363,15 +2368,16 @@ private void chkbToggleOverlay_CheckedChanged(object sender, EventArgs e) checkInventoryStats = Properties.Settings.Default.inventoryCheckTimer }; _overlay.InitLabelPositions(); + _overlay.CreatureTimers = _creatureCollection.creatures.Where(c => c.ShowInOverlay).ToList(); } - if (!SetOverlayLocation()) return; + if (enableOverlay && !SetOverlayLocation()) return; - _overlay.Visible = cbToggleOverlay.Checked; - _overlay.EnableOverlayTimer = cbToggleOverlay.Checked; + _overlay.Visible = enableOverlay; + _overlay.EnableOverlayTimer = enableOverlay; // disable speechRecognition if overlay is disabled. (no use if no data can be displayed) - if (_speechRecognition != null && !cbToggleOverlay.Checked) + if (_speechRecognition != null && !enableOverlay) _speechRecognition.Listen = false; } @@ -2382,30 +2388,29 @@ private void chkbToggleOverlay_CheckedChanged(object sender, EventArgs e) /// private bool SetOverlayLocation() { - if (cbToggleOverlay.Checked) + if (!cbToggleOverlay.Checked) return true; + + if (Properties.Settings.Default.UseCustomOverlayLocation) + { + _overlay.Location = Properties.Settings.Default.CustomOverlayLocation; + } + else { - if (Properties.Settings.Default.UseCustomOverlayLocation) + var p = Process.GetProcessesByName(Properties.Settings.Default.OCRApp).FirstOrDefault(); + + if (p == null) { - _overlay.Location = Properties.Settings.Default.CustomOverlayLocation; + MessageBoxes.ShowMessageBox( + "Process for capturing screenshots and for overlay (e.g. the game, or a stream of the game) not found.\n" + + "Start the game or change the process in the settings.", "Game started?", + MessageBoxIcon.Warning); + cbToggleOverlay.Checked = false; + return false; } - else - { - var p = Process.GetProcessesByName(Properties.Settings.Default.OCRApp).FirstOrDefault(); - if (p == null) - { - MessageBoxes.ShowMessageBox( - "Process for capturing screenshots and for overlay (e.g. the game, or a stream of the game) not found.\n" + - "Start the game or change the process in the settings.", "Game started?", - MessageBoxIcon.Warning); - cbToggleOverlay.Checked = false; - return false; - } - - IntPtr mwhd = p.MainWindowHandle; - Screen scr = Screen.FromHandle(mwhd); - _overlay.Location = scr.WorkingArea.Location; - } + IntPtr mwhd = p.MainWindowHandle; + Screen scr = Screen.FromHandle(mwhd); + _overlay.Location = scr.WorkingArea.Location; } return true; diff --git a/ARKBreedingStats/Form1.l10n.cs b/ARKBreedingStats/Form1.l10n.cs index 09fe67834..f355d40a9 100644 --- a/ARKBreedingStats/Form1.l10n.cs +++ b/ARKBreedingStats/Form1.l10n.cs @@ -170,7 +170,7 @@ private void SetLocalizations(bool initialize = true) raisingControl1.SetLocalizations(); creatureBoxListView.SetLocalizations(); notesControl1.SetLocalizations(); - _overlay?.SetLocatlizations(); + _overlay?.SetLocalizations(); } } } diff --git a/ARKBreedingStats/Form1.resx b/ARKBreedingStats/Form1.resx index d6f6fe4b5..6d64181b7 100644 --- a/ARKBreedingStats/Form1.resx +++ b/ARKBreedingStats/Form1.resx @@ -125,6 +125,89 @@ The TE can differ 0.1% due to ingame-rounding. 17, 17 + + + + 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 + + Extraction failed, common causes: @@ -158,6 +241,47 @@ The TE can differ 0.1% due to ingame-rounding. This will probably work if you play on a server with no new mod colors. If you play on a server with new colors, this will screw the colors up. It's recommended to first create a backup file of you library. + + + + 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 + 248, 17 @@ -165,7 +289,6 @@ It's recommended to first create a backup file of you library. 655, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -362,129 +485,6 @@ It's recommended to first create a backup file of you library. 760, 17 - - - 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 - - 76 diff --git a/ARKBreedingStats/IncubationTimerEntry.cs b/ARKBreedingStats/IncubationTimerEntry.cs index 83c4aeb8c..e032cb12d 100644 --- a/ARKBreedingStats/IncubationTimerEntry.cs +++ b/ARKBreedingStats/IncubationTimerEntry.cs @@ -20,6 +20,7 @@ public class IncubationTimerEntry public Guid fatherGuid; public string kind; // contains "Egg" or "Gestation", depending on the species public bool expired; + public bool ShowInOverlay; public IncubationTimerEntry() { } diff --git a/ARKBreedingStats/Properties/Settings.Designer.cs b/ARKBreedingStats/Properties/Settings.Designer.cs index c1499a632..c99552820 100644 --- a/ARKBreedingStats/Properties/Settings.Designer.cs +++ b/ARKBreedingStats/Properties/Settings.Designer.cs @@ -2206,5 +2206,17 @@ public string language2 { this["language2"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("1")] + public float OverlayRelativeFontSize { + get { + return ((float)(this["OverlayRelativeFontSize"])); + } + set { + this["OverlayRelativeFontSize"] = value; + } + } } } diff --git a/ARKBreedingStats/Properties/Settings.settings b/ARKBreedingStats/Properties/Settings.settings index c4f46cfbc..250654cd0 100644 --- a/ARKBreedingStats/Properties/Settings.settings +++ b/ARKBreedingStats/Properties/Settings.settings @@ -554,5 +554,8 @@ + + 1 + \ No newline at end of file diff --git a/ARKBreedingStats/TimerControl.cs b/ARKBreedingStats/TimerControl.cs index 14baa16d2..1b6f6bf4f 100644 --- a/ARKBreedingStats/TimerControl.cs +++ b/ARKBreedingStats/TimerControl.cs @@ -382,7 +382,7 @@ private void RefreshOverlayTimers() if (noOverlayUpdate || ARKOverlay.theOverlay == null) return; - ARKOverlay.theOverlay.timers = timerListEntries.Where(t => t.showInOverlay).OrderBy(t => t.time).ToList(); + ARKOverlay.theOverlay.timers = timerListEntries.Where(t => t.showInOverlay).OrderBy(t => t.time).ToArray(); } public ListViewColumnSorter ColumnSorter diff --git a/ARKBreedingStats/library/Creature.cs b/ARKBreedingStats/library/Creature.cs index d96017cc4..75c3abf22 100644 --- a/ARKBreedingStats/library/Creature.cs +++ b/ARKBreedingStats/library/Creature.cs @@ -174,6 +174,8 @@ public DateTime? growingUntil get => !growingPaused ? _growingUntil : growingLeft.Ticks > 0 ? DateTime.Now.Add(growingLeft) : default(DateTime?); } + public bool ShowInOverlay; + public TimeSpan growingLeft; [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public bool growingPaused; diff --git a/ARKBreedingStats/raising/RaisingControl.Designer.cs b/ARKBreedingStats/raising/RaisingControl.Designer.cs index 4b313dd02..008db9237 100644 --- a/ARKBreedingStats/raising/RaisingControl.Designer.cs +++ b/ARKBreedingStats/raising/RaisingControl.Designer.cs @@ -50,25 +50,21 @@ private void InitializeComponent() this.deleteTimerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.removeAllExpiredTimersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.parentStats1 = new ARKBreedingStats.raising.ParentStats(); this.btStartPauseTimer = new System.Windows.Forms.Button(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPageMaturationProgress = new System.Windows.Forms.TabPage(); this.label1 = new System.Windows.Forms.Label(); - this.nudMaturationProgress = new ARKBreedingStats.uiControls.Nud(); this.tabPageEditTimer = new System.Windows.Forms.TabPage(); this.bSaveTimerEdit = new System.Windows.Forms.Button(); this.label9 = new System.Windows.Forms.Label(); this.lEditTimerName = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); this.dateTimePickerEditTimerFinish = new System.Windows.Forms.DateTimePicker(); - this.dhmsInputTimerEditTimer = new ARKBreedingStats.uiControls.dhmsInput(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.cbSubtractOffsetToAllTimers = new System.Windows.Forms.CheckBox(); this.label2 = new System.Windows.Forms.Label(); this.btAdjustAllTimers = new System.Windows.Forms.Button(); this.label10 = new System.Windows.Forms.Label(); - this.dhmsInputOffsetAllTimers = new ARKBreedingStats.uiControls.dhmsInput(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.LbFoodInfoGeneral = new System.Windows.Forms.Label(); this.CbGrowingFood = new System.Windows.Forms.ComboBox(); @@ -80,15 +76,19 @@ private void InitializeComponent() this.columnHeaderBabyTime = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeaderGrowingTime = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeaderStatus = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.parentStats1 = new ARKBreedingStats.raising.ParentStats(); + this.nudMaturationProgress = new ARKBreedingStats.uiControls.Nud(); + this.dhmsInputTimerEditTimer = new ARKBreedingStats.uiControls.dhmsInput(); + this.dhmsInputOffsetAllTimers = new ARKBreedingStats.uiControls.dhmsInput(); this.contextMenuStripBabyList.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPageMaturationProgress.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudMaturationProgress)).BeginInit(); this.tabPageEditTimer.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudMaturationProgress)).BeginInit(); this.SuspendLayout(); // // labelRaisingInfos @@ -273,14 +273,6 @@ private void InitializeComponent() this.tableLayoutPanel1.Size = new System.Drawing.Size(364, 853); this.tableLayoutPanel1.TabIndex = 7; // - // parentStats1 - // - this.parentStats1.Dock = System.Windows.Forms.DockStyle.Fill; - this.parentStats1.Location = new System.Drawing.Point(3, 485); - this.parentStats1.Name = "parentStats1"; - this.parentStats1.Size = new System.Drawing.Size(358, 365); - this.parentStats1.TabIndex = 7; - // // btStartPauseTimer // this.btStartPauseTimer.Dock = System.Windows.Forms.DockStyle.Top; @@ -335,21 +327,6 @@ private void InitializeComponent() this.label1.TabIndex = 17; this.label1.Text = "%"; // - // nudMaturationProgress - // - this.nudMaturationProgress.DecimalPlaces = 2; - this.nudMaturationProgress.ForeColor = System.Drawing.SystemColors.GrayText; - this.nudMaturationProgress.Location = new System.Drawing.Point(136, 6); - this.nudMaturationProgress.Name = "nudMaturationProgress"; - this.nudMaturationProgress.NeutralNumber = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.nudMaturationProgress.Size = new System.Drawing.Size(77, 20); - this.nudMaturationProgress.TabIndex = 16; - this.nudMaturationProgress.ValueChanged += new System.EventHandler(this.nudMaturationProgress_ValueChanged); - // // tabPageEditTimer // this.tabPageEditTimer.Controls.Add(this.bSaveTimerEdit); @@ -413,16 +390,6 @@ private void InitializeComponent() this.dateTimePickerEditTimerFinish.TabIndex = 4; this.dateTimePickerEditTimerFinish.ValueChanged += new System.EventHandler(this.dateTimePickerEditTimerFinish_ValueChanged); // - // dhmsInputTimerEditTimer - // - this.dhmsInputTimerEditTimer.Location = new System.Drawing.Point(90, 72); - this.dhmsInputTimerEditTimer.Name = "dhmsInputTimerEditTimer"; - this.dhmsInputTimerEditTimer.Size = new System.Drawing.Size(136, 26); - this.dhmsInputTimerEditTimer.TabIndex = 15; - this.dhmsInputTimerEditTimer.Timespan = System.TimeSpan.Parse("00:00:00"); - this.dhmsInputTimerEditTimer.ValueChanged += new ARKBreedingStats.uiControls.dhmsInput.ValueChangedEventHandler(this.dhmsInputTimerEditTimer_ValueChanged); - this.dhmsInputTimerEditTimer.TextChanged += new System.EventHandler(this.dhmsInputTimerEditTimer_TextChanged); - // // tabPage1 // this.tabPage1.Controls.Add(this.cbSubtractOffsetToAllTimers); @@ -478,14 +445,6 @@ private void InitializeComponent() this.label10.TabIndex = 20; this.label10.Text = "Offest"; // - // dhmsInputOffsetAllTimers - // - this.dhmsInputOffsetAllTimers.Location = new System.Drawing.Point(90, 72); - this.dhmsInputOffsetAllTimers.Name = "dhmsInputOffsetAllTimers"; - this.dhmsInputOffsetAllTimers.Size = new System.Drawing.Size(136, 26); - this.dhmsInputOffsetAllTimers.TabIndex = 21; - this.dhmsInputOffsetAllTimers.Timespan = System.TimeSpan.Parse("00:00:00"); - // // groupBox2 // this.groupBox2.Controls.Add(this.LbFoodInfoGeneral); @@ -536,6 +495,7 @@ private void InitializeComponent() // // listViewBabies // + this.listViewBabies.CheckBoxes = true; this.listViewBabies.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeaderBabyName, this.columnHeaderSpecies, @@ -555,6 +515,7 @@ private void InitializeComponent() this.listViewBabies.UseCompatibleStateImageBehavior = false; this.listViewBabies.View = System.Windows.Forms.View.Details; this.listViewBabies.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listViewBabies_ColumnClick); + this.listViewBabies.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.listViewBabies_ItemChecked); this.listViewBabies.SelectedIndexChanged += new System.EventHandler(this.listViewBabies_SelectedIndexChanged); // // columnHeaderBabyName @@ -586,6 +547,47 @@ private void InitializeComponent() // this.columnHeaderStatus.Text = "Status"; // + // parentStats1 + // + this.parentStats1.Dock = System.Windows.Forms.DockStyle.Fill; + this.parentStats1.Location = new System.Drawing.Point(3, 485); + this.parentStats1.Name = "parentStats1"; + this.parentStats1.Size = new System.Drawing.Size(358, 365); + this.parentStats1.TabIndex = 7; + // + // nudMaturationProgress + // + this.nudMaturationProgress.DecimalPlaces = 2; + this.nudMaturationProgress.ForeColor = System.Drawing.SystemColors.GrayText; + this.nudMaturationProgress.Location = new System.Drawing.Point(136, 6); + this.nudMaturationProgress.Name = "nudMaturationProgress"; + this.nudMaturationProgress.NeutralNumber = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.nudMaturationProgress.Size = new System.Drawing.Size(77, 20); + this.nudMaturationProgress.TabIndex = 16; + this.nudMaturationProgress.ValueChanged += new System.EventHandler(this.nudMaturationProgress_ValueChanged); + // + // dhmsInputTimerEditTimer + // + this.dhmsInputTimerEditTimer.Location = new System.Drawing.Point(90, 72); + this.dhmsInputTimerEditTimer.Name = "dhmsInputTimerEditTimer"; + this.dhmsInputTimerEditTimer.Size = new System.Drawing.Size(136, 26); + this.dhmsInputTimerEditTimer.TabIndex = 15; + this.dhmsInputTimerEditTimer.Timespan = System.TimeSpan.Parse("00:00:00"); + this.dhmsInputTimerEditTimer.ValueChanged += new ARKBreedingStats.uiControls.dhmsInput.ValueChangedEventHandler(this.dhmsInputTimerEditTimer_ValueChanged); + this.dhmsInputTimerEditTimer.TextChanged += new System.EventHandler(this.dhmsInputTimerEditTimer_TextChanged); + // + // dhmsInputOffsetAllTimers + // + this.dhmsInputOffsetAllTimers.Location = new System.Drawing.Point(90, 72); + this.dhmsInputOffsetAllTimers.Name = "dhmsInputOffsetAllTimers"; + this.dhmsInputOffsetAllTimers.Size = new System.Drawing.Size(136, 26); + this.dhmsInputOffsetAllTimers.TabIndex = 21; + this.dhmsInputOffsetAllTimers.Timespan = System.TimeSpan.Parse("00:00:00"); + // // RaisingControl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -599,7 +601,6 @@ private void InitializeComponent() this.tabControl1.ResumeLayout(false); this.tabPageMaturationProgress.ResumeLayout(false); this.tabPageMaturationProgress.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudMaturationProgress)).EndInit(); this.tabPageEditTimer.ResumeLayout(false); this.tabPageEditTimer.PerformLayout(); this.tabPage1.ResumeLayout(false); @@ -607,6 +608,7 @@ private void InitializeComponent() this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); this.tableLayoutPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.nudMaturationProgress)).EndInit(); this.ResumeLayout(false); } diff --git a/ARKBreedingStats/raising/RaisingControl.cs b/ARKBreedingStats/raising/RaisingControl.cs index 0c2698e81..e6a0f197b 100644 --- a/ARKBreedingStats/raising/RaisingControl.cs +++ b/ARKBreedingStats/raising/RaisingControl.cs @@ -735,5 +735,21 @@ private void CbGrowingFood_SelectedIndexChanged(object sender, EventArgs e) } internal string LastSelectedFood => _lastSelectedFood; + + private void listViewBabies_ItemChecked(object sender, ItemCheckedEventArgs e) + { + var isChecked = e.Item.Checked; + if (e.Item.Tag is Creature creature) + { + if (isChecked) ARKOverlay.AddTimer(creature); + else ARKOverlay.RemoveTimer(creature); + return; + } + if (e.Item.Tag is IncubationTimerEntry incubationTimerEntry) + { + if (isChecked) ARKOverlay.AddTimer(incubationTimerEntry); + else ARKOverlay.RemoveTimer(incubationTimerEntry); + } + } } } diff --git a/ARKBreedingStats/settings/Settings.Designer.cs b/ARKBreedingStats/settings/Settings.Designer.cs index 00d750a27..94a5e47b2 100644 --- a/ARKBreedingStats/settings/Settings.Designer.cs +++ b/ARKBreedingStats/settings/Settings.Designer.cs @@ -166,6 +166,8 @@ private void InitializeComponent() this.groupBox20 = new System.Windows.Forms.GroupBox(); this.cbPrettifyJSON = new System.Windows.Forms.CheckBox(); this.groupBox17 = new System.Windows.Forms.GroupBox(); + this.LbLanguage2 = new System.Windows.Forms.Label(); + this.CbbLanguage2 = new System.Windows.Forms.ComboBox(); this.CbbLanguage = new System.Windows.Forms.ComboBox(); this.groupBox9 = new System.Windows.Forms.GroupBox(); this.CbNaturalSortIgnoreSpaces = new System.Windows.Forms.CheckBox(); @@ -284,6 +286,8 @@ private void InitializeComponent() this.label20 = new System.Windows.Forms.Label(); this.tabPageOverlay = new System.Windows.Forms.TabPage(); this.groupBox10 = new System.Windows.Forms.GroupBox(); + this.NudOverlayRelativeFontSize = new ARKBreedingStats.uiControls.Nud(); + this.label65 = new System.Windows.Forms.Label(); this.CbOverlayDisplayInheritance = new System.Windows.Forms.CheckBox(); this.label45 = new System.Windows.Forms.Label(); this.pCustomOverlayLocation = new System.Windows.Forms.Panel(); @@ -331,8 +335,6 @@ private void InitializeComponent() this.label1 = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.colorDialog1 = new System.Windows.Forms.ColorDialog(); - this.CbbLanguage2 = new System.Windows.Forms.ComboBox(); - this.LbLanguage2 = new System.Windows.Forms.Label(); this.groupBoxMultiplier.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudTamedDinoCharacterFoodDrain)).BeginInit(); @@ -421,6 +423,7 @@ private void InitializeComponent() this.groupBox8.SuspendLayout(); this.tabPageOverlay.SuspendLayout(); this.groupBox10.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NudOverlayRelativeFontSize)).BeginInit(); this.pCustomOverlayLocation.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudCustomOverlayLocX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudCustomOverlayLocY)).BeginInit(); @@ -2307,6 +2310,24 @@ private void InitializeComponent() this.groupBox17.TabStop = false; this.groupBox17.Text = "Language (WIP)"; // + // LbLanguage2 + // + this.LbLanguage2.AutoSize = true; + this.LbLanguage2.Location = new System.Drawing.Point(198, 19); + this.LbLanguage2.Name = "LbLanguage2"; + this.LbLanguage2.Size = new System.Drawing.Size(37, 13); + this.LbLanguage2.TabIndex = 2; + this.LbLanguage2.Text = "Export"; + // + // CbbLanguage2 + // + this.CbbLanguage2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbbLanguage2.FormattingEnabled = true; + this.CbbLanguage2.Location = new System.Drawing.Point(241, 16); + this.CbbLanguage2.Name = "CbbLanguage2"; + this.CbbLanguage2.Size = new System.Drawing.Size(166, 21); + this.CbbLanguage2.TabIndex = 1; + // // CbbLanguage // this.CbbLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -3566,6 +3587,8 @@ private void InitializeComponent() // // groupBox10 // + this.groupBox10.Controls.Add(this.NudOverlayRelativeFontSize); + this.groupBox10.Controls.Add(this.label65); this.groupBox10.Controls.Add(this.CbOverlayDisplayInheritance); this.groupBox10.Controls.Add(this.label45); this.groupBox10.Controls.Add(this.pCustomOverlayLocation); @@ -3586,19 +3609,62 @@ private void InitializeComponent() this.groupBox10.Controls.Add(this.chkbSpeechRecognition); this.groupBox10.Location = new System.Drawing.Point(8, 6); this.groupBox10.Name = "groupBox10"; - this.groupBox10.Size = new System.Drawing.Size(734, 243); + this.groupBox10.Size = new System.Drawing.Size(734, 261); this.groupBox10.TabIndex = 0; this.groupBox10.TabStop = false; this.groupBox10.Text = "Overlay"; // + // NudOverlayRelativeFontSize + // + this.NudOverlayRelativeFontSize.DecimalPlaces = 2; + this.NudOverlayRelativeFontSize.ForeColor = System.Drawing.SystemColors.WindowText; + this.NudOverlayRelativeFontSize.Increment = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.NudOverlayRelativeFontSize.Location = new System.Drawing.Point(219, 212); + this.NudOverlayRelativeFontSize.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.NudOverlayRelativeFontSize.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.NudOverlayRelativeFontSize.Name = "NudOverlayRelativeFontSize"; + this.NudOverlayRelativeFontSize.NeutralNumber = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.NudOverlayRelativeFontSize.Size = new System.Drawing.Size(57, 20); + this.NudOverlayRelativeFontSize.TabIndex = 4; + this.NudOverlayRelativeFontSize.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // label65 + // + this.label65.AutoSize = true; + this.label65.Location = new System.Drawing.Point(6, 214); + this.label65.Name = "label65"; + this.label65.Size = new System.Drawing.Size(141, 13); + this.label65.TabIndex = 18; + this.label65.Text = "Relative font size (default: 1)"; + // // CbOverlayDisplayInheritance // this.CbOverlayDisplayInheritance.AutoSize = true; - this.CbOverlayDisplayInheritance.Location = new System.Drawing.Point(6, 215); + this.CbOverlayDisplayInheritance.Location = new System.Drawing.Point(6, 234); this.CbOverlayDisplayInheritance.Name = "CbOverlayDisplayInheritance"; - this.CbOverlayDisplayInheritance.Size = new System.Drawing.Size(162, 17); + this.CbOverlayDisplayInheritance.Size = new System.Drawing.Size(203, 17); this.CbOverlayDisplayInheritance.TabIndex = 17; - this.CbOverlayDisplayInheritance.Text = "Display Inheritance on import"; + this.CbOverlayDisplayInheritance.Text = "Display creature inheritance on import"; this.CbOverlayDisplayInheritance.UseVisualStyleBackColor = true; // // label45 @@ -4192,24 +4258,6 @@ private void InitializeComponent() this.panel1.Size = new System.Drawing.Size(758, 30); this.panel1.TabIndex = 12; // - // CbbLanguage2 - // - this.CbbLanguage2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CbbLanguage2.FormattingEnabled = true; - this.CbbLanguage2.Location = new System.Drawing.Point(241, 16); - this.CbbLanguage2.Name = "CbbLanguage2"; - this.CbbLanguage2.Size = new System.Drawing.Size(166, 21); - this.CbbLanguage2.TabIndex = 1; - // - // LbLanguage2 - // - this.LbLanguage2.AutoSize = true; - this.LbLanguage2.Location = new System.Drawing.Point(198, 19); - this.LbLanguage2.Name = "LbLanguage2"; - this.LbLanguage2.Size = new System.Drawing.Size(37, 13); - this.LbLanguage2.TabIndex = 2; - this.LbLanguage2.Text = "Export"; - // // Settings // this.AcceptButton = this.buttonOK; @@ -4347,6 +4395,7 @@ private void InitializeComponent() this.tabPageOverlay.ResumeLayout(false); this.groupBox10.ResumeLayout(false); this.groupBox10.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NudOverlayRelativeFontSize)).EndInit(); this.pCustomOverlayLocation.ResumeLayout(false); this.pCustomOverlayLocation.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudCustomOverlayLocX)).EndInit(); @@ -4675,5 +4724,7 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CbColorIdOnColorRegionButton; private System.Windows.Forms.Label LbLanguage2; private System.Windows.Forms.ComboBox CbbLanguage2; + private uiControls.Nud NudOverlayRelativeFontSize; + private System.Windows.Forms.Label label65; } } \ No newline at end of file diff --git a/ARKBreedingStats/settings/Settings.cs b/ARKBreedingStats/settings/Settings.cs index b1efb9fd0..4bc7cef51 100644 --- a/ARKBreedingStats/settings/Settings.cs +++ b/ARKBreedingStats/settings/Settings.cs @@ -294,6 +294,7 @@ private void LoadSettings(CreatureCollection cc) NudOCRClipboardCropWidth.ValueSave = rec.Width; NudOCRClipboardCropHeight.ValueSave = rec.Height; cbOCRIgnoreImprintValue.Checked = Properties.Settings.Default.OCRIgnoresImprintValue; + NudOverlayRelativeFontSize.ValueSave = (decimal)Properties.Settings.Default.OverlayRelativeFontSize; #endregion customSCStarving.SoundFile = Properties.Settings.Default.soundStarving; @@ -537,6 +538,7 @@ private void SaveSettings() Properties.Settings.Default.OCRFromClipboard = CbOCRFromClipboard.Checked; Properties.Settings.Default.OCRFromRectangle = new Rectangle((int)NudOCRClipboardCropLeft.Value, (int)NudOCRClipboardCropTop.Value, (int)NudOCRClipboardCropWidth.Value, (int)NudOCRClipboardCropHeight.Value); Properties.Settings.Default.OCRIgnoresImprintValue = cbOCRIgnoreImprintValue.Checked; + Properties.Settings.Default.OverlayRelativeFontSize = (float)NudOverlayRelativeFontSize.Value; #endregion Properties.Settings.Default.soundStarving = customSCStarving.SoundFile; From 434c70c615eeca62e64cbfdf6ed5feb8c474108f Mon Sep 17 00:00:00 2001 From: cadon Date: Tue, 16 May 2023 23:41:49 +0200 Subject: [PATCH 2/4] more info for the overlay --- .../settings/Settings.Designer.cs | 72 +++++++++++-------- ARKBreedingStats/settings/Settings.resx | 24 +++++++ 2 files changed, 67 insertions(+), 29 deletions(-) diff --git a/ARKBreedingStats/settings/Settings.Designer.cs b/ARKBreedingStats/settings/Settings.Designer.cs index 94a5e47b2..12a16cd95 100644 --- a/ARKBreedingStats/settings/Settings.Designer.cs +++ b/ARKBreedingStats/settings/Settings.Designer.cs @@ -335,6 +335,7 @@ private void InitializeComponent() this.label1 = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.colorDialog1 = new System.Windows.Forms.ColorDialog(); + this.label66 = new System.Windows.Forms.Label(); this.groupBoxMultiplier.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudTamedDinoCharacterFoodDrain)).BeginInit(); @@ -3538,7 +3539,7 @@ private void InitializeComponent() this.customSCCustom.Location = new System.Drawing.Point(6, 139); this.customSCCustom.Name = "customSCCustom"; this.customSCCustom.Size = new System.Drawing.Size(401, 23); - this.customSCCustom.SoundFile = ""; + this.customSCCustom.SoundFile = null; this.customSCCustom.TabIndex = 4; // // customSCWakeup @@ -3546,7 +3547,7 @@ private void InitializeComponent() this.customSCWakeup.Location = new System.Drawing.Point(6, 81); this.customSCWakeup.Name = "customSCWakeup"; this.customSCWakeup.Size = new System.Drawing.Size(401, 23); - this.customSCWakeup.SoundFile = null; + this.customSCWakeup.SoundFile = ""; this.customSCWakeup.TabIndex = 2; // // customSCBirth @@ -3554,7 +3555,7 @@ private void InitializeComponent() this.customSCBirth.Location = new System.Drawing.Point(6, 110); this.customSCBirth.Name = "customSCBirth"; this.customSCBirth.Size = new System.Drawing.Size(401, 23); - this.customSCBirth.SoundFile = null; + this.customSCBirth.SoundFile = ""; this.customSCBirth.TabIndex = 3; // // customSCStarving @@ -3562,7 +3563,7 @@ private void InitializeComponent() this.customSCStarving.Location = new System.Drawing.Point(6, 52); this.customSCStarving.Name = "customSCStarving"; this.customSCStarving.Size = new System.Drawing.Size(401, 23); - this.customSCStarving.SoundFile = ""; + this.customSCStarving.SoundFile = null; this.customSCStarving.TabIndex = 1; // // label20 @@ -3607,9 +3608,10 @@ private void InitializeComponent() this.groupBox10.Controls.Add(this.label21); this.groupBox10.Controls.Add(this.nudOverlayInfoDuration); this.groupBox10.Controls.Add(this.chkbSpeechRecognition); + this.groupBox10.Controls.Add(this.label66); this.groupBox10.Location = new System.Drawing.Point(8, 6); this.groupBox10.Name = "groupBox10"; - this.groupBox10.Size = new System.Drawing.Size(734, 261); + this.groupBox10.Size = new System.Drawing.Size(734, 307); this.groupBox10.TabIndex = 0; this.groupBox10.TabStop = false; this.groupBox10.Text = "Overlay"; @@ -3623,7 +3625,7 @@ private void InitializeComponent() 0, 0, 65536}); - this.NudOverlayRelativeFontSize.Location = new System.Drawing.Point(219, 212); + this.NudOverlayRelativeFontSize.Location = new System.Drawing.Point(219, 250); this.NudOverlayRelativeFontSize.Maximum = new decimal(new int[] { 1000, 0, @@ -3651,7 +3653,7 @@ private void InitializeComponent() // label65 // this.label65.AutoSize = true; - this.label65.Location = new System.Drawing.Point(6, 214); + this.label65.Location = new System.Drawing.Point(6, 252); this.label65.Name = "label65"; this.label65.Size = new System.Drawing.Size(141, 13); this.label65.TabIndex = 18; @@ -3660,7 +3662,7 @@ private void InitializeComponent() // CbOverlayDisplayInheritance // this.CbOverlayDisplayInheritance.AutoSize = true; - this.CbOverlayDisplayInheritance.Location = new System.Drawing.Point(6, 234); + this.CbOverlayDisplayInheritance.Location = new System.Drawing.Point(6, 284); this.CbOverlayDisplayInheritance.Name = "CbOverlayDisplayInheritance"; this.CbOverlayDisplayInheritance.Size = new System.Drawing.Size(203, 17); this.CbOverlayDisplayInheritance.TabIndex = 17; @@ -3670,11 +3672,12 @@ private void InitializeComponent() // label45 // this.label45.AutoSize = true; - this.label45.Location = new System.Drawing.Point(6, 16); + this.label45.Location = new System.Drawing.Point(38, 25); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(315, 13); + this.label45.Size = new System.Drawing.Size(495, 13); this.label45.TabIndex = 0; - this.label45.Text = "The window-mode \"Fullscreen-Windowed\" should be set ingame."; + this.label45.Text = "For the overlay to work, you need to set the window-mode \"Fullscreen-Windowed\" in" + + " the game settings."; // // pCustomOverlayLocation // @@ -3683,7 +3686,7 @@ private void InitializeComponent() this.pCustomOverlayLocation.Controls.Add(this.label43); this.pCustomOverlayLocation.Controls.Add(this.nudCustomOverlayLocY); this.pCustomOverlayLocation.Enabled = false; - this.pCustomOverlayLocation.Location = new System.Drawing.Point(195, 179); + this.pCustomOverlayLocation.Location = new System.Drawing.Point(195, 217); this.pCustomOverlayLocation.Name = "pCustomOverlayLocation"; this.pCustomOverlayLocation.Size = new System.Drawing.Size(201, 28); this.pCustomOverlayLocation.TabIndex = 16; @@ -3756,7 +3759,7 @@ private void InitializeComponent() // cbCustomOverlayLocation // this.cbCustomOverlayLocation.AutoSize = true; - this.cbCustomOverlayLocation.Location = new System.Drawing.Point(6, 183); + this.cbCustomOverlayLocation.Location = new System.Drawing.Point(6, 221); this.cbCustomOverlayLocation.Name = "cbCustomOverlayLocation"; this.cbCustomOverlayLocation.Size = new System.Drawing.Size(138, 17); this.cbCustomOverlayLocation.TabIndex = 15; @@ -3767,7 +3770,7 @@ private void InitializeComponent() // label38 // this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(120, 149); + this.label38.Location = new System.Drawing.Point(120, 187); this.label38.Name = "label38"; this.label38.Size = new System.Drawing.Size(93, 13); this.label38.TabIndex = 11; @@ -3776,7 +3779,7 @@ private void InitializeComponent() // nudOverlayInfoPosY // this.nudOverlayInfoPosY.ForeColor = System.Drawing.SystemColors.GrayText; - this.nudOverlayInfoPosY.Location = new System.Drawing.Point(320, 147); + this.nudOverlayInfoPosY.Location = new System.Drawing.Point(320, 185); this.nudOverlayInfoPosY.Maximum = new decimal(new int[] { 10000, 0, @@ -3794,7 +3797,7 @@ private void InitializeComponent() // label39 // this.label39.AutoSize = true; - this.label39.Location = new System.Drawing.Point(300, 149); + this.label39.Location = new System.Drawing.Point(300, 187); this.label39.Name = "label39"; this.label39.Size = new System.Drawing.Size(14, 13); this.label39.TabIndex = 13; @@ -3803,7 +3806,7 @@ private void InitializeComponent() // nudOverlayInfoPosDFR // this.nudOverlayInfoPosDFR.ForeColor = System.Drawing.SystemColors.GrayText; - this.nudOverlayInfoPosDFR.Location = new System.Drawing.Point(219, 147); + this.nudOverlayInfoPosDFR.Location = new System.Drawing.Point(219, 185); this.nudOverlayInfoPosDFR.Maximum = new decimal(new int[] { 10000, 0, @@ -3821,7 +3824,7 @@ private void InitializeComponent() // label40 // this.label40.AutoSize = true; - this.label40.Location = new System.Drawing.Point(6, 149); + this.label40.Location = new System.Drawing.Point(6, 187); this.label40.Name = "label40"; this.label40.Size = new System.Drawing.Size(94, 13); this.label40.TabIndex = 10; @@ -3830,7 +3833,7 @@ private void InitializeComponent() // label37 // this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(300, 123); + this.label37.Location = new System.Drawing.Point(300, 161); this.label37.Name = "label37"; this.label37.Size = new System.Drawing.Size(14, 13); this.label37.TabIndex = 8; @@ -3839,7 +3842,7 @@ private void InitializeComponent() // nudOverlayTimerPosY // this.nudOverlayTimerPosY.ForeColor = System.Drawing.SystemColors.GrayText; - this.nudOverlayTimerPosY.Location = new System.Drawing.Point(320, 121); + this.nudOverlayTimerPosY.Location = new System.Drawing.Point(320, 159); this.nudOverlayTimerPosY.Maximum = new decimal(new int[] { 10000, 0, @@ -3857,7 +3860,7 @@ private void InitializeComponent() // label36 // this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(199, 123); + this.label36.Location = new System.Drawing.Point(199, 161); this.label36.Name = "label36"; this.label36.Size = new System.Drawing.Size(14, 13); this.label36.TabIndex = 6; @@ -3866,7 +3869,7 @@ private void InitializeComponent() // nudOverlayTimerPosX // this.nudOverlayTimerPosX.ForeColor = System.Drawing.SystemColors.GrayText; - this.nudOverlayTimerPosX.Location = new System.Drawing.Point(219, 121); + this.nudOverlayTimerPosX.Location = new System.Drawing.Point(219, 159); this.nudOverlayTimerPosX.Maximum = new decimal(new int[] { 10000, 0, @@ -3884,7 +3887,7 @@ private void InitializeComponent() // label35 // this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(6, 123); + this.label35.Location = new System.Drawing.Point(6, 161); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(104, 13); this.label35.TabIndex = 5; @@ -3892,7 +3895,7 @@ private void InitializeComponent() // // cbInventoryCheck // - this.cbInventoryCheck.Location = new System.Drawing.Point(6, 85); + this.cbInventoryCheck.Location = new System.Drawing.Point(6, 116); this.cbInventoryCheck.Name = "cbInventoryCheck"; this.cbInventoryCheck.Size = new System.Drawing.Size(305, 35); this.cbInventoryCheck.TabIndex = 4; @@ -3902,7 +3905,7 @@ private void InitializeComponent() // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(6, 61); + this.label21.Location = new System.Drawing.Point(6, 84); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(138, 13); this.label21.TabIndex = 2; @@ -3911,7 +3914,7 @@ private void InitializeComponent() // nudOverlayInfoDuration // this.nudOverlayInfoDuration.ForeColor = System.Drawing.SystemColors.WindowText; - this.nudOverlayInfoDuration.Location = new System.Drawing.Point(150, 59); + this.nudOverlayInfoDuration.Location = new System.Drawing.Point(150, 82); this.nudOverlayInfoDuration.Minimum = new decimal(new int[] { 1, 0, @@ -3934,11 +3937,11 @@ private void InitializeComponent() // chkbSpeechRecognition // this.chkbSpeechRecognition.AutoSize = true; - this.chkbSpeechRecognition.Location = new System.Drawing.Point(6, 36); + this.chkbSpeechRecognition.Location = new System.Drawing.Point(6, 59); this.chkbSpeechRecognition.Name = "chkbSpeechRecognition"; - this.chkbSpeechRecognition.Size = new System.Drawing.Size(123, 17); + this.chkbSpeechRecognition.Size = new System.Drawing.Size(338, 17); this.chkbSpeechRecognition.TabIndex = 1; - this.chkbSpeechRecognition.Text = "Speech Recognition"; + this.chkbSpeechRecognition.Text = "Speech Recognition (displays taming info, e.g. say \"Rex level 30\")"; this.chkbSpeechRecognition.UseVisualStyleBackColor = true; // // tabPageOCR @@ -4258,6 +4261,16 @@ private void InitializeComponent() this.panel1.Size = new System.Drawing.Size(758, 30); this.panel1.TabIndex = 12; // + // label66 + // + this.label66.AutoSize = true; + this.label66.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label66.Location = new System.Drawing.Point(6, 16); + this.label66.Name = "label66"; + this.label66.Size = new System.Drawing.Size(37, 26); + this.label66.TabIndex = 19; + this.label66.Text = "💡"; + // // Settings // this.AcceptButton = this.buttonOK; @@ -4726,5 +4739,6 @@ private void InitializeComponent() private System.Windows.Forms.ComboBox CbbLanguage2; private uiControls.Nud NudOverlayRelativeFontSize; private System.Windows.Forms.Label label65; + private System.Windows.Forms.Label label66; } } \ No newline at end of file diff --git a/ARKBreedingStats/settings/Settings.resx b/ARKBreedingStats/settings/Settings.resx index f1fb305ab..21260f88c 100644 --- a/ARKBreedingStats/settings/Settings.resx +++ b/ARKBreedingStats/settings/Settings.resx @@ -133,6 +133,18 @@ You can also select the text of the settings and drag&&drop the selectio 17, 17 + + True + + + True + + + True + + + 17, 17 + The creature data can be directly imported from the save-game, if you have access to that. This is also possible via an ftp-adress. If you set the according files below, you can start the process automatically from the file-menu. @@ -149,6 +161,18 @@ If you set the according files below, you can start the process automatically fr 262, 17 + + True + + + True + + + True + + + 262, 17 + In ARK you can export a creature (hold use while looking at a creature, then choose "Options" - "Export" from the wheel). Note: Parents and the mutations count are only exported and imported if you have opened the ancestor tab of the creature before the export! From 65db7f7b4d94b7bbf8118a082651afc50bba916d Mon Sep 17 00:00:00 2001 From: cadon Date: Wed, 17 May 2023 00:31:25 +0200 Subject: [PATCH 3/4] changed modal info after quick save import to label info --- .../BreedingPlanning/BreedingPlan.cs | 4 +-- ARKBreedingStats/CreatureInfoInput.cs | 5 +-- ARKBreedingStats/Form1.Designer.cs | 27 ++++++++------ ARKBreedingStats/Form1.cs | 35 ++++++++++++------- ARKBreedingStats/Form1.extractor.cs | 2 +- ARKBreedingStats/Form1.importExported.cs | 2 +- ARKBreedingStats/Form1.importSave.cs | 5 ++- ARKBreedingStats/Form1.library.cs | 6 ++-- 8 files changed, 53 insertions(+), 33 deletions(-) diff --git a/ARKBreedingStats/BreedingPlanning/BreedingPlan.cs b/ARKBreedingStats/BreedingPlanning/BreedingPlan.cs index 8baf30753..9bf911861 100644 --- a/ARKBreedingStats/BreedingPlanning/BreedingPlan.cs +++ b/ARKBreedingStats/BreedingPlanning/BreedingPlan.cs @@ -572,8 +572,8 @@ private void DoCalculateBreedingScoresAndDisplayPairs() { // display warning if breeding pairs are filtered out string warningText = null; - if (creaturesTagFilteredOut) warningText = Loc.S("BPsomeCreaturesAreFilteredOutTags") + ".\n" + Loc.S("BPTopStatsShownMightNotTotalTopStats"); - if (creaturesMutationsFilteredOut) warningText = (!string.IsNullOrEmpty(warningText) ? warningText + "\n" : string.Empty) + Loc.S("BPsomePairingsAreFilteredOutMutations"); + if (creaturesTagFilteredOut) warningText = Loc.S("BPsomeCreaturesAreFilteredOutTags") + ".\r\n" + Loc.S("BPTopStatsShownMightNotTotalTopStats"); + if (creaturesMutationsFilteredOut) warningText = (!string.IsNullOrEmpty(warningText) ? warningText + "\r\n" : string.Empty) + Loc.S("BPsomePairingsAreFilteredOutMutations"); if (!string.IsNullOrEmpty(warningText)) SetMessageLabelText(warningText, MessageBoxIcon.Warning); } diff --git a/ARKBreedingStats/CreatureInfoInput.cs b/ARKBreedingStats/CreatureInfoInput.cs index 4cd6bddb3..c3c5937ed 100644 --- a/ARKBreedingStats/CreatureInfoInput.cs +++ b/ARKBreedingStats/CreatureInfoInput.cs @@ -589,8 +589,9 @@ public void GenerateCreatureName(Creature creature, int[] speciesTopLevels, int[ { SetCreatureData(creature); CreatureName = NamePattern.GenerateCreatureName(creature, _sameSpecies, speciesTopLevels, speciesLowestLevels, customReplacings, showDuplicateNameWarning, namingPatternIndex, false, colorsExisting: ColorAlreadyExistingInformation); - if (CreatureName.Length > 24) - SetMessageLabelText?.Invoke("The generated name is longer than 24 characters, the name will look like this in game:\n" + CreatureName.Substring(0, 24), MessageBoxIcon.Error); + const int maxNameLengthInGame = 24; + if (CreatureName.Length > maxNameLengthInGame) + SetMessageLabelText?.Invoke($"The generated name is longer than {maxNameLengthInGame} characters, the name will look like this in game:\r\n" + CreatureName.Substring(0, maxNameLengthInGame), MessageBoxIcon.Error); else SetMessageLabelText?.Invoke(); } diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs index 2f26a67c0..eb6703fe9 100644 --- a/ARKBreedingStats/Form1.Designer.cs +++ b/ARKBreedingStats/Form1.Designer.cs @@ -346,6 +346,7 @@ private void InitializeComponent() this.TsLbLabelSet = new System.Windows.Forms.ToolStripLabel(); this.TsCbbLabelSets = new System.Windows.Forms.ToolStripComboBox(); this.panelToolBar = new System.Windows.Forms.Panel(); + this.TbMessageLabel = new System.Windows.Forms.TextBox(); this.btImportLastExported = new System.Windows.Forms.Button(); this.pbSpecies = new System.Windows.Forms.PictureBox(); this.tbSpeciesGlobal = new ARKBreedingStats.uiControls.TextBoxSuggest(); @@ -353,7 +354,6 @@ private void InitializeComponent() this.cbToggleOverlay = new System.Windows.Forms.CheckBox(); this.lbListening = new System.Windows.Forms.Label(); this.lbSpecies = new System.Windows.Forms.Label(); - this.lbLibrarySelectionInfo = new System.Windows.Forms.Label(); this.contextMenuStripLibraryHeader = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItemResetLibraryColumnWidths = new System.Windows.Forms.ToolStripMenuItem(); this.speciesSelector1 = new ARKBreedingStats.SpeciesSelector(); @@ -3390,13 +3390,26 @@ private void InitializeComponent() this.panelToolBar.Controls.Add(this.lbListening); this.panelToolBar.Controls.Add(this.cbEventMultipliers); this.panelToolBar.Controls.Add(this.lbSpecies); - this.panelToolBar.Controls.Add(this.lbLibrarySelectionInfo); + this.panelToolBar.Controls.Add(this.TbMessageLabel); this.panelToolBar.Dock = System.Windows.Forms.DockStyle.Top; this.panelToolBar.Location = new System.Drawing.Point(0, 49); this.panelToolBar.Name = "panelToolBar"; this.panelToolBar.Size = new System.Drawing.Size(1878, 54); this.panelToolBar.TabIndex = 2; // + // TbMessageLabel + // + this.TbMessageLabel.AcceptsReturn = true; + this.TbMessageLabel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.TbMessageLabel.Location = new System.Drawing.Point(470, 3); + this.TbMessageLabel.Multiline = true; + this.TbMessageLabel.Name = "TbMessageLabel"; + this.TbMessageLabel.ReadOnly = true; + this.TbMessageLabel.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.TbMessageLabel.Size = new System.Drawing.Size(889, 48); + this.TbMessageLabel.TabIndex = 14; + this.TbMessageLabel.Click += new System.EventHandler(this.TbMessageLabel_Click); + // // btImportLastExported // this.btImportLastExported.Location = new System.Drawing.Point(379, 3); @@ -3475,14 +3488,6 @@ private void InitializeComponent() this.lbSpecies.TabIndex = 0; this.lbSpecies.Text = "Species"; // - // lbLibrarySelectionInfo - // - this.lbLibrarySelectionInfo.Location = new System.Drawing.Point(470, 3); - this.lbLibrarySelectionInfo.Name = "lbLibrarySelectionInfo"; - this.lbLibrarySelectionInfo.Size = new System.Drawing.Size(691, 45); - this.lbLibrarySelectionInfo.TabIndex = 5; - this.lbLibrarySelectionInfo.Click += new System.EventHandler(this.lbLibrarySelectionInfo_Click); - // // contextMenuStripLibraryHeader // this.contextMenuStripLibraryHeader.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -3820,7 +3825,6 @@ private void InitializeComponent() private System.Windows.Forms.ColumnHeader columnHeaderNote; private System.Windows.Forms.ToolStripMenuItem obeliskToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem obeliskToolStripMenuItem1; - private System.Windows.Forms.Label lbLibrarySelectionInfo; private System.Windows.Forms.ToolStripSeparator toolStripSeparator9; private System.Windows.Forms.CheckBox cbGuessSpecies; private System.Windows.Forms.ColumnHeader columnHeaderColor0; @@ -3938,5 +3942,6 @@ private void InitializeComponent() private System.Windows.Forms.TableLayoutPanel tlpLibraryInfo; private System.Windows.Forms.Button BtCopyLibraryColorToClipboard; private System.Windows.Forms.CheckBox CbLibraryInfoUseFilter; + private System.Windows.Forms.TextBox TbMessageLabel; } } diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs index 03a9cf0b8..233a9083d 100644 --- a/ARKBreedingStats/Form1.cs +++ b/ARKBreedingStats/Form1.cs @@ -1330,38 +1330,44 @@ private void Form1_FormClosed(object sender, FormClosedEventArgs e) /// Sets the text at the top to display infos. /// /// Text to display - /// Backcolor of the label - /// If valid path to file or folder, the user can click on the label to display the path in the explorer + /// Back color of the message + /// If valid path to file or folder, the user can click on the message to display the path in the explorer private void SetMessageLabelText(string text = null, MessageBoxIcon icon = MessageBoxIcon.None, string path = null) { - lbLibrarySelectionInfo.Text = text; + if (_ignoreNextMessageLabel) + { + _ignoreNextMessageLabel = false; + return; + } + // a TextBox needs \r\n for a new line, only \n will not result in a line break. + TbMessageLabel.Text = text; _librarySelectionInfoClickPath = path; if (string.IsNullOrEmpty(path)) { - lbLibrarySelectionInfo.Cursor = null; - _tt.SetToolTip(lbLibrarySelectionInfo, null); + TbMessageLabel.Cursor = null; + _tt.SetToolTip(TbMessageLabel, null); } else { - lbLibrarySelectionInfo.Cursor = Cursors.Hand; - _tt.SetToolTip(lbLibrarySelectionInfo, Loc.S("ClickDisplayFile")); + TbMessageLabel.Cursor = Cursors.Hand; + _tt.SetToolTip(TbMessageLabel, Loc.S("ClickDisplayFile")); } switch (icon) { case MessageBoxIcon.Information: - lbLibrarySelectionInfo.BackColor = Color.LightGreen; + TbMessageLabel.BackColor = Color.LightGreen; break; case MessageBoxIcon.Warning: - lbLibrarySelectionInfo.BackColor = Color.Yellow; + TbMessageLabel.BackColor = Color.Yellow; break; case MessageBoxIcon.Error: - lbLibrarySelectionInfo.BackColor = Color.LightSalmon; + TbMessageLabel.BackColor = Color.LightSalmon; break; default: - lbLibrarySelectionInfo.BackColor = SystemColors.Control; + TbMessageLabel.BackColor = SystemColors.Control; break; } } @@ -1371,7 +1377,12 @@ private void SetMessageLabelText(string text = null, MessageBoxIcon icon = Messa /// private string _librarySelectionInfoClickPath; - private void lbLibrarySelectionInfo_Click(object sender, EventArgs e) + /// + /// If true, the next message is ignored to preserve the previous one. This is used to avoid that the library selection info overwrites the results of the save game import. + /// + private bool _ignoreNextMessageLabel; + + private void TbMessageLabel_Click(object sender, EventArgs e) { OpenFolderInExplorer(_librarySelectionInfoClickPath); } diff --git a/ARKBreedingStats/Form1.extractor.cs b/ARKBreedingStats/Form1.extractor.cs index 4e779ebf1..4b0df599d 100644 --- a/ARKBreedingStats/Form1.extractor.cs +++ b/ARKBreedingStats/Form1.extractor.cs @@ -1031,7 +1031,7 @@ void SetExistingValueIfNewValueIsEmpty(ref string newValue, ref string oldValue) UpdateParentListInput(creatureInfoInputExtractor); // this function is only used for single-creature extractions, e.g. LastExport creatureInfoInputExtractor.UpdateExistingCreature = creatureExists; if (!string.IsNullOrEmpty(filePath)) - SetMessageLabelText(Loc.S("creatureOfFile") + "\n" + filePath, path: filePath); + SetMessageLabelText(Loc.S("creatureOfFile") + "\r\n" + filePath, path: filePath); return creatureExists; } diff --git a/ARKBreedingStats/Form1.importExported.cs b/ARKBreedingStats/Form1.importExported.cs index 034b7a7ae..a2978141c 100644 --- a/ARKBreedingStats/Form1.importExported.cs +++ b/ARKBreedingStats/Form1.importExported.cs @@ -189,7 +189,7 @@ private void ImportExportedAddIfPossible(string filePath) && Properties.Settings.Default.OnAutoImportAddToLibrary) { creature = AddCreatureToCollection(true, goToLibraryTab: Properties.Settings.Default.AutoImportGotoLibraryAfterSuccess); - SetMessageLabelText($"Successful {(alreadyExists ? "updated" : "added")} {creature.name} ({species.name}) of the exported file\n" + filePath, MessageBoxIcon.Information, filePath); + SetMessageLabelText($"Successful {(alreadyExists ? "updated" : "added")} {creature.name} ({species.name}) of the exported file\r\n" + filePath, MessageBoxIcon.Information, filePath); addedToLibrary = true; } diff --git a/ARKBreedingStats/Form1.importSave.cs b/ARKBreedingStats/Form1.importSave.cs index 9c342adf4..20e1e4691 100644 --- a/ARKBreedingStats/Form1.importSave.cs +++ b/ARKBreedingStats/Form1.importSave.cs @@ -398,7 +398,10 @@ private async void TsbQuickSaveGameImport_Click(object sender, EventArgs e) ); } - MessageBoxes.ShowMessageBox(string.Join("\n\n--------\n\n", results), "Save game import done", MessageBoxIcon.Information); + SetMessageLabelText("Save game import done\r\n" + string.Join("\r\n--------\r\n", results), MessageBoxIcon.Information); + if (listViewLibrary.SelectedIndices.Count > 0) + _ignoreNextMessageLabel = true; + //MessageBoxes.ShowMessageBox(string.Join("\n\n--------\n\n", results), "Save game import done", MessageBoxIcon.Information); } } } diff --git a/ARKBreedingStats/Form1.library.cs b/ARKBreedingStats/Form1.library.cs index 2dd3a51bf..d869e2934 100644 --- a/ARKBreedingStats/Form1.library.cs +++ b/ARKBreedingStats/Form1.library.cs @@ -1301,11 +1301,11 @@ private void LibrarySelectedIndexChanged() SetMessageLabelText($"{cnt} creatures selected, " + $"{selCrs.Count(cr => cr.sex == Sex.Female)} females, " + - $"{selCrs.Count(cr => cr.sex == Sex.Male)} males\n" + + $"{selCrs.Count(cr => cr.sex == Sex.Male)} males\r\n" + (cnt == 1 ? $"level: {selCrs[0].Level}; Ark-Id (ingame): " + (selCrs[0].ArkIdImported ? Utils.ConvertImportedArkIdToIngameVisualization(selCrs[0].ArkId) : selCrs[0].ArkId.ToString()) : $"level-range: {selCrs.Min(cr => cr.Level)} - {selCrs.Max(cr => cr.Level)}" - ) + "\n" + + ) + "\r\n" + $"Tags: {string.Join(", ", tagList)}"); } @@ -1755,7 +1755,7 @@ private void saveInfographicsToFolderToolStripMenuItem_Click(object sender, Even if (imagesCreated == 0) return; var pluralS = (imagesCreated != 1 ? "s" : string.Empty); - SetMessageLabelText($"Infographic{pluralS} for {imagesCreated} creature{pluralS} created at\n{(imagesCreated == 1 ? firstImageFilePath : folderPath)}", MessageBoxIcon.Information, firstImageFilePath); + SetMessageLabelText($"Infographic{pluralS} for {imagesCreated} creature{pluralS} created at\r\n{(imagesCreated == 1 ? firstImageFilePath : folderPath)}", MessageBoxIcon.Information, firstImageFilePath); } #region Library ContextMenu From 0e5ff39f5d43bf93fb65542458de0d9d1ef9c87d Mon Sep 17 00:00:00 2001 From: cadon Date: Wed, 17 May 2023 10:45:24 +0200 Subject: [PATCH 4/4] ver --- ARKBreedingStats/Properties/AssemblyInfo.cs | 2 +- ARKBreedingStats/_manifest.json | 2 +- ARKBreedingStats/json/values/_manifest.json | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs index 3abe69d1b..ce447be09 100644 --- a/ARKBreedingStats/Properties/AssemblyInfo.cs +++ b/ARKBreedingStats/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ // Revision // [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("0.54.0.0")] +[assembly: AssemblyFileVersion("0.55.0.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/ARKBreedingStats/_manifest.json b/ARKBreedingStats/_manifest.json index 56243ce82..7efe0cf7e 100644 --- a/ARKBreedingStats/_manifest.json +++ b/ARKBreedingStats/_manifest.json @@ -4,7 +4,7 @@ "ARK Smart Breeding": { "Id": "ARK Smart Breeding", "Category": "main", - "version": "0.54.0.0" + "version": "0.55.0.0" }, "SpeciesColorImages": { "Id": "SpeciesColorImages", diff --git a/ARKBreedingStats/json/values/_manifest.json b/ARKBreedingStats/json/values/_manifest.json index b0c124b43..5e1157e65 100644 --- a/ARKBreedingStats/json/values/_manifest.json +++ b/ARKBreedingStats/json/values/_manifest.json @@ -6,7 +6,7 @@ "mod": { "id": "1083349027", "tag": "SpeedyFlyers", "title": "Najs Speedy Flyers" } }, "1090809604-Pyria.json": { - "version": "357.14.1682203587", + "version": "357.18.1683920382", "mod": { "id": "1090809604", "tag": "Pyria", "title": "Pyria: Mythos Evolved" } }, "1092784125-Gryphons.json": { @@ -161,7 +161,7 @@ "mod": { "id": "1696957410", "tag": "MarniimodsTest", "title": "Marnii's Equines" } }, "1729386191-BonusDinoMod.json": { - "version": "356.5.1675791338", + "version": "357.18.1683922895", "mod": { "id": "1729386191", "tag": "BonusDinoMod", "title": "AC: Kami Creations" } }, "1729512589-Brachiosaurus.json": { @@ -243,7 +243,7 @@ "mod": { "id": "2000326197", "tag": "ExtraResources", "title": "Event Assets" } }, "2003934830-Beasts.json": { - "version": "357.15.1682712826", + "version": "357.18.1683429743", "mod": { "id": "2003934830", "tag": "Beasts", "title": "Prehistoric Beasts" } }, "2019846325-ApexMod.json": { @@ -311,7 +311,7 @@ "mod": { "id": "2869411055", "tag": "SDinoVariants", "title": "SDinoVariants" } }, "710880648-DinoOverHaulMODX.json": { - "version": "357.15.1682903614", + "version": "357.18.1683668064", "mod": { "id": "710880648", "tag": "DinoOverHaulMODX", "title": "DinoOverhaul X -- Hardcore PvE Experience" } }, "729352919-IndomRex.json": {