From 7a55495eb892d02f71e72c1e5f567f45c808e9d8 Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Sat, 2 Jan 2021 20:40:58 -0700
Subject: [PATCH] Player walk animation

---
 .../rpg-tutorial/assets/images/player.png     | Bin 0 -> 1876 bytes
 projects/flixel/rpg-tutorial/source/Player.hx |   3 +-
 .../flixel/rpg-tutorial/source/Player.kiss    |  36 +++++++++++++++---
 3 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 projects/flixel/rpg-tutorial/assets/images/player.png

diff --git a/projects/flixel/rpg-tutorial/assets/images/player.png b/projects/flixel/rpg-tutorial/assets/images/player.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bb1e9addf6398724d022a0636c873bf0176e6e6
GIT binary patch
literal 1876
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

literal 0
HcmV?d00001

diff --git a/projects/flixel/rpg-tutorial/source/Player.hx b/projects/flixel/rpg-tutorial/source/Player.hx
index 6883d330..5ccb4120 100644
--- a/projects/flixel/rpg-tutorial/source/Player.hx
+++ b/projects/flixel/rpg-tutorial/source/Player.hx
@@ -5,7 +5,8 @@ import flixel.FlxSprite;
 import flixel.util.FlxColor;
 import flixel.input.keyboard.FlxKey;
 import flixel.math.FlxPoint;
+import flixel.FlxObject;
 import kiss.Prelude;
 
 @:build(kiss.Kiss.build("source/Player.kiss"))
-class Player extends FlxSprite {}
\ No newline at end of file
+class Player extends FlxSprite {}
diff --git a/projects/flixel/rpg-tutorial/source/Player.kiss b/projects/flixel/rpg-tutorial/source/Player.kiss
index 5ed17f40..ce4ece51 100644
--- a/projects/flixel/rpg-tutorial/source/Player.kiss
+++ b/projects/flixel/rpg-tutorial/source/Player.kiss
@@ -2,7 +2,12 @@
 
 (defmethod new [:Float x :Float y]
     (super x y)
-    (makeGraphic 16 16 FlxColor.BLUE)
+    (loadGraphic AssetPaths.player__png true 16 16)
+    (setFacingFlip FlxObject.LEFT false false)
+    (setFacingFlip FlxObject.RIGHT true false)
+    (animation.add "lr" [3 4 3 5] 6 false)
+    (animation.add "u" [6 7 6 8] 6 false)
+    (animation.add "d" [0 1 0 2] 6 false)
     (set drag.x (set drag.y 1600))
     (return))
 
@@ -22,20 +27,39 @@
                         (left
                             (set newAngle (- newAngle 45)))
                         (right
-                            (set newAngle (+ newAngle 45)))))
+                            (set newAngle (+ newAngle 45))))
+                    (set facing FlxObject.UP))
                 (down
                     (set newAngle 90)
                     (cond
                         (left
                             (set newAngle (+ newAngle 45)))
                         (right
-                            (set newAngle (- newAngle 45)))))
+                            (set newAngle (- newAngle 45))))
+                    (set facing FlxObject.DOWN))
                 (left
-                    (set newAngle 180))
+                    (set newAngle 180)
+                    (set facing FlxObject.LEFT))
                 (right
-                    (set newAngle 0)))
+                    (set newAngle 0)
+                    (set facing FlxObject.RIGHT)))
             (velocity.set SPEED 0)
-            (velocity.rotate (FlxPoint.weak 0 0) newAngle))))
+            (velocity.rotate (FlxPoint.weak 0 0) newAngle)))
+            // TODO != is not implemented. Not sure how it would work as a variadic, because other
+            // Lisps don't have that either
+            (when !(and (= 0 velocity.x) (= 0 velocity.y))
+                (case facing
+                    // TODO allow | in case?
+                    (FlxObject.LEFT
+                        (animation.play "lr"))
+                    (FlxObject.RIGHT
+                        (animation.play "lr"))
+                    (FlxObject.UP
+                        (animation.play "u"))
+                    (FlxObject.DOWN
+                        (animation.play "d"))
+                    (otherwise
+                        (return)))))
 
 (defmethod &override update [:Float elapsed]
     (updateMovement)