fix: aim up always works, boss at 20k, weapon upgrades stack
This commit is contained in:
parent
22410c3a6c
commit
ba33437f56
13
script.js
13
script.js
@ -211,7 +211,7 @@ function update() {
|
|||||||
const currentFireRate = Math.max(30, wpn.fireRate - fireRateReduction);
|
const currentFireRate = Math.max(30, wpn.fireRate - fireRateReduction);
|
||||||
const damageMult = 1 + (player.weaponLevel - 1) * 0.2;
|
const damageMult = 1 + (player.weaponLevel - 1) * 0.2;
|
||||||
|
|
||||||
player.aimUp = keys['ArrowUp'] && !player.grounded;
|
player.aimUp = keys['ArrowUp'];
|
||||||
|
|
||||||
if (keys['ArrowLeft']) { player.vx = -player.speed; player.facing = -1; }
|
if (keys['ArrowLeft']) { player.vx = -player.speed; player.facing = -1; }
|
||||||
else if (keys['ArrowRight']) { player.vx = player.speed; player.facing = 1; }
|
else if (keys['ArrowRight']) { player.vx = player.speed; player.facing = 1; }
|
||||||
@ -277,7 +277,7 @@ function update() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!bossActive && enemiesRemaining === 0 && enemies.length === 0) {
|
if (!bossActive && enemiesRemaining === 0 && enemies.length === 0) {
|
||||||
if (player.score >= 30000 && waveNum >= 2) {
|
if (player.score >= 20000 && waveNum >= 2) {
|
||||||
spawnBoss();
|
spawnBoss();
|
||||||
} else {
|
} else {
|
||||||
startNextWave();
|
startNextWave();
|
||||||
@ -386,12 +386,9 @@ function update() {
|
|||||||
if (player.x < p.x + p.width && player.x + player.width > p.x &&
|
if (player.x < p.x + p.width && player.x + player.width > p.x &&
|
||||||
player.y < p.y + p.height && player.y + player.height > p.y) {
|
player.y < p.y + p.height && player.y + player.height > p.y) {
|
||||||
if (p.weapon !== undefined) {
|
if (p.weapon !== undefined) {
|
||||||
if (player.weapon === p.weapon) {
|
player.weapon = p.weapon;
|
||||||
player.weaponLevel = Math.min(5, player.weaponLevel + 1);
|
player.weaponLevel = Math.min(5, player.weaponLevel + 1);
|
||||||
} else {
|
createExplosion(p.x + p.width/2, p.y + p.height/2, '#ffff00', 20);
|
||||||
player.weapon = p.weapon;
|
|
||||||
player.weaponLevel = 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (p.upgrade) {
|
if (p.upgrade) {
|
||||||
player.weaponLevel = Math.min(5, player.weaponLevel + 1);
|
player.weaponLevel = Math.min(5, player.weaponLevel + 1);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user