added support for the noGender property

cadon · Jun 12, 2021 · 0226353 · 0226353
1 parent 4891f83
commit 0226353
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/ARKBreedingStats/BreedingPlanning/BreedingPlan.cs b/ARKBreedingStats/BreedingPlanning/BreedingPlan.cs
@@ -339,7 +339,7 @@ private void DoCalculateBreedingScoresAndDisplayPairs()
             var combinedCreatures = new List<Creature>(selectedFemales);
             combinedCreatures.AddRange(selectedMales);
 
-            if (Settings.Default.IgnoreSexInBreedingPlan)
+            if (Settings.Default.IgnoreSexInBreedingPlan || _currentSpecies.noGender)
             {
                 selectedFemales = combinedCreatures.ToArray();
                 selectedMales = combinedCreatures.ToArray();

diff --git a/ARKBreedingStats/BreedingPlanning/BreedingScore.cs b/ARKBreedingStats/BreedingPlanning/BreedingScore.cs
@@ -19,15 +19,16 @@ public static List<BreedingPair> CalculateBreedingScores(Creature[] females, Cre
             ref bool creaturesMutationsFilteredOut)
         {
             var breedingPairs = new List<BreedingPair>();
+            var ignoreSex = Properties.Settings.Default.IgnoreSexInBreedingPlan || species.noGender;
             for (int fi = 0; fi < females.Length; fi++)
             {
                 var female = females[fi];
                 for (int mi = 0; mi < males.Length; mi++)
                 {
                     var male = males[mi];
-                    // if Properties.Settings.Default.IgnoreSexInBreedingPlan (useful when using S+ mutator), skip pair if
+                    // if ignoreSex (useful when using S+ mutator), skip pair if
                     // creatures are the same, or pair has already been added
-                    if (Settings.Default.IgnoreSexInBreedingPlan)
+                    if (ignoreSex)
                     {
                         if (considerChosenCreature)
                         {

diff --git a/ARKBreedingStats/Form1.values.cs b/ARKBreedingStats/Form1.values.cs
@@ -7,7 +7,6 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ARKBreedingStats.utils;
@@ -208,7 +207,7 @@ private bool LoadStatValues(Values values)
                     _ = Task.Run(async () => await LoadModsManifestAsync(values));
                 if (values.serverMultipliersPresets == null)
                     LoadServerMultiplierPresets(values);
-
+                
                 success = true;
             }
             catch (DirectoryNotFoundException)

diff --git a/ARKBreedingStats/species/Species.cs b/ARKBreedingStats/species/Species.cs
@@ -91,6 +91,11 @@ public class Species
         public TamingData taming;
         [JsonProperty]
         public BreedingData breeding;
+        /// <summary>
+        /// If the species uses no gender, ignore the sex in the breeding planner.
+        /// </summary>
+        [JsonProperty]
+        public bool noGender;
         [JsonProperty]
         public Dictionary<string, double> boneDamageAdjusters;
         [JsonProperty]