removed food searching bug

ragsav · ragsav · commit 41a3a9d08350 · 2021-04-27T12:41:56.000+05:30
diff --git a/node_modules/.cache/.eslintcache b/node_modules/.cache/.eslintcache
diff --git a/src/components/core/creature.js b/src/components/core/creature.js
@@ -2,56 +2,103 @@ import { Vector } from "./vector";
 import { v4 as uuidv4 } from "uuid";
 export class Creature {
   constructor(x, y, r, gender, creatures) {
+    //gene
     this.id = uuidv4();
-    this.pos = new Vector(x, y);
     this.r = r;
+    this.gender = gender;
     this.sightRange = 5;
     this.smellRange = 20;
-    this.gender = gender;
-    this.vel = new Vector(0, 0);
-    this.acc = new Vector(0, 0);
-    this.acceleration = 0;
-    this.birth = Date.now();
+    this.dob = Date.now();
     this.color = "#ffffff";
-    this.isAdult = false;
-    this.lastBirth = Date.now();
-    this.isAbleToMate = false;
+    this.parents = null;
+    this.children = null;
+    this.isSightActivated = true;
+    this.isSmellActivated = true;
+
+    //food
     this.isFoodFound = false;
     this.foundFoodPosition = null;
     this.foodId = null;
     this.lastFoodTime = Date.now();
-    this.canEatFood = false;
+    this.energy = 600;
+
+    //reproduction
+    this.fertility = "fertile";
+    this.fertilityChance = 1;
+    this.fertilityType = "all";
+    this.fertilityConstraints = "all";
+    this.minFertilityEnergy = 600;
+    this.isFertilityMemoryActivated = true;
+    this.lastBirth = Date.now();
+
+    //movement
+    this.pos = new Vector(x, y);
+    this.vel = new Vector(0, 0);
+
+    //immunity
     this.isInfected = false;
     this.infectionTime = null;
-    this.energy = 600;
-    this.parents = null;
-    this.children = null;
+
     creatures.current.push(this);
   }
 
-  updateToAdult() {
-    if (this.birth + 10000 < Date.now()) {
-      this.isAdult = true;
-    }
+  isAdult() {
+    return this.dob + 10000 < Date.now();
   }
-  updateAbleToMate() {
-    if (this.lastBirth + 10000 < Date.now()) {
-      this.isAbleToMate = true;
-    }
+
+  isMale() {
+    return this.gender == "M";
   }
 
-  updateNotAbleToMate() {
-    this.isAbleToMate = false;
-    this.lastBirth = Date.now();
+  isFemale() {
+    return this.gender == "F";
+  }
+
+  isBisexual() {
+    return this.gender == "B";
+  }
+
+  isFertile() {
+    if (this.fertility.localeCompare("infertile") === 0) return false;
+    if (
+      this.fertility.localeCompare("semiFertile") === 0 &&
+      this.fertilityChance < Math.random()
+    )
+      return false;
+    return true;
+  }
+
+  canReproduce(partner) {
+    if (partner.isMale()&&this.lastBirth+5000<Date.now()) {
+      if (
+        this.isFertilityMemoryActivated &&
+        this.energy > this.minFertilityEnergy
+      ) {
+        return true;
+      } else if (!this.isFertilityMemoryActivated) {
+        return true;
+      } else if (
+        this.isFertilityMemoryActivated &&
+        this.energy < this.minFertilityEnergy
+      ) {
+        return false;
+      }
+    }
+    return false;
   }
 
+
+  canSearchFood(){
+    return this.isSightActivated&&this.isSmellActivated;
+  }
   updateFoodFound(pos, fid) {
     this.isFoodFound = true;
     this.foundFoodPosition = pos;
     this.foodId = fid;
   }
+
   updateFoodEaten() {
-    this.energy = this.energy + 600 + Math.random() * 400;
+    this.energy = this.energy + 800 + Math.random() * 400;
     this.isFoodFound = false;
     this.foundFoodPosition = null;
     this.foodId = null;
@@ -63,21 +110,12 @@ export class Creature {
     this.foodId = null;
   }
 
-  updateLastFoodTime() {
-    this.lastFoodTime = Date.now();
-  }
-
-  updateCanEatFood() {
-    if (this.energy < 300) {
-      this.canEatFood = true;
-    } else {
-      this.canEatFood = false;
-    }
+  canEatFood() {
+    return this.energy < 2000;
   }
 
   canDie() {
     return this.energy < 20;
-    // return false;
   }
 
   infect() {
@@ -97,7 +135,7 @@ export class Creature {
   updateColor() {
     if (this.isInfected) {
       this.color = "#FF0000";
-    } else if (this.isAdult) {
+    } else if (this.isAdult()) {
       this.color = this.gender == "F" ? "#FF75BF" : "#2ED9FF";
     } else {
       this.color = "#ffffff";
@@ -112,7 +150,9 @@ export class Creature {
         this.energy -= 1;
       }
     }
+    
   }
+
   drawBall(ctx) {
     ctx.beginPath();
     ctx.arc(this.pos.x, this.pos.y, this.r, 0, 2 * Math.PI);
@@ -186,9 +226,6 @@ export class Creature {
 
   updateCreature(ctx, speed) {
     this.reposition(ctx, speed);
-    this.updateToAdult();
-    this.updateAbleToMate();
-    this.updateCanEatFood();
     this.disInfect();
     this.updateColor();
     this.drawBall(ctx);
diff --git a/src/components/gaFunctions/mating.js b/src/components/gaFunctions/mating.js
@@ -8,17 +8,19 @@ export function matingPool(creatures) {
     const observer = creatures.current[i];
     if (
       !vis[i] &&
-      observer.gender == "F" &&
-      observer.isAdult &&
-      observer.isAbleToMate
+      observer.isFemale() &&
+      observer.isAdult() &&
+      observer.isFertile()
     ) {
       vis[i] = true;
       for (let j = i + 1; j < l; j++) {
         const target = creatures.current[j];
         if (
           !vis[j] &&
-          target.gender == "M" &&
-          target.isAdult &&
+          target.isMale()  &&
+          target.isAdult()  &&
+          target.isFertile()  &&
+          observer.canReproduce(target)  &&
           observer.pos.subtr(target.pos).mag() < 5
         ) {
           pairs.push({ mother: observer, father: target });
@@ -36,6 +38,8 @@ export function matingPool(creatures) {
       Math.random() > 0.5 ? "F" : "M",
       creatures
     );
-    mother.updateNotAbleToMate();
+    mother.energy -= 600;
+    mother.lastBirth = Date.now();
   });
+  
 }
diff --git a/src/components/gaFunctions/survival.js b/src/components/gaFunctions/survival.js
@@ -1,33 +1,39 @@
 export function findFood(creatures, foods) {
-  creatures.current.forEach((creature, index) => {
-    if (!creature.isFoodFound && creature.canEatFood) {
-      for (let i = 0; i < foods.current.length; i++) {
-        const food = foods.current[i];
+  const l = creatures.current.length;
+  for (let i = 0; i < l; i++) {
+    const creature = creatures.current[i];
+    
+    if (
+      !creature.isFoodFound &&
+      creature.canSearchFood() &&
+      creature.canEatFood()
+    ) {
+      
+      for (let j = 0; j < foods.current.length; j++) {
+        const food = foods.current[j];
         if (food.pos.subtr(creature.pos).mag() < creature.smellRange) {
           creature.updateFoodFound(food.pos, food.id);
           break;
         }
       }
-    } else {
-      if (
-        creature.isFoodFound &&
-        creature.canEatFood &&
-        creature.pos.subtr(creature.foundFoodPosition).mag() <
-          creature.sightRange
-      ) {
-        let foodIndex = -1;
-        for (var i = 0; i < foods.current.length; i++) {
-          if (foods.current[i].id.localeCompare(creature.foodId) === 0) {
-            foodIndex = i;
-            break;
-          }
-        }
-        if (foodIndex !== -1) {
-          foods.current.splice(foodIndex, 1);
-          creature.updateFoodEaten();
-          creature.updateLastFoodTime();
+    } if (
+      creature.isFoodFound &&
+      creature.canEatFood() &&
+      creature.canSearchFood() &&
+      creature.pos.subtr(creature.foundFoodPosition).mag() < creature.sightRange
+    ) {
+     
+      let foodIndex = -1;
+      for (var j = 0; j < foods.current.length; j++) {
+        if (foods.current[j].id.localeCompare(creature.foodId) === 0) {
+          foodIndex = j;
+          break;
         }
       }
+      if (foodIndex !== -1) {
+        foods.current.splice(foodIndex, 1);
+        creature.updateFoodEaten();        
+      }
     }
-  });
+  }
 }
