diff --git a/game.py b/game.py index 80a0486..8042856 100644 --- a/game.py +++ b/game.py @@ -84,14 +84,10 @@ class Game(gameUtils.Game): self.playSound(self.gunShot) self.turnHandler.playing[0].punish(self.shockScale) print(f'{self.turnHandler.playing[0].name} is fucking dead.') - self.turnHandler.next() - print(f'{self.turnHandler.playing[0].name} is up') return 0.04 #remember to add shock else: self.playSound(self.gunBlank) - self.turnHandler.next() - print(f'{self.turnHandler.playing[0].name} is up') return 0 def onEvent(self, event): @@ -122,6 +118,8 @@ class Game(gameUtils.Game): 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 + self.turnHandler.next() + self.popup('Next player', f'Pass shocker to {self.turnHandler.playing[0].name},\nthen press R-CTRL+ENTER to continue.') def update(self): """