From d5ce797d1eb388bf8e35d20a1b77a86cbc6d8410 Mon Sep 17 00:00:00 2001
From: Skullheadx <94652084+Skullheadx@users.noreply.github.com>
Date: Sat, 9 Jul 2022 23:02:56 -0400
Subject: [PATCH] sword animation

---
 Assets/player/Sword_Slash.gif | Bin 0 -> 8503 bytes
 Player.py                     |  56 +++++++++++++++++++++++++++++-----
 Setup.py                      |  12 ++++++++
 3 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 Assets/player/Sword_Slash.gif

diff --git a/Assets/player/Sword_Slash.gif b/Assets/player/Sword_Slash.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8f9cb6ef10faf12eee0c5577132b4150a680525d
GIT binary patch
literal 8503
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

literal 0
HcmV?d00001

diff --git a/Player.py b/Player.py
index 611c387..7da1794 100644
--- a/Player.py
+++ b/Player.py
@@ -11,6 +11,7 @@ from Weapon import Melee
 from CommonImports.colours import red, white
 from Function.createText import createText
 
+
 class Player(Actor):
     scale = 100
     factor = 640 / scale
@@ -18,6 +19,12 @@ class Player(Actor):
     idle_frames = [
         pg.transform.scale(pg.image.load(path.join("Assets/player/idle", file)).subsurface(pg.Rect(179, 169, 170, 401)),
                            (50, 100)) for file in listdir("Assets/player/idle")]
+
+    attack_gif = Image.open("Assets/player/Sword_Slash.gif")
+    attack_frames = []
+    for i in range(attack_gif.n_frames):
+        attack_frames.append(pg.transform.scale(pil_to_game(get_gif_frame(attack_gif, i)), (200,200)))
+
     width, height = idle_frames[0].get_size()
 
     colour = (52, 94, 235)
@@ -54,7 +61,14 @@ class Player(Actor):
         self.state = "IDLE"
         self.current_frame = 0
         self.display = self.idle_frames[0]
-        self.display_offsets = {"weapon": pg.Vector2(0, 0)}
+        self.display_offsets = {"weapon": pg.Vector2(0, 0), "player":pg.Vector2(0,0)}
+
+    # def attack(self, enemy, weapon):
+    #     super(Player, self).attack(enemy, weapon)
+    #     self.current_frame = 0
+    #     self.state = "ATTACK"
+    #     print('a')
+
 
     def update(self, delta):
         super().update(delta)
@@ -72,13 +86,16 @@ class Player(Actor):
         self.position, self.velocity = self.move_and_collide(self.position.copy(), self.velocity.copy(), delta)
 
         prev_direction = self.direction
-        if self.velocity.x == 0:
-            self.direction = 0
-        else:
-            self.direction = math.copysign(1, self.velocity.x)
+        # if self.velocity.x == 0:
+        #     self.direction = 0
+        # else:
+        #     self.direction = math.copysign(1, self.velocity.x)
+        self.direction = math.copysign(1, pg.mouse.get_pos()[0] - get_display_point(self.position).x)
         self.weapon.update(delta, self.position, self.direction)
 
         if self.state == "IDLE":
+            self.display_offsets["player"] = pg.Vector2(0,0)
+
             frame = math.floor(self.current_frame)
             if self.direction == 1:
                 self.display = self.idle_frames[math.floor(frame)]
@@ -99,7 +116,29 @@ class Player(Actor):
             else:
                 self.display_offsets["weapon"] = pg.Vector2(0, 0)
             self.current_frame = (self.current_frame + 0.1) % len(self.idle_frames)
+        elif self.state == "ATTACK":
+            frame = math.floor(self.current_frame)
+            if self.direction == 1:
+                self.display = self.attack_frames[math.floor(frame)]
+                self.display_offsets["player"] = pg.Vector2(-50,-50)
 
+            elif self.direction == -1:
+                self.display = pg.transform.flip(self.attack_frames[math.floor(frame)], True, False)
+                self.display_offsets["player"] = pg.Vector2(-100,-50)
+
+            else:
+                self.direction = prev_direction
+                if prev_direction == 1:
+                    self.display_offsets["player"] = pg.Vector2(-50,-50)
+
+                    self.display = self.attack_frames[math.floor(frame)]
+                elif prev_direction == -1:
+                    self.display = pg.transform.flip(self.attack_frames[math.floor(frame)], True, False)
+                    self.display_offsets["player"] = pg.Vector2(-100,-50)
+
+            self.current_frame += 0.4
+            if math.floor(self.current_frame) == self.attack_gif.n_frames:
+                self.state = "IDLE"
         return self.position - center
 
     def handle_input(self):
@@ -145,14 +184,17 @@ class Player(Actor):
         if mouse_pressed[0]:  # LMB
             if not self.weapon.attacking:
                 self.weapon.swing()
+                self.state = "ATTACK"
+                self.current_frame = 0
                 for mask in self.targets:
                     for enemy in mask:
                         if self.weapon.get_collision_rect().colliderect(enemy.get_collision_rect()):
                             enemy.attack(self, self.weapon)
 
+
     def draw(self, surf):
-        self.weapon.draw(surf, self.display_offsets["weapon"])
-        surf.blit(self.display, get_display_rect(self.get_collision_rect()))
+        # self.weapon.draw(surf, self.display_offsets["weapon"])
+        surf.blit(self.display, get_display_rect(self.get_collision_rect()).topleft + self.display_offsets["player"])
         # super().draw(surf)
         # print(self.position, self.velocity, get_display_rect(self.get_collision_rect()).topleft, Setup.camera_offset)
         # pg.draw.rect(surf, self.colour, get_display_rect(self.get_collision_rect()), border_radius=8)
diff --git a/Setup.py b/Setup.py
index b36e7e7..b9e8cb6 100644
--- a/Setup.py
+++ b/Setup.py
@@ -44,3 +44,15 @@ def get_display_point(vec):
     return vec - camera_offset
 
 from Area import Area
+
+from PIL import Image
+
+FORMAT = "RGBA"
+
+def pil_to_game(img):
+    data = img.tobytes("raw", FORMAT)
+    return pg.image.fromstring(data, img.size, FORMAT)
+
+def get_gif_frame(img, frame):
+    img.seek(frame)
+    return img.convert(FORMAT)
\ No newline at end of file
-- 
2.54.0