1 files changed, 14 insertions, 13 deletions
diff --git a/src/drawables/Bullet.ts b/src/drawables/Bullet.ts
index a745a06..f121cfa 100644
--- a/src/drawables/Bullet.ts
+++ b/src/drawables/Bullet.ts
@@ -1,29 +1,30 @@
-import { canvas } from "../consts";
 import Drawable, { Rectangle } from "../Drawable";
+import { IMGS } from "../Images";
 
 export default class Bullet extends Drawable {
   static width = 2;
   static height = 5;
   static color = "black";
-  width = 2;
-  height = 5;
-  color = "black";
-  sprite = "black";
+  // width = 2;
+  // height = 5;
+  // color = "black";
 
-  squares: Rectangle[] = [new Rectangle(this)]
 
-  constructor(x: number, y: number, public xvel: number, public yvel: number, public players: boolean) {
-    super(x, y);
-    // this.width = Bullet.width;
-    // this.height = Bullet.height;
+  constructor(x: number, y: number, public xvel: number, public yvel: number, public players: boolean, public power?: number) {
+    super(Math.floor(x), Math.floor(y));
+    //@ts-expect-error
+    if (players) this.sprite = IMGS["playerBullet" + power]
+    else this.sprite = IMGS.enemyBullet;
+    this.width = (this.sprite as HTMLImageElement).width
+    this.height = (this.sprite as HTMLImageElement).height
+    this.squares = [new Rectangle(this)]
+    console.log(this.width, this.height);
   }
 
   move(): boolean {
     this.x += this.xvel;
     this.y += this.yvel;
 
-    return (
-      this.x + this.width < 0 || this.y + this.height < 0 || this.x > canvas.width || this.y > canvas.height
-    );
+    return this.isOutsideMap()
   }
 }