fix: player can eat its own food

yamcodes · Feb 7, 2022 · 92ce941 · 92ce941
1 parent f21748f
commit 92ce941
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/config/settings.json b/config/settings.json
@@ -11,7 +11,7 @@
         "randomColor": true
     },
     "blob": {
-        "strokeSize": 9,
+        "strokeSize": 10,
         "strokeOpacity": 0.1
     },
     "pellets": {

diff --git a/src/assets/Food.js b/src/assets/Food.js
@@ -32,7 +32,7 @@ export default class Food {
         ) {
           const foodVect = p5.createVector(food.x, food.y);
           const trajectory = food.mouse;
-          if (!this.player.contains(food)) {
+          if (!this.player.eats(food)) {
             food.speed = p5.lerp(0, food.speed, settings.food.deceleration);
           }
           trajectory.setMag(food.speed);

diff --git a/src/assets/Player.js b/src/assets/Player.js
@@ -93,9 +93,9 @@ export default class Player extends Blob {
   }
 
   reduceMass(m) {
-    const initialMass = p5.round(Player.getMassByRadius(settings.player.initialRadius));
+    const foodMass = Player.getMassByRadius(settings.food.radius);
     const newMass = this.mass - m;
-    if (newMass > initialMass) {
+    if (newMass > foodMass) {
       this.mass = newMass;
       return true;
     }