diff --git a/assets/gun-base.png b/assets/gun-base.png new file mode 100644 index 0000000..f0853d5 Binary files /dev/null and b/assets/gun-base.png differ diff --git a/sfx/gun-blank.mp3 b/assets/gun-blank.mp3 similarity index 100% rename from sfx/gun-blank.mp3 rename to assets/gun-blank.mp3 diff --git a/sfx/gun-cylinder-stop.mp3 b/assets/gun-cylinder-stop.mp3 similarity index 100% rename from sfx/gun-cylinder-stop.mp3 rename to assets/gun-cylinder-stop.mp3 diff --git a/sfx/gun-load.mp3 b/assets/gun-load.mp3 similarity index 100% rename from sfx/gun-load.mp3 rename to assets/gun-load.mp3 diff --git a/sfx/gun-shot.mp3 b/assets/gun-shot.mp3 similarity index 100% rename from sfx/gun-shot.mp3 rename to assets/gun-shot.mp3 diff --git a/sfx/gun-spin.mp3 b/assets/gun-spin.mp3 similarity index 100% rename from sfx/gun-spin.mp3 rename to assets/gun-spin.mp3 diff --git a/gun.webp b/assets/gun-spin.webp similarity index 100% rename from gun.webp rename to assets/gun-spin.webp diff --git a/images/muzzleflash.png b/assets/muzzleflash.png similarity index 100% rename from images/muzzleflash.png rename to assets/muzzleflash.png diff --git a/game.py b/game.py index 36fcfa7..c3768cd 100644 --- a/game.py +++ b/game.py @@ -33,14 +33,14 @@ class Game(gameUtils.Game): #Sounds for the gun :3 self.playSound = pygame.mixer.Sound.play - self.gunBlank = pygame.mixer.Sound("sfx/gun-blank.mp3") - self.gunShot = pygame.mixer.Sound("sfx/gun-shot.mp3") - self.gunSpin = pygame.mixer.Sound("sfx/gun-spin.mp3") - self.gunLoad = pygame.mixer.Sound("sfx/gun-load.mp3") - self.gunCyclinder = pygame.mixer.Sound("sfx/gun-cylinder-stop.mp3") - - self.gun = pygame.image.load_animation("gun.webp") - self.gunFlash = pygame.image.load("images/muzzleflash.png") + self.gunBlank = pygame.mixer.Sound("./assets/gun-blank.mp3") + self.gunShot = pygame.mixer.Sound("./assets/gun-shot.mp3") + self.gunSpin = pygame.mixer.Sound("./assets/gun-spin.mp3") + self.gunLoad = pygame.mixer.Sound("./assets/gun-load.mp3") + self.gunCyclinder = pygame.mixer.Sound("./assets/gun-cylinder-stop.mp3") + + self.gun = pygame.load_animation('./assets/gun-spin.webp') + self.gunFlash = pygame.image.load("./assets/muzzleflash.png") self.shockScale = 0 #controls shock level sent to PDO (on a scale of 0 to 1) #gun variables