catarrh/ravaged-planet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use constant in tank damage

Browse Source
This commit is contained in:
zenoamaro committed 2019-06-30 05:10:59 +02:00
1 parent a1c2cdd937
commit f463aac6a3
1 file changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files
weapons.js
+4 -3
View File
@@ -2,6 +2,7 @@ import {drawCircle, plot} from './gfx.js';
import {clipTerrain} from './terrain.js'; import {clipTerrain} from './terrain.js';
import {within, cycle, random, randomInt} from './math.js'; import {within, cycle, random, randomInt} from './math.js';
import {createOsc, audio} from './sound.js'; import {createOsc, audio} from './sound.js';
import {PLAYER_TANK_BOUNDING_RADIUS} from './constants.js';
export function drawExplosion(ctx, x, y, r) { export function drawExplosion(ctx, x, y, r) {
const color = 255 - (16 * (r % 16)); const color = 255 - (16 * (r % 16));
@@ -48,11 +49,11 @@ export const EXPLOSION_TYPES = {
clipTerrain(terrain, (ctx) => drawExplosion(ctx, x, y, cr)); clipTerrain(terrain, (ctx) => drawExplosion(ctx, x, y, cr));
}, },
damage(explosion, player) { 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; return 100;
} else if ( } else if (
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+3, player.y, explosion.r) within(explosion.x, explosion.y, player.x+PLAYER_TANK_BOUNDING_RADIUS, player.y, explosion.r)
) { ) {
return 50; return 50;
} }