From: Skullheadx <704277@pdsb.net>
Date: Wed, 13 Jul 2022 17:02:18 +0000 (-0400)
Subject: Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
X-Git-Url: http://git.skullheadx.com/tech/index.html?a=commitdiff_plain;h=ab048a264662ea4d4beb80b7262a3a60dbf8d63f;p=Pygame-Jam.git

Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
---

ab048a264662ea4d4beb80b7262a3a60dbf8d63f
diff --cc Enemy.py
index 654f3f8,13eaa40..ea87a3c
--- a/Enemy.py
+++ b/Enemy.py
@@@ -131,9 -131,10 +131,12 @@@ class Skeleton(Actor)
      attack_frames = []
      for i in range(attack_gif.n_frames):
          attack_frames.append(pg.transform.scale(pil_to_game(get_gif_frame(attack_gif, i)), (170, 138)))
 +    # player_grunt = pg.mixer.Sound("Assets/SFX/Player Grunt.wav")
 +    # player_grunt_channel = pg.mixer.Channel(4)
  
+     player_grunt = pg.mixer.Sound("Assets/SFX/Player Grunt.wav")
+     player_grunt_channel = pg.mixer.Channel(4)
+ 
      def __init__(self, pos, collision_layer, collision_mask):
          super().__init__(pos, collision_layer, collision_mask)