From: lbcmk <30442978+lbcmk@users.noreply.github.com>
Date: Thu, 7 Jul 2022 22:02:43 +0000 (-0400)
Subject: Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
X-Git-Url: http://git.skullheadx.com/pfp.webp?a=commitdiff_plain;h=aaf705b3b3c12c054c18210f2bd7e75b5c24513f;p=Pygame-Jam.git

Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
---

aaf705b3b3c12c054c18210f2bd7e75b5c24513f
diff --cc Player.py
index fc1ae91,b93c991..d0fe9c2
--- a/Player.py
+++ b/Player.py
@@@ -43,34 -34,12 +43,37 @@@ class Player(Actor)
              self.jump()
          if pressed[pg.K_a] or pressed[pg.K_LEFT]:
              self.move_left()
 +            if(self.lastValueL == False):
 +                timeSincePressed = datetime.utcnow() - self.lastPressedLeft
 +                timeSinceLastDash = datetime.utcnow() - self.lastDash
 +
 +                if(timeSincePressed < timedelta(seconds=0, microseconds=500000) and self.dashPossible == True):
 +                    self.move_left(self.dashSpeed) # change this to change how the player dashes (maybe replace with a custom dash function)
 +                    self.dashPossible = False
 +                    self.lastDash = datetime.utcnow()
 +                if(timeSinceLastDash >= self.dashCooldown):
 +                    self.dashPossible = True
 +                self.lastPressedLeft = datetime.utcnow()            
 +            
          if pressed[pg.K_d] or pressed[pg.K_RIGHT]:
              self.move_right()
 +            if(self.lastValueR == False):
 +                timeSincePressed = datetime.utcnow() - self.lastPressedRight
 +                timeSinceLastDash = datetime.utcnow() - self.lastDash
 +                if(timeSincePressed.seconds == 0 and timeSincePressed.microseconds < 500000 and self.dashPossible == True):
 +                    self.move_right(self.dashSpeed) # change this to change how the player dashes (maybe replace with a custom dash function)
 +                    self.dashPossible = False
 +                    self.lastDash = datetime.utcnow()
 +                if(timeSinceLastDash >= self.dashCooldown):
 +                    self.dashPossible = True
 +                self.lastPressedRight = datetime.utcnow()        
 +        
 +        self.lastValueL = pressed[pg.K_a] or pressed[pg.K_LEFT]
 +        self.lastValueR = pressed[pg.K_d] or pressed[pg.K_RIGHT]
  
+     def attack(self, enemy, weapon):
+         self.modify_health(-10,"enemy")
+ 
      def draw(self, surf):
          super().draw(surf)
          # print(self.position, self.velocity, get_display_rect(self.get_collision_rect()).topleft, Setup.camera_offset)