Skip to content

Commit 9befb58

Browse files
authored
Merge pull request #41 from PaulBayfield/feat-sfx
feat: kill enemy sfx
2 parents e2768f2 + 4c6f214 commit 9befb58

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

assets/songs/sfx/sword1.wav

1.32 MB
Binary file not shown.

assets/songs/sfx/sword2.wav

654 KB
Binary file not shown.

game/components/player.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ def __init__(self, game: "Game", name: str) -> None:
4747
self.beginInvincible = 0
4848
self.isInvincible = False
4949

50+
self.swords = [
51+
self.game.mixer.Sound("assets/songs/sfx/sword1.wav"),
52+
self.game.mixer.Sound("assets/songs/sfx/sword2.wav"),
53+
]
5054
self.screams = [
5155
self.game.mixer.Sound("assets/songs/sfx/chicken_scream.wav"),
5256
self.game.mixer.Sound("assets/songs/sfx/chicken_scream2.wav"),
@@ -318,9 +322,9 @@ def isAttacked(self) -> None:
318322
for enemy in self.game.enemy_spawner.enemies_list:
319323
if self.collide_rect.colliderect(enemy):
320324
self.damage(enemy.damage)
321-
scream = random.choice(self.screams)
322-
scream.set_volume(0.5)
323-
scream.play()
325+
sword = random.choice(self.swords)
326+
sword.set_volume(0.5)
327+
sword.play()
324328
self.beginInvincible = time()
325329
self.isInvincible = True
326330

@@ -341,7 +345,9 @@ def on_fire(self):
341345
if self.onFire:
342346
for enemy in self.game.enemy_spawner.enemies_list:
343347
if self.collide_rect.colliderect(enemy):
348+
scream = random.choice(self.screams)
349+
scream.set_volume(0.5)
350+
scream.play()
344351
enemy.kill()
345352
self.game.enemy_spawner.enemies_list.remove(enemy)
346-
347353
self.game.stats.update("kills", 1)

0 commit comments

Comments
 (0)