From c2acdd9fadde7295757760953317d7a06e57b223 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Sat, 13 Mar 2021 16:59:36 +0100
Subject: [PATCH] added climbing and jumping animations

---
 .../Content/Textures/Player.aseprite          | Bin 997 -> 1194 bytes
 .../Content/Textures/Player.png               | Bin 487 -> 772 bytes
 GreatSpringGameJam/Player.cs                  |  41 ++++++++++++------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/GreatSpringGameJam/Content/Textures/Player.aseprite b/GreatSpringGameJam/Content/Textures/Player.aseprite
index b7895e6c348c17765fe7cc88ec7b7d48d345d06e..2f171800dfca86806150db6cb87865a32473fddf 100644
GIT binary patch
delta 485
zcmaFLzKWB36$=BygQYAC0t^Ndxl0)jPHg-ke}aL5fmMNlfrWvQ;Xf0Q0|p!n`V19w
zk`o*zUuV*+7uM!qH1TT8>F}TYhi*KXy?xfd@HrX0#}o=n_8M5GnErTj@$m60MHlN+
zdVJ-iXGi?>*#GDMjT;IJbf5l}Z@GB$3ftnB&1Nr|V|nKG%iT9HjEH&Ml^=AOQTMU9
z*u5Kv=1s8KB~|n3#uEpI`EfJqBK9P8?>{)_zaxX?x`{U#4)Awsai0Y`>eoj`h7=&p
z2*i7V802VHAdPS|JA?k@0_ME<*>^M~_BGu4$v@5f!e>r9%aY2Nq8E=88oc>^<aO>Z
zd~WFVS>8&TWx{8EJIk0#fmm4vz6OR1$AD%b+p!I92U@^PzQ~jx-rp4Hz_lRtU;9(n
zoS)Ose6Z8t$|rjch3A!D{_rzc>}3Ca4b5zjU64RWc0VW3{klvgmO!%&E;PhF<=6TD
zSWCYnuz6kI1gV%$3JxcDW>{|6)H&@bzYnjOnV#v6Q-V*7IHpV0qzW)JrE#_Z0G33n
A3IG5A

delta 205
zcmZ3*`IMdeDKi7ZgQYAC0t^BZxl0*aCN}<H?4B&oEXvHzz&|;QDbi`fM$VJ2zn=a-
ze(c(`PyhH2y~q(@V7RruZTS)g28LfB85vT5G$RmC0b*7K1_l-&{htX)fB`4an7_;=
z63NUAu~8GE=K}?iHT47S5@+O}Y|fl-aF~H%?))Cxd1y-dfP9d-tUwxJF2s3x?2$YS
J2LIca0{~4fG=u;E

diff --git a/GreatSpringGameJam/Content/Textures/Player.png b/GreatSpringGameJam/Content/Textures/Player.png
index 69161d14f79a8083cf5b39fa7a80b4aee1eeaf6c..fe9360b0fd3c107e39f315501695db3f60f5143b 100644
GIT binary patch
delta 761
zcmV<V0tWr(1B3>U7k@Aa1^@s6p-X%p00001b5ch_0Itp)=>Px%zDYzuRA_<inz3tB
zK^(`wPb7m&Iz$RV1WV~)oC<FU?k*3cli-pm;LxE%`yXTzJ2-R|S`gxvB}*5l5+Uj!
zbqRrDTbw#1i%6E|pjR%h_j|p&-@AJ~o6nLL$nQS)`@JK{{eRv84mm$uPtOn6Q<n~|
zKe}!J0C@21YwqXrVg;NrT>8m@ISEiz=ZxXXe@Ax!lcn5k&v3S1!D=$b*?tAx_6)yY
z-_s5E>Q@$ko50TLaRdM#Up&^1@!@~-@X3`TDht3(fI>9^6Tfb}ir#2~jkTpKV<-zi
zVKRZ{`%h7|c7K6t?ZQMsLM6cUlLg==(CNo%va*b1Wf{QV1jL=yp-BJUc9on1IiXHJ
zPT!3y0D#TiDF7HH@aXN+xjVJFJ2i@z{Wf#R`cJlwlyT$=kmaI+988kW`bE6y7&_e5
z{h+D5)_pbi{sc!R;cRsMWC4muU^r++ar40Ho15bo&VS*c70K^a<o*f_2dzj9V#CYl
zTdaKm*PoqBqn_x`N3NRfT@+%QIF6rkstQ1^fYtk7l-DLS>Ph<T^VllZ)}QD6{<E*Q
zni}=wa=FOYz9`$jV8K7i?&$cyNkb$glt~rQ(Fp}74Uv%W+7P*kIBST6g0qH5D3H6s
zPCrf)(SH!Z)VQM)3f>wbHx=#gfdBFC1CARa!4fwQ((Hbm(-Q~|RYSqJqY^54`|n#(
zfFdb-H@P?;py9vu=L3{KgVghR-AQ!YGi<Cap*NZUz}&SCKK;r9a1-F-({HpJ)Me-N
zI1-Pu%fQ4>_5+GaK-@i(ztTSa*RBAY1mrj_u5$fk0k{eDMicC9S1(^p@#QBAz)e8J
z*lwkL`N`cNHv#T$(wE=)`2fJ~>9Q}sv-1JJetfVAE6lGu7bpJ%ve-Ue_u+JQK0tmJ
rZ*xX~>zAF{=K^Hpy?+^f0AKz;UcWv%$$n&U00000NkvXXu0mjfxD0t)

delta 474
zcmV<00VV!~2Im8i7k>~41^@s6rssJn00001b5ch_0Itp)=>Px$p-DtRR9J<*m9a|#
zaTLeD7jZ+24Tc~QB+`&g!VS{iav)8Ci<8jc;86d8TjbEt8W;qQEiNuiVqi5yEg=Xg
zO%Az*%dbHWPWipN-}8C*o$gNG_w(NO{on^gsBtH+#+|&1l7AuPTVVzOuzT_r_`jf9
zPZEzP`J}OA04jBfM^yX`Qv=RXZdGO&HEm?w0Y*(5t;!64S6im#vGTP6NC&w5{;&Yx
z>FjXf`}N+D(GXGbb<zgFF)-ER*Dp>Fwv9rN21rR)uML1>K&kNXY$cKtB$5*jf)pn}
z4xbD_IzYYcD1SGTf}2U<_96jbK7_a3Fs+jx#3q}mw;gpiumJ$o#uNaIn+JgXo8yH|
z4QpN2Rp#ff(!(;p+L&r<$rIp*dmD^Xem*cCoU?#sQMH>=14_x(`NI1UT~4`JrhGC0
z$pB8_UI9SASGN4`9IYe3ey?nWu>)^`ey?nKLr7IB)>Bk2?XrT9@=L|q>er?}Iqn82
zFed;B-=r5$<O#^`ylS7rluNtn{biv2?enK?yv<elroDs~dfW0p$E7&=|K@KG^$nb~
Qq5uE@07*qoM6N<$f*bPQod5s;

diff --git a/GreatSpringGameJam/Player.cs b/GreatSpringGameJam/Player.cs
index 56fd4eb..f45eee5 100644
--- a/GreatSpringGameJam/Player.cs
+++ b/GreatSpringGameJam/Player.cs
@@ -18,7 +18,7 @@ using RectangleF = MLEM.Misc.RectangleF;
 namespace GreatSpringGameJam {
     public class Player : Entity {
 
-        private static readonly UniformTextureAtlas PlayerTexture = new(MlemGame.LoadContent<Texture2D>("Textures/Player"), 4, 1);
+        private static readonly UniformTextureAtlas PlayerTexture = new(MlemGame.LoadContent<Texture2D>("Textures/Player"), 4, 3);
 
         public RectangleF Bounds => new(this.Position + new Vector2(4 / 16F, 0), new Vector2(9 / 16F, 1));
 
@@ -35,8 +35,14 @@ namespace GreatSpringGameJam {
 
         public Player(Map map, Vector2 position) : base(map, position) {
             this.animations = new SpriteAnimationGroup();
-            this.animations.Add(new SpriteAnimation(0.15F, PlayerTexture[1], PlayerTexture[2], PlayerTexture[3], PlayerTexture[0]), () => this.walking);
+            // walking animations
             this.animations.Add(new SpriteAnimation(1, PlayerTexture[0]), () => !this.walking);
+            this.animations.Add(new SpriteAnimation(0.15F, PlayerTexture[1], PlayerTexture[2], PlayerTexture[3], PlayerTexture[0]), () => this.walking);
+            // jumping animation
+            this.animations.Add(new SpriteAnimation(1, PlayerTexture[0, 1]), () => this.jumpTime > TimeSpan.Zero || !this.onGround, 1);
+            // climbing animations
+            this.animations.Add(new SpriteAnimation(1, PlayerTexture[0, 2]), () => this.climbingVine && !this.walking, 2);
+            this.animations.Add(new SpriteAnimation(0.18F, PlayerTexture[1, 2], PlayerTexture[2, 2], PlayerTexture[3, 2], PlayerTexture[0, 2]), () => this.climbingVine && this.walking, 2);
             this.facingRight = true;
         }
 
@@ -140,22 +146,29 @@ namespace GreatSpringGameJam {
         public override void Draw(GameTime time, SpriteBatch batch) {
             if (this.invisible)
                 return;
+            var pos = this.Position * this.Map.TileSize;
+
+            void DrawHeldItem() {
+                var tex = this.heldItem switch {
+                    HeldItem.SnowBlower => StuffTexture[0, 0],
+                    HeldItem.WateringCan => StuffTexture[2, 0],
+                    _ => null
+                };
+                var origin = new Vector2(tex.Width * 0.25F, tex.Height / 2);
+                var rot = this.GetHeldRotation();
+                var flip = rot >= MathHelper.PiOver2 && rot <= MathHelper.Pi * 1.5F ? SpriteEffects.FlipVertically : SpriteEffects.None;
+                batch.Draw(tex, pos + this.Map.TileSize / 2, Color.White, rot, origin, 1, flip, 0);
+            }
+            
+            if(this.climbingVine)
+                DrawHeldItem();
 
             // draw self
-            var pos = this.Position * this.Map.TileSize;
             var effects = this.facingRight ? SpriteEffects.FlipHorizontally : SpriteEffects.None;
             batch.Draw(this.animations.CurrentRegion, pos, Color.White, 0, Vector2.Zero, 1, effects, 0);
-
-            // draw held item
-            var tex = this.heldItem switch {
-                HeldItem.SnowBlower => StuffTexture[0, 0],
-                HeldItem.WateringCan => StuffTexture[2, 0],
-                _ => null
-            };
-            var origin = new Vector2(tex.Width * 0.25F, tex.Height / 2);
-            var rot = this.GetHeldRotation();
-            var flip = rot >= MathHelper.PiOver2 && rot <= MathHelper.Pi * 1.5F ? SpriteEffects.FlipVertically : SpriteEffects.None;
-            batch.Draw(tex, pos + this.Map.TileSize / 2, Color.White, rot, origin, 1, flip, 0);
+            
+            if(!this.climbingVine)
+                DrawHeldItem();
         }
 
         private float GetHeldRotation() {