admin/n-gon-improved
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

another bug fix for holding

Browse Source
This commit is contained in:
lilgreenland
2020-01-06 14:18:26 -08:00
parent ea328a764b
commit 4fec0c4848
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/bullets.js
View File

@@ -169,8 +169,8 @@ const b = {
} }
}, },
{ {
name: "electrostatic repulsion", //11 name: "Pauli exclusion", //11
description: "<strong>immune</strong> to harm from <strong>collisions</strong> for +2 seconds<br>activates after being <strong>harmed</strong> from a collision", description: "unable to <strong>collide</strong> with enemies for +2 seconds<br>activates after being <strong>harmed</strong> from a collision",
maxCount: 1, maxCount: 1,
count: 0, count: 0,
effect() { effect() {

8
js/player.js
View File

@@ -697,9 +697,11 @@ const mech = {
mech.isHolding = false; mech.isHolding = false;
mech.throwCharge = 0; mech.throwCharge = 0;
mech.definePlayerMass() mech.definePlayerMass()
mech.holdingTarget = null; if (mech.holdingTarget) {
mech.holdingTarget.collisionFilter.category = cat.body; mech.holdingTarget.collisionFilter.category = cat.body;
mech.holdingTarget.collisionFilter.mask = cat.player | cat.map | cat.body | cat.bullet | cat.mob | cat.mobBullet mech.holdingTarget.collisionFilter.mask = cat.player | cat.map | cat.body | cat.bullet | cat.mob | cat.mobBullet
mech.holdingTarget = null;
}
} }
}, },
definePlayerMass(mass = mech.defaultMass) { definePlayerMass(mass = mech.defaultMass) {