diff --git a/js/bullets.js b/js/bullets.js index d644425..a886dee 100644 --- a/js/bullets.js +++ b/js/bullets.js @@ -169,8 +169,8 @@ const b = { } }, { - name: "electrostatic repulsion", //11 - description: "immune to harm from collisions for +2 seconds
activates after being harmed from a collision", + name: "Pauli exclusion", //11 + description: "unable to collide with enemies for +2 seconds
activates after being harmed from a collision", maxCount: 1, count: 0, effect() { diff --git a/js/player.js b/js/player.js index e88b5d1..a935203 100644 --- a/js/player.js +++ b/js/player.js @@ -697,9 +697,11 @@ const mech = { mech.isHolding = false; mech.throwCharge = 0; mech.definePlayerMass() - mech.holdingTarget = null; - mech.holdingTarget.collisionFilter.category = cat.body; - mech.holdingTarget.collisionFilter.mask = cat.player | cat.map | cat.body | cat.bullet | cat.mob | cat.mobBullet + if (mech.holdingTarget) { + mech.holdingTarget.collisionFilter.category = cat.body; + mech.holdingTarget.collisionFilter.mask = cat.player | cat.map | cat.body | cat.bullet | cat.mob | cat.mobBullet + mech.holdingTarget = null; + } } }, definePlayerMass(mass = mech.defaultMass) {