Fixed Torpor-level for real. Added percentiles-tooltip. fixed Plesios…

…aur-levels (probably extraction will still produce some errors for level <35). Layout-fix for StatIO. Breedingvalues for Tester fixed. Added settings-form for easier change of multipliers. Column-widths are saved now.
cadon · Mar 26, 2016 · 27a83cd · 27a83cd
1 parent a00583d
commit 27a83cd
Show file tree

Hide file tree

Showing 26 changed files with 1,495 additions and 500 deletions.
diff --git a/ARKBreedingStats/ARKBreedingStats.csproj b/ARKBreedingStats/ARKBreedingStats.csproj
@@ -80,6 +80,12 @@
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
     <Compile Include="ListViewColumnSorter.cs" />
+    <Compile Include="MultiplierSetting.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="MultiplierSetting.Designer.cs">
+      <DependentUpon>MultiplierSetting.cs</DependentUpon>
+    </Compile>
     <Compile Include="Pedigree.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -99,6 +105,12 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
+    <Compile Include="Settings.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Settings.Designer.cs">
+      <DependentUpon>Settings.cs</DependentUpon>
+    </Compile>
     <Compile Include="StatDisplay.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -112,6 +124,7 @@
       <DependentUpon>StatIO.cs</DependentUpon>
     </Compile>
     <Compile Include="Utils.cs" />
+    <None Include="kofi.png" />
     <Content Include="lock.png" />
     <Content Include="unlock.png" />
     <Content Include="ver.txt" />
@@ -127,6 +140,9 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MultiplierSetting.resx">
+      <DependentUpon>MultiplierSetting.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Pedigree.resx">
       <DependentUpon>Pedigree.cs</DependentUpon>
     </EmbeddedResource>
@@ -143,6 +159,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <EmbeddedResource Include="Settings.resx">
+      <DependentUpon>Settings.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="StatDisplay.resx">
       <DependentUpon>StatDisplay.cs</DependentUpon>
     </EmbeddedResource>
@@ -163,6 +182,7 @@
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/ARKBreedingStats/AboutBox1.Designer.cs b/ARKBreedingStats/AboutBox1.Designer.cs
diff --git a/ARKBreedingStats/AboutBox1.cs b/ARKBreedingStats/AboutBox1.cs
@@ -98,5 +98,10 @@ private void linkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
         {
             System.Diagnostics.Process.Start("https://github.com/cadon/ARKStatsExtractor");
         }
+
+        private void pictureBox1_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("http://ko-fi.com/826WMCII3B24");
+        }
     }
 }
diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config
@@ -25,6 +25,9 @@
             <setting name="formLocation" serializeAs="String">
                 <value>100, 100</value>
             </setting>
+            <setting name="columnWidths" serializeAs="String">
+                <value />
+            </setting>
         </ARKBreedingStats.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/ARKBreedingStats/Creature.cs b/ARKBreedingStats/Creature.cs
@@ -64,10 +64,20 @@ public void calculateLevelFound()
         {
             levelFound = 0;
             if (!isBred && tamingEff >= 0)
-                levelFound = (int)Math.Ceiling((levelsWild[7] + 1) / (1 + tamingEff / 2));
+                levelFound = (int)Math.Ceiling(levelHatched / (1 + tamingEff / 2));
         }
 
-        public int level { get { return 1 + levelsWild[7] + levelsDom.Sum(); } }
+        public int levelHatched
+        {
+            get
+            {
+                int lvl = levelsWild[7] + 1;
+                if (species == "Plesiosaur" && lvl < 35)
+                    lvl = 35;
+                return lvl;
+            }
+        }
+        public int level { get { return levelHatched + levelsDom.Sum(); } }
 
         public Int32 topStatsCount { get { return topBreedingStats.Count(s => s); } }
 
@@ -117,8 +127,6 @@ public Creature Father
             }
             get { return father; }
         }
-
-        public int levelHatched { get { return levelsWild[7] + 1; } }
     }
 
     public enum Gender

diff --git a/ARKBreedingStats/CreatureBox.cs b/ARKBreedingStats/CreatureBox.cs
@@ -102,9 +102,9 @@ public void buttonEdit_Click(object sender, EventArgs e)
                     textBoxOwner.Text = creature.owner;
                     textBoxNote.Text = creature.note;
                     gender = creature.gender;
-                    buttonGender.Text = Utils.gSym(gender);
+                    buttonGender.Text = Utils.genderSymbol(gender);
                     status = creature.status;
-                    buttonStatus.Text = Utils.sSym(status);
+                    buttonStatus.Text = Utils.statusSymbol(status);
                     textBoxName.SelectAll();
                     textBoxName.Focus();
                     panel1.Visible = true;
@@ -150,7 +150,7 @@ public void updateLabel()
         {
             if (creature != null)
             {
-                labelGender.Text = Utils.gSym(creature.gender);
+                labelGender.Text = Utils.genderSymbol(creature.gender);
                 groupBox1.Text = creature.name + " (" + creature.species + ", Lvl " + creature.level + ")";
                 if (creature.Mother != null || creature.Father != null)
                 {
@@ -250,14 +250,14 @@ private void buttonCancel_Click(object sender, EventArgs e)
 
         private void buttonGender_Click(object sender, EventArgs e)
         {
-            gender = Utils.nextG(gender);
-            buttonGender.Text = Utils.gSym(gender);
+            gender = Utils.nextGender(gender);
+            buttonGender.Text = Utils.genderSymbol(gender);
         }
 
         private void buttonStatus_Click(object sender, EventArgs e)
         {
-            status = Utils.nextS(status);
-            buttonStatus.Text = Utils.sSym(status);
+            status = Utils.nextStatus(status);
+            buttonStatus.Text = Utils.statusSymbol(status);
         }
 
         private void checkBoxIsBred_CheckedChanged(object sender, EventArgs e)

diff --git a/ARKBreedingStats/CreatureCollection.cs b/ARKBreedingStats/CreatureCollection.cs
@@ -14,7 +14,7 @@ namespace ARKBreedingStats
         [XmlArray]
         public List<Creature> creatures = new List<Creature>();
         [XmlArray]
-        public double[][] multipliers; // multipliers[stat][m], m: 0:tamingadd, 1:tamingmult, 2:levelupdom, 3:levelupdom
+        public double[][] multipliers; // multipliers[stat][m], m: 0:tamingadd, 1:tamingmult, 2:levelupdom, 3:levelupwild
         [XmlArray]
         public List<string> hiddenOwners = new List<string>(); // which owners are not selected to be shown
         [XmlArray]

diff --git a/ARKBreedingStats/CreatureInfoInput.cs b/ARKBreedingStats/CreatureInfoInput.cs
@@ -61,21 +61,8 @@ public Creature father
 
         private void buttonGender_Click(object sender, EventArgs e)
         {
-            switch (gender)
-            {
-                case Gender.Male:
-                    gender = Gender.Unknown;
-                    buttonGender.Text = "?";
-                    break;
-                case Gender.Female:
-                    gender = Gender.Male;
-                    buttonGender.Text = "♂";
-                    break;
-                default:
-                    gender = Gender.Female;
-                    buttonGender.Text = "♀";
-                    break;
-            }
+            gender = Utils.nextGender(gender);
+            buttonGender.Text = Utils.genderSymbol(gender);
         }
 
         public List<Creature>[] Parents
@@ -174,6 +161,6 @@ private void comboBoxParents_DropDownClosed(object sender, EventArgs e)
         {
             tt.Hide((ComboBox)sender);
         }
-        
+
     }
 }