Added name in corner

Muzzle flash will be done in animation,
BG music was done in commit a6a64cdf69

__main__.py

@@ -1,58 +0,0 @@
-# Import the game code
-import __init__
-
-import argparse
-import tomllib
-import pathlib
-import pygame
-import os
-
-# Store the current working directory
-# This is used to revert the cd change
-originalCWD = os.getcwd()
-
-# Get the path of the game
-basePath = pathlib.Path(__file__).parent.resolve()
-
-# Set the current working directory
-# to the base path of the game
-os.chdir(basePath)
-
-# Load the game.toml data
-with open('game.toml', 'r') as f:
-    gameData = tomllib.loads(f.read())
-
-# Parse command line arguments
-parser = argparse.ArgumentParser(prog=gameData['name'])
-parser.add_argument('-sw', '--width', type=int, default=1280)
-parser.add_argument('-sh', '--height', type=int, default=720)
-parser.add_argument('-f', '--fullscreen', action='store_true')
-args = parser.parse_args()
-
-# Initialise screen
-flags = 0
-if args.fullscreen: flags |= pygame.FULLSCREEN
-screen = pygame.display.set_mode((args.width, args.height), flags)
-pygame.display.set_caption(gameData['name'])
-
-# Initialise game
-game = __init__.Game(screen, screen.size)
-
-# Set to False when the game should exit
-run = True
-
-while run:
-    # Event loop
-    for event in pygame.event.get():
-        if event.type == pygame.QUIT:
-            run = False
-        
-        game.onEvent(event)
-    
-    # Draw loop
-    game.draw()
-
-# Clean up
-os.chdir(originalCWD)
-game.close()
-pygame.quit()

game.py

@@ -1,10 +1,17 @@
 import logging
 import pygame
-from random import randint
+import random
 import gameUtils
+import NoPELib
 
 #Oh god here we go. I'm gonna screw up this entire thing
 
+def transform(value, minA, maxA, minB, maxB):
+    """
+    Translates `value` from `minA`-`maxA` to `minB`-`maxB`.
+    """
+    return ((value - minA) / (maxA - minA)) * (maxB - minB) + minB
+
 class Game(gameUtils.Game):
     def __init__(self, *args, **kwargs):
         """
@@ -18,56 +25,96 @@ class Game(gameUtils.Game):
         
         # Don't remove this. It does important things. :3
         super().__init__(*args, **kwargs)
+        self.em = NoPELib.ExpansionsManager(self.pm, includeExpansions=['ShockColar1'])
 
-        self.clock = pygame.time.Clock()
+        # TODO: Utilise the following new sounds:
-
-        # 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.
+        # TODO: Add a hook to see if the current player has become inactive.
-        # gun-spin/blank/shot are all used in their original ways.
+        playerName = random.choice(list(self.pm.keys()))
+        self.currentlyPlaying = self.pm[playerName]
 
         #Sounds for the gun :3
         self.playSound = pygame.mixer.Sound.play
-        self.gunBlank = pygame.mixer.Sound("sfx/gun-blank.mp3")
+        self.gunBlank = pygame.mixer.Sound("./assets/gun-blank.mp3")
-        self.gunShot = pygame.mixer.Sound("sfx/gun-shot.mp3")
+        self.gunShot = pygame.mixer.Sound("./assets/gun-shot.mp3")
-        self.gunSpin = pygame.mixer.Sound("sfx/gun-spin.mp3")
+        self.gunSpin = pygame.mixer.Sound("./assets/gun-spin.mp3")
-        self.gunLoad = pygame.mixer.Sound("sfx/gun-load.mp3")
+        self.gunLoad = pygame.mixer.Sound("./assets/gun-load.mp3")
-        self.gunCyclinder = pygame.mixer.Sound("sfx/gun-cylinder-stop.mp3")
+        self.gunCyclinderStop = pygame.mixer.Sound("./assets/gun-cylinder-stop.mp3")
 
-        self.gun = pygame.image.load_animation("gun.webp")
+        #Background Music commands
-        self.gunFlash = pygame.image.load("images/muzzleflash.png")
+        self.unloadMusic = pygame.mixer.music.unload
+        self.stopMusic = pygame.mixer.music.stop
+        self.playMusic = pygame.mixer.music.play
+
+        #self.gun = pygame.load_animation('./assets/gun-spin.webp')
+        self.gunFlash = pygame.image.load("./assets/muzzleflash.png")
+
+        self.gun = self.createAnimObj('gun', './assets/gun-base.png')
+        self.gun.addAnimation(gameUtils.AnimationHandler('spin', './assets/gun-spin.webp', 60))
+        self.gun.addAnimation(gameUtils.AnimationHandler('blank', './assets/gun-blank.webp', 60))
+        self.gun.addAnimation(gameUtils.AnimationHandler('fire', './assets/gun-fire.webp', 60))
 
         self.shockScale = 0 #controls shock level sent to PDO (on a scale of 0 to 1)
-        #gun variables
-        self.startSpin = False
-        self.spinInc = 0
     
         #render variables
-        self.gunw=self.gun[0][0].size[0]    #calculates width of gun anim
+        self.gunw=self.gun.size[0]    #calculates width of gun anim
-        self.gunh=self.gun[0][0].size[1]    #calculates height of gun anim
+        self.gunh=self.gun.size[1]    #calculates height of gun anim
                                             #NOTE: Brosef, istg you better not make the gun webm
                                             #       change sizes mid file, or so help me
+                                            #
+                                            #      :3
+                                            #         - Brosef
 
         self.screenMidx = self.size[0]/2    #calculates horizontal midpoint of screen
         self.screenMidy = self.size[1]/2    #calculates verticle midpoint of screen
 
         self.gunScale = min(self.size[1]/self.gunh,self.size[0]/self.gunw)  #calculates how to scale the gun so that it stays on the screen
 
-        self.gunMidx = self.screenMidx-(self.gunw*self.gunScale/2)          #gun midpoint on the x axis
+        self.font = pygame.font.SysFont('', 64)
-        self.gunMidy = self.screenMidy-(self.gunh*self.gunScale/2)          #gun midpoint on the y axis
+        
+        #Selects random music to play at the start of the game, might change because I just threw this together.
+        #I feel horrible writing this code this feels super unoptimised :c
+        # Bro I'm gonna be honest, there's not much I'd change about that, you're good.
+        # The only thing I can think if just moving `set_volume()` to after both if statements.
+        self.musicNumber = random.randint(1,2)
+        if self.musicNumber == 1:
+            pygame.mixer.music.load("./assets/surrounded.ogg")
+            self.playMusic(-1)
+            pygame.mixer.music.set_volume(0.5)
+        if self.musicNumber == 2:
+            pygame.mixer.music.load("./assets/twiceoritsluck.ogg")
+            self.playMusic(-1)
+            pygame.mixer.music.set_volume(0.5)
+
+    def nextPlayer(self):
+        playerIndex = list(self.pm.keys()).index(self.currentlyPlaying.name)
+        playerIndex += 1
+        if playerIndex >= len(self.pm):
+            playerIndex = 0
+        playerName = list(self.pm.keys())[playerIndex]
+        self.currentlyPlaying = self.pm[playerName]
+        self.popup('Next player', f'Pass shocker to {self.currentlyPlaying.name},\nthen press R-CTRL+ENTER to continue.')
 
     def fire(self):#LETS GO GAMBLING
-        if randint(1,6) == 6:
+        if random.randint(1,6) == 6:
             self.playSound(self.gunShot)
+            self.gun.playAnim('fire')
+            expansionIDs = self.em.lookupPlayer(self.currentlyPlaying.name)
+            shocker = self.em[expansionIDs[0]]
+            iMin, iMax = self.currentlyPlaying.expansions['ShockCollar1']['shcokRange']
+            v = round(transform(self.shockScale, 0, 1, iMin, iMax))
+
+            print(f'Shocking {self.currentlyPlaying.name} with intensity {v}')
+            shocker.step((False, 0.5, v))
+            print(f'{self.currentlyPlaying.name} is fucking dead.')
             return 0.04
             #remember to add shock
         else:
             self.playSound(self.gunBlank)
+            self.gun.playAnim('blank')
             return 0
 
     def onEvent(self, event):
@@ -85,42 +132,32 @@ class Game(gameUtils.Game):
                 self.playSound(self.gunShot)
             elif event.key == pygame.K_3:
                 self.playSound(self.gunSpin)
-            elif event.key == pygame.K_SPACE:
+            elif event.key == pygame.K_SPACE and not self.awaitingTimeout("FireDelay"):
-                self.startSpin = True
+                self.gun.playAnim('spin')
+        elif event.type == gameUtils.AnimStart:
+            if event.objectID == self.gun.objectID and event.animationID == 'spin':
+                self.playSound(self.gunSpin)
+        elif event.type == gameUtils.AnimFinish:
+            if event.objectID == self.gun.objectID and event.animationID == 'spin':
+                self.timeout("FireDelay",random.randint(750,2000)/1000)
+                self.playSound(self.gunCyclinderStop)
+            elif event.objectID == self.gun.objectID and event.animationID in ['blank', 'fire']:
+                self.nextPlayer()
+                
+        elif event.type == gameUtils.Timeout and event.timeoutID == 'FireDelay':
+            self.shockScale += self.fire()            #check if the user gets shot
+            self.shockScale = min(self.shockScale, 1) #keeps shockScale in bounds
     
     def update(self):
         """
         Ran once per frame, put your drawing code and any
         game logic that should be ran once per frame in here.
         """
-        
-        #gun code WOO
-        if self.startSpin == True:#check if space was pressed or if the gun is already spinning
-            if self.spinInc == 0:
-                self.playSound(self.gunSpin)
-            self.spinInc += 1                             #next gun frame
-            if self.spinInc == len(self.gun):             #if we've reached the end
-                self.spinInc = 0                          #reset frame count    
-                self.startSpin = False                    #what did i say bitch? stop spinning
-                self.shockScale += self.fire()            #check if the user gets shot
-                self.shockScale = min(self.shockScale, 1) #keeps shockScale in bounds
 
         #screen code
         self.surf.fill("black")
-        self.surf.blit(pygame.transform.scale_by(self.gun[self.spinInc][0],self.gunScale),(self.gunMidx,self.gunMidy))#draw the gun
+        self.surf.blit(gameUtils.centre(pygame.transform.scale_by(self.gun.getFrame(), self.gunScale), self.size))
-        #screen.blit(pygame.transform.scale_by(MainSurface,1),(0,yOffset))#renders the main surface to the screen, while also scaling it for the required display resolution
+        self.surf.blit(self.font.render(f'Current player: {self.currentlyPlaying.name}', True, (255, 255, 255)), (0, 0))
-
-        # TODO:
-        # I've removed the whole "main surface" thing for now,
-        # because I'm not sure how we're going to deal with it
-        # from now on right now. I'll fix this later when it's
-        # a bit clearer on how NoPE-Lib will draw the players
-        # and how the base game should draw that.
-        #   - Brosef
-
-        pygame.display.flip()
-
-        self.clock.tick(60)
 
     def close(self):
         """