From 80a06d762875d942904617bd28f2c1c9bfef2cce Mon Sep 17 00:00:00 2001 From: Mark <mark@remarkablemark.org> Date: Thu, 23 Jan 2025 22:01:44 -0500 Subject: [PATCH] refactor(gameobjects): use getDirection helper in bullet --- src/gameobjects/bullet.ts | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/gameobjects/bullet.ts b/src/gameobjects/bullet.ts index 4c35c91..74bab03 100644 --- a/src/gameobjects/bullet.ts +++ b/src/gameobjects/bullet.ts @@ -1,4 +1,5 @@ import { Sound, Tag } from '../constants' +import { getDirection } from '../helpers' import type { Enemy, Player } from '../types' const BULLET_SPEED = 200 @@ -7,7 +8,7 @@ const BULLET_DAMAGE = 20 export function addBullet(player: Player) { const bullet = add([ pos(player.pos), - move(getBulletDir(player), BULLET_SPEED), + move(getDirection(player.screenPos()!, mousePos()), BULLET_SPEED), circle(30), area(), offscreen({ destroy: true }), @@ -25,14 +26,3 @@ export function addBullet(player: Player) { return bullet } - -function getBulletDir(player: Player) { - const mousePosition = mousePos() - const playerPosition = player.screenPos() - const angle = Math.atan2( - mousePosition.y - playerPosition!.y, - mousePosition.x - playerPosition!.x, - ) - const degrees = (angle * 180) / Math.PI - return degrees -}