From e62567df5c4aadec56a69c2020bd6b1930f1459d Mon Sep 17 00:00:00 2001
From: Picoseconds <rw7@proacad.ca>
Date: Fri, 7 Aug 2020 15:57:14 -0600
Subject: [PATCH] fix: fixed pit trap hitbox being too small

---
 src/moomoo/Physics.ts | 2 +-
 src/moomoo/Player.ts  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/moomoo/Physics.ts b/src/moomoo/Physics.ts
index 68d8d6d..412464e 100755
--- a/src/moomoo/Physics.ts
+++ b/src/moomoo/Physics.ts
@@ -28,7 +28,7 @@ function moveTowards(player: Player, angle: number, speed: number, deltaTime: nu
  * @param gameObj the GameObject to test collision for
  */
 function collidePlayerGameObject(player: Player, gameObj: GameObject) {
-  return collideCircles(player.location, 35, gameObj.location, gameObj.realScale);
+  return collideCircles(player.location, 35, gameObj.location, gameObj.data === ItemType.PitTrap ? 0.3 * gameObj.realScale : gameObj.realScale;
 }
 
 function tryMovePlayer(player: Player, delta: number, xVel: number, yVel: number, state: GameState) {
diff --git a/src/moomoo/Player.ts b/src/moomoo/Player.ts
index 3320dc4..40f6f8d 100755
--- a/src/moomoo/Player.ts
+++ b/src/moomoo/Player.ts
@@ -40,6 +40,7 @@ export default class Player extends Entity {
   public spdMult: number = 1;
 
   public upgradeAge = 2;
+  public invincible = false;
 
   public foodHealOverTime = 0;
   public foodHealOverTimeAmt = 0;
@@ -312,7 +313,7 @@ export default class Player extends Entity {
         this.angle,
         getScale(item),
         -1,
-        item === ItemType.PitTrap ? 0.3 * getScale(item) : undefined,
+        undefined,
         item,
         this.id,
         getGameObjHealth(item)