diff --git a/__init__.py b/__init__.py index e9701f5..0b5854e 100644 --- a/__init__.py +++ b/__init__.py @@ -45,7 +45,6 @@ class Game: self.shockScale = 0 #controls shock level sent to PDO (on a scale of 0 to 1) #gun variables self.startSpin = False - self.spinning = False self.spinInc = 0 #render variables @@ -88,14 +87,12 @@ class Game: """ #gun code WOO - if self.startSpin == True or self.spinning == True:#check if space was pressed or if the gun is already spinning - self.spinning = True #keep the gun spinning + 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.spinning = False #stop spinning + 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 @@ -113,9 +110,6 @@ class Game: # and how the base game should draw that. # - Brosef - # TODO: - # Actually scale the gun with self.size, and centre it - pygame.display.flip() self.clock.tick(60)