added option to apply global species selection to library (#879). In …

…taming control added input for current food-stat-value for more precise starving-time. added info on how to extract creatures that show wrong stat-values after imprinting. fixed that savegame-imports did not import the ArkId properly. added considering owner-filter from library to breeding-planner (#885). The clear-button in the extractor now clears the ArkId-input. fixed when importing a creature that the tribe's name was saved as the owner's name. Increased the max imprinting bonus value to 100000 % (if more than 100 % IB is allowed via the settings) (#884). fix for disappeared importExport-window (#892). fixed that maturation was not saved when importing exported creatures. in the breeding-planner, the best level now considers the stat-weights. prevent exception if TE is higher than expected (>100 %)(#896). updated taming-food with new kibbles, recipes are not yet included.

ARKBreedingStats/App.config

@@ -148,6 +148,12 @@
             <setting name="ExportCreatureFolder" serializeAs="String">
                 <value />
             </setting>
+            <setting name="ApplyGlobalSpeciesToLibrary" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="UseOwnerFilterForBreedingPlan" serializeAs="String">
+                <value>False</value>
+            </setting>
         </ARKBreedingStats.Properties.Settings>
     </userSettings>
 </configuration>

ARKBreedingStats/BreedingPlan.cs

@@ -69,6 +69,7 @@ public BreedingPlan()
             dontUpdateBreedingPlan = false;
 
             cbServerFilterLibrary.Checked = Properties.Settings.Default.UseServerFilterForBreedingPlan;
+            cbOwnerFilterLibrary.Checked = Properties.Settings.Default.UseOwnerFilterForBreedingPlan;
 
             tagSelectorList1.OnTagChanged += TagSelectorList1_OnTagChanged;
         }
@@ -219,6 +220,14 @@ private void AsyncCalculateBreedingScoresAndDisplayPairs(BreedingMode breedingMo
                 chosenM = chosenM.Where(c => (c.server == "" && !creatureCollection.hiddenServers.Contains("n/a"))
                                               || (c.server != "" && !creatureCollection.hiddenServers.Contains(c.server))).ToList();
             }
+            // filter by owner
+            if (cbOwnerFilterLibrary.Checked)
+            {
+                chosenF = chosenF.Where(c => (c.owner == "" && !creatureCollection.hiddenOwners.Contains("n/a"))
+                                              || (c.owner != "" && !creatureCollection.hiddenOwners.Contains(c.owner))).ToList();
+                chosenM = chosenM.Where(c => (c.owner == "" && !creatureCollection.hiddenOwners.Contains("n/a"))
+                                              || (c.owner != "" && !creatureCollection.hiddenOwners.Contains(c.owner))).ToList();
+            }
 
             bool creaturesTagFilteredOut = (crCountF != chosenF.Count)
                                         || (crCountM != chosenM.Count);
@@ -650,7 +659,9 @@ public List<Creature> Creatures
                 {
                     for (int s = 0; s < 8; s++)
                     {
-                        if (c.levelsWild[s] > bestLevels[s])
+                        if ((s > 6 || statWeights[s] > 0) && c.levelsWild[s] > bestLevels[s])
+                            bestLevels[s] = c.levelsWild[s];
+                        else if (s < 7 && statWeights[s] < 0 && c.levelsWild[s] >= 0 && (c.levelsWild[s] < bestLevels[s] || bestLevels[s] < 0))
                             bestLevels[s] = c.levelsWild[s];
                     }
                 }
@@ -978,5 +989,11 @@ private void btShowAllCreatures_Click(object sender, EventArgs e)
             chosenCreature = null;
             calculateBreedingScoresAndDisplayPairs();
         }
+
+        private void cbOwnerFilterLibrary_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.UseOwnerFilterForBreedingPlan = cbOwnerFilterLibrary.Checked;
+            calculateBreedingScoresAndDisplayPairs();
+        }
     }
 }

ARKBreedingStats/CreatureInfoInput.cs

@@ -231,6 +231,12 @@ public DateTime Grown
             set => dhmsInputGrown.Timespan = value - DateTime.Now;
         }
 
+        public void SetTimersToChanged()
+        {
+            dhmsInputCooldown.changed = true;
+            dhmsInputGrown.changed = true;
+        }
+
         public string[] AutocompleteOwnerList
         {
             set

ARKBreedingStats/Form1.cs

@@ -146,6 +146,13 @@ public Form1()
             }
 
             reactOnSelectionChange = true;
+
+            // TODO temporary fix if importExportWindow.Location was set to an invalid value
+            if (Properties.Settings.Default.importExportedLocation.X < 0)
+            {
+                Properties.Settings.Default.importExportedLocation = new Point(0, 0);
+                Properties.Settings.Default.importExportedSize = new Size(800, 800);
+            }
         }
 
         private void Form1_Load(object sender, EventArgs e)
@@ -427,6 +434,7 @@ private void clearAll(bool clearExtraCreatureData = true)
                 creatureInfoInputExtractor.parentListValid = false;
                 creatureInfoInputExtractor.CreatureGuid = Guid.Empty;
                 exportedCreatureControl = null;
+                creatureInfoInputExtractor.SetArkId(0, false);
             }
         }
 
@@ -613,7 +621,7 @@ private void extractionFailed(IssueNotes.Issue issues = IssueNotes.Issue.None)
                 labelTE.BackColor = Color.Transparent;
                 llOnlineHelpExtractionIssues.Visible = false;
                 labelErrorHelp.Visible = false;
-                labelImprintingFailInfo.Visible = false; // TODO move imprinting-fail to upper note-info
+                lbImprintingFailInfo.Visible = false; // TODO move imprinting-fail to upper note-info
                 extractor.possibleIssues = IssueNotes.Issue.None;
             }
             else
@@ -675,16 +683,15 @@ private void extractionFailed(IssueNotes.Issue issues = IssueNotes.Issue.None)
                 lbInfoYellowStats.Visible = false;
                 if (rbBredExtractor.Checked && numericUpDownImprintingBonusExtractor.Value > 0)
                 {
-                    labelImprintingFailInfo.Text = "If the creature is imprinted the extraction may fail because the game sometimes \"forgets\" " +
-                            "to increase some stat-values during the imprinting-process. Usually it works after a server-restart.";
-                    labelImprintingFailInfo.Visible = true;
+                    lbImprintingFailInfo.Text = Loc.s("lbImprintingFailInfo");
+                    lbImprintingFailInfo.Visible = true;
                 }
                 else if (rbTamedExtractor.Checked && "Procoptodon,Pulmonoscorpius,Troodon".Split(',').ToList().Contains(speciesSelector1.species))
                 {
                     // creatures that display wrong stat-values after taming
-                    labelImprintingFailInfo.Text = $"The {speciesSelector1.species} is known for displaying wrong stat-values after taming. " +
+                    lbImprintingFailInfo.Text = $"The {speciesSelector1.species} is known for displaying wrong stat-values after taming. " +
                             "Please try the extraction again after the server restarted.";
-                    labelImprintingFailInfo.Visible = true;
+                    lbImprintingFailInfo.Visible = true;
                 }
                 toolStripButtonSaveCreatureValuesTemp.Visible = true;
 
@@ -1010,6 +1017,11 @@ private void SpeciesSelector1_onSpeciesChanged()
                 statPotentials1.setLevels(testingIOs.Select(s => s.LevelWild).ToArray(), true);
                 setTesterInfoInputCreature();
             }
+            else if (tabControlMain.SelectedTab == tabPageLibrary)
+            {
+                if (Properties.Settings.Default.ApplyGlobalSpeciesToLibrary)
+                    listBoxSpeciesLib.SelectedIndex = listBoxSpeciesLib.Items.IndexOf(speciesSelector1.species);
+            }
             else if (tabControlMain.SelectedTab == tabPageTaming)
             {
                 tamingControl1.setSpeciesIndex(speciesSelector1.speciesIndex);
@@ -1424,7 +1436,7 @@ private void applySettingsToValues()
             ArkOCR.OCR.waitBeforeScreenCapture = Properties.Settings.Default.waitBeforeScreenCapture;
             ocrControl1.setWhiteThreshold(Properties.Settings.Default.OCRWhiteThreshold);
 
-            int maxImprintingPercentage = creatureCollection.allowMoreThanHundredImprinting ? 1000 : 100;
+            int maxImprintingPercentage = creatureCollection.allowMoreThanHundredImprinting ? 100000 : 100;
             numericUpDownImprintingBonusExtractor.Maximum = maxImprintingPercentage;
             numericUpDownImprintingBonusTester.Maximum = maxImprintingPercentage;
 
@@ -3345,7 +3357,9 @@ private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
             }
             else if (tabControlMain.SelectedTab == tabPageLibrary)
             {
-                if (libraryNeedsUpdate)
+                if (Properties.Settings.Default.ApplyGlobalSpeciesToLibrary)
+                    listBoxSpeciesLib.SelectedIndex = listBoxSpeciesLib.Items.IndexOf(speciesSelector1.species);
+                else if (libraryNeedsUpdate)
                     filterLib();
             }
             else if (tabControlMain.SelectedTab == tabPagePedigree)
@@ -3449,8 +3463,8 @@ private void editCreatureInTester(Creature c, bool virtualCreature = false)
             if (c != null)
             {
                 speciesSelector1.setSpecies(c.species);
-                NumericUpDownTestingTE.Value = c.tamingEff >= 0 ? (decimal)c.tamingEff * 100 : 0;
-                numericUpDownImprintingBonusTester.Value = (decimal)c.imprintingBonus * 100;
+                NumericUpDownTestingTE.ValueSave = c.tamingEff >= 0 ? (decimal)c.tamingEff * 100 : 0;
+                numericUpDownImprintingBonusTester.ValueSave = (decimal)c.imprintingBonus * 100;
                 if (c.isBred)
                     rbBredTester.Checked = true;
                 else if (c.tamingEff > 0 || c.tamingEff == -2) // -2 is unknown (e.g. Giganotosaurus)
@@ -4651,7 +4665,7 @@ private void chkbToggleOverlay_CheckedChanged(object sender, EventArgs e)
         private void toolStripButtonCopy2Tester_Click_1(object sender, EventArgs e)
         {
             double te = extractor.uniqueTE();
-            NumericUpDownTestingTE.Value = (decimal)(te >= 0 ? te * 100 : 80);
+            NumericUpDownTestingTE.ValueSave = (decimal)(te >= 0 ? te * 100 : 80);
             numericUpDownImprintingBonusTester.Value = numericUpDownImprintingBonusExtractor.Value;
             if (rbBredExtractor.Checked)
                 rbBredTester.Checked = true;
@@ -5082,6 +5096,8 @@ private void setCreatureValuesToInfoInput(CreatureValues cv, CreatureInfoInput i
             input.Cooldown = cv.cooldownUntil;
             input.MotherArkId = cv.motherArkId;
             input.FatherArkId = cv.fatherArkId;
+            input.CreatureNote = "";
+            input.SetTimersToChanged();
         }
 
         private void toolStripButtonSaveCreatureValuesTemp_Click(object sender, EventArgs e)
@@ -5389,6 +5405,8 @@ private void extractExportedFileInExtractor(string exportFile)
 
         private void extractExportedFileInExtractor(importExported.ExportedCreatureControl ecc, bool updateParentVisuals = false)
         {
+            if (ecc == null) return;
+
             setCreatureValuesToExtractor(ecc.creatureValues, false, false);
             extractLevels();
             // gets deleted in extractLevels()
@@ -5546,6 +5564,7 @@ private void setLocalizations(bool init = true)
             Loc.ControlText(lbExtractorDomLevel, "domLvl");
             Loc.ControlText(lbSum);
             Loc.ControlText(lbShouldBe);
+            Loc.ControlText(lbImprintingFailInfo);
             Loc.ControlText(cbExactlyImprinting, tt);
             Loc.ControlText(btExtractLevels);
             Loc.ControlText(cbQuickWildCheck, tt);

ARKBreedingStats/ImportSavegame.cs

@@ -1,17 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using ARKBreedingStats.species;
+using ARKBreedingStats.species;
 using SavegameToolkit;
 using SavegameToolkit.Arrays;
 using SavegameToolkit.Structs;
 using SavegameToolkit.Types;
 using SavegameToolkitAdditions;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
-namespace ARKBreedingStats {
+namespace ARKBreedingStats
+{
 
     public class ImportSavegame
     {
@@ -179,6 +180,8 @@ private Creature convertGameObject(GameObject creatureObject, int? levelStep)
             {
                 imprinterName = creatureObject.GetPropertyValue<string>("ImprinterName"),
                 guid = Utils.ConvertArkIdToGuid(creatureObject.GetDinoId()),
+                ArkId = creatureObject.GetDinoId(),
+                ArkIdImported = true,
                 domesticatedAt = DateTime.Now, // TODO: convert ingame-time to realtime?
                 addedToLibrary = DateTime.Now,
                 mutationsMaternal = creatureObject.GetPropertyValue<int>("RandomMutationsFemale"),
@@ -250,7 +253,8 @@ private string convertSpecies(string species)
 
             // Use fuzzy matching to convert between the two slightly different naming schemes
             // This doesn't handle spaces well, so we simply remove them and then it works perfectly
-            var scores = Values.V.speciesNames.Select(n => new {
+            var scores = Values.V.speciesNames.Select(n => new
+            {
                 Score = DiceCoefficient.diceCoefficient(n.Replace(" ", string.Empty), species.Replace(" ", string.Empty)),
                 Name = n
             });

ARKBreedingStats/Properties/AssemblyInfo.cs

@@ -31,6 +31,6 @@
 //      Revision
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.30.0.0")]
+[assembly: AssemblyFileVersion("0.30.1.0")]
 [assembly: NeutralResourcesLanguage("en")]