added support for baby-weight (can be used to determine growth and ti…

…me until maturation, is also read by OCR). input for cooldown and growth changed to the format d:h:m. added support for mutation-counter.
cadon · Jan 27, 2017 · f825ab1 · f825ab1
1 parent 600e731
commit f825ab1
Show file tree

Hide file tree

Showing 24 changed files with 550 additions and 237 deletions.
diff --git a/ARKBreedingStats/ARKBreedingStats.csproj b/ARKBreedingStats/ARKBreedingStats.csproj
@@ -208,6 +208,9 @@
     <Compile Include="TribesControl.Designer.cs">
       <DependentUpon>TribesControl.cs</DependentUpon>
     </Compile>
+    <Compile Include="uiControls\dhmInput.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Utils.cs" />
     <Compile Include="Values.cs" />
     <Compile Include="Win32Stuff.cs" />

diff --git a/ARKBreedingStats/ArkOCR.cs b/ARKBreedingStats/ArkOCR.cs
@@ -648,7 +648,7 @@ public float[] doOCR(out string OCRText, out string dinoName, out string ownerNa
                     else
                         dinoName = testStatName;
                     // remove prefixes Baby, Juvenile and Adolescent
-                    r = new Regex("^(?:Baby|Juven[il]le|Adolescent) *");
+                    r = new Regex("^(?:Ba[bh]y|Juven[il]le|Adolescent) *");
                     dinoName = r.Replace(dinoName, "");
 
                     // common OCR-mistake, 'I' is taken instead of 'i' in names

diff --git a/ARKBreedingStats/BreedingPlan.Designer.cs b/ARKBreedingStats/BreedingPlan.Designer.cs
diff --git a/ARKBreedingStats/BreedingPlan.cs b/ARKBreedingStats/BreedingPlan.cs
@@ -199,7 +199,7 @@ public void drawBestParents(BreedingMode breedingMode, bool updateBreedingData =
                     panelCombinations.Controls.Add(pc);
                     pcs.Add(pc);
                     pc = new PedigreeCreature(males[combinedTops[1][comboOrder[i]]], enabledColorRegions, comboOrder[i]);
-                    pc.Location = new Point(350 + xS, 5 + 35 * row + yS);
+                    pc.Location = new Point(397 + xS, 5 + 35 * row + yS);
                     pc.CreatureClicked += new PedigreeCreature.CreatureChangedEventHandler(CreatureClicked);
                     pc.CreatureEdit += new PedigreeCreature.CreatureEditEventHandler(CreatureEdit);
                     pc.BPRecalc += new BPRecalcEventHandler(BPRecalc);
@@ -212,7 +212,7 @@ public void drawBestParents(BreedingMode breedingMode, bool updateBreedingData =
                     pbs.Add(pb);
                     panelCombinations.Controls.Add(pb);
                     pb.Size = new Size(87, 15);
-                    pb.Location = new Point(261 + xS, 19 + 35 * row + yS);
+                    pb.Location = new Point(308 + xS, 19 + 35 * row + yS);
                     bm = new Bitmap(pb.Width, pb.Height);
                     g = Graphics.FromImage(bm);
                     g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
@@ -405,6 +405,9 @@ private void setParents(int comboIndex)
             crW.name = "Worst Possible";
             pedigreeCreatureBest.totalLevelUnknown = totalLevelUnknown;
             pedigreeCreatureWorst.totalLevelUnknown = totalLevelUnknown;
+            int mutationCounter = mother.mutationCounter + father.mutationCounter;
+            crB.mutationCounter = mutationCounter;
+            crW.mutationCounter = mutationCounter;
             pedigreeCreatureBest.setCreature(crB);
             pedigreeCreatureWorst.setCreature(crW);
             labelProbabilityBest.Text = "Probability for this Best Possible outcome: " + Math.Round(100 * probabilityBest, 1).ToString() + "%";

diff --git a/ARKBreedingStats/Creature.cs b/ARKBreedingStats/Creature.cs
@@ -48,6 +48,7 @@ public class Creature : IEquatable<Creature>
         public DateTime cooldownUntil = new DateTime(0);
         public DateTime domesticatedAt = new DateTime(0);
         public bool neutered = false;
+        public int mutationCounter;
 
         public Creature()
         {