removed rough estimation of food spoiling for clarity

cadon · Nov 26, 2021 · fa6d587 · fa6d587
1 parent f43220a
commit fa6d587
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/ARKBreedingStats/raising/RaisingControl.cs b/ARKBreedingStats/raising/RaisingControl.cs
@@ -79,7 +79,8 @@ public void UpdateRaisingData(Species species, bool forceUpdate = false)
             _ignoreChangedFood = false;
             var selectIndex = string.IsNullOrEmpty(_lastSelectedFood) ? 0 : eats.IndexOf(_lastSelectedFood);
             if (selectIndex == -1) selectIndex = 0;
-            CbGrowingFood.SelectedIndex = selectIndex;
+            if (CbGrowingFood.Items.Count > 0)
+                CbGrowingFood.SelectedIndex = selectIndex;
 
             if (Raising.GetRaisingTimes(_selectedSpecies, out TimeSpan matingTime, out string incubationMode,
                 out TimeSpan incubationTime, out _babyTime, out _maturationTime, out TimeSpan nextMatingMin,
@@ -177,7 +178,7 @@ string FoodAmountString(string _foodName)
                            + $"\nTotal Food for maturation: ~{Math.Ceiling(totalFood / foodValue)} {_foodName}";
                 }
 
-                foodAmount += "\n - Loss by spoiling is only a rough estimate and may vary.";
+                foodAmount += "\n - Loss by spoiling is not considered!";
             }
 
             LbFoodInfoGeneral.Text = foodAmount;

diff --git a/ARKBreedingStats/uiControls/Trough.cs b/ARKBreedingStats/uiControls/Trough.cs
@@ -29,7 +29,6 @@ public class Trough
 
         /// <summary>
         /// Calculates the needed food from a specific maturation to a specific maturation.
-        /// The returned value adds 10 % to compensate for spoiling.
         /// </summary>
         public static bool FoodAmountFromUntil(Species species, double babyFoodConsumptionSpeedMultiplier, double currentMaturation, double untilMaturation, out double totalFood)
         {
@@ -52,9 +51,7 @@ public static bool FoodAmountFromUntil(Species species, double babyFoodConsumpti
             // calculate area of rectangle and triangle on top to get the total food needed
             // assuming foodRateStart > foodRateEnd
             totalFood = species.breeding.maturationTimeAdjusted * ((untilMaturation - currentMaturation) * (foodRateEnd + 0.5 * (foodRateStart - foodRateEnd)));
-
-            totalFood *= 1.1; // rough estimation of spoiling
-
+
             return true;
         }
     }