diff --git a/js/bullets.js b/js/bullets.js index 34a82d9..d644425 100644 --- a/js/bullets.js +++ b/js/bullets.js @@ -726,7 +726,7 @@ const b = { restitution: 1, dmg: 0.13, //damage done in addition to the damage from momentum lookFrequency: 83 + Math.floor(41 * Math.random()), - endCycle: game.cycle + Math.floor((1080 + 360 * Math.random()) * b.isModBulletsLastLonger), + endCycle: game.cycle + Math.floor((1200 + 420 * Math.random()) * b.isModBulletsLastLonger), classType: "bullet", collisionFilter: { category: cat.bullet, @@ -1712,7 +1712,7 @@ const b = { name: "drones", //12 description: "deploy drones that crash into enemies
collisions reduce drone cycles by 1 second", ammo: 0, - ammoPack: 8, + ammoPack: 9, have: false, isStarterGun: true, fire() { @@ -2446,9 +2446,9 @@ const b = { } //use energy to explode - const energy = 0.25 * Math.min(mech.fieldMeter, 1.5) + const energy = 0.3 * Math.min(mech.fieldMeter, 1.75) mech.fieldMeter -= energy - if (best.who) b.explosion(path[1], 1200 * energy) + if (best.who) b.explosion(path[1], 950 * energy) mech.fireCDcycle = mech.cycle + Math.floor(60 * b.modFireRate); // cool down //draw laser beam diff --git a/js/player.js b/js/player.js index d6f78b2..e88b5d1 100644 --- a/js/player.js +++ b/js/player.js @@ -696,12 +696,10 @@ const mech = { if (mech.isHolding) { mech.isHolding = false; mech.throwCharge = 0; - if (mech.holdingTarget) { - mech.definePlayerMass() - 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; - } + 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 } }, definePlayerMass(mass = mech.defaultMass) {