Remove Enemy SearchSpace script

Author: Tyago-Teoi

Assets/Scripts/Game/EnemyGenerator/EnemyGenerator.cs

@@ -49,7 +49,7 @@ private void Evolution()
             while (pop.Count() < _parameters.initialPopulationSize)
             {
                 Individual ind = Individual.GetRandom(_searchSpace);
-                //Difficulty.Calculate(ref ind);
+                _fitnessFunction.SetSearchSpace(_searchSpace);
                 _fitnessFunction.Calculate(ref ind, _parameters.difficulty);
                 pop.PlaceIndividual(ind);
             }

Assets/Scripts/Game/EnemyGenerator/EnemyGeneratorManager.cs

@@ -56,7 +56,6 @@ private void SetGeneticAlgorithmSettings(DifficultyLevels difficultyLevels)
             _geneticSettings.numberOfWeapons = _searchSpaceConfig.WeaponSet.GetEnemyWeaponCount();
             _geneticSettings.difficulty = EnemyDifficultyFactor.GetDifficultyFactor(difficultyLevels);
             _fitnessFunction = new TopdownGame.Overlord.Inheritance.RulesGenerator.TopdownFitness();
-
         }
 
         private void EvolveEnemies()

Assets/Scripts/Game/EnemyGenerator/IEnemyFitness.cs

@@ -5,6 +5,7 @@
 
 public interface IEnemyFitness
 {
+    void SetSearchSpace(SearchSpaceConfig searchSpace);
     void Calculate(ref Individual _individual, float goal);
     bool IsBest(Individual _i1, Individual _i2);
 }

Assets/Scripts/Game/EnemyGenerator/Mutation.cs

@@ -1,5 +1,6 @@
 using Util;
 using System;
+using Codice.Client.Common;
 
 namespace Game.EnemyGenerator
 {
@@ -48,9 +49,13 @@ public static Individual Apply(Individual parent, int chance, SearchSpaceConfig
             }
             // Apply mutation on weapon attributes
             var weapon = individual.Weapon;
-            if (chance > RandomSingleton.GetInstance().RandomPercent())
+            var test = RandomSingleton.GetInstance().RandomPercent();
+            if (chance > test)
+            {                
+            }
+            if (chance > test)
             {
-                weapon.Weapon = RandomSingleton.GetInstance().RandomElementFromArray(SearchSpace.Instance.rWeaponType);
+                weapon.Weapon = RandomSingleton.GetInstance().RandomElementFromList<Enum>(searchSpace.WeaponSet.GetAllWeaponTypes());
             }
             if (chance > RandomSingleton.GetInstance().RandomPercent())
             {

Assets/Scripts/Game/EnemyGenerator/Population.cs

@@ -107,6 +107,16 @@ public List<Individual> ToList()
         }
 
         /// Print all the individuals of the MAP-Elites population.
+        /*
+        public enum WeaponType
+        {
+            Barehand,    // Enemy attacks the player with barehands (Melee).
+            Sword,       // Enemy uses a short sword to damage the player (Melee).
+            Bow,         // Enemy shots projectiles towards the player (Range).
+            BombThrower, // Enemy shots bombs towards the player (Range).
+            Shield,      // Enemy uses a shield to defend itself (Defense).
+            CureSpell,   // Enemy uses magic to cure other enemies (Defense).
+        }
         public void Debug()
         {
             for (int m = 0; m < dimension.movement; m++)
@@ -129,7 +139,7 @@ public void Debug()
                 }
             }
         }
-
+        */
         public int NIndividualsBetterThan(int amount, float acceptableFitness)
         {
             var betterThanNCounter = 0;

Assets/Scripts/Game/EnemyGenerator/Representation.cs

@@ -84,7 +84,7 @@ public static Individual GetRandom(SearchSpaceConfig searchSpace)
             var restTime = RandomSingleton.GetInstance().Next(minFloat, maxFloat);
             EnemyData e = new EnemyData(health, strength, attackSpeed, movementType, movementSpeed, activeTime, restTime);
             // Create a random weapon
-            var weaponType = RandomSingleton.GetInstance().RandomElementFromArray(SearchSpace.Instance.rWeaponType);
+            var weaponType = RandomSingleton.GetInstance().RandomElementFromList<Enum>(searchSpace.WeaponSet.GetAllWeaponTypes());
             (minFloat, maxFloat) = (searchSpace.WeaponStatus1.Min, searchSpace.WeaponStatus1.Max);
             var projectileSpeed = RandomSingleton.GetInstance().Next(minFloat, maxFloat);
             WeaponData w = new WeaponData(weaponType, projectileSpeed);
@@ -134,12 +134,12 @@ float restTime
     [Serializable]
     public struct WeaponData
     {
-        public WeaponType Weapon { get; set; }
+        public Enum Weapon { get; set; }
         public float WeaponStatus1 { get; set; }    // Old name: ProjectileSpeed
 
         /// Weapon constructor.
         public WeaponData(
-            WeaponType weapon,
+            Enum weapon,
             float projectileSpeed
         )
         {

Assets/Scripts/Game/EnemyGenerator/SearchSpace.cs

@@ -1,7 +1,9 @@
 using Game.EnemyGenerator;
 using Overlord.GenerationController.Facade;
 using System;
+using System.Linq;
 using UnityEngine;
+using static Codice.Client.Common.Connection.AskCredentialsToUser;
 
 namespace TopdownGame.Overlord.Inheritance.RulesGenerator
 {
@@ -12,6 +14,13 @@ public class TopdownFitness: IEnemyFitness
         public readonly string CANNOT_COMPARE_INDIVIDUALS =
             "There is no way of comparing two null individuals.";
 
+        private SearchSpaceConfig _searchSpace;
+
+        public void SetSearchSpace(SearchSpaceConfig searchSpace)
+        {
+            _searchSpace = searchSpace;
+        }
+
         /// Calculate the fitness value of the entered individual.
         ///
         /// An individual's fitness is defined by the distance of the
@@ -93,16 +102,19 @@ private float CalculateStrengthFactor(Individual _individual)
             float fS = 1;
             // Melee enemies attack by touching the player, therefore, the
             // movement speed increase their strenght
-            fS *= SearchSpace.MeleeWeaponList().Contains(w.Weapon) ?
+            fS *= _searchSpace.WeaponSet.GetMeleeWeaponTypes().Contains(w.Weapon) ?
                 e.Status2 * e.Status4 : 1;
             // Shooter enemies attack by throwing projectiles, then we count
             // both attack speed (shooting frequency) and projectile speed
             // Besides, the projectiles have the same damage
-            fS *= SearchSpace.RangedWeaponList().Contains(w.Weapon) ?
-                (e.Status3 * w.WeaponStatus1) * 3 : 1;
+            fS *= _searchSpace.WeaponSet.GetRangedWeaponTypes().Contains(w.Weapon) ?
+                (e.Status2 * e.Status3) * w.WeaponStatus1 : 1;
             // The cooldown of healer enemies follows the attack speed
-            fS *= w.Weapon == WeaponType.CureSpell ?
+            if (_searchSpace.WeaponSet is TopdownEnemyWeaponsSO topdownWeaponsSO)
+                fS *= topdownWeaponsSO.IsHealerWeapon(w.Weapon) ?
                 e.Status3 * 2 : 1;
+            //fS *= w.Weapon == WeaponType.CureSpell ?
+            //    e.Status3 * 2 : 1;
             return fS;
         }
 
@@ -115,15 +127,16 @@ private float CalculateGameplayFactor(Individual individual)
             var enemy = individual.Enemy;
             var weapon = individual.Weapon;
             var gameplayFactor = 1f;
-            if (SearchSpace.MeleeWeaponList().Contains(weapon.Weapon))
+            if (_searchSpace.WeaponSet.GetMeleeWeaponTypes().Contains(weapon.Weapon))
             {
                 gameplayFactor = CalculateMeleeWeaponGameplayFactor(enemy, gameplayFactor);
             }
-            else if (SearchSpace.RangedWeaponList().Contains(weapon.Weapon))
+            else if (_searchSpace.WeaponSet.GetRangedWeaponTypes().Contains(weapon.Weapon))
             {
                 gameplayFactor = CalculateRangedWeaponGameplayFactor(enemy, gameplayFactor);
             }
-            if (weapon.Weapon == WeaponType.CureSpell)
+            if (_searchSpace.WeaponSet is TopdownEnemyWeaponsSO topdownWeaponsSO &&
+                topdownWeaponsSO.IsHealerWeapon(weapon.Weapon))
             {
                 gameplayFactor = CalculateHealerGameplayFactor(enemy, gameplayFactor);
             }

Assets/Scripts/Game/EnemyGenerator/SearchSpace.cs.meta

@@ -8,12 +8,12 @@ public class TopdownEnemyWeaponsSO : EnemyWeaponsSO<TopdownEnemyWeaponsSO.Weapon
 {
     public enum WeaponTypeEnums
     {
-        None,       // No weapon
-        Bow,        // Ranged weapon
-        BombThrower,// Ranged weapon
-        Barehand,   // Melee weapon
-        Sword,      // Melee weapon
-        Shield      // Melee weapon
+        Barehand,    // Enemy attacks the player with barehands (Melee).
+        Sword,       // Enemy uses a short sword to damage the player (Melee).
+        Bow,         // Enemy shots projectiles towards the player (Range).
+        BombThrower, // Enemy shots bombs towards the player (Range).
+        Shield,      // Enemy uses a shield to defend itself (Defense).
+        CureSpell,   // Enemy uses magic to cure other enemies (Defense).
     }
     public override List<Enum> GetRangedWeaponTypes()
     {
@@ -32,4 +32,17 @@ public override List<Enum> GetMeleeWeaponTypes()
             WeaponTypeEnums.Shield,
         };
     }
+
+    public List<Enum> GetHealerWeaponTypes()
+    {
+        return new List<Enum>
+        {
+            WeaponTypeEnums.CureSpell,
+        };
+    }
+
+    public bool IsHealerWeapon(Enum weapon)
+    {
+        return weapon.Equals(WeaponTypeEnums.CureSpell);
+    }
 }