chore(gameobjects): add enemy damage over time

remarkablegames · Jan 25, 2025 · fc61e7b · fc61e7b
1 parent 3a7df08
commit fc61e7b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/events/attack.ts b/src/events/attack.ts
@@ -3,24 +3,24 @@ import { addBubble } from '../gameobjects'
 import type { Player } from '../types'
 
 export function addAttack(player: Player) {
-  const attack = new Attack(player)
+  const attack = new Attack()
 
   onClick(() => {
     if (attack.canAttack()) {
-      attack.update()
       play(Sound.Shoot, { detune: rand(-100, 100) })
       addBubble(player)
+      attack.update()
     }
   })
 }
 
 class Attack {
-  private attackDelay = 1
-  private lastAttacked = 0
-  private player
+  private attackDelay
+  private lastAttacked
 
-  constructor(player: Player) {
-    this.player = player
+  constructor(attackDelay = 1, lastAttacked = 0) {
+    this.attackDelay = attackDelay
+    this.lastAttacked = lastAttacked
   }
 
   update() {

diff --git a/src/events/states.ts b/src/events/states.ts
@@ -42,7 +42,7 @@ export function addEnemyState(enemy: Enemy) {
     enemy.enterState(State.Move)
   })
 
-  enemy.onStateUpdate(State.Move, async () => {
+  enemy.onStateUpdate(State.Move, () => {
     const player = getPlayer()
 
     if (!player?.exists()) {

diff --git a/src/gameobjects/enemy.ts b/src/gameobjects/enemy.ts
@@ -36,7 +36,7 @@ export function addEnemy(x: number, y: number) {
 
   addEnemyState(enemy)
 
-  enemy.onCollide(Tag.Player, async () => {
+  enemy.onCollide(Tag.Player, () => {
     if (enemy.bubble) {
       return
     }
@@ -45,6 +45,14 @@ export function addEnemy(x: number, y: number) {
     getPlayer()?.hurt(enemy.damage)
   })
 
+  enemy.onCollideUpdate(Tag.Player, () => {
+    if (enemy.bubble) {
+      return
+    }
+
+    getPlayer()?.hurt(enemy.damage / 1000)
+  })
+
   enemy.onHurt(() => {
     enemy.enterState(State.Stunned)
   })

diff --git a/src/gameobjects/projectile.ts b/src/gameobjects/projectile.ts
@@ -30,6 +30,7 @@ export function addProjectile(enemy: Enemy, player: Player) {
   projectile.onCollide(Tag.Enemy, (enemy) => {
     play(Sound.Hit)
     enemy.removeAll(Tag.EnemyBubble)
+    enemy.bubble = false
   })
 
   return projectile