From 38dbbe5cfbaa83bebdf72769e118f1d31be05bae Mon Sep 17 00:00:00 2001 From: cadaei Date: Fri, 19 Jan 2018 21:05:08 +0100 Subject: [PATCH] removed code for handling the torpor-bug which was fixed ingame. added setting to allow more than 100% imprinting (e.g. the mod S+ Nanny). right-clicking on the cuddle-counter in the tester now sets the imprinting-value in the tester to the value that is needed to yield the torpor-value entered in the extractor with the wild-levels entered in the tester. fix for Wyvern's weight with classic flyers mod. fix for updating temporary saved creature-values when loading a new file. fixed showing wrong raising-data if no data was available in the raising-tab. added option to extract imprinting-bonus from the torpor-value. --- ARKBreedingStats/CreatureCollection.cs | 1 + ARKBreedingStats/Extraction.cs | 121 +- ARKBreedingStats/Form1.Designer.cs | 1032 +++++++++-------- ARKBreedingStats/Form1.cs | 72 +- ARKBreedingStats/Form1.resx | 248 ++-- ARKBreedingStats/Properties/AssemblyInfo.cs | 2 +- ARKBreedingStats/RaisingControl.cs | 6 + ARKBreedingStats/json/classicFlyers.json | 2 +- .../settings/Settings.Designer.cs | 51 +- ARKBreedingStats/settings/Settings.cs | 3 + ARKBreedingStats/ver.txt | 2 +- 11 files changed, 793 insertions(+), 747 deletions(-) diff --git a/ARKBreedingStats/CreatureCollection.cs b/ARKBreedingStats/CreatureCollection.cs index 7deb3221..13979d6f 100644 --- a/ARKBreedingStats/CreatureCollection.cs +++ b/ARKBreedingStats/CreatureCollection.cs @@ -54,6 +54,7 @@ namespace ARKBreedingStats public double BabyFoodConsumptionSpeedMultiplierEvent = 1; public bool singlePlayerSettings = false; + public bool allowMoreThanHundredImprinting = false; // allow more than 100% imprinting, can happen with mods, e.g. S+ Nanny [XmlArray] public List players = new List(); diff --git a/ARKBreedingStats/Extraction.cs b/ARKBreedingStats/Extraction.cs index 5b091ac7..b65c5e2f 100644 --- a/ARKBreedingStats/Extraction.cs +++ b/ARKBreedingStats/Extraction.cs @@ -14,7 +14,6 @@ class Extraction public List statsWithEff; public bool validResults; public bool postTamed; - public bool justTamed; public int[] levelDomFromTorporAndTotalRange = new int[] { 0, 0 }, levelWildFromTorporRange = new int[] { 0, 0 }; // 0: min, 1: max public int[] lowerBoundWilds, lowerBoundDoms, upperBoundDoms; public int wildFreeMax = 0, domFreeMin = 0, domFreeMax = 0; // unassigned levels @@ -174,19 +173,20 @@ public int filterResultsByFixed(int dontFix = -1) } public void extractLevels(int speciesI, int level, List statIOs, double lowerTEBound, double upperTEBound, bool autoDetectTamed, - bool tamed, bool justTamed, bool bred, double imprintingBonusRounded, bool adjustImprinting, double imprintingBonusMultiplier, double cuddleIntervalMultiplier, + bool tamed, bool justTamed, bool bred, double imprintingBonusRounded, bool adjustImprinting, bool allowMoreThanHundredImprinting, bool extractImprintingFromTorpor, double imprintingBonusMultiplier, double cuddleIntervalMultiplier, bool considerWildLevelSteps, int wildLevelSteps, out bool imprintingChanged) { + List stats = Values.V.species[speciesI].stats; validResults = true; imprintingChanged = false; considerWildLevelSteps = considerWildLevelSteps && !bred; if (bred) postTamed = true; - else if (autoDetectTamed && Values.V.species[speciesI].stats[7].AddWhenTamed > 0) + else if (autoDetectTamed && stats[7].AddWhenTamed > 0) { // torpor is directly proportional to wild level. Check if creature is wild or tamed (doesn't work with creatures that have no additive bonus on torpor, e.g. the Giganotosaurus) - postTamed = (Math.Round(Values.V.species[speciesI].stats[7].BaseValue * (1 + Values.V.species[speciesI].stats[7].IncPerWildLevel * Math.Round((statIOs[7].Input - Values.V.species[speciesI].stats[7].BaseValue) / (Values.V.species[speciesI].stats[7].BaseValue * Values.V.species[speciesI].stats[7].IncPerWildLevel))), 3) != statIOs[7].Input); + postTamed = (Math.Round(stats[7].BaseValue * (1 + stats[7].IncPerWildLevel * Math.Round((statIOs[7].Input - stats[7].BaseValue) / (stats[7].BaseValue * stats[7].IncPerWildLevel))), 3) != statIOs[7].Input); } else postTamed = tamed; @@ -198,51 +198,34 @@ public void extractLevels(int speciesI, int level, List statIOs, double { imprintingBonus = imprintingBonusRounded; } + else if (extractImprintingFromTorpor) + { + int wildLevelsFromImprintedTorpor = (int)Math.Round(((statIOs[7].Input / (1 + imprintingBonusRounded * 0.2)) / (1 + stats[7].MultAffinity) - stats[7].AddWhenTamed - stats[7].BaseValue) / (stats[7].IncPerWildLevel * stats[7].BaseValue)); + double ttt = Stats.calculateValue(speciesI, 7, wildLevelsFromImprintedTorpor, 0, true, 1, 0); + imprintingBonus = (statIOs[7].Input / Stats.calculateValue(speciesI, 7, wildLevelsFromImprintedTorpor, 0, true, 1, 0) - 1) / (0.2 * imprintingBonusMultiplier); + } else if (Values.V.species[speciesI].breeding != null && Values.V.species[speciesI].breeding.maturationTimeAdjusted > 0) { double imprintingGainPerCuddle = Utils.imprintingGainPerCuddle(Values.V.species[speciesI].breeding.maturationTimeAdjusted, cuddleIntervalMultiplier); imprintingBonus = Math.Round(Math.Round(imprintingBonusRounded / imprintingGainPerCuddle) * imprintingGainPerCuddle, 7); - if (imprintingBonus > 1) - imprintingBonus = 1; - if (Math.Abs(imprintingBonusRounded - imprintingBonus) > 0.01) - imprintingChanged = true; } + if (!allowMoreThanHundredImprinting && imprintingBonus > 1) + imprintingBonus = 1; + if (Math.Abs(imprintingBonusRounded - imprintingBonus) > 0.01) + imprintingChanged = true; } double imprintingMultiplier = (1 + imprintingBonus * imprintingBonusMultiplier * .2); - - // needed to handle Torpor-bug - this.justTamed = false; // Torpor-bug got fixed :)) leaving the code for a while - - // Torpor-bug: if bonus levels are added due to taming-effectiveness, torpor is too high - // instead of giving only the TE-bonus, the original wild levels W are added a second time to the torporlevels - // the game does this after taming: toLvl = (Math.Floor(W*TE/2) > 0 ? 2*W + Math.Min(W*TE/2) : W); - // the game should do (and does after some while, maybe a server-restart): toLvl = W + Math.Min(W*TE/2); - // max level for wild according to torpor (possible bug ingame: torpor is depending on taming effectiveness 5/3 - 2 times "too high" for level after taming until server-restart (not only the bonus levels are added, but also the existing levels again) double torporLevelTamingMultMax, torporLevelTamingMultMin; - bool runTorporRangeAgain; - do + torporLevelTamingMultMax = 1; + torporLevelTamingMultMin = 1; + if (postTamed && justTamed && !bred) { - runTorporRangeAgain = false; - torporLevelTamingMultMax = 1; - torporLevelTamingMultMin = 1; - if (postTamed && justTamed && !bred) - { - torporLevelTamingMultMax = (2 + upperTEBound) / (4 + upperTEBound); - torporLevelTamingMultMin = (2 + lowerTEBound) / (4 + lowerTEBound); - } - levelWildFromTorporRange[0] = (int)Math.Round((statIOs[7].Input / imprintingMultiplier - (postTamed ? Values.V.species[speciesI].stats[7].AddWhenTamed : 0) - Values.V.species[speciesI].stats[7].BaseValue) * torporLevelTamingMultMin / (Values.V.species[speciesI].stats[7].BaseValue * Values.V.species[speciesI].stats[7].IncPerWildLevel), 0); - levelWildFromTorporRange[1] = (int)Math.Round((statIOs[7].Input / imprintingMultiplier - (postTamed ? Values.V.species[speciesI].stats[7].AddWhenTamed : 0) - Values.V.species[speciesI].stats[7].BaseValue) * torporLevelTamingMultMax / (Values.V.species[speciesI].stats[7].BaseValue * Values.V.species[speciesI].stats[7].IncPerWildLevel), 0); - - // if level of torpor is higher than the total-level, the torporBug displayed a too high torpor. If the user didn't check the justTamed-checkbox, do it for them and recalculate the true torpor-level - if (false && !runTorporRangeAgain && !justTamed && levelWildFromTorporRange[0] > level) // torpor bug got fixed, leaving the code for a while - { - justTamed = true; - this.justTamed = true; - runTorporRangeAgain = true; - } - // if levelWildFromTorporRange[0] > level, then justTamed has to be true, then run the previous calculation again - } while (runTorporRangeAgain); + torporLevelTamingMultMax = (2 + upperTEBound) / (4 + upperTEBound); + torporLevelTamingMultMin = (2 + lowerTEBound) / (4 + lowerTEBound); + } + levelWildFromTorporRange[0] = (int)Math.Round((statIOs[7].Input / imprintingMultiplier - (postTamed ? stats[7].AddWhenTamed : 0) - stats[7].BaseValue) * torporLevelTamingMultMin / (stats[7].BaseValue * stats[7].IncPerWildLevel), 0); + levelWildFromTorporRange[1] = (int)Math.Round((statIOs[7].Input / imprintingMultiplier - (postTamed ? stats[7].AddWhenTamed : 0) - stats[7].BaseValue) * torporLevelTamingMultMax / (stats[7].BaseValue * stats[7].IncPerWildLevel), 0); domFreeMin = 0; domFreeMax = 0; @@ -266,22 +249,22 @@ public void extractLevels(int speciesI, int level, List statIOs, double // check all possible level-combinations for (int s = 7; s >= 0; s--) { - if (Values.V.species[speciesI].stats[s].BaseValue > 0 && activeStats[s]) // if stat is used (oxygen sometimes is not) + if (stats[s].BaseValue > 0 && activeStats[s]) // if stat is used (oxygen sometimes is not) { statIOs[s].postTame = postTamed; double inputValue = statIOs[s].Input; - double statBaseValue = Values.V.species[speciesI].stats[s].BaseValue; + double statBaseValue = stats[s].BaseValue; if (postTamed) statBaseValue *= (s == 0 ? (double)Values.V.species[speciesI].TamedBaseHealthMultiplier : 1); double tamingEffectiveness = -1; double valueWODom = 0; // value without domesticated levels - bool withTEff = (postTamed && Values.V.species[speciesI].stats[s].MultAffinity > 0); + bool withTEff = (postTamed && stats[s].MultAffinity > 0); if (withTEff) { statsWithEff.Add(s); } double maxLW = 0; - if (Values.V.species[speciesI].stats[s].BaseValue > 0 && Values.V.species[speciesI].stats[s].IncPerWildLevel > 0) + if (stats[s].BaseValue > 0 && stats[s].IncPerWildLevel > 0) { - double multAffinityFactor = Values.V.species[speciesI].stats[s].MultAffinity; + double multAffinityFactor = stats[s].MultAffinity; if (postTamed) { // the multiplicative bonus is only multiplied with the TE if it is positive (i.e. negative boni won't get less bad if the TE is low) @@ -291,14 +274,14 @@ public void extractLevels(int speciesI, int level, List statIOs, double } else multAffinityFactor = 1; - maxLW = Math.Round(((inputValue / multAffinityFactor - (postTamed ? Values.V.species[speciesI].stats[s].AddWhenTamed : 0)) / statBaseValue - 1) / Values.V.species[speciesI].stats[s].IncPerWildLevel); // floor is too unprecise + maxLW = Math.Round(((inputValue / multAffinityFactor - (postTamed ? stats[s].AddWhenTamed : 0)) / statBaseValue - 1) / stats[s].IncPerWildLevel); // floor is too unprecise } if (s != 7 && maxLW > levelWildFromTorporRange[1]) { maxLW = levelWildFromTorporRange[1]; } // torpor level can be too high right after taming (torpor bug in the game) double maxLD = 0; - if (!statIOs[s].DomLevelZero && postTamed && Values.V.species[speciesI].stats[s].BaseValue > 0 && Values.V.species[speciesI].stats[s].IncPerTamedLevel > 0) + if (!statIOs[s].DomLevelZero && postTamed && stats[s].BaseValue > 0 && stats[s].IncPerTamedLevel > 0) { - maxLD = Math.Round((inputValue / ((statBaseValue + Values.V.species[speciesI].stats[s].AddWhenTamed) * (1 + lowerTEBound * Values.V.species[speciesI].stats[s].MultAffinity)) - 1) / Values.V.species[speciesI].stats[s].IncPerTamedLevel); //floor is sometimes too unprecise + maxLD = Math.Round((inputValue / ((statBaseValue + stats[s].AddWhenTamed) * (1 + lowerTEBound * stats[s].MultAffinity)) - 1) / stats[s].IncPerTamedLevel); //floor is sometimes too unprecise } if (maxLD > domFreeMax) maxLD = domFreeMax; if (maxLD < 0) maxLD = 0; @@ -306,18 +289,18 @@ public void extractLevels(int speciesI, int level, List statIOs, double for (int w = 0; w < maxLW + 1; w++) { // imprinting bonus is applied to all stats except stamina (s==1) and oxygen (s==2) and speed (s==6) - valueWODom = statBaseValue * (1 + Values.V.species[speciesI].stats[s].IncPerWildLevel * w) * (s == 1 || s == 2 || (s == 6 && Values.V.species[speciesI].NoImprintingForSpeed == true) ? 1 : imprintingMultiplier) + (postTamed ? Values.V.species[speciesI].stats[s].AddWhenTamed : 0); + valueWODom = statBaseValue * (1 + stats[s].IncPerWildLevel * w) * (s == 1 || s == 2 || (s == 6 && Values.V.species[speciesI].NoImprintingForSpeed == true) ? 1 : imprintingMultiplier) + (postTamed ? stats[s].AddWhenTamed : 0); for (int d = 0; d < maxLD + 1; d++) { if (withTEff) { // taming bonus is dependant on taming-effectiveness // get tamingEffectiveness-possibility - tamingEffectiveness = Math.Round((inputValue / (1 + Values.V.species[speciesI].stats[s].IncPerTamedLevel * d) - valueWODom) / (valueWODom * Values.V.species[speciesI].stats[s].MultAffinity), 4); + tamingEffectiveness = Math.Round((inputValue / (1 + stats[s].IncPerTamedLevel * d) - valueWODom) / (valueWODom * stats[s].MultAffinity), 4); // calculate rounding-error thresholds. Here it's assumed that the displayed ingame value is maximal 0.6 off of the true ingame value - double tamingEffectivenessMax = Math.Round(((inputValue + (Utils.precision(s) == 3 ? 0.0006 : 0.06)) / (1 + Values.V.species[speciesI].stats[s].IncPerTamedLevel * d) - valueWODom) / (valueWODom * Values.V.species[speciesI].stats[s].MultAffinity), 4); - double tamingEffectivenessMin = Math.Round(((inputValue - (Utils.precision(s) == 3 ? 0.0006 : 0.06)) / (1 + Values.V.species[speciesI].stats[s].IncPerTamedLevel * d) - valueWODom) / (valueWODom * Values.V.species[speciesI].stats[s].MultAffinity), 4); + double tamingEffectivenessMax = Math.Round(((inputValue + (Utils.precision(s) == 3 ? 0.0006 : 0.06)) / (1 + stats[s].IncPerTamedLevel * d) - valueWODom) / (valueWODom * stats[s].MultAffinity), 4); + double tamingEffectivenessMin = Math.Round(((inputValue - (Utils.precision(s) == 3 ? 0.0006 : 0.06)) / (1 + stats[s].IncPerTamedLevel * d) - valueWODom) / (valueWODom * stats[s].MultAffinity), 4); if (tamingEffectivenessMin <= 1 && tamingEffectiveness > 1) tamingEffectiveness = 1; if (tamingEffectivenessMax >= lowerTEBound) @@ -327,8 +310,8 @@ public void extractLevels(int speciesI, int level, List statIOs, double // test if TE with torpor-level of tamed-creatures results in a valid wild-level if (considerWildLevelSteps && s != 7 && tamingEffectiveness > 0) { - int preTameLevelMin = (int)((trueTorporLevel(tamingEffectiveness) + 1) / (1 + tamingEffectivenessMax / 2)); - int preTameLevelMax = (int)Math.Ceiling((trueTorporLevel(tamingEffectiveness) + 1) / (1 + tamingEffectivenessMax / 2)); + int preTameLevelMin = (int)((trueTorporLevel() + 1) / (1 + tamingEffectivenessMax / 2)); + int preTameLevelMax = (int)Math.Ceiling((trueTorporLevel() + 1) / (1 + tamingEffectivenessMax / 2)); bool validWildLevel = false; for (int wl = preTameLevelMin; wl <= preTameLevelMax; wl++) { @@ -351,7 +334,7 @@ public void extractLevels(int speciesI, int level, List statIOs, double break; } } - else if (Math.Abs((valueWODom * (postTamed ? 1 + Values.V.species[speciesI].stats[s].MultAffinity : 1) * (1 + Values.V.species[speciesI].stats[s].IncPerTamedLevel * d) - inputValue) * (Utils.precision(s) == 3 ? 100 : 1)) < 0.15) + else if (Math.Abs((valueWODom * (postTamed ? 1 + stats[s].MultAffinity : 1) * (1 + stats[s].IncPerTamedLevel * d) - inputValue) * (Utils.precision(s) == 3 ? 100 : 1)) < 0.15) { results[s].Add(new StatResult(w, d)); break; // no other solution with this w possible @@ -491,31 +474,29 @@ public int removeOutOfBoundsResults() return -1; } - public int trueTorporLevel(double te) + public int trueTorporLevel() { - // set Torpor-level (depends on TE due to torpor-bug) int torporWildLevel = 0; if (results[7].Count > 0) - { torporWildLevel = results[7][0].levelWild; - if (justTamed) + return torporWildLevel; + } + + public bool EveryStatHasAtLeastOneResult + { + get + { + bool r = true; + for (int s = 0; s < 8; s++) { - if (te >= 0) + if (results[s].Count == 0) { - // Torpor-bug: if bonus levels are added due to taming-effectiveness, torpor is too high - // instead of giving only the TE-bonus, the original wild levels W are added a second time - // the game does this after taming: W = (Math.Floor(W*TE/2) > 0 ? 2*W + Math.Floor(W*TE/2) : W); - // First check, if bonus levels are given - int bonuslevel = (int)Math.Floor(te * (4 + 2 * torporWildLevel) / (8 + 2 * te)); - if (bonuslevel > 0) - { - // now substract the wrongly added levels of torpor - torporWildLevel = (torporWildLevel - bonuslevel) / 2 + bonuslevel; - } + r = false; + break; } } + return r; } - return torporWildLevel; } } } diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs index e9ccca04..0286e8e4 100644 --- a/ARKBreedingStats/Form1.Designer.cs +++ b/ARKBreedingStats/Form1.Designer.cs @@ -119,52 +119,31 @@ private void InitializeComponent() this.radioButtonWild = new System.Windows.Forms.RadioButton(); this.tabControlMain = new System.Windows.Forms.TabControl(); this.tabPageStatTesting = new System.Windows.Forms.TabPage(); - this.statPotentials1 = new ARKBreedingStats.uiControls.StatPotentials(); this.groupBox8 = new System.Windows.Forms.GroupBox(); - this.radarChart1 = new ARKBreedingStats.RadarChart(); this.panelWildTamedBredTester = new System.Windows.Forms.Panel(); this.radioButtonTesterBred = new System.Windows.Forms.RadioButton(); this.radioButtonTesterTamed = new System.Windows.Forms.RadioButton(); this.radioButtonTesterWild = new System.Windows.Forms.RadioButton(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.labelTesterTotalLevel = new System.Windows.Forms.Label(); - this.statTestingHealth = new ARKBreedingStats.StatIO(); this.labelDomLevelSum = new System.Windows.Forms.Label(); - this.statTestingStamina = new ARKBreedingStats.StatIO(); - this.statTestingOxygen = new ARKBreedingStats.StatIO(); this.labelNotTamedNoteTesting = new System.Windows.Forms.Label(); - this.statTestingFood = new ARKBreedingStats.StatIO(); this.label10 = new System.Windows.Forms.Label(); - this.statTestingWeight = new ARKBreedingStats.StatIO(); - this.statTestingDamage = new ARKBreedingStats.StatIO(); - this.statTestingSpeed = new ARKBreedingStats.StatIO(); - this.statTestingTorpor = new ARKBreedingStats.StatIO(); this.groupBox5 = new System.Windows.Forms.GroupBox(); this.labelCurrentTesterCreature = new System.Windows.Forms.Label(); this.labelTestingInfo = new System.Windows.Forms.Label(); - this.creatureInfoInputTester = new ARKBreedingStats.CreatureInfoInput(); this.tabPageExtractor = new System.Windows.Forms.TabPage(); this.groupBoxRadarChartExtractor = new System.Windows.Forms.GroupBox(); - this.radarChartExtractor = new ARKBreedingStats.RadarChart(); this.labelImprintingFailInfo = new System.Windows.Forms.Label(); this.groupBoxTamingInfo = new System.Windows.Forms.GroupBox(); this.labelTamingInfo = new System.Windows.Forms.Label(); this.button2TamingCalc = new System.Windows.Forms.Button(); this.gbStats = new System.Windows.Forms.GroupBox(); this.label7 = new System.Windows.Forms.Label(); - this.statIOHealth = new ARKBreedingStats.StatIO(); - this.statIODamage = new ARKBreedingStats.StatIO(); - this.statIOTorpor = new ARKBreedingStats.StatIO(); - this.statIOWeight = new ARKBreedingStats.StatIO(); - this.statIOSpeed = new ARKBreedingStats.StatIO(); - this.statIOFood = new ARKBreedingStats.StatIO(); - this.statIOOxygen = new ARKBreedingStats.StatIO(); - this.statIOStamina = new ARKBreedingStats.StatIO(); this.buttonExtract = new System.Windows.Forms.Button(); this.checkBoxQuickWildCheck = new System.Windows.Forms.CheckBox(); this.buttonHelp = new System.Windows.Forms.Button(); this.labelErrorHelp = new System.Windows.Forms.Label(); - this.creatureInfoInputExtractor = new ARKBreedingStats.CreatureInfoInput(); this.tabPageLibrary = new System.Windows.Forms.TabPage(); this.tableLayoutPanelLibrary = new System.Windows.Forms.TableLayoutPanel(); this.tabControlLibFilter = new System.Windows.Forms.TabControl(); @@ -185,7 +164,6 @@ private void InitializeComponent() this.checkBoxShowUnavailableCreatures = new System.Windows.Forms.CheckBox(); this.checkBoxShowDead = new System.Windows.Forms.CheckBox(); this.tabPageLibRadarChart = new System.Windows.Forms.TabPage(); - this.radarChartLibrary = new ARKBreedingStats.RadarChart(); this.listViewLibrary = new System.Windows.Forms.ListView(); this.columnHeaderName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeaderOwner = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -228,23 +206,14 @@ private void InitializeComponent() this.obeliskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItemRemove = new System.Windows.Forms.ToolStripMenuItem(); - this.creatureBoxListView = new ARKBreedingStats.CreatureBox(); this.tabPagePedigree = new System.Windows.Forms.TabPage(); - this.pedigree1 = new ARKBreedingStats.Pedigree(); this.tabPageTaming = new System.Windows.Forms.TabPage(); - this.tamingControl1 = new ARKBreedingStats.TamingControl(); this.tabPageBreedingPlan = new System.Windows.Forms.TabPage(); - this.breedingPlan1 = new ARKBreedingStats.BreedingPlan(); this.tabPageRaising = new System.Windows.Forms.TabPage(); - this.raisingControl1 = new ARKBreedingStats.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.btnReadValuesFromArk = new System.Windows.Forms.Button(); this.cbEventMultipliers = new System.Windows.Forms.CheckBox(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); @@ -277,6 +246,38 @@ private void InitializeComponent() this.labelListening = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.comboBoxSpeciesGlobal = new System.Windows.Forms.ComboBox(); + this.statPotentials1 = new ARKBreedingStats.uiControls.StatPotentials(); + this.radarChart1 = new ARKBreedingStats.RadarChart(); + this.statTestingHealth = new ARKBreedingStats.StatIO(); + this.statTestingStamina = new ARKBreedingStats.StatIO(); + this.statTestingOxygen = new ARKBreedingStats.StatIO(); + this.statTestingFood = new ARKBreedingStats.StatIO(); + this.statTestingWeight = new ARKBreedingStats.StatIO(); + this.statTestingDamage = new ARKBreedingStats.StatIO(); + this.statTestingSpeed = new ARKBreedingStats.StatIO(); + this.statTestingTorpor = new ARKBreedingStats.StatIO(); + this.creatureInfoInputTester = new ARKBreedingStats.CreatureInfoInput(); + this.radarChartExtractor = new ARKBreedingStats.RadarChart(); + this.statIOHealth = new ARKBreedingStats.StatIO(); + this.statIODamage = new ARKBreedingStats.StatIO(); + this.statIOTorpor = new ARKBreedingStats.StatIO(); + this.statIOWeight = new ARKBreedingStats.StatIO(); + this.statIOSpeed = new ARKBreedingStats.StatIO(); + this.statIOFood = new ARKBreedingStats.StatIO(); + this.statIOOxygen = new ARKBreedingStats.StatIO(); + this.statIOStamina = new ARKBreedingStats.StatIO(); + this.creatureInfoInputExtractor = new ARKBreedingStats.CreatureInfoInput(); + this.radarChartLibrary = new ARKBreedingStats.RadarChart(); + this.creatureBoxListView = new ARKBreedingStats.CreatureBox(); + this.pedigree1 = new ARKBreedingStats.Pedigree(); + this.tamingControl1 = new ARKBreedingStats.TamingControl(); + this.breedingPlan1 = new ARKBreedingStats.BreedingPlan(); + this.raisingControl1 = new ARKBreedingStats.RaisingControl(); + this.timerList1 = new ARKBreedingStats.TimerControl(); + this.tribesControl1 = new ARKBreedingStats.TribesControl(); + this.notesControl1 = new ARKBreedingStats.NotesControl(); + this.ocrControl1 = new ARKBreedingStats.ocr.OCRControl(); + this.cbExtractImprintingFromTorpor = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownImprintingBonusTester)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NumericUpDownTestingTE)).BeginInit(); @@ -294,13 +295,11 @@ private void InitializeComponent() this.tabControlMain.SuspendLayout(); this.tabPageStatTesting.SuspendLayout(); this.groupBox8.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.radarChart1)).BeginInit(); this.panelWildTamedBredTester.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox5.SuspendLayout(); this.tabPageExtractor.SuspendLayout(); this.groupBoxRadarChartExtractor.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.radarChartExtractor)).BeginInit(); this.groupBoxTamingInfo.SuspendLayout(); this.gbStats.SuspendLayout(); this.tabPageLibrary.SuspendLayout(); @@ -312,7 +311,6 @@ private void InitializeComponent() this.tableLayoutPanel2.SuspendLayout(); this.tabPage4.SuspendLayout(); this.tabPageLibRadarChart.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.radarChartLibrary)).BeginInit(); this.contextMenuStripLibrary.SuspendLayout(); this.tabPagePedigree.SuspendLayout(); this.tabPageTaming.SuspendLayout(); @@ -325,6 +323,9 @@ private void InitializeComponent() this.statusStrip1.SuspendLayout(); this.toolStrip2.SuspendLayout(); this.panelToolBar.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radarChart1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radarChartExtractor)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radarChartLibrary)).BeginInit(); this.SuspendLayout(); // // aboutToolStripMenuItem @@ -451,12 +452,12 @@ private void InitializeComponent() // labelImprintedCount // this.labelImprintedCount.AutoSize = true; - this.labelImprintedCount.Location = new System.Drawing.Point(189, 47); + this.labelImprintedCount.Location = new System.Drawing.Point(181, 47); this.labelImprintedCount.Name = "labelImprintedCount"; this.labelImprintedCount.Size = new System.Drawing.Size(25, 13); this.labelImprintedCount.TabIndex = 5; this.labelImprintedCount.Text = "(0×)"; - this.labelImprintedCount.Click += new System.EventHandler(this.labelImprintedCount_Click); + this.labelImprintedCount.MouseClick += new System.Windows.Forms.MouseEventHandler(this.labelImprintedCount_MouseClick); // // labelImprintingTester // @@ -570,6 +571,7 @@ private void InitializeComponent() // // panelExtrImpr // + this.panelExtrImpr.Controls.Add(this.cbExtractImprintingFromTorpor); this.panelExtrImpr.Controls.Add(this.cbExactlyImprinting); this.panelExtrImpr.Controls.Add(this.labelImprintingBonus); this.panelExtrImpr.Controls.Add(this.labelImprintingCuddleCountExtractor); @@ -613,6 +615,11 @@ private void InitializeComponent() // this.numericUpDownImprintingBonusExtractor.DecimalPlaces = 5; 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.Size = new System.Drawing.Size(77, 20); this.numericUpDownImprintingBonusExtractor.TabIndex = 6; @@ -1177,13 +1184,6 @@ private void InitializeComponent() this.tabPageStatTesting.Text = "Stat Testing"; this.tabPageStatTesting.UseVisualStyleBackColor = true; // - // statPotentials1 - // - this.statPotentials1.Location = new System.Drawing.Point(556, 243); - this.statPotentials1.Name = "statPotentials1"; - this.statPotentials1.Size = new System.Drawing.Size(293, 361); - this.statPotentials1.TabIndex = 12; - // // groupBox8 // this.groupBox8.Controls.Add(this.radarChart1); @@ -1194,16 +1194,6 @@ private void InitializeComponent() this.groupBox8.TabStop = false; this.groupBox8.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.radioButtonTesterBred); @@ -1282,24 +1272,6 @@ private void InitializeComponent() this.labelTesterTotalLevel.TabIndex = 49; this.labelTesterTotalLevel.Text = "Total Level"; // - // statTestingHealth - // - this.statTestingHealth.BackColor = System.Drawing.Color.Transparent; - this.statTestingHealth.BreedingValue = 0D; - this.statTestingHealth.DomLevelZero = false; - this.statTestingHealth.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingHealth.Input = 100D; - this.statTestingHealth.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingHealth.LevelDom = 0; - this.statTestingHealth.LevelWild = 0; - this.statTestingHealth.Location = new System.Drawing.Point(6, 32); - this.statTestingHealth.Name = "statTestingHealth"; - this.statTestingHealth.Percent = false; - this.statTestingHealth.Size = new System.Drawing.Size(295, 50); - this.statTestingHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingHealth.TabIndex = 0; - this.statTestingHealth.Unknown = false; - // // labelDomLevelSum // this.labelDomLevelSum.AutoSize = true; @@ -1309,42 +1281,6 @@ private void InitializeComponent() this.labelDomLevelSum.TabIndex = 46; this.labelDomLevelSum.Text = "Dom Levels"; // - // statTestingStamina - // - this.statTestingStamina.BackColor = System.Drawing.Color.Transparent; - this.statTestingStamina.BreedingValue = 0D; - this.statTestingStamina.DomLevelZero = false; - this.statTestingStamina.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingStamina.Input = 100D; - this.statTestingStamina.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingStamina.LevelDom = 0; - this.statTestingStamina.LevelWild = 0; - this.statTestingStamina.Location = new System.Drawing.Point(6, 82); - this.statTestingStamina.Name = "statTestingStamina"; - this.statTestingStamina.Percent = false; - this.statTestingStamina.Size = new System.Drawing.Size(295, 50); - this.statTestingStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingStamina.TabIndex = 1; - this.statTestingStamina.Unknown = false; - // - // statTestingOxygen - // - this.statTestingOxygen.BackColor = System.Drawing.Color.Transparent; - this.statTestingOxygen.BreedingValue = 0D; - this.statTestingOxygen.DomLevelZero = false; - this.statTestingOxygen.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingOxygen.Input = 100D; - this.statTestingOxygen.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingOxygen.LevelDom = 0; - this.statTestingOxygen.LevelWild = 0; - this.statTestingOxygen.Location = new System.Drawing.Point(6, 132); - this.statTestingOxygen.Name = "statTestingOxygen"; - this.statTestingOxygen.Percent = false; - this.statTestingOxygen.Size = new System.Drawing.Size(295, 50); - this.statTestingOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingOxygen.TabIndex = 2; - this.statTestingOxygen.Unknown = false; - // // labelNotTamedNoteTesting // this.labelNotTamedNoteTesting.Location = new System.Drawing.Point(6, 469); @@ -1354,24 +1290,6 @@ private void InitializeComponent() this.labelNotTamedNoteTesting.Text = "*Creature is not yet tamed and may get better values then."; this.labelNotTamedNoteTesting.Visible = false; // - // statTestingFood - // - this.statTestingFood.BackColor = System.Drawing.Color.Transparent; - this.statTestingFood.BreedingValue = 0D; - this.statTestingFood.DomLevelZero = false; - this.statTestingFood.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingFood.Input = 100D; - this.statTestingFood.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingFood.LevelDom = 0; - this.statTestingFood.LevelWild = 0; - this.statTestingFood.Location = new System.Drawing.Point(6, 182); - this.statTestingFood.Name = "statTestingFood"; - this.statTestingFood.Percent = false; - this.statTestingFood.Size = new System.Drawing.Size(295, 50); - this.statTestingFood.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingFood.TabIndex = 3; - this.statTestingFood.Unknown = false; - // // label10 // this.label10.AutoSize = true; @@ -1381,78 +1299,6 @@ private void InitializeComponent() this.label10.TabIndex = 36; this.label10.Text = "Current Value"; // - // statTestingWeight - // - this.statTestingWeight.BackColor = System.Drawing.Color.Transparent; - this.statTestingWeight.BreedingValue = 0D; - this.statTestingWeight.DomLevelZero = false; - this.statTestingWeight.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingWeight.Input = 100D; - this.statTestingWeight.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingWeight.LevelDom = 0; - this.statTestingWeight.LevelWild = 0; - this.statTestingWeight.Location = new System.Drawing.Point(6, 232); - this.statTestingWeight.Name = "statTestingWeight"; - this.statTestingWeight.Percent = false; - this.statTestingWeight.Size = new System.Drawing.Size(295, 50); - this.statTestingWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingWeight.TabIndex = 4; - this.statTestingWeight.Unknown = false; - // - // statTestingDamage - // - this.statTestingDamage.BackColor = System.Drawing.Color.Transparent; - this.statTestingDamage.BreedingValue = 0D; - this.statTestingDamage.DomLevelZero = false; - this.statTestingDamage.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingDamage.Input = 100D; - this.statTestingDamage.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingDamage.LevelDom = 0; - this.statTestingDamage.LevelWild = 0; - this.statTestingDamage.Location = new System.Drawing.Point(6, 282); - this.statTestingDamage.Name = "statTestingDamage"; - this.statTestingDamage.Percent = false; - this.statTestingDamage.Size = new System.Drawing.Size(295, 50); - this.statTestingDamage.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingDamage.TabIndex = 5; - this.statTestingDamage.Unknown = false; - // - // statTestingSpeed - // - this.statTestingSpeed.BackColor = System.Drawing.Color.Transparent; - this.statTestingSpeed.BreedingValue = 0D; - this.statTestingSpeed.DomLevelZero = false; - this.statTestingSpeed.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingSpeed.Input = 100D; - this.statTestingSpeed.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingSpeed.LevelDom = 0; - this.statTestingSpeed.LevelWild = 0; - this.statTestingSpeed.Location = new System.Drawing.Point(6, 332); - this.statTestingSpeed.Name = "statTestingSpeed"; - this.statTestingSpeed.Percent = false; - this.statTestingSpeed.Size = new System.Drawing.Size(295, 50); - this.statTestingSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingSpeed.TabIndex = 6; - this.statTestingSpeed.Unknown = false; - // - // statTestingTorpor - // - this.statTestingTorpor.BackColor = System.Drawing.Color.Transparent; - this.statTestingTorpor.BreedingValue = 0D; - this.statTestingTorpor.DomLevelZero = false; - this.statTestingTorpor.ForeColor = System.Drawing.SystemColors.ControlText; - this.statTestingTorpor.Input = 100D; - this.statTestingTorpor.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statTestingTorpor.LevelDom = 0; - this.statTestingTorpor.LevelWild = 0; - this.statTestingTorpor.Location = new System.Drawing.Point(6, 382); - this.statTestingTorpor.Name = "statTestingTorpor"; - this.statTestingTorpor.Percent = false; - this.statTestingTorpor.Size = new System.Drawing.Size(295, 50); - this.statTestingTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statTestingTorpor.TabIndex = 7; - this.statTestingTorpor.Unknown = false; - // // groupBox5 // this.groupBox5.Controls.Add(this.labelCurrentTesterCreature); @@ -1481,30 +1327,6 @@ private void InitializeComponent() this.labelTestingInfo.TabIndex = 37; this.labelTestingInfo.Text = "Preview or edit levels of a creature."; // - // creatureInfoInputTester - // - this.creatureInfoInputTester.Cooldown = new System.DateTime(2018, 1, 14, 19, 26, 7, 314); - this.creatureInfoInputTester.CreatureName = ""; - this.creatureInfoInputTester.CreatureNote = ""; - this.creatureInfoInputTester.CreatureOwner = ""; - this.creatureInfoInputTester.CreatureServer = ""; - this.creatureInfoInputTester.CreatureSex = ARKBreedingStats.Sex.Unknown; - this.creatureInfoInputTester.CreatureStatus = ARKBreedingStats.CreatureStatus.Available; - this.creatureInfoInputTester.CreatureTribe = ""; - this.creatureInfoInputTester.domesticatedAt = new System.DateTime(2016, 7, 5, 13, 11, 41, 997); - this.creatureInfoInputTester.father = null; - this.creatureInfoInputTester.Grown = new System.DateTime(2018, 1, 14, 19, 26, 7, 315); - this.creatureInfoInputTester.Location = new System.Drawing.Point(321, 184); - this.creatureInfoInputTester.mother = null; - this.creatureInfoInputTester.MutationCounter = 0; - this.creatureInfoInputTester.Name = "creatureInfoInputTester"; - this.creatureInfoInputTester.Neutered = false; - this.creatureInfoInputTester.Size = new System.Drawing.Size(229, 408); - this.creatureInfoInputTester.TabIndex = 4; - this.creatureInfoInputTester.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInputTester_Add2Library_Clicked); - this.creatureInfoInputTester.Save2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Save2LibraryClickedEventHandler(this.creatureInfoInputTester_Save2Library_Clicked); - this.creatureInfoInputTester.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); - // // tabPageExtractor // this.tabPageExtractor.AllowDrop = true; @@ -1546,17 +1368,6 @@ 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; - // // labelImprintingFailInfo // this.labelImprintingFailInfo.BackColor = System.Drawing.Color.MistyRose; @@ -1632,157 +1443,6 @@ private void InitializeComponent() this.label7.TabIndex = 50; this.label7.Text = "Current stat-value"; // - // statIOHealth - // - this.statIOHealth.BackColor = System.Drawing.Color.Transparent; - this.statIOHealth.BreedingValue = 0D; - this.statIOHealth.DomLevelZero = false; - this.statIOHealth.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOHealth.Input = 100D; - this.statIOHealth.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOHealth.LevelDom = 0; - this.statIOHealth.LevelWild = 0; - this.statIOHealth.Location = new System.Drawing.Point(6, 32); - this.statIOHealth.Name = "statIOHealth"; - this.statIOHealth.Percent = false; - this.statIOHealth.Size = new System.Drawing.Size(295, 50); - this.statIOHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOHealth.TabIndex = 0; - this.statIOHealth.Unknown = false; - this.statIOHealth.Click += new System.EventHandler(this.statIO_Click); - // - // statIODamage - // - this.statIODamage.BackColor = System.Drawing.Color.Transparent; - this.statIODamage.BreedingValue = 0D; - this.statIODamage.DomLevelZero = false; - this.statIODamage.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIODamage.Input = 100D; - this.statIODamage.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIODamage.LevelDom = 0; - this.statIODamage.LevelWild = 0; - this.statIODamage.Location = new System.Drawing.Point(6, 282); - this.statIODamage.Name = "statIODamage"; - this.statIODamage.Percent = false; - this.statIODamage.Size = new System.Drawing.Size(295, 50); - this.statIODamage.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIODamage.TabIndex = 5; - this.statIODamage.Unknown = false; - this.statIODamage.Click += new System.EventHandler(this.statIO_Click); - // - // statIOTorpor - // - this.statIOTorpor.BackColor = System.Drawing.Color.Transparent; - this.statIOTorpor.BreedingValue = 0D; - this.statIOTorpor.DomLevelZero = false; - this.statIOTorpor.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOTorpor.Input = 100D; - this.statIOTorpor.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOTorpor.LevelDom = 0; - this.statIOTorpor.LevelWild = 0; - this.statIOTorpor.Location = new System.Drawing.Point(6, 382); - this.statIOTorpor.Name = "statIOTorpor"; - this.statIOTorpor.Percent = false; - this.statIOTorpor.Size = new System.Drawing.Size(295, 50); - this.statIOTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOTorpor.TabIndex = 7; - this.statIOTorpor.Unknown = false; - // - // statIOWeight - // - this.statIOWeight.BackColor = System.Drawing.Color.Transparent; - this.statIOWeight.BreedingValue = 0D; - this.statIOWeight.DomLevelZero = false; - this.statIOWeight.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOWeight.Input = 100D; - this.statIOWeight.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOWeight.LevelDom = 0; - this.statIOWeight.LevelWild = 0; - this.statIOWeight.Location = new System.Drawing.Point(6, 232); - this.statIOWeight.Name = "statIOWeight"; - this.statIOWeight.Percent = false; - this.statIOWeight.Size = new System.Drawing.Size(295, 50); - this.statIOWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOWeight.TabIndex = 4; - this.statIOWeight.Unknown = false; - this.statIOWeight.Click += new System.EventHandler(this.statIO_Click); - // - // statIOSpeed - // - this.statIOSpeed.BackColor = System.Drawing.Color.Transparent; - this.statIOSpeed.BreedingValue = 0D; - this.statIOSpeed.DomLevelZero = false; - this.statIOSpeed.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOSpeed.Input = 100D; - this.statIOSpeed.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOSpeed.LevelDom = 0; - this.statIOSpeed.LevelWild = 0; - this.statIOSpeed.Location = new System.Drawing.Point(6, 332); - this.statIOSpeed.Name = "statIOSpeed"; - this.statIOSpeed.Percent = false; - this.statIOSpeed.Size = new System.Drawing.Size(295, 50); - this.statIOSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOSpeed.TabIndex = 6; - this.statIOSpeed.Unknown = false; - this.statIOSpeed.Click += new System.EventHandler(this.statIO_Click); - // - // statIOFood - // - this.statIOFood.BackColor = System.Drawing.Color.Transparent; - this.statIOFood.BreedingValue = 0D; - this.statIOFood.DomLevelZero = false; - this.statIOFood.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOFood.Input = 100D; - this.statIOFood.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOFood.LevelDom = 0; - this.statIOFood.LevelWild = 0; - this.statIOFood.Location = new System.Drawing.Point(6, 182); - this.statIOFood.Name = "statIOFood"; - this.statIOFood.Percent = false; - this.statIOFood.Size = new System.Drawing.Size(295, 50); - this.statIOFood.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOFood.TabIndex = 3; - this.statIOFood.Unknown = false; - this.statIOFood.Click += new System.EventHandler(this.statIO_Click); - // - // statIOOxygen - // - this.statIOOxygen.BackColor = System.Drawing.Color.Transparent; - this.statIOOxygen.BreedingValue = 0D; - this.statIOOxygen.DomLevelZero = false; - this.statIOOxygen.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOOxygen.Input = 100D; - this.statIOOxygen.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOOxygen.LevelDom = 0; - this.statIOOxygen.LevelWild = 0; - this.statIOOxygen.Location = new System.Drawing.Point(6, 132); - this.statIOOxygen.Name = "statIOOxygen"; - this.statIOOxygen.Percent = false; - this.statIOOxygen.Size = new System.Drawing.Size(295, 50); - this.statIOOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOOxygen.TabIndex = 2; - this.statIOOxygen.Unknown = false; - this.statIOOxygen.Click += new System.EventHandler(this.statIO_Click); - // - // statIOStamina - // - this.statIOStamina.BackColor = System.Drawing.Color.Transparent; - this.statIOStamina.BreedingValue = 0D; - this.statIOStamina.DomLevelZero = false; - this.statIOStamina.ForeColor = System.Drawing.SystemColors.ControlText; - this.statIOStamina.Input = 100D; - this.statIOStamina.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; - this.statIOStamina.LevelDom = 0; - this.statIOStamina.LevelWild = 0; - this.statIOStamina.Location = new System.Drawing.Point(6, 82); - this.statIOStamina.Name = "statIOStamina"; - this.statIOStamina.Percent = false; - this.statIOStamina.Size = new System.Drawing.Size(295, 50); - this.statIOStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; - this.statIOStamina.TabIndex = 1; - this.statIOStamina.Unknown = false; - this.statIOStamina.Click += new System.EventHandler(this.statIO_Click); - // // buttonExtract // this.buttonExtract.Location = new System.Drawing.Point(321, 110); @@ -1823,29 +1483,6 @@ private void InitializeComponent() this.labelErrorHelp.TabIndex = 40; this.labelErrorHelp.Text = resources.GetString("labelErrorHelp.Text"); // - // creatureInfoInputExtractor - // - this.creatureInfoInputExtractor.Cooldown = new System.DateTime(2018, 1, 14, 19, 26, 7, 345); - this.creatureInfoInputExtractor.CreatureName = ""; - this.creatureInfoInputExtractor.CreatureNote = ""; - this.creatureInfoInputExtractor.CreatureOwner = ""; - this.creatureInfoInputExtractor.CreatureServer = ""; - this.creatureInfoInputExtractor.CreatureSex = ARKBreedingStats.Sex.Unknown; - this.creatureInfoInputExtractor.CreatureStatus = ARKBreedingStats.CreatureStatus.Available; - this.creatureInfoInputExtractor.CreatureTribe = ""; - this.creatureInfoInputExtractor.domesticatedAt = new System.DateTime(2016, 7, 5, 13, 12, 15, 968); - this.creatureInfoInputExtractor.father = null; - this.creatureInfoInputExtractor.Grown = new System.DateTime(2018, 1, 14, 19, 26, 7, 346); - this.creatureInfoInputExtractor.Location = new System.Drawing.Point(321, 184); - this.creatureInfoInputExtractor.mother = null; - this.creatureInfoInputExtractor.MutationCounter = 0; - this.creatureInfoInputExtractor.Name = "creatureInfoInputExtractor"; - this.creatureInfoInputExtractor.Neutered = false; - this.creatureInfoInputExtractor.Size = new System.Drawing.Size(229, 408); - this.creatureInfoInputExtractor.TabIndex = 7; - this.creatureInfoInputExtractor.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInput1_Add2Library_Clicked); - this.creatureInfoInputExtractor.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); - // // tabPageLibrary // this.tabPageLibrary.AutoScroll = true; @@ -2105,17 +1742,6 @@ private void InitializeComponent() this.tabPageLibRadarChart.Text = "Chart"; this.tabPageLibRadarChart.UseVisualStyleBackColor = true; // - // radarChartLibrary - // - this.radarChartLibrary.Dock = System.Windows.Forms.DockStyle.Fill; - 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(181, 189); - this.radarChartLibrary.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.radarChartLibrary.TabIndex = 0; - this.radarChartLibrary.TabStop = false; - // // listViewLibrary // this.listViewLibrary.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { @@ -2445,15 +2071,6 @@ private void InitializeComponent() this.toolStripMenuItemRemove.Text = "Delete creature..."; this.toolStripMenuItemRemove.Click += new System.EventHandler(this.toolStripMenuItemRemove_Click); // - // creatureBoxListView - // - this.creatureBoxListView.Location = new System.Drawing.Point(3, 3); - this.creatureBoxListView.Name = "creatureBoxListView"; - this.creatureBoxListView.Size = new System.Drawing.Size(195, 390); - this.creatureBoxListView.TabIndex = 0; - this.creatureBoxListView.Changed += new ARKBreedingStats.CreatureBox.ChangedEventHandler(this.updateCreatureValues); - this.creatureBoxListView.GiveParents += new ARKBreedingStats.CreatureBox.EventHandler(this.creatureBoxListView_FindParents); - // // tabPagePedigree // this.tabPagePedigree.Controls.Add(this.pedigree1); @@ -2465,15 +2082,6 @@ private void InitializeComponent() this.tabPagePedigree.Text = "Pedigree"; this.tabPagePedigree.UseVisualStyleBackColor = true; // - // pedigree1 - // - this.pedigree1.AutoScroll = true; - this.pedigree1.Dock = System.Windows.Forms.DockStyle.Fill; - this.pedigree1.Location = new System.Drawing.Point(3, 3); - this.pedigree1.Name = "pedigree1"; - this.pedigree1.Size = new System.Drawing.Size(926, 623); - this.pedigree1.TabIndex = 0; - // // tabPageTaming // this.tabPageTaming.Controls.Add(this.tamingControl1); @@ -2485,23 +2093,6 @@ 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(926, 623); - this.tamingControl1.TabIndex = 0; - this.tamingControl1.weaponDamages = new double[] { - 100D, - 100D, - 100D, - 100D, - 100D, - 100D}; - this.tamingControl1.weaponDamagesEnabled = 3; - // // tabPageBreedingPlan // this.tabPageBreedingPlan.Controls.Add(this.breedingPlan1); @@ -2513,16 +2104,6 @@ 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.Name = "breedingPlan1"; - this.breedingPlan1.Size = new System.Drawing.Size(926, 623); - this.breedingPlan1.TabIndex = 0; - // // tabPageRaising // this.tabPageRaising.Controls.Add(this.raisingControl1); @@ -2534,15 +2115,6 @@ 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(926, 623); - this.raisingControl1.TabIndex = 0; - // // tabPageTimer // this.tabPageTimer.Controls.Add(this.timerList1); @@ -2554,15 +2126,6 @@ private void InitializeComponent() this.tabPageTimer.Text = "Timer"; this.tabPageTimer.UseVisualStyleBackColor = true; // - // timerList1 - // - this.timerList1.Dock = System.Windows.Forms.DockStyle.Fill; - this.timerList1.Location = new System.Drawing.Point(3, 3); - this.timerList1.Name = "timerList1"; - this.timerList1.Size = new System.Drawing.Size(926, 623); - this.timerList1.TabIndex = 0; - this.timerList1.TimerAlertsCSV = ""; - // // tabPagePlayerTribes // this.tabPagePlayerTribes.Controls.Add(this.tribesControl1); @@ -2574,14 +2137,6 @@ private void InitializeComponent() this.tabPagePlayerTribes.Text = "Player"; this.tabPagePlayerTribes.UseVisualStyleBackColor = true; // - // tribesControl1 - // - this.tribesControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tribesControl1.Location = new System.Drawing.Point(3, 3); - this.tribesControl1.Name = "tribesControl1"; - this.tribesControl1.Size = new System.Drawing.Size(926, 623); - this.tribesControl1.TabIndex = 0; - // // tabPageNotes // this.tabPageNotes.Controls.Add(this.notesControl1); @@ -2593,14 +2148,6 @@ 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(926, 623); - this.notesControl1.TabIndex = 0; - // // TabPageOCR // this.TabPageOCR.Controls.Add(this.ocrControl1); @@ -2612,14 +2159,6 @@ 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(926, 623); - this.ocrControl1.TabIndex = 2; - // // btnReadValuesFromArk // this.btnReadValuesFromArk.Location = new System.Drawing.Point(212, 3); @@ -2958,6 +2497,484 @@ private void InitializeComponent() this.comboBoxSpeciesGlobal.TabIndex = 1; this.comboBoxSpeciesGlobal.SelectedIndexChanged += new System.EventHandler(this.comboBoxSpeciesGlobal_SelectedIndexChanged); // + // statPotentials1 + // + this.statPotentials1.Location = new System.Drawing.Point(556, 243); + this.statPotentials1.Name = "statPotentials1"; + this.statPotentials1.Size = new System.Drawing.Size(293, 361); + this.statPotentials1.TabIndex = 12; + // + // 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; + // + // statTestingHealth + // + this.statTestingHealth.BackColor = System.Drawing.Color.Transparent; + this.statTestingHealth.BreedingValue = 0D; + this.statTestingHealth.DomLevelZero = false; + this.statTestingHealth.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingHealth.Input = 100D; + this.statTestingHealth.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingHealth.LevelDom = 0; + this.statTestingHealth.LevelWild = 0; + this.statTestingHealth.Location = new System.Drawing.Point(6, 32); + this.statTestingHealth.Name = "statTestingHealth"; + this.statTestingHealth.Percent = false; + this.statTestingHealth.Size = new System.Drawing.Size(295, 50); + this.statTestingHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingHealth.TabIndex = 0; + this.statTestingHealth.Unknown = false; + // + // statTestingStamina + // + this.statTestingStamina.BackColor = System.Drawing.Color.Transparent; + this.statTestingStamina.BreedingValue = 0D; + this.statTestingStamina.DomLevelZero = false; + this.statTestingStamina.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingStamina.Input = 100D; + this.statTestingStamina.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingStamina.LevelDom = 0; + this.statTestingStamina.LevelWild = 0; + this.statTestingStamina.Location = new System.Drawing.Point(6, 82); + this.statTestingStamina.Name = "statTestingStamina"; + this.statTestingStamina.Percent = false; + this.statTestingStamina.Size = new System.Drawing.Size(295, 50); + this.statTestingStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingStamina.TabIndex = 1; + this.statTestingStamina.Unknown = false; + // + // statTestingOxygen + // + this.statTestingOxygen.BackColor = System.Drawing.Color.Transparent; + this.statTestingOxygen.BreedingValue = 0D; + this.statTestingOxygen.DomLevelZero = false; + this.statTestingOxygen.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingOxygen.Input = 100D; + this.statTestingOxygen.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingOxygen.LevelDom = 0; + this.statTestingOxygen.LevelWild = 0; + this.statTestingOxygen.Location = new System.Drawing.Point(6, 132); + this.statTestingOxygen.Name = "statTestingOxygen"; + this.statTestingOxygen.Percent = false; + this.statTestingOxygen.Size = new System.Drawing.Size(295, 50); + this.statTestingOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingOxygen.TabIndex = 2; + this.statTestingOxygen.Unknown = false; + // + // statTestingFood + // + this.statTestingFood.BackColor = System.Drawing.Color.Transparent; + this.statTestingFood.BreedingValue = 0D; + this.statTestingFood.DomLevelZero = false; + this.statTestingFood.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingFood.Input = 100D; + this.statTestingFood.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingFood.LevelDom = 0; + this.statTestingFood.LevelWild = 0; + this.statTestingFood.Location = new System.Drawing.Point(6, 182); + this.statTestingFood.Name = "statTestingFood"; + this.statTestingFood.Percent = false; + this.statTestingFood.Size = new System.Drawing.Size(295, 50); + this.statTestingFood.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingFood.TabIndex = 3; + this.statTestingFood.Unknown = false; + // + // statTestingWeight + // + this.statTestingWeight.BackColor = System.Drawing.Color.Transparent; + this.statTestingWeight.BreedingValue = 0D; + this.statTestingWeight.DomLevelZero = false; + this.statTestingWeight.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingWeight.Input = 100D; + this.statTestingWeight.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingWeight.LevelDom = 0; + this.statTestingWeight.LevelWild = 0; + this.statTestingWeight.Location = new System.Drawing.Point(6, 232); + this.statTestingWeight.Name = "statTestingWeight"; + this.statTestingWeight.Percent = false; + this.statTestingWeight.Size = new System.Drawing.Size(295, 50); + this.statTestingWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingWeight.TabIndex = 4; + this.statTestingWeight.Unknown = false; + // + // statTestingDamage + // + this.statTestingDamage.BackColor = System.Drawing.Color.Transparent; + this.statTestingDamage.BreedingValue = 0D; + this.statTestingDamage.DomLevelZero = false; + this.statTestingDamage.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingDamage.Input = 100D; + this.statTestingDamage.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingDamage.LevelDom = 0; + this.statTestingDamage.LevelWild = 0; + this.statTestingDamage.Location = new System.Drawing.Point(6, 282); + this.statTestingDamage.Name = "statTestingDamage"; + this.statTestingDamage.Percent = false; + this.statTestingDamage.Size = new System.Drawing.Size(295, 50); + this.statTestingDamage.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingDamage.TabIndex = 5; + this.statTestingDamage.Unknown = false; + // + // statTestingSpeed + // + this.statTestingSpeed.BackColor = System.Drawing.Color.Transparent; + this.statTestingSpeed.BreedingValue = 0D; + this.statTestingSpeed.DomLevelZero = false; + this.statTestingSpeed.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingSpeed.Input = 100D; + this.statTestingSpeed.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingSpeed.LevelDom = 0; + this.statTestingSpeed.LevelWild = 0; + this.statTestingSpeed.Location = new System.Drawing.Point(6, 332); + this.statTestingSpeed.Name = "statTestingSpeed"; + this.statTestingSpeed.Percent = false; + this.statTestingSpeed.Size = new System.Drawing.Size(295, 50); + this.statTestingSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingSpeed.TabIndex = 6; + this.statTestingSpeed.Unknown = false; + // + // statTestingTorpor + // + this.statTestingTorpor.BackColor = System.Drawing.Color.Transparent; + this.statTestingTorpor.BreedingValue = 0D; + this.statTestingTorpor.DomLevelZero = false; + this.statTestingTorpor.ForeColor = System.Drawing.SystemColors.ControlText; + this.statTestingTorpor.Input = 100D; + this.statTestingTorpor.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statTestingTorpor.LevelDom = 0; + this.statTestingTorpor.LevelWild = 0; + this.statTestingTorpor.Location = new System.Drawing.Point(6, 382); + this.statTestingTorpor.Name = "statTestingTorpor"; + this.statTestingTorpor.Percent = false; + this.statTestingTorpor.Size = new System.Drawing.Size(295, 50); + this.statTestingTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statTestingTorpor.TabIndex = 7; + this.statTestingTorpor.Unknown = false; + // + // creatureInfoInputTester + // + this.creatureInfoInputTester.Cooldown = new System.DateTime(2018, 1, 19, 19, 51, 56, 880); + this.creatureInfoInputTester.CreatureName = ""; + this.creatureInfoInputTester.CreatureNote = ""; + this.creatureInfoInputTester.CreatureOwner = ""; + this.creatureInfoInputTester.CreatureServer = ""; + this.creatureInfoInputTester.CreatureSex = ARKBreedingStats.Sex.Unknown; + this.creatureInfoInputTester.CreatureStatus = ARKBreedingStats.CreatureStatus.Available; + this.creatureInfoInputTester.CreatureTribe = ""; + this.creatureInfoInputTester.domesticatedAt = new System.DateTime(2016, 7, 5, 13, 11, 41, 997); + this.creatureInfoInputTester.father = null; + this.creatureInfoInputTester.Grown = new System.DateTime(2018, 1, 19, 19, 51, 56, 882); + this.creatureInfoInputTester.Location = new System.Drawing.Point(321, 184); + this.creatureInfoInputTester.mother = null; + this.creatureInfoInputTester.MutationCounter = 0; + this.creatureInfoInputTester.Name = "creatureInfoInputTester"; + this.creatureInfoInputTester.Neutered = false; + this.creatureInfoInputTester.Size = new System.Drawing.Size(229, 408); + this.creatureInfoInputTester.TabIndex = 4; + this.creatureInfoInputTester.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInputTester_Add2Library_Clicked); + this.creatureInfoInputTester.Save2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Save2LibraryClickedEventHandler(this.creatureInfoInputTester_Save2Library_Clicked); + this.creatureInfoInputTester.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); + // + // 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; + // + // statIOHealth + // + this.statIOHealth.BackColor = System.Drawing.Color.Transparent; + this.statIOHealth.BreedingValue = 0D; + this.statIOHealth.DomLevelZero = false; + this.statIOHealth.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOHealth.Input = 100D; + this.statIOHealth.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOHealth.LevelDom = 0; + this.statIOHealth.LevelWild = 0; + this.statIOHealth.Location = new System.Drawing.Point(6, 32); + this.statIOHealth.Name = "statIOHealth"; + this.statIOHealth.Percent = false; + this.statIOHealth.Size = new System.Drawing.Size(295, 50); + this.statIOHealth.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOHealth.TabIndex = 0; + this.statIOHealth.Unknown = false; + this.statIOHealth.Click += new System.EventHandler(this.statIO_Click); + // + // statIODamage + // + this.statIODamage.BackColor = System.Drawing.Color.Transparent; + this.statIODamage.BreedingValue = 0D; + this.statIODamage.DomLevelZero = false; + this.statIODamage.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIODamage.Input = 100D; + this.statIODamage.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIODamage.LevelDom = 0; + this.statIODamage.LevelWild = 0; + this.statIODamage.Location = new System.Drawing.Point(6, 282); + this.statIODamage.Name = "statIODamage"; + this.statIODamage.Percent = false; + this.statIODamage.Size = new System.Drawing.Size(295, 50); + this.statIODamage.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIODamage.TabIndex = 5; + this.statIODamage.Unknown = false; + this.statIODamage.Click += new System.EventHandler(this.statIO_Click); + // + // statIOTorpor + // + this.statIOTorpor.BackColor = System.Drawing.Color.Transparent; + this.statIOTorpor.BreedingValue = 0D; + this.statIOTorpor.DomLevelZero = false; + this.statIOTorpor.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOTorpor.Input = 100D; + this.statIOTorpor.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOTorpor.LevelDom = 0; + this.statIOTorpor.LevelWild = 0; + this.statIOTorpor.Location = new System.Drawing.Point(6, 382); + this.statIOTorpor.Name = "statIOTorpor"; + this.statIOTorpor.Percent = false; + this.statIOTorpor.Size = new System.Drawing.Size(295, 50); + this.statIOTorpor.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOTorpor.TabIndex = 7; + this.statIOTorpor.Unknown = false; + // + // statIOWeight + // + this.statIOWeight.BackColor = System.Drawing.Color.Transparent; + this.statIOWeight.BreedingValue = 0D; + this.statIOWeight.DomLevelZero = false; + this.statIOWeight.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOWeight.Input = 100D; + this.statIOWeight.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOWeight.LevelDom = 0; + this.statIOWeight.LevelWild = 0; + this.statIOWeight.Location = new System.Drawing.Point(6, 232); + this.statIOWeight.Name = "statIOWeight"; + this.statIOWeight.Percent = false; + this.statIOWeight.Size = new System.Drawing.Size(295, 50); + this.statIOWeight.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOWeight.TabIndex = 4; + this.statIOWeight.Unknown = false; + this.statIOWeight.Click += new System.EventHandler(this.statIO_Click); + // + // statIOSpeed + // + this.statIOSpeed.BackColor = System.Drawing.Color.Transparent; + this.statIOSpeed.BreedingValue = 0D; + this.statIOSpeed.DomLevelZero = false; + this.statIOSpeed.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOSpeed.Input = 100D; + this.statIOSpeed.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOSpeed.LevelDom = 0; + this.statIOSpeed.LevelWild = 0; + this.statIOSpeed.Location = new System.Drawing.Point(6, 332); + this.statIOSpeed.Name = "statIOSpeed"; + this.statIOSpeed.Percent = false; + this.statIOSpeed.Size = new System.Drawing.Size(295, 50); + this.statIOSpeed.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOSpeed.TabIndex = 6; + this.statIOSpeed.Unknown = false; + this.statIOSpeed.Click += new System.EventHandler(this.statIO_Click); + // + // statIOFood + // + this.statIOFood.BackColor = System.Drawing.Color.Transparent; + this.statIOFood.BreedingValue = 0D; + this.statIOFood.DomLevelZero = false; + this.statIOFood.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOFood.Input = 100D; + this.statIOFood.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOFood.LevelDom = 0; + this.statIOFood.LevelWild = 0; + this.statIOFood.Location = new System.Drawing.Point(6, 182); + this.statIOFood.Name = "statIOFood"; + this.statIOFood.Percent = false; + this.statIOFood.Size = new System.Drawing.Size(295, 50); + this.statIOFood.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOFood.TabIndex = 3; + this.statIOFood.Unknown = false; + this.statIOFood.Click += new System.EventHandler(this.statIO_Click); + // + // statIOOxygen + // + this.statIOOxygen.BackColor = System.Drawing.Color.Transparent; + this.statIOOxygen.BreedingValue = 0D; + this.statIOOxygen.DomLevelZero = false; + this.statIOOxygen.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOOxygen.Input = 100D; + this.statIOOxygen.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOOxygen.LevelDom = 0; + this.statIOOxygen.LevelWild = 0; + this.statIOOxygen.Location = new System.Drawing.Point(6, 132); + this.statIOOxygen.Name = "statIOOxygen"; + this.statIOOxygen.Percent = false; + this.statIOOxygen.Size = new System.Drawing.Size(295, 50); + this.statIOOxygen.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOOxygen.TabIndex = 2; + this.statIOOxygen.Unknown = false; + this.statIOOxygen.Click += new System.EventHandler(this.statIO_Click); + // + // statIOStamina + // + this.statIOStamina.BackColor = System.Drawing.Color.Transparent; + this.statIOStamina.BreedingValue = 0D; + this.statIOStamina.DomLevelZero = false; + this.statIOStamina.ForeColor = System.Drawing.SystemColors.ControlText; + this.statIOStamina.Input = 100D; + this.statIOStamina.InputType = ARKBreedingStats.StatIOInputType.FinalValueInputType; + this.statIOStamina.LevelDom = 0; + this.statIOStamina.LevelWild = 0; + this.statIOStamina.Location = new System.Drawing.Point(6, 82); + this.statIOStamina.Name = "statIOStamina"; + this.statIOStamina.Percent = false; + this.statIOStamina.Size = new System.Drawing.Size(295, 50); + this.statIOStamina.Status = ARKBreedingStats.StatIOStatus.Neutral; + this.statIOStamina.TabIndex = 1; + this.statIOStamina.Unknown = false; + this.statIOStamina.Click += new System.EventHandler(this.statIO_Click); + // + // creatureInfoInputExtractor + // + this.creatureInfoInputExtractor.Cooldown = new System.DateTime(2018, 1, 19, 19, 51, 56, 906); + this.creatureInfoInputExtractor.CreatureName = ""; + this.creatureInfoInputExtractor.CreatureNote = ""; + this.creatureInfoInputExtractor.CreatureOwner = ""; + this.creatureInfoInputExtractor.CreatureServer = ""; + this.creatureInfoInputExtractor.CreatureSex = ARKBreedingStats.Sex.Unknown; + this.creatureInfoInputExtractor.CreatureStatus = ARKBreedingStats.CreatureStatus.Available; + this.creatureInfoInputExtractor.CreatureTribe = ""; + this.creatureInfoInputExtractor.domesticatedAt = new System.DateTime(2016, 7, 5, 13, 12, 15, 968); + this.creatureInfoInputExtractor.father = null; + this.creatureInfoInputExtractor.Grown = new System.DateTime(2018, 1, 19, 19, 51, 56, 906); + this.creatureInfoInputExtractor.Location = new System.Drawing.Point(321, 184); + this.creatureInfoInputExtractor.mother = null; + this.creatureInfoInputExtractor.MutationCounter = 0; + this.creatureInfoInputExtractor.Name = "creatureInfoInputExtractor"; + this.creatureInfoInputExtractor.Neutered = false; + this.creatureInfoInputExtractor.Size = new System.Drawing.Size(229, 408); + this.creatureInfoInputExtractor.TabIndex = 7; + this.creatureInfoInputExtractor.Add2Library_Clicked += new ARKBreedingStats.CreatureInfoInput.Add2LibraryClickedEventHandler(this.creatureInfoInput1_Add2Library_Clicked); + this.creatureInfoInputExtractor.ParentListRequested += new ARKBreedingStats.CreatureInfoInput.RequestParentListEventHandler(this.creatureInfoInput_ParentListRequested); + // + // radarChartLibrary + // + this.radarChartLibrary.Dock = System.Windows.Forms.DockStyle.Fill; + 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(181, 189); + 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(195, 390); + this.creatureBoxListView.TabIndex = 0; + this.creatureBoxListView.Changed += new ARKBreedingStats.CreatureBox.ChangedEventHandler(this.updateCreatureValues); + this.creatureBoxListView.GiveParents += new ARKBreedingStats.CreatureBox.EventHandler(this.creatureBoxListView_FindParents); + // + // pedigree1 + // + this.pedigree1.AutoScroll = true; + this.pedigree1.Dock = System.Windows.Forms.DockStyle.Fill; + this.pedigree1.Location = new System.Drawing.Point(3, 3); + this.pedigree1.Name = "pedigree1"; + this.pedigree1.Size = new System.Drawing.Size(926, 623); + 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(926, 623); + this.tamingControl1.TabIndex = 0; + this.tamingControl1.weaponDamages = new double[] { + 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.Name = "breedingPlan1"; + this.breedingPlan1.Size = new System.Drawing.Size(926, 623); + this.breedingPlan1.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(926, 623); + 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(926, 623); + 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(926, 623); + 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(926, 623); + 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(926, 623); + this.ocrControl1.TabIndex = 2; + // + // cbExtractImprintingFromTorpor + // + this.cbExtractImprintingFromTorpor.AutoSize = true; + this.cbExtractImprintingFromTorpor.Location = new System.Drawing.Point(129, 29); + this.cbExtractImprintingFromTorpor.Name = "cbExtractImprintingFromTorpor"; + this.cbExtractImprintingFromTorpor.Size = new System.Drawing.Size(89, 17); + this.cbExtractImprintingFromTorpor.TabIndex = 52; + this.cbExtractImprintingFromTorpor.Text = "Extract (beta)"; + this.cbExtractImprintingFromTorpor.UseVisualStyleBackColor = true; + // // Form1 // this.AcceptButton = this.buttonExtract; @@ -2999,7 +3016,6 @@ private void InitializeComponent() this.tabControlMain.ResumeLayout(false); this.tabPageStatTesting.ResumeLayout(false); this.groupBox8.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.radarChart1)).EndInit(); this.panelWildTamedBredTester.ResumeLayout(false); this.panelWildTamedBredTester.PerformLayout(); this.groupBox2.ResumeLayout(false); @@ -3009,7 +3025,6 @@ private void InitializeComponent() this.tabPageExtractor.ResumeLayout(false); this.tabPageExtractor.PerformLayout(); this.groupBoxRadarChartExtractor.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.radarChartExtractor)).EndInit(); this.groupBoxTamingInfo.ResumeLayout(false); this.gbStats.ResumeLayout(false); this.gbStats.PerformLayout(); @@ -3024,7 +3039,6 @@ private void InitializeComponent() this.tabPage4.ResumeLayout(false); this.tabPage4.PerformLayout(); this.tabPageLibRadarChart.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.radarChartLibrary)).EndInit(); this.contextMenuStripLibrary.ResumeLayout(false); this.tabPagePedigree.ResumeLayout(false); this.tabPageTaming.ResumeLayout(false); @@ -3040,6 +3054,9 @@ private void InitializeComponent() this.toolStrip2.PerformLayout(); this.panelToolBar.ResumeLayout(false); this.panelToolBar.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radarChart1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radarChartExtractor)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radarChartLibrary)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -3293,5 +3310,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem mutatedCreaturesToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator9; private System.Windows.Forms.CheckBox cbGuessSpecies; + private System.Windows.Forms.CheckBox cbExtractImprintingFromTorpor; } } diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs index 6d67a5c5..1a03941a 100644 --- a/ARKBreedingStats/Form1.cs +++ b/ARKBreedingStats/Form1.cs @@ -257,6 +257,7 @@ private void Form1_Load(object sender, EventArgs e) tt.SetToolTip(lblExtractorWildLevel, "Wild levels, which are considered for breeding"); tt.SetToolTip(lblTesterWildLevel, "Wild levels, which are considered for breeding"); tt.SetToolTip(cbGuessSpecies, "If checked, the tool will try to guess the species after reading the values from ARK.\nIf the tool recognizes the species-name it will take that, otherwise it will check if the stat-values match a certain species.\n\nUncheck this if the tool repeatedly selects the wrong species after OCR (you have to choose it manually then)."); + tt.SetToolTip(cbExtractImprintingFromTorpor, "Enable this to extract the exact imprinting from the torpor-value instead of the number of cuddles.\nThis should allow the extraction if you raised the creature during an event or if you don't know the matureSpeed- or cuddleIntervalMultiplier."); // was used to calculate the growing-progress. TODO: remove? (UI doesn't show the current weight anymore) creatureInfoInputExtractor.weightStat = statIOs[4]; @@ -455,17 +456,17 @@ private bool extractLevels(bool autoExtraction = false) extractor.extractLevels(speciesIndex, (int)numericUpDownLevel.Value, statIOs, (double)numericUpDownLowerTEffBound.Value / 100, (double)numericUpDownUpperTEffBound.Value / 100, !radioButtonBred.Checked, radioButtonTamed.Checked, false, radioButtonBred.Checked, - (double)numericUpDownImprintingBonusExtractor.Value / 100, !cbExactlyImprinting.Checked, creatureCollection.imprintingMultiplier, Values.V.babyCuddleIntervalMultiplier, + (double)numericUpDownImprintingBonusExtractor.Value / 100, !cbExactlyImprinting.Checked, creatureCollection.allowMoreThanHundredImprinting, cbExtractImprintingFromTorpor.Checked, creatureCollection.imprintingMultiplier, Values.V.babyCuddleIntervalMultiplier, creatureCollection.considerWildLevelSteps, creatureCollection.wildLevelStep, out imprintingBonusChanged); - if (false && radioButtonTamed.Checked)// torpor bug got fixed - checkBoxJustTamed.Checked = extractor.justTamed; numericUpDownImprintingBonusExtractor.Value = (decimal)extractor.imprintingBonus * 100; numericUpDownImprintingBonusExtractor_ValueChanged(null, null); if (imprintingBonusChanged && !autoExtraction) MessageBox.Show("The imprinting-percentage given is not possible with the current multipliers and may cause wrong values during the extraction-process.\n\nMake sure the BabyCuddleIntervallMultiplier and the BabyMatureSpeedMultiplier are set correctly.\nThey may have to be set to the value when the creature hatched/was born, even if they were changed.", "Imprinting-Value or multipliers probably wrong", MessageBoxButtons.OK, MessageBoxIcon.Warning); + bool everyStatHasAtLeastOneResult = extractor.EveryStatHasAtLeastOneResult; + // remove all results that require a total wild-level higher than the max if (!radioButtonBred.Checked && creatureCollection.maxWildLevel > 0 @@ -490,6 +491,11 @@ private bool extractLevels(bool autoExtraction = false) } } } + if (everyStatHasAtLeastOneResult && !extractor.EveryStatHasAtLeastOneResult) + { + MessageBox.Show("The extraction is potentially possible, but it seems the max wild level is set too low for a valid extraction. Check if you set the correct value in the settings.\nThe current value is " + + creatureCollection.maxWildLevel + " and this creature seems to have a higher wild level than this.\n\nFor other reasons of the failing of the extraction, see the list on the right after closing this messagebox."); + } if (!extractor.setStatLevelBounds()) { @@ -646,7 +652,7 @@ private void extractionFailed() private void setUniqueTE() { double te = extractor.uniqueTE(); - statIOs[7].LevelWild = extractor.trueTorporLevel(te); + statIOs[7].LevelWild = extractor.trueTorporLevel(); if (te >= 0) { labelTE.Text = "Extracted: " + Math.Round(100 * te, 1) + " %"; @@ -855,7 +861,7 @@ private void setPossibilitiesListview(int s) subItems.Add(extractor.results[s][r].levelDom.ToString()); subItems.Add((te >= 0 ? (te * 100).ToString() : "")); - subItems.Add((te > 0 ? Math.Ceiling((extractor.trueTorporLevel(te) + 1) / (1 + te / 2)).ToString() : "")); + subItems.Add((te > 0 ? Math.Ceiling((extractor.trueTorporLevel() + 1) / (1 + te / 2)).ToString() : "")); lvi = new ListViewItem(subItems.ToArray()); if (!resultsValid || extractor.results[s][r].currentlyNotValid) @@ -888,7 +894,7 @@ private void updateSpeciesComboboxes() } } - // global species changed + // global species changed / globalspecieschanged private void comboBoxSpeciesGlobal_SelectedIndexChanged(object sender, EventArgs e) { if (comboBoxSpeciesGlobal.SelectedIndex >= 0) @@ -903,6 +909,10 @@ private void comboBoxSpeciesGlobal_SelectedIndexChanged(object sender, EventArgs statIOs[s].Enabled = activeStats[s]; statIOs[s].Title = Utils.statName(s, false, isglowSpecies); testingIOs[s].Title = Utils.statName(s, false, isglowSpecies); + if (isglowSpecies && ((s == 1 || s == 2 || s == 5))) + { + statIOs[s].DomLevelZero = false; + } } if (tabControlMain.SelectedTab == tabPageExtractor) { @@ -959,12 +969,9 @@ private void setPossibility(int s, int i, bool validateCombination = false) private void setWildSpeedLevelAccordingToOthers() { - /* - * wild speed level is wildTotalLevels - determinedWildLevels. sometimes the oxygenlevel cannot be determined - * if TE cannot be determined and creature is just tamed (so torpor-bug applies), speed cannot as well - */ + // wild speed level is wildTotalLevels - determinedWildLevels. sometimes the oxygenlevel cannot be determined bool unique = true; - bool uniqueWildTorporLevel = extractor.lastTEUnique || !extractor.justTamed; + bool uniqueWildTorporLevel = extractor.lastTEUnique; int notDeterminedLevels = statIOs[7].LevelWild; if (uniqueWildTorporLevel) { @@ -1180,6 +1187,8 @@ private void initializeCollection() pedigree1.Clear(); breedingPlan1.Clear(); + + updateTempCreatureDropDown(); } private void applySettingsToValues() @@ -1220,6 +1229,10 @@ private void applySettingsToValues() ocrControl1.setWhiteThreshold(Properties.Settings.Default.OCRWhiteThreshold); + int maxImprintingPercentage = creatureCollection.allowMoreThanHundredImprinting ? 1000 : 100; + numericUpDownImprintingBonusExtractor.Maximum = maxImprintingPercentage; + numericUpDownImprintingBonusTester.Maximum = maxImprintingPercentage; + // sound-files timerList1.sounds = new System.Media.SoundPlayer[] { File.Exists(Properties.Settings.Default.soundStarving) ? new System.Media.SoundPlayer(Properties.Settings.Default.soundStarving) : null, @@ -3486,7 +3499,7 @@ public void doOCR(string imageFilePath = "", bool manuallyTriggered = true) } // use imprinting if existing - if (OCRvalues.Length > 8 && OCRvalues[8] > 0 && OCRvalues[8] <= 100) + if (OCRvalues.Length > 8 && OCRvalues[8] > 0 && (OCRvalues[8] <= 100 || creatureCollection.allowMoreThanHundredImprinting)) { radioButtonBred.Checked = true; numericUpDownImprintingBonusExtractor.Value = (decimal)OCRvalues[8]; @@ -3894,20 +3907,31 @@ private void button2TamingCalc_Click(object sender, EventArgs e) tabControlMain.SelectedTab = tabPageTaming; } - private void labelImprintedCount_Click(object sender, EventArgs e) + private void labelImprintedCount_MouseClick(object sender, MouseEventArgs e) { - // set imprinting-count to closes integer - if (Values.V.species[speciesIndex].breeding != null && Values.V.species[speciesIndex].breeding.maturationTimeAdjusted > 0) + if (e.Button == MouseButtons.Left) { - double imprintingGainPerCuddle = Utils.imprintingGainPerCuddle(Values.V.species[speciesIndex].breeding.maturationTimeAdjusted, Values.V.babyCuddleIntervalMultiplier); - int cuddleCount = (int)Math.Round((double)numericUpDownImprintingBonusTester.Value / (100 * imprintingGainPerCuddle)); - double imprintingBonus; - do + // set imprinting-count to closes integer + if (Values.V.species[speciesIndex].breeding != null && Values.V.species[speciesIndex].breeding.maturationTimeAdjusted > 0) { - imprintingBonus = Math.Round(100 * cuddleCount * imprintingGainPerCuddle, 5); - cuddleCount--; - } while (imprintingBonus > 100); // TODO some mods allow more than 100% imprinting - numericUpDownImprintingBonusTester.Value = (decimal)imprintingBonus; + double imprintingGainPerCuddle = Utils.imprintingGainPerCuddle(Values.V.species[speciesIndex].breeding.maturationTimeAdjusted, Values.V.babyCuddleIntervalMultiplier); + int cuddleCount = (int)Math.Round((double)numericUpDownImprintingBonusTester.Value / (100 * imprintingGainPerCuddle)); + double imprintingBonus; + do + { + imprintingBonus = Math.Round(100 * cuddleCount * imprintingGainPerCuddle, 5); + cuddleCount--; + } while (imprintingBonus > 100 && !creatureCollection.allowMoreThanHundredImprinting); + numericUpDownImprintingBonusTester.Value = (decimal)imprintingBonus; + } + } + else if (e.Button == MouseButtons.Right) + { + // set imprinting value so the set levels in the tester yield the value in the extractor + double imprintingBonus = (statIOs[7].Input / Stats.calculateValue(speciesIndex, 7, testingIOs[7].LevelWild, 0, true, 1, 0) - 1) / (0.2 * creatureCollection.imprintingMultiplier); + if (imprintingBonus < 0) imprintingBonus = 0; + if (!creatureCollection.allowMoreThanHundredImprinting && imprintingBonus > 1) imprintingBonus = 1; + numericUpDownImprintingBonusTester.Value = 100 * (decimal)imprintingBonus; } } @@ -4021,7 +4045,7 @@ private void OcrupdateWhiteThreshold(int value) private void toolStripCBTempCreatures_SelectedIndexChanged(object sender, EventArgs e) { - if (toolStripCBTempCreatures.SelectedIndex >= 0) + if (toolStripCBTempCreatures.SelectedIndex >= 0 && toolStripCBTempCreatures.SelectedIndex < creatureCollection.creaturesValues.Count) { species.CreatureValues cv = creatureCollection.creaturesValues[toolStripCBTempCreatures.SelectedIndex]; for (int s = 0; s < 8; s++) diff --git a/ARKBreedingStats/Form1.resx b/ARKBreedingStats/Form1.resx index 88f711fa..5359e60e 100644 --- a/ARKBreedingStats/Form1.resx +++ b/ARKBreedingStats/Form1.resx @@ -125,89 +125,6 @@ The TE can differ 0.1% due to ingame-rounding. 17, 17 - - - - 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 - - Extraction failed, common causes: @@ -232,47 +149,6 @@ The TE can differ 0.1% due to ingame-rounding. 10. The stats of the creature were changed recently and the game displays the old values. Level up a stat, that should trigger a recalculation of the values. 11. The stat-values in this tool are wrong or the game does show wrong stats. You can via reddit or github send me a screenshot that contains the stats of the creature ingame and the extractor with the typed in values along with the stat-multipliers in the settings. - - - - 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 - 364, 17 @@ -283,6 +159,7 @@ The TE can differ 0.1% due to ingame-rounding. 655, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -459,6 +336,129 @@ The TE can differ 0.1% due to ingame-rounding. mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + 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 diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs index 4be4404e..309bc527 100644 --- a/ARKBreedingStats/Properties/AssemblyInfo.cs +++ b/ARKBreedingStats/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("0.24.5")] +[assembly: AssemblyFileVersion("0.24.6")] diff --git a/ARKBreedingStats/RaisingControl.cs b/ARKBreedingStats/RaisingControl.cs index c6e149b0..a0688ecf 100644 --- a/ARKBreedingStats/RaisingControl.cs +++ b/ARKBreedingStats/RaisingControl.cs @@ -107,6 +107,12 @@ public void updateRaisingData(int speciesIndex, bool forceUpdate = false) ResumeLayout(); } + else + { + // no taming- or breeding-data available + labelRaisingInfos.Text = "No raising-data available."; + tabPageMaturationProgress.Enabled = false; + } } } diff --git a/ARKBreedingStats/json/classicFlyers.json b/ARKBreedingStats/json/classicFlyers.json index 882f738a..3dd28929 100644 --- a/ARKBreedingStats/json/classicFlyers.json +++ b/ARKBreedingStats/json/classicFlyers.json @@ -1 +1 @@ -{"ver":"1.0.4","species":[{"name":"Argentavis","statsRaw":[[null,null,0.27],[750,0.1,0.1],null,null,[350,0.02,0.04,0,0],null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Lymantria","statsRaw":[null,[180,0.1,0.1],null,null,null,null,[null,null,0.025],null]},{"name":"Pelagornis","statsRaw":[[210,0.2,0.27,0.5,0],[320,0.1,0.1],null,null,[135,0.02,0.04,0,0],null,[null,null,0.025],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Pteranodon","statsRaw":[[210,0.2,0.27,0.5,0],[300,0.1,0.1],null,null,[150,0.02,0.04,0,0],null,[null,null,0.018518],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Quetzal","statsRaw":[[1200,0.2,0.27,0.5,0],[750,0.1,0.1],null,null,[780,0.02,0.04,0,0],null,[null,null,0.02194],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Tapejara","statsRaw":[null,[450,0.1,0.1],null,null,[330],null,[null,null,0.0457],null],"NoImprintingForSpeed":false},{"name":"Fire Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,null,null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Lightning Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,null,null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Poison Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,null,null,[null,null,0.025],null],"NoImprintingForSpeed":false}]} \ No newline at end of file +{"ver":"1.0.5","species":[{"name":"Argentavis","statsRaw":[[null,null,0.27],[750,0.1,0.1],null,null,[350,0.02,0.04,0,0],null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Lymantria","statsRaw":[null,[180,0.1,0.1],null,null,null,null,[null,null,0.025],null]},{"name":"Pelagornis","statsRaw":[[210,0.2,0.27,0.5,0],[320,0.1,0.1],null,null,[135,0.02,0.04,0,0],null,[null,null,0.025],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Pteranodon","statsRaw":[[210,0.2,0.27,0.5,0],[300,0.1,0.1],null,null,[150,0.02,0.04,0,0],null,[null,null,0.018518],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Quetzal","statsRaw":[[1200,0.2,0.27,0.5,0],[750,0.1,0.1],null,null,[780,0.02,0.04,0,0],null,[null,null,0.02194],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Tapejara","statsRaw":[null,[450,0.1,0.1],null,null,[330],null,[null,null,0.0457],null],"NoImprintingForSpeed":false},{"name":"Fire Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,[350],null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Lightning Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,[350],null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Poison Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,[350],null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Ice Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,[350],null,[null,null,0.025],null],"NoImprintingForSpeed":false}]} \ No newline at end of file diff --git a/ARKBreedingStats/settings/Settings.Designer.cs b/ARKBreedingStats/settings/Settings.Designer.cs index d0ba1112..d3e3549a 100644 --- a/ARKBreedingStats/settings/Settings.Designer.cs +++ b/ARKBreedingStats/settings/Settings.Designer.cs @@ -115,6 +115,7 @@ private void InitializeComponent() this.labelEvent = new System.Windows.Forms.Label(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.groupBox10 = new System.Windows.Forms.GroupBox(); + this.cbInventoryCheck = new System.Windows.Forms.CheckBox(); this.label21 = new System.Windows.Forms.Label(); this.nudOverlayInfoDuration = new ARKBreedingStats.uiControls.Nud(); this.chkbSpeechRecognition = new System.Windows.Forms.CheckBox(); @@ -126,7 +127,7 @@ private void InitializeComponent() this.customSCBirth = new ARKBreedingStats.settings.customSoundChooser(); this.customSCStarving = new ARKBreedingStats.settings.customSoundChooser(); this.label20 = new System.Windows.Forms.Label(); - this.cbInventoryCheck = new System.Windows.Forms.CheckBox(); + this.cbAllowMoreThanHundredImprinting = new System.Windows.Forms.CheckBox(); this.groupBoxMultiplier.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudWaitBeforeScreenCapture)).BeginInit(); @@ -356,7 +357,7 @@ private void InitializeComponent() // this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonOK.Location = new System.Drawing.Point(613, 543); + this.buttonOK.Location = new System.Drawing.Point(613, 567); this.buttonOK.Name = "buttonOK"; this.buttonOK.Size = new System.Drawing.Size(75, 23); this.buttonOK.TabIndex = 0; @@ -368,7 +369,7 @@ private void InitializeComponent() // this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.Location = new System.Drawing.Point(532, 543); + this.buttonCancel.Location = new System.Drawing.Point(532, 567); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Size = new System.Drawing.Size(75, 23); this.buttonCancel.TabIndex = 1; @@ -1040,7 +1041,7 @@ private void InitializeComponent() // // label15 // - this.label15.Location = new System.Drawing.Point(6, 445); + this.label15.Location = new System.Drawing.Point(5, 475); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(321, 54); this.label15.TabIndex = 8; @@ -1106,7 +1107,7 @@ private void InitializeComponent() this.tabControl1.Location = new System.Drawing.Point(3, 3); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(685, 534); + this.tabControl1.Size = new System.Drawing.Size(685, 558); this.tabControl1.TabIndex = 11; // // tabPage2 @@ -1125,7 +1126,7 @@ private void InitializeComponent() this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(677, 508); + this.tabPage2.Size = new System.Drawing.Size(677, 532); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Multipliers"; this.tabPage2.UseVisualStyleBackColor = true; @@ -1144,11 +1145,12 @@ private void InitializeComponent() // // groupBox11 // + this.groupBox11.Controls.Add(this.cbAllowMoreThanHundredImprinting); this.groupBox11.Controls.Add(this.nudWildLevelStep); this.groupBox11.Controls.Add(this.cbConsiderWildLevelSteps); this.groupBox11.Location = new System.Drawing.Point(6, 380); this.groupBox11.Name = "groupBox11"; - this.groupBox11.Size = new System.Drawing.Size(321, 50); + this.groupBox11.Size = new System.Drawing.Size(321, 69); this.groupBox11.TabIndex = 1; this.groupBox11.TabStop = false; this.groupBox11.Text = "Extractor"; @@ -1243,6 +1245,15 @@ private void InitializeComponent() this.groupBox10.TabStop = false; this.groupBox10.Text = "Overlay"; // + // cbInventoryCheck + // + this.cbInventoryCheck.Location = new System.Drawing.Point(6, 68); + this.cbInventoryCheck.Name = "cbInventoryCheck"; + this.cbInventoryCheck.Size = new System.Drawing.Size(234, 35); + this.cbInventoryCheck.TabIndex = 7; + this.cbInventoryCheck.Text = "Automatically extract inventory levels (needs enabled overlay)"; + this.cbInventoryCheck.UseVisualStyleBackColor = true; + // // label21 // this.label21.AutoSize = true; @@ -1316,7 +1327,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 = 7; // // customSCWakeup @@ -1324,7 +1335,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 = 6; // // customSCBirth @@ -1332,7 +1343,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 = 5; // // customSCStarving @@ -1340,7 +1351,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 = 4; // // label20 @@ -1352,14 +1363,15 @@ private void InitializeComponent() this.label20.Text = "Only PCM-WAV-files are supported. The sound will play 1 min before the timer runs" + " out."; // - // cbInventoryCheck + // cbAllowMoreThanHundredImprinting // - this.cbInventoryCheck.Location = new System.Drawing.Point(6, 68); - this.cbInventoryCheck.Name = "cbInventoryCheck"; - this.cbInventoryCheck.Size = new System.Drawing.Size(234, 35); - this.cbInventoryCheck.TabIndex = 7; - this.cbInventoryCheck.Text = "Automatically extract inventory levels (needs enabled overlay)"; - this.cbInventoryCheck.UseVisualStyleBackColor = true; + this.cbAllowMoreThanHundredImprinting.AutoSize = true; + this.cbAllowMoreThanHundredImprinting.Location = new System.Drawing.Point(6, 43); + this.cbAllowMoreThanHundredImprinting.Name = "cbAllowMoreThanHundredImprinting"; + this.cbAllowMoreThanHundredImprinting.Size = new System.Drawing.Size(177, 17); + this.cbAllowMoreThanHundredImprinting.TabIndex = 2; + this.cbAllowMoreThanHundredImprinting.Text = "Allow more than 100% imprinting"; + this.cbAllowMoreThanHundredImprinting.UseVisualStyleBackColor = true; // // Settings // @@ -1368,7 +1380,7 @@ private void InitializeComponent() this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.buttonCancel; - this.ClientSize = new System.Drawing.Size(700, 578); + this.ClientSize = new System.Drawing.Size(700, 602); this.Controls.Add(this.tabControl1); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonOK); @@ -1530,5 +1542,6 @@ private void InitializeComponent() private System.Windows.Forms.Label label22; private System.Windows.Forms.TextBox tbPlayAlarmsSeconds; private System.Windows.Forms.CheckBox cbInventoryCheck; + private System.Windows.Forms.CheckBox cbAllowMoreThanHundredImprinting; } } \ No newline at end of file diff --git a/ARKBreedingStats/settings/Settings.cs b/ARKBreedingStats/settings/Settings.cs index 95790d64..8369ee33 100644 --- a/ARKBreedingStats/settings/Settings.cs +++ b/ARKBreedingStats/settings/Settings.cs @@ -56,6 +56,7 @@ private void initStuff() tt.SetToolTip(cbConsiderWildLevelSteps, "Enable to sort out all level-combinations that are not possible for naturally spawned creatures.\nThe step is max-wild-level / 30 by default, e.g. with a max wildlevel of 150, only creatures with levels that are a multiple of 5 are possible (can be different with mods).\nDisable if there are creatures that have other levels, e.g. spawned in by an admin."); tt.SetToolTip(cbSingleplayerSettings, "Check this if you have enabled the \"Singleplayer-Settings\" in your game. This settings adjusts some of the multipliers again."); tt.SetToolTip(buttonSetToOfficialMP, "Set all stat-multipliers to the default values"); + tt.SetToolTip(cbAllowMoreThanHundredImprinting, "Enable this if on your server more than 100% imprinting are possible, e.g. with the mod S+ with a Nanny"); } private void loadSettings(CreatureCollection cc) @@ -124,6 +125,7 @@ private void loadSettings(CreatureCollection cc) cbConsiderWildLevelSteps.Checked = cc.considerWildLevelSteps; nudWildLevelStep.Value = cc.wildLevelStep; cbInventoryCheck.Checked = Properties.Settings.Default.inventoryCheckTimer; + cbAllowMoreThanHundredImprinting.Checked = cc.allowMoreThanHundredImprinting; } private void saveSettings() @@ -181,6 +183,7 @@ private void saveSettings() cc.considerWildLevelSteps = cbConsiderWildLevelSteps.Checked; cc.wildLevelStep = (int)nudWildLevelStep.Value; Properties.Settings.Default.inventoryCheckTimer = cbInventoryCheck.Checked; + cc.allowMoreThanHundredImprinting = cbAllowMoreThanHundredImprinting.Checked; } private string setSoundFile(string soundFilePath) diff --git a/ARKBreedingStats/ver.txt b/ARKBreedingStats/ver.txt index 33b2fbce..99ea9086 100644 --- a/ARKBreedingStats/ver.txt +++ b/ARKBreedingStats/ver.txt @@ -1 +1 @@ -276.42.1,0.24.5 \ No newline at end of file +276.42.1,0.24.6 \ No newline at end of file