added estimation of duration of waiting after feeding the first time …

…in non-violent-taming. fix for starving-timer. readjusted ocr, currently only working in 1920x1080 and not optimized yet.
cadon · Apr 2, 2017 · 267598f · 267598f
1 parent 34354ee
commit 267598f
Show file tree

Hide file tree

Showing 28 changed files with 561 additions and 487 deletions.
diff --git a/ARKBreedingStats/ARKBreedingStats.csproj b/ARKBreedingStats/ARKBreedingStats.csproj
@@ -76,6 +76,11 @@
     <Compile Include="NotesControl.Designer.cs">
       <DependentUpon>NotesControl.cs</DependentUpon>
     </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="Raising.cs" />
     <Compile Include="RaisingControl.cs">
       <SubType>UserControl</SubType>
@@ -161,16 +166,16 @@
     <Compile Include="MultiplierSetting.Designer.cs">
       <DependentUpon>MultiplierSetting.cs</DependentUpon>
     </Compile>
-    <Compile Include="MultiSetter.cs">
+    <Compile Include="uiControls\MultiSetter.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MultiSetter.Designer.cs">
+    <Compile Include="uiControls\MultiSetter.Designer.cs">
       <DependentUpon>MultiSetter.cs</DependentUpon>
     </Compile>
-    <Compile Include="MyColorPicker.cs">
+    <Compile Include="uiControls\MyColorPicker.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MyColorPicker.Designer.cs">
+    <Compile Include="uiControls\MyColorPicker.Designer.cs">
       <DependentUpon>MyColorPicker.cs</DependentUpon>
     </Compile>
     <Compile Include="ParentComboBox.cs">
@@ -303,10 +308,10 @@
       <DependentUpon>StatPotentials.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="Resources\kofi.png" />
+    <None Include="Resources\ARKCalibration18.png" />
     <Content Include="Resources\ARKExtractor.ico" />
     <Content Include="Resources\lock.png" />
-    <Content Include="Resources\ARKCalibration1050.png" />
-    <Content Include="Resources\ARKCalibration1080.png" />
+    <Content Include="Resources\ARKCalibration15.png" />
     <Content Include="Resources\newPlayer.png" />
     <Content Include="Resources\newTribe.png" />
     <Content Include="Resources\settings.png" />
@@ -330,10 +335,10 @@
     <EmbeddedResource Include="MultiplierSetting.resx">
       <DependentUpon>MultiplierSetting.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MultiSetter.resx">
+    <EmbeddedResource Include="uiControls\MultiSetter.resx">
       <DependentUpon>MultiSetter.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MyColorPicker.resx">
+    <EmbeddedResource Include="uiControls\MyColorPicker.resx">
       <DependentUpon>MyColorPicker.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Pedigree.resx">
@@ -344,14 +349,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <EmbeddedResource Include="Settings.resx">
       <DependentUpon>Settings.cs</DependentUpon>
     </EmbeddedResource>
@@ -362,9 +362,6 @@
       <DependentUpon>StatIO.cs</DependentUpon>
     </EmbeddedResource>
     <Content Include="Resources\pen.png" />
-    <None Include="Resources\Sansation-Bold.ttf" />
-    <None Include="Resources\Sansation-Light.ttf" />
-    <None Include="Resources\Sansation-Regular.ttf" />
     <None Include="values.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/ARKBreedingStats/ARKOverlay.Designer.cs b/ARKBreedingStats/ARKOverlay.Designer.cs
diff --git a/ARKBreedingStats/ARKOverlay.cs b/ARKBreedingStats/ARKOverlay.cs
@@ -50,25 +50,15 @@ public ARKOverlay()
             this.Location = Point.Empty;
             this.Size = new Size(2000, 2000);
 
-            inventoryCheckTimer.Interval = 1000;
+            inventoryCheckTimer.Interval = 1500;
             inventoryCheckTimer.Tick += inventoryCheckTimer_Tick;
             theOverlay = this;
 
 
-            if (ArkOCR.OCR.currentResolution == -1)
-                ArkOCR.OCR.calibrate();
-
-            int rightDistance = labelInfo.Width + 30;
-
-            var infoLocation = new Point(1500 - rightDistance, 40);
-            switch (ArkOCR.OCR.currentResolution)
-            {
-                case 0: infoLocation = new Point(1920 - rightDistance, 40); break;
-                case 1: infoLocation = new Point(1680 - rightDistance, 40); break;
-                case 2: infoLocation = new Point(1600 - rightDistance, 40); break;
-                default: break;
-            }
-            labelInfo.Location = infoLocation;
+            if (ArkOCR.OCR.currentResolutionW == 0 && !ArkOCR.OCR.calibrate())
+                MessageBox.Show("Couldn't calibrate for the current resolution, sorry.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+            labelInfo.Location = new Point(ArkOCR.OCR.currentResolutionW - (labelInfo.Width + 30), 40); ;
 
             InfoDuration = 10;
         }
@@ -174,6 +164,8 @@ public void setTimer()
 
         internal void setBreedingProgressValues(float percentage, int maxTime)
         {
+            return;
+            // current weight cannot be read in the new ui. TODO remove this function when current weight is confirmed to be not shown anymore
             if (percentage >= 1)
             {
                 lblBreedingProgress.Text = "";