From 3b493e6c75179323f2d90549e15d89910374538a Mon Sep 17 00:00:00 2001 From: Tango Date: Mon, 16 Jun 2025 20:21:34 +0100 Subject: [PATCH 1/4] Added extra gun sfx into the code, no clue how to use it in game but I'm balling --- __init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__init__.py b/__init__.py index 7dfb883..e1f42d6 100644 --- a/__init__.py +++ b/__init__.py @@ -23,6 +23,8 @@ class Game: 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") self.gun = pygame.image.load_animation("gun.webp") self.gunFlash = pygame.image.load("images/muzzleflash.png") From 81e0f7b1f85b377da4f39183458bb70fb46586c6 Mon Sep 17 00:00:00 2001 From: Brosef Date: Mon, 16 Jun 2025 20:25:27 +0100 Subject: [PATCH 2/4] My bad, team. I actually failed English --- __init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__init__.py b/__init__.py index 7dfb883..61319fc 100644 --- a/__init__.py +++ b/__init__.py @@ -28,7 +28,7 @@ class Game: self.gunFlash = pygame.image.load("images/muzzleflash.png") self.shockScale = 0 #controls shock level sent to PDO (on a scale of 0 to 1) - #gun varialbes + #gun variables self.startSpin = False self.spinning = False self.spinInc = 0 From 508ea87a7dab4fed4d29d84025feaeb61fdfa7cc Mon Sep 17 00:00:00 2001 From: Brosef Date: Mon, 16 Jun 2025 20:30:08 +0100 Subject: [PATCH 3/4] Added back Dylan's motivational comment that I accidentally removed --- __init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__init__.py b/__init__.py index fc092b2..33f8f4e 100644 --- a/__init__.py +++ b/__init__.py @@ -4,6 +4,8 @@ from random import randint #import NoPELib #import PDOLib +#Oh god here we go. I'm gonna screw up this entire thing + class Game: def __init__(self, surface, size): """ From cb59cbdcaebe0b340b5021f05edc4bd600a4f71a Mon Sep 17 00:00:00 2001 From: Brosef Date: Mon, 16 Jun 2025 20:30:30 +0100 Subject: [PATCH 4/4] Added back to TODOs I put in the main file that I then deleted. Nice job, me. --- __init__.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/__init__.py b/__init__.py index 33f8f4e..eef0d55 100644 --- a/__init__.py +++ b/__init__.py @@ -20,6 +20,17 @@ class Game: self.surface = surface self.size = size self.clock = pygame.time.Clock() + + # TODO: Add a random delay between the spin and fire + + # TODO: Utiles the following new sounds: + # gun-load: Should be played at the beginning of the game, + # and should have an animation accompanying it. + # see Brosef for the animation. + # gun-cylinder-stop: Plays directly after the load + # animation is complete. + # gun-spin/blank/shot are all used in their original ways. + #Sounds for the gun :3 self.playSound = pygame.mixer.Sound.play self.gunBlank = pygame.mixer.Sound("sfx/gun-blank.mp3")