From f463aac6a31e117b11097c27092917c370842e1d Mon Sep 17 00:00:00 2001 From: zenoamaro Date: Sun, 30 Jun 2019 05:10:59 +0200 Subject: [PATCH] Use constant in tank damage --- weapons.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/weapons.js b/weapons.js index cd89976..65639a7 100644 --- a/weapons.js +++ b/weapons.js @@ -2,6 +2,7 @@ import {drawCircle, plot} from './gfx.js'; import {clipTerrain} from './terrain.js'; import {within, cycle, random, randomInt} from './math.js'; import {createOsc, audio} from './sound.js'; +import {PLAYER_TANK_BOUNDING_RADIUS} from './constants.js'; export function drawExplosion(ctx, x, y, r) { const color = 255 - (16 * (r % 16)); @@ -48,11 +49,11 @@ export const EXPLOSION_TYPES = { clipTerrain(terrain, (ctx) => drawExplosion(ctx, x, y, cr)); }, damage(explosion, player) { - if (within(explosion.x, explosion.y, player.x-3, player.y, explosion.r)) { + if (within(explosion.x, explosion.y, player.x, player.y, explosion.r)) { return 100; } else if ( - within(explosion.x, explosion.y, player.x-3, player.y, explosion.r) || - within(explosion.x, explosion.y, player.x+3, player.y, explosion.r) + within(explosion.x, explosion.y, player.x-PLAYER_TANK_BOUNDING_RADIUS, player.y, explosion.r) || + within(explosion.x, explosion.y, player.x+PLAYER_TANK_BOUNDING_RADIUS, player.y, explosion.r) ) { return 50; }