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

minor bug fixes

Browse Source
This commit is contained in:
landgreen
2020-04-19 08:00:35 -07:00
parent e632f67967
commit 4c535e3670
6 changed files with 153 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

207
js/bullets.js
View File

@@ -409,9 +409,9 @@ const b = {
maxCount: 1, maxCount: 1,
count: 0, count: 0,
allowed() { allowed() {
return true return !b.isModEnergyHealth
}, },
requires: "", requires: "not mass-energy equivalence",
effect() { effect() {
b.isModHealthRecovery = true; b.isModHealthRecovery = true;
}, },
@@ -556,10 +556,12 @@ const b = {
mech.health = 0 mech.health = 0
b.modOnHealthChange(); b.modOnHealthChange();
mech.displayHealth(); mech.displayHealth();
document.getElementById("health-bg").style.display = "none"
b.isModEnergyHealth = true; b.isModEnergyHealth = true;
}, },
remove() { remove() {
b.isModEnergyHealth = false; b.isModEnergyHealth = false;
document.getElementById("health-bg").style.display = "inline"
mech.health = mech.energy; mech.health = mech.energy;
} }
}, },
@@ -621,9 +623,9 @@ const b = {
maxCount: 9, maxCount: 9,
count: 0, count: 0,
allowed() { allowed() {
return true return !b.isModEnergyHealth
}, },
requires: "", requires: "not mass-energy equivalence",
effect() { effect() {
b.modHealthDrain += 0.015; b.modHealthDrain += 0.015;
}, },
@@ -654,9 +656,9 @@ const b = {
maxCount: 9, maxCount: 9,
count: 0, count: 0,
allowed() { allowed() {
return true return !b.isModEnergyHealth
}, },
requires: "", requires: "not mass-energy equivalence",
effect() { effect() {
mech.maxHealth += 0.50 mech.maxHealth += 0.50
mech.addHealth(0.50) mech.addHealth(0.50)
@@ -673,9 +675,9 @@ const b = {
maxCount: 9, maxCount: 9,
count: 0, count: 0,
allowed() { allowed() {
return mech.health < 0.7 || build.isCustomSelection return (mech.health < 0.7 || build.isCustomSelection) && !b.isModEnergyHealth
}, },
requires: "health below 70%", requires: "not mass-energy equivalence",
effect() { effect() {
b.modRecursiveHealing += 1 b.modRecursiveHealing += 1
}, },
@@ -734,13 +736,13 @@ const b = {
}, },
{ {
name: "catabolism", name: "catabolism",
description: "gain <strong>ammo</strong> when you <strong>fire</strong> while <strong>out</strong> of <strong>ammo</strong><br>drains <strong>3%</strong> of current remaining <strong>health</strong>", description: "gain <strong>ammo</strong> when you <strong>fire</strong> while <strong>out</strong> of <strong>ammo</strong><br>drains <strong>3%</strong> of current remaining <strong class='color-h'>health</strong>",
maxCount: 1, maxCount: 1,
count: 0, count: 0,
allowed() { allowed() {
return true return !b.isModEnergyHealth
}, },
requires: "", requires: "not mass-energy equivalence",
effect: () => { effect: () => {
b.isModAmmoFromHealth = 0.03; b.isModAmmoFromHealth = 0.03;
}, },
@@ -972,26 +974,8 @@ const b = {
} }
}, },
{ {
name: "wave phase velocity", name: "wave packet",
description: "the <strong>wave beam</strong> propagates faster in solids", description: "<strong>wave beam</strong> emits <strong>two</strong> oscillating particles<br>wave particles do <strong>40%</strong> less <strong class='color-d'>damage</strong>",
maxCount: 1,
count: 0,
allowed() {
return b.haveGunCheck("wave beam")
},
requires: "wave beam",
effect() {
b.modWaveSpeedMap = 3
b.modWaveSpeedBody = 1.9
},
remove() {
b.modWaveSpeedMap = 0.08
b.modWaveSpeedBody = 0.25
}
},
{
name: "double helix",
description: "<strong>wave beam</strong> emits <strong>two</strong> out of phase particles<br>wave particles do <strong>40%</strong> less <strong class='color-d'>damage</strong>",
maxCount: 1, maxCount: 1,
count: 0, count: 0,
allowed() { allowed() {
@@ -1005,14 +989,31 @@ const b = {
b.modWaveHelix = 1 b.modWaveHelix = 1
} }
}, },
{ {
name: "pocket universe", name: "phase velocity",
description: "<strong>wave beam</strong> bullets last <strong>4</strong> times longer<br>bullets are <strong>confined</strong> to a <strong>region</strong> around player", description: "the <strong>wave beam</strong> propagates faster in solids",
maxCount: 1, maxCount: 1,
count: 0, count: 0,
allowed() { allowed() {
return b.haveGunCheck("wave beam") return b.haveGunCheck("wave beam") && !b.isModWaveReflect
},
requires: "wave beam",
effect() {
b.modWaveSpeedMap = 3 //needs to be 3 for pocket universe require check
b.modWaveSpeedBody = 1.9
},
remove() {
b.modWaveSpeedMap = 0.08
b.modWaveSpeedBody = 0.25
}
},
{
name: "pocket universe",
description: "<strong>wave beam</strong> bullets last <strong>5x</strong> longer<br>bullets are <strong>confined</strong> to a <strong>region</strong> around player",
maxCount: 1,
count: 0,
allowed() {
return b.haveGunCheck("wave beam") && b.modWaveSpeedMap !== 3
}, },
requires: "wave beam", requires: "wave beam",
effect() { effect() {
@@ -1235,7 +1236,7 @@ const b = {
} }
}, },
{ {
name: "foam stabilization", name: "quantum foam",
description: "<strong>foam</strong> can stick to <strong>shields</strong>", description: "<strong>foam</strong> can stick to <strong>shields</strong>",
maxCount: 1, maxCount: 1,
count: 0, count: 0,
@@ -1466,7 +1467,7 @@ const b = {
}, },
{ {
name: "renormalization", name: "renormalization",
description: "<strong>phase decoherence field</strong> has <strong>3x visibility</strong><br>and <strong>3x</strong> less <strong class='color-f'>energy</strong> drain when <strong>firing</strong>", description: "<strong>phase decoherence field</strong> has increased <strong>visibility</strong><br>and <strong>3x</strong> less <strong class='color-f'>energy</strong> drain when <strong>firing</strong>",
maxCount: 1, maxCount: 1,
count: 0, count: 0,
allowed() { allowed() {
@@ -1474,10 +1475,10 @@ const b = {
}, },
requires: "phase decoherence field", requires: "phase decoherence field",
effect() { effect() {
b.modRenormalization = 3; b.modRenormalization = true;
}, },
remove() { remove() {
b.modRenormalization = 1; b.modRenormalization = false;
} }
}, },
{ {
@@ -2540,7 +2541,7 @@ const b = {
game.makeGunHUD(); game.makeGunHUD();
}, },
guns: [{ guns: [{
name: "minigun", //0 name: "minigun",
description: "<strong>rapidly</strong> fire a stream of small <strong>bullets</strong>", description: "<strong>rapidly</strong> fire a stream of small <strong>bullets</strong>",
ammo: 0, ammo: 0,
ammoPack: 65, ammoPack: 65,
@@ -2577,7 +2578,7 @@ const b = {
} }
}, },
{ {
name: "shotgun", //1 name: "shotgun",
description: "fire a <strong>burst</strong> of short range bullets<br><em>crouch to reduce recoil</em>", description: "fire a <strong>burst</strong> of short range bullets<br><em>crouch to reduce recoil</em>",
ammo: 0, ammo: 0,
ammoPack: 11, ammoPack: 11,
@@ -2624,7 +2625,7 @@ const b = {
} }
}, },
{ {
name: "super balls", //2 name: "super balls",
description: "fire <strong>four</strong> balls in a wide arc<br>balls <strong>bounce</strong> with no momentum loss", description: "fire <strong>four</strong> balls in a wide arc<br>balls <strong>bounce</strong> with no momentum loss",
ammo: 0, ammo: 0,
ammoPack: 14, ammoPack: 14,
@@ -2681,7 +2682,7 @@ const b = {
} }
}, },
{ {
name: "flechettes", //3 name: "flechettes",
description: "fire a volley of <strong class='color-p'>uranium-235</strong> <strong>needles</strong><br>does <strong class='color-d'>damage</strong> over <strong>3</strong> seconds", description: "fire a volley of <strong class='color-p'>uranium-235</strong> <strong>needles</strong><br>does <strong class='color-d'>damage</strong> over <strong>3</strong> seconds",
ammo: 0, ammo: 0,
ammoPack: 23, ammoPack: 23,
@@ -2735,7 +2736,7 @@ const b = {
} }
}, },
{ {
name: "wave beam", //4 name: "wave beam",
description: "emit a <strong>sine wave</strong> of oscillating particles<br>particles <strong>slowly</strong> propagate through <strong>solids</strong>", description: "emit a <strong>sine wave</strong> of oscillating particles<br>particles <strong>slowly</strong> propagate through <strong>solids</strong>",
ammo: 0, ammo: 0,
ammoPack: 110, ammoPack: 110,
@@ -2746,14 +2747,20 @@ const b = {
mech.fireCDcycle = mech.cycle + Math.floor(3 * b.modFireRate); // cool down mech.fireCDcycle = mech.cycle + Math.floor(3 * b.modFireRate); // cool down
const dir = mech.angle const dir = mech.angle
const SPEED = 10 const SPEED = 10
const wiggleMag = mech.crouch ? 6 : 12 let wiggleMag
if (b.modWaveHelix === 2) {
wiggleMag = (mech.crouch ? 6 : 12) * (1 + Math.sin(mech.cycle * 0.1))
} else {
wiggleMag = mech.crouch ? 6 : 12
}
// const wiggleMag = b.modWaveHelix ? (mech.crouch ? 6 + 6 * Math.sin(mech.cycle * 0.1) : 13 + 13 * Math.sin(mech.cycle * 0.1)) : (mech.crouch ? 6 : 12)
const size = 5 * (b.modWaveHelix === 1 ? 1 : 0.7) const size = 5 * (b.modWaveHelix === 1 ? 1 : 0.7)
for (let i = 0; i < b.modWaveHelix; i++) { for (let i = 0; i < b.modWaveHelix; i++) {
const me = bullet.length; const me = bullet.length;
bullet[me] = Bodies.polygon(mech.pos.x + 25 * Math.cos(dir), mech.pos.y + 25 * Math.sin(dir), 7, size, { bullet[me] = Bodies.polygon(mech.pos.x + 25 * Math.cos(dir), mech.pos.y + 25 * Math.sin(dir), 7, size, {
angle: dir, angle: dir,
cycle: -0.5, cycle: -0.5,
endCycle: game.cycle + Math.floor((b.isModWaveReflect ? 480 : 120) * b.isModBulletsLastLonger), endCycle: game.cycle + Math.floor((b.isModWaveReflect ? 600 : 120) * b.isModBulletsLastLonger),
inertia: Infinity, inertia: Infinity,
frictionAir: 0, frictionAir: 0,
slow: 0, slow: 0,
@@ -2769,36 +2776,62 @@ const b = {
onEnd() {}, onEnd() {},
do() { do() {
if (!mech.isBodiesAsleep) { if (!mech.isBodiesAsleep) {
let slowCheck = 1; if (b.isModWaveReflect) {
if (Matter.Query.point(map, this.position).length) { //check if inside map // check if inside a mob
slowCheck = b.modWaveSpeedMap q = Matter.Query.point(mob, this.position)
} else { //check if inside a body for (let i = 0; i < q.length; i++) {
let q = Matter.Query.point(body, this.position) let dmg = b.dmgScale * 0.43 / Math.sqrt(q[i].mass) * (b.modWaveHelix === 1 ? 1 : 0.6) //1 - 0.4 = 0.6 for helix mod 40% damage reduction
if (q.length) { q[i].damage(dmg);
slowCheck = b.modWaveSpeedBody q[i].foundPlayer();
Matter.Body.setPosition(this, Vector.add(this.position, q[0].velocity)) //move with the medium game.drawList.push({ //add dmg to draw queue
} else { // check if inside a mob x: this.position.x,
q = Matter.Query.point(mob, this.position) y: this.position.y,
for (let i = 0; i < q.length; i++) { radius: Math.log(2 * dmg + 1.1) * 40,
slowCheck = 0.3; color: 'rgba(0,0,0,0.4)',
Matter.Body.setPosition(this, Vector.add(this.position, q[i].velocity)) //move with the medium time: game.drawTime
let dmg = b.dmgScale * 0.43 / Math.sqrt(q[i].mass) * (b.modWaveHelix === 1 ? 1 : 0.6) //1 - 0.4 = 0.6 for helix mod 40% damage reduction });
q[i].damage(dmg); }
q[i].foundPlayer(); Matter.Body.setPosition(this, Vector.add(this.position, player.velocity)) //bullets move with player
game.drawList.push({ //add dmg to draw queue const sub = Vector.sub(this.position, mech.pos)
x: this.position.x, const range = 558 //93 * x
y: this.position.y, if (Vector.magnitude(sub) > range) {
radius: Math.log(2 * dmg + 1.1) * 40, // Matter.Body.setPosition(this, Vector.sub(this.position, Vector.mult(Vector.normalise(sub), 2 * range))) //teleport to opposite side
color: 'rgba(0,0,0,0.4)', Matter.Body.setVelocity(this, Vector.mult(this.velocity, -1));
time: game.drawTime // Matter.Body.setPosition(this, Vector.add(mech.pos, Vector.mult(Vector.normalise(sub), range)))
}); }
} else {
let slowCheck = 1
if (Matter.Query.point(map, this.position).length) { //check if inside map
slowCheck = b.modWaveSpeedMap
} else { //check if inside a body
let q = Matter.Query.point(body, this.position)
if (q.length) {
slowCheck = b.modWaveSpeedBody
Matter.Body.setPosition(this, Vector.add(this.position, q[0].velocity)) //move with the medium
} else { // check if inside a mob
q = Matter.Query.point(mob, this.position)
for (let i = 0; i < q.length; i++) {
slowCheck = 0.3;
Matter.Body.setPosition(this, Vector.add(this.position, q[i].velocity)) //move with the medium
let dmg = b.dmgScale * 0.43 / Math.sqrt(q[i].mass) * (b.modWaveHelix === 1 ? 1 : 0.6) //1 - 0.4 = 0.6 for helix mod 40% damage reduction
q[i].damage(dmg);
q[i].foundPlayer();
game.drawList.push({ //add dmg to draw queue
x: this.position.x,
y: this.position.y,
radius: Math.log(2 * dmg + 1.1) * 40,
color: 'rgba(0,0,0,0.4)',
time: game.drawTime
});
}
} }
} }
if (slowCheck !== this.slow) { //toggle velocity based on inside and outside status change
this.slow = slowCheck
Matter.Body.setVelocity(this, Vector.mult(Vector.normalise(this.velocity), SPEED * slowCheck));
}
} }
if (slowCheck !== this.slow) { //toggle velocity based on inside and outside status change
this.slow = slowCheck
Matter.Body.setVelocity(this, Vector.mult(Vector.normalise(this.velocity), SPEED * slowCheck));
}
this.cycle++ this.cycle++
const wiggle = Vector.mult(transverse, wiggleMag * Math.cos(this.cycle * 0.35) * ((i % 2) ? -1 : 1)) const wiggle = Vector.mult(transverse, wiggleMag * Math.cos(this.cycle * 0.35) * ((i % 2) ? -1 : 1))
Matter.Body.setPosition(this, Vector.add(this.position, wiggle)) Matter.Body.setPosition(this, Vector.add(this.position, wiggle))
@@ -2814,14 +2847,6 @@ const b = {
// } // }
// } // }
if (b.isModWaveReflect) {
Matter.Body.setPosition(this, Vector.add(this.position, player.velocity)) //bullets move with player
const sub = Vector.sub(this.position, mech.pos)
if (Vector.magnitude(sub) > 630) {
Matter.Body.setPosition(this, Vector.add(this.position, Vector.mult(Vector.normalise(sub), -2 * 630))) //teleport to opposite side
}
}
// if (b.isModWaveReflect) { // if (b.isModWaveReflect) {
// Matter.Body.setPosition(this, Vector.add(this.position, player.velocity)) //bullets move with player // Matter.Body.setPosition(this, Vector.add(this.position, player.velocity)) //bullets move with player
@@ -2917,7 +2942,7 @@ const b = {
} }
}, },
{ {
name: "grenades", //7 name: "grenades",
description: "lob a single <strong>bouncy</strong> projectile<br><strong class='color-e'>explodes</strong> on <strong>contact</strong> or after one second", description: "lob a single <strong>bouncy</strong> projectile<br><strong class='color-e'>explodes</strong> on <strong>contact</strong> or after one second",
ammo: 0, ammo: 0,
ammoPack: 7, ammoPack: 7,
@@ -2979,7 +3004,7 @@ const b = {
} }
}, },
{ {
name: "vacuum bomb", //8 name: "vacuum bomb",
description: "fire a bomb that <strong>sucks</strong> before <strong class='color-e'>exploding</strong><br><strong>click</strong> left mouse again to <strong>detonate</strong>", description: "fire a bomb that <strong>sucks</strong> before <strong class='color-e'>exploding</strong><br><strong>click</strong> left mouse again to <strong>detonate</strong>",
ammo: 0, ammo: 0,
ammoPack: 3, ammoPack: 3,
@@ -3101,7 +3126,7 @@ const b = {
} }
}, },
{ {
name: "mine", //9 name: "mine",
description: "toss a <strong>proximity</strong> mine that <strong>sticks</strong> to walls<br>fires <strong>nails</strong> at mobs within range", description: "toss a <strong>proximity</strong> mine that <strong>sticks</strong> to walls<br>fires <strong>nails</strong> at mobs within range",
ammo: 0, ammo: 0,
ammoPack: 3, ammoPack: 3,
@@ -3121,7 +3146,7 @@ const b = {
} }
}, },
{ {
name: "spores", //10 name: "spores",
description: "fire a <strong>sporangium</strong> that discharges <strong class='color-p' style='letter-spacing: 2px;'>spores</strong>", description: "fire a <strong>sporangium</strong> that discharges <strong class='color-p' style='letter-spacing: 2px;'>spores</strong>",
ammo: 0, ammo: 0,
ammoPack: (game.difficultyMode > 3) ? 3 : 4, ammoPack: (game.difficultyMode > 3) ? 3 : 4,
@@ -3167,7 +3192,7 @@ const b = {
} }
}, },
{ {
name: "drones", //11 name: "drones",
description: "deploy drones that <strong>crash</strong> into mobs<br>collisions reduce their <strong>lifespan</strong> by 1 second", description: "deploy drones that <strong>crash</strong> into mobs<br>collisions reduce their <strong>lifespan</strong> by 1 second",
ammo: 0, ammo: 0,
ammoPack: 12, ammoPack: 12,
@@ -3180,7 +3205,7 @@ const b = {
} }
}, },
{ {
name: "ice IX", //11 name: "ice IX",
description: "synthesize <strong>short-lived</strong> ice crystals<br>crystals <strong>seek</strong> out and <strong class='color-s'>freeze</strong> mobs", description: "synthesize <strong>short-lived</strong> ice crystals<br>crystals <strong>seek</strong> out and <strong class='color-s'>freeze</strong> mobs",
ammo: 0, ammo: 0,
ammoPack: 75, ammoPack: 75,
@@ -3199,7 +3224,7 @@ const b = {
} }
}, },
{ {
name: "foam", //12 name: "foam",
description: "spray bubbly foam that <strong>sticks</strong> to mobs<br><strong class='color-s'>slows</strong> mobs and does <strong class='color-d'>damage</strong> over time", description: "spray bubbly foam that <strong>sticks</strong> to mobs<br><strong class='color-s'>slows</strong> mobs and does <strong class='color-d'>damage</strong> over time",
ammo: 0, ammo: 0,
ammoPack: 35, ammoPack: 35,
@@ -3299,7 +3324,7 @@ const b = {
} }
}, },
{ {
name: "rail gun", //13 name: "rail gun",
description: "use <strong class='color-f'>energy</strong> to launch a high-speed <strong>dense</strong> rod<br><strong>hold</strong> left mouse to charge, <strong>release</strong> to fire", description: "use <strong class='color-f'>energy</strong> to launch a high-speed <strong>dense</strong> rod<br><strong>hold</strong> left mouse to charge, <strong>release</strong> to fire",
ammo: 0, ammo: 0,
ammoPack: 4, ammoPack: 4,
@@ -3553,7 +3578,7 @@ const b = {
} }
}, },
{ {
name: "laser", //14 name: "laser",
description: "emit a <strong>beam</strong> of collimated coherent <strong>light</strong><br>drains <strong class='color-f'>energy</strong> instead of ammunition", description: "emit a <strong>beam</strong> of collimated coherent <strong>light</strong><br>drains <strong class='color-f'>energy</strong> instead of ammunition",
ammo: 0, ammo: 0,
ammoPack: Infinity, ammoPack: Infinity,
@@ -3712,7 +3737,7 @@ const b = {
} }
}, },
{ {
name: "pulse", //15 name: "pulse",
description: "convert <strong>25%</strong> of your <strong class='color-f'>energy</strong> into a pulsed laser<br>instantly initiates a fusion <strong class='color-e'>explosion</strong>", description: "convert <strong>25%</strong> of your <strong class='color-f'>energy</strong> into a pulsed laser<br>instantly initiates a fusion <strong class='color-e'>explosion</strong>",
ammo: 0, ammo: 0,
ammoPack: Infinity, ammoPack: Infinity,

24
js/engine.js
View File

@@ -144,7 +144,19 @@ function collisionChecks(event) {
} }
mech.damage(dmg); mech.damage(dmg);
if (mob[k].onHit) mob[k].onHit(k); if (mob[k].onHit) mob[k].onHit(k);
if (b.isModAnnihilation) {
//extra kick between player and mob //this section would be better with forces but they don't work...
let angle = Math.atan2(player.position.y - mob[k].position.y, player.position.x - mob[k].position.x);
Matter.Body.setVelocity(player, {
x: player.velocity.x + 8 * Math.cos(angle),
y: player.velocity.y + 8 * Math.sin(angle)
});
Matter.Body.setVelocity(mob[k], {
x: mob[k].velocity.x - 8 * Math.cos(angle),
y: mob[k].velocity.y - 8 * Math.sin(angle)
});
if (b.isModAnnihilation && !mob[k].shield && !mob[k].isShielded) {
mob[k].death(); mob[k].death();
game.drawList.push({ game.drawList.push({
//add dmg to draw queue //add dmg to draw queue
@@ -165,16 +177,6 @@ function collisionChecks(event) {
}); });
} }
//extra kick between player and mob //this section would be better with forces but they don't work...
let angle = Math.atan2(player.position.y - mob[k].position.y, player.position.x - mob[k].position.x);
Matter.Body.setVelocity(player, {
x: player.velocity.x + 8 * Math.cos(angle),
y: player.velocity.y + 8 * Math.sin(angle)
});
Matter.Body.setVelocity(mob[k], {
x: mob[k].velocity.x - 8 * Math.cos(angle),
y: mob[k].velocity.y - 8 * Math.sin(angle)
});
return; return;
} }
//mob + bullet collisions //mob + bullet collisions

12
js/level.js
View File

@@ -15,12 +15,14 @@ const level = {
if (build.isURLBuild && level.levelsCleared === 0) build.onLoadPowerUps(); if (build.isURLBuild && level.levelsCleared === 0) build.onLoadPowerUps();
if (level.levelsCleared === 0) { //this code only runs on the first level if (level.levelsCleared === 0) { //this code only runs on the first level
// level.difficultyIncrease(9) // level.difficultyIncrease(9)
b.giveGuns("rail gun") // b.giveGuns("wave beam")
// mech.setField("pilot wave") // mech.setField("phase decoherence field")
// b.giveMod("nonlocality"); // b.giveMod("renormalization");
// b.giveMod("pocket universe");
// b.giveMod("wave packet");
// level.intro(); //starting level level.intro(); //starting level
level.testing(); // level.testing();
// level.stronghold() // level.stronghold()
// level.bosses(); // level.bosses();
// level.satellite(); // level.satellite();

29
js/player.js
View File

@@ -1318,9 +1318,9 @@ const mech = {
// mech.fieldArc = 0.3; //run calculateFieldThreshold after setting fieldArc, used for powerUp grab and mobPush with lookingAt(mob) // mech.fieldArc = 0.3; //run calculateFieldThreshold after setting fieldArc, used for powerUp grab and mobPush with lookingAt(mob)
// mech.calculateFieldThreshold(); // mech.calculateFieldThreshold();
mech.hold = function () { mech.hold = function () {
const wave = Math.sin(mech.cycle * 0.02); const wave = Math.sin(mech.cycle * 0.022);
mech.fieldRange = 165 + 10 * wave mech.fieldRange = 165 + 12 * wave
mech.fieldArc = 0.3 + 0.03 * wave //run calculateFieldThreshold after setting fieldArc, used for powerUp grab and mobPush with lookingAt(mob) mech.fieldArc = 0.3 + 0.035 * wave //run calculateFieldThreshold after setting fieldArc, used for powerUp grab and mobPush with lookingAt(mob)
mech.calculateFieldThreshold(); mech.calculateFieldThreshold();
if (mech.isHolding) { if (mech.isHolding) {
mech.drawHold(mech.holdingTarget); mech.drawHold(mech.holdingTarget);
@@ -1517,7 +1517,6 @@ const mech = {
if (mob[i].distanceToPlayer2() < this.fieldDrawRadius * this.fieldDrawRadius && Matter.Query.ray(map, mech.pos, mob[i].position).length === 0 && Matter.Query.ray(body, mech.pos, mob[i].position).length === 0) { if (mob[i].distanceToPlayer2() < this.fieldDrawRadius * this.fieldDrawRadius && Matter.Query.ray(map, mech.pos, mob[i].position).length === 0 && Matter.Query.ray(body, mech.pos, mob[i].position).length === 0) {
mob[i].damage(b.dmgScale * 0.085); mob[i].damage(b.dmgScale * 0.085);
mob[i].locatePlayer(); mob[i].locatePlayer();
//draw electricity //draw electricity
const sub = Vector.sub(mob[i].position, mech.pos) const sub = Vector.sub(mob[i].position, mech.pos)
const unit = Vector.normalise(sub); const unit = Vector.normalise(sub);
@@ -1535,7 +1534,6 @@ const mech = {
ctx.lineWidth = 1; ctx.lineWidth = 1;
ctx.strokeStyle = "rgba(0,255,0,0.5)" //"#fff"; ctx.strokeStyle = "rgba(0,255,0,0.5)" //"#fff";
ctx.stroke(); ctx.stroke();
} }
} }
} }
@@ -1821,23 +1819,24 @@ const mech = {
mech.hold = function () { mech.hold = function () {
function drawField(radius) { function drawField(radius) {
radius *= 0.6 + 0.7 * mech.energy * b.modRenormalization; radius *= 0.7 + 0.6 * mech.energy;
const rotate = mech.cycle * 0.005; const rotate = mech.cycle * 0.005;
mech.fieldPhase += 0.5 - 0.5 * Math.sqrt(Math.min(mech.energy, 1)); mech.fieldPhase += 0.5 - 0.5 * Math.sqrt(Math.max(0.01, Math.min(mech.energy, 1)));
const off1 = 1 + 0.06 * Math.sin(mech.fieldPhase); const off1 = 1 + 0.06 * Math.sin(mech.fieldPhase);
const off2 = 1 - 0.06 * Math.sin(mech.fieldPhase); const off2 = 1 - 0.06 * Math.sin(mech.fieldPhase);
ctx.beginPath(); ctx.beginPath();
ctx.ellipse(mech.pos.x, mech.pos.y, radius * off1, radius * off2, rotate, 0, 2 * Math.PI); ctx.ellipse(mech.pos.x, mech.pos.y, radius * off1, radius * off2, rotate, 0, 2 * Math.PI);
if (mech.fireCDcycle > mech.cycle && (keys[32] || game.mouseDownRight)) {
ctx.lineWidth = 5;
ctx.strokeStyle = `rgba(0, 204, 255,1)`
ctx.stroke()
}
if (b.modRenormalization) { if (b.modRenormalization) {
for (let i = 0; i < bullet.length; i++) { for (let i = 0; i < bullet.length; i++) {
ctx.moveTo(bullet[i].position.x, bullet[i].position.y) ctx.moveTo(bullet[i].position.x, bullet[i].position.y)
ctx.arc(bullet[i].position.x, bullet[i].position.y, radius, 0, 2 * Math.PI); ctx.arc(bullet[i].position.x, bullet[i].position.y, radius, 0, 2 * Math.PI);
} }
} else {
if (mech.fireCDcycle > mech.cycle && (keys[32] || game.mouseDownRight)) {
ctx.lineWidth = 5;
ctx.strokeStyle = `rgba(0, 204, 255,1)`
ctx.stroke()
}
} }
ctx.fillStyle = "#fff" //`rgba(0,0,0,${0.5+0.5*mech.energy})`; ctx.fillStyle = "#fff" //`rgba(0,0,0,${0.5+0.5*mech.energy})`;
ctx.globalCompositeOperation = "destination-in"; //in or atop ctx.globalCompositeOperation = "destination-in"; //in or atop
@@ -1857,7 +1856,7 @@ const mech = {
mech.grabPowerUp(); mech.grabPowerUp();
mech.lookForPickUp(); mech.lookForPickUp();
const DRAIN = (0.0004 + 0.00007 * player.speed) * (mech.fireCDcycle > mech.cycle ? 7 / b.modRenormalization : 1) //game.mouseDown const DRAIN = 0.0004 + 0.0002 * player.speed + ((!b.modRenormalization && mech.fireCDcycle > mech.cycle) ? 0.005 : 0.0017)
if (mech.energy > DRAIN) { if (mech.energy > DRAIN) {
mech.energy -= DRAIN; mech.energy -= DRAIN;
if (mech.energy < 0.001) { if (mech.energy < 0.001) {
@@ -1875,9 +1874,9 @@ const mech = {
if (inPlayer.length > 0) { if (inPlayer.length > 0) {
for (let i = 0; i < inPlayer.length; i++) { for (let i = 0; i < inPlayer.length; i++) {
if (inPlayer[i].shield) { if (inPlayer[i].shield) {
mech.energy -= 0.01; //shields drain player energy mech.energy -= 0.005; //shields drain player energy
//draw outline of shield //draw outline of shield
ctx.fillStyle = `rgba(0, 204, 255,0.6)` ctx.fillStyle = `rgba(140,217,255,0.5)`
ctx.fill() ctx.fill()
} else if (b.superposition && inPlayer[i].dropPowerUp) { } else if (b.superposition && inPlayer[i].dropPowerUp) {
// inPlayer[i].damage(0.4 * b.dmgScale); //damage mobs inside the player // inPlayer[i].damage(0.4 * b.dmgScale); //damage mobs inside the player

4
js/powerups.js
View File

@@ -225,7 +225,7 @@ const powerUps = {
} }
}, },
spawnRandomPowerUp(x, y) { //mostly used after mob dies spawnRandomPowerUp(x, y) { //mostly used after mob dies
if (Math.random() * Math.random() - 0.3 > Math.sqrt(mech.health) || Math.random() < 0.035) { //spawn heal chance is higher at low health if ((Math.random() * Math.random() - 0.3 > Math.sqrt(mech.health) && !b.isModEnergyHealth) || Math.random() < 0.035) { //spawn heal chance is higher at low health
powerUps.spawn(x, y, "heal"); powerUps.spawn(x, y, "heal");
if (Math.random() < b.isModBayesian) powerUps.spawn(x, y, "heal"); if (Math.random() < b.isModBayesian) powerUps.spawn(x, y, "heal");
return; return;
@@ -264,7 +264,7 @@ const powerUps = {
// } else if (Math.random() < 0.5) { // } else if (Math.random() < 0.5) {
// powerUps.spawn(x, y, "field"); // powerUps.spawn(x, y, "field");
// if (Math.random() < b.isModBayesian) powerUps.spawn(x, y, "field"); // if (Math.random() < b.isModBayesian) powerUps.spawn(x, y, "field");
} else if (mech.health < 0.65) { } else if (mech.health < 0.65 && !b.isModEnergyHealth) {
powerUps.spawn(x, y, "heal"); powerUps.spawn(x, y, "heal");
powerUps.spawn(x, y, "heal"); powerUps.spawn(x, y, "heal");
powerUps.spawn(x, y, "heal"); powerUps.spawn(x, y, "heal");

2
js/spawn.js
View File

@@ -833,7 +833,7 @@ const spawn = {
me.onDeath = function () { me.onDeath = function () {
powerUps.spawnBossPowerUp(this.position.x, this.position.y) powerUps.spawnBossPowerUp(this.position.x, this.position.y)
}; };
me.rotateVelocity = Math.min(0.01, 0.0025 * game.accelScale * game.accelScale) * (level.levelsCleared > 8 ? 1 : -1) me.rotateVelocity = Math.min(0.0054, 0.0022 * game.accelScale * game.accelScale) * (level.levelsCleared > 8 ? 1 : -1)
me.do = function () { me.do = function () {
this.fill = '#' + Math.random().toString(16).substr(-6); //flash colors this.fill = '#' + Math.random().toString(16).substr(-6); //flash colors
// Matter.Body.rotate(this, -0.003 / (0.3 + this.health)) // Matter.Body.rotate(this, -0.003 / (0.3 + this.health))