PainJam/RussianRoulette
Archived
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved away from deprecated gameUtils.RoundTable()

Browse Source
This commit is contained in:
Brosef
2025-06-25 08:01:50 +01:00
parent ccf08724ab
commit 5a62ca10d0
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
game.py
View File

@ -26,7 +26,9 @@ class Game(gameUtils.Game):
# and should have an animation accompanying it. # and should have an animation accompanying it.
# see Brosef for the animation. # see Brosef for the animation.
self.turnHandler = gameUtils.RoundTable(1, self.pm) # TODO: Add a hook to see if the current player has become inactive.
playerName = random.choice(list(self.pm.keys()))
self.currentlyPlaying = self.pm[playerName]
#Sounds for the gun :3 #Sounds for the gun :3
self.playSound = pygame.mixer.Sound.play self.playSound = pygame.mixer.Sound.play
@ -78,12 +80,20 @@ class Game(gameUtils.Game):
self.playMusic(-1) self.playMusic(-1)
pygame.mixer.music.set_volume(0.5) 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 def fire(self):#LETS GO GAMBLING
if random.randint(1,6) == 6: if random.randint(1,6) == 6:
self.playSound(self.gunShot) self.playSound(self.gunShot)
self.turnHandler.playing[0].punish(self.shockScale) self.currentlyPlaying.punish(self.shockScale)
print(f'{self.turnHandler.playing[0].name} is fucking dead.') print(f'{self.currentlyPlaying.name} is fucking dead.')
return 0.04 return 0.04
#remember to add shock #remember to add shock
else: else:
@ -118,8 +128,7 @@ class Game(gameUtils.Game):
elif event.type == gameUtils.Timeout and event.timeoutID == 'FireDelay': elif event.type == gameUtils.Timeout and event.timeoutID == 'FireDelay':
self.shockScale += self.fire() #check if the user gets shot self.shockScale += self.fire() #check if the user gets shot
self.shockScale = min(self.shockScale, 1) #keeps shockScale in bounds self.shockScale = min(self.shockScale, 1) #keeps shockScale in bounds
self.turnHandler.next() self.nextPlayer()
self.popup('Next player', f'Pass shocker to {self.turnHandler.playing[0].name},\nthen press R-CTRL+ENTER to continue.')
def update(self): def update(self):
""" """