From 18d5c1492f061bbec9b73932d712cc5c4a4f2202 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Mon, 8 Mar 2021 16:04:51 +0100
Subject: [PATCH] jump pad

---
 GreatSpringGameJam/Content/Maps/Level1.tmx    |  26 +++++++++---------
 .../Content/Tilesets/World.aseprite           | Bin 1101 -> 1184 bytes
 GreatSpringGameJam/Content/Tilesets/World.png | Bin 1183 -> 1344 bytes
 GreatSpringGameJam/Content/Tilesets/World.tsx |  14 ++++++++++
 GreatSpringGameJam/Entity.cs                  |  25 +++++++++++++----
 GreatSpringGameJam/GreatSpringGameJam.csproj  |   6 ++--
 GreatSpringGameJam/Player.cs                  |  22 +++++++++++----
 GreatSpringGameJam/WaterDrop.cs               |   5 ++--
 8 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/GreatSpringGameJam/Content/Maps/Level1.tmx b/GreatSpringGameJam/Content/Maps/Level1.tmx
index 6100796..da7ecc2 100644
--- a/GreatSpringGameJam/Content/Maps/Level1.tmx
+++ b/GreatSpringGameJam/Content/Maps/Level1.tmx
@@ -25,14 +25,14 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,2,2,2,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,23,0,0,0,0,0,0,0,0,9,10,10,10,10,4,2,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,2,2,2,2,2,2,2,3,0,0,0,9,10,10,10,10,10,10,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-10,10,10,10,10,10,10,10,10,10,11,0,0,22,9,10,10,10,10,10,10,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-10,10,10,10,10,10,10,10,10,10,11,0,0,1,5,10,10,10,10,10,10,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-10,10,10,10,10,10,10,10,10,10,11,0,0,9,10,10,10,10,10,10,10,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-10,10,10,10,10,10,10,10,10,10,4,3,0,9,10,10,10,10,10,10,10,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,2,2,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,9,10,10,10,4,2,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,2,2,2,2,2,2,3,0,0,0,0,0,0,0,9,10,10,10,10,10,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+10,10,10,10,10,10,10,10,10,11,0,0,0,0,0,0,0,9,10,10,10,10,10,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+10,10,10,10,10,10,10,10,10,4,3,0,0,0,0,21,23,9,10,10,10,10,10,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+10,10,10,10,10,10,10,10,10,10,11,0,0,0,1,2,2,5,10,10,10,10,10,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+10,10,10,10,10,10,10,10,10,10,4,3,0,0,9,10,10,10,10,10,10,10,10,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <layer id="2" name="Snow" width="100" height="30">
@@ -59,10 +59,10 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,8,6,7,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,16,14,15,16,0,6,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-7,8,6,7,8,0,6,7,8,6,8,0,0,0,0,0,0,0,0,0,14,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-15,16,14,15,16,0,14,15,16,14,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,8,6,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,16,14,16,0,6,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,8,6,7,8,0,6,7,8,0,0,0,0,0,0,0,0,0,0,0,0,0,14,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+15,16,14,15,16,0,14,15,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -93,7 +93,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,23,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,23,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,22,0,0,0,22,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/GreatSpringGameJam/Content/Tilesets/World.aseprite b/GreatSpringGameJam/Content/Tilesets/World.aseprite
index 8cb7089968a5d5d0a9b8aeb291be8e2a776abd6a..9891552c002d885db53d7ce8321c5927e5db8d57 100644
GIT binary patch
delta 805
zcmV+=1KRw}2%rf8ppgN80w4sDg7*R^1Cx6J9e-{WF%X9LBuGe<R7jD6NXaee({h1y
zw4tD+%^lJpQBiOLkdP?TMdAt@Ibx*AF!r1E*gH1+f6{1Qc6a>z{KcE~`t4>}mgV`U
zH|tEX{N?BS7wgu@m045PGBLS!_;7pnB&^%^$S3#Q!SA;hPeSvQ)_;F@{!iH{tob~m
z-G6x~we@Hry>kc2ClBdJ?!(KKxt9DC(e6A*-<G!7x~^qD`A>D%eC-+0?mV3OY`Okm
zjb8a$-RXE-Dvuwxz4_7ZJmfx;{QTN_>$;Zt+<VQrSj&iZ=Rxx=+uqYQJ@Vn*kJn2?
zz`GxKKeqRp@vC)PtNfDpi26sn^FZF^d4H>A{OTD$*W{BA^1k=`Yh#L8v5sFx3GO|*
zF468h<j$8%?Vj7OcfLH%@BRKVKiZuK&HLy<-lOXg?al+d_wj!J<LgS1Tc6vfXFj~Q
z^R9XL{PE^7O51YVd*{#YeFUhD`ErYcsC@2yw(<K2$oAxY@suyk)n57JU5-yj9Dl!$
z=)L5m_87fKzIFUELX7DB^4qU97h2!r+sQ>l{w(A7QIGQ_q=(%0h<u#a9TRvzCh&et
z;Qg5JaU90)$AP@>G5+@E%lUUu&rIWY{yQ4oZnHDX_+4&~ZnxRNdEGIA_hSO@00000
z000000000000000EK7QRpY|H~pntaHOYOC`ueHqDx+Lg%qBZ4#Jk+lA>{I#NR{s2J
zxv#a%+PZkl17);!md`xT?Q1Qwwl3cC0001tPr8@&{OV8f-dFH{LC()!-@yHWAm<e6
z=jb{Co%Q;1<x4AfUtX<znLvM^1G<kdIZw;$XD>~j=sV)cx%{p;{=WAixqqR1GfPX0
zLn@2H>OJ=?7hJ3BL-LZ^IQ7p{k@mB?r`S>#elH-c<JS*sJ|EB_Kd1USIk&p3^`zzT
zYxJNkypQs0^R<1qrFTzxz>YR2Q<GnttGzFd_5JaB_spG^=6*3Z(+}-`lX}Y8lCSk?
joY(C`Y5si+p80p{deD~A{0{q;GFs-fKE^))eHeh_N{-L%

delta 721
zcmV;?0xtca3C#!rO_2eA0?h-Fg7*T{0+V|I9e+y2KoEv=5<#%E5(Gs{Z((oi1?+6K
zu(b6KHiDIfCr}V9?F6q7S#e+-cjIO!*_n0!4~FRG&Axs6nV5Nb$s2}Y*t|LzTZ-YE
z=hLlmZlwAw>1$}1)I6Nu?*53}bv5$IJ$LYWboe7;o<jTM@!qe#L*(Z3uy&_mYOcM7
z^ncDB1fM*lBl#HKuguNK4`J<2gY=y<H*?#T%qRb0>@i<8!`hvOzg}Bvd&rHo@?&GC
z{qa<Pe7~*Dw|1u?^_t}CkG1EvEt$`~mmG^N8P@JJ#C*%S*UZft`S7ks>%}7AT@SqX
z?Y*Ra&0V)t{*-r%@mssoK;GqXYfk;DsehkK^2rBzul@Y7nxa*5>lZJ<y<3mP+MR~f
z@$%HXryjR<zTD5(etwy6?M_3?yZ0dP*5j~trvcvA@&5jFKT@RHQ;%6QAKsVq9`kU0
zdGi%h>r(62&Trkj2WXD@a*hM5eD1xq`rQL^KKZuzm#>(sTKVK%)~6opcaPquoPU(=
zqif{n)-N8yqxX}CmoXKwZI7=f7Z&-g)bC#R^HWF<sr455IIimxc<&Q<?-O|M6JE!m
ze(wkJUZeij=F9W%pq!TKcm6kOJ#VekO8qX^ThCkT;JB_&;Jr`a9RL6T0000000000
z00000fME#t?~DBm{6T)^dWz-I{eMJD`U7<#SNz`Dn!M8fKz&LbrSjk$0090k;ab+c
zvyaJZU%~%^obT@6z<o!MbBgf0^_W1M@#19U%Us^>c1FGoV0&)^x{fb656g><?JQ69
z8S&s;epVd+-~AIj^XoWsy{GQwg7@m$A-JZPlgF<Gq&EJ&Ps@)KEKRAWSUMhmj~@7D
zN$;BeKs_}3<<$8X?CbrbId>}k@_uk`#y|YKP3PwDHXPTrh35QwZaeUY_w(<cbc(o8
D-A9-Y

diff --git a/GreatSpringGameJam/Content/Tilesets/World.png b/GreatSpringGameJam/Content/Tilesets/World.png
index 7c12efb06f06350723f74af88f277cd7dce13e16..2b607911c6fd4c22e6ed5e8a25531ab3a0bdd9ee 100644
GIT binary patch
delta 1272
zcmV<U1PA+{3BU@FF@O3=L_t(|obBCBNE~Mz$MN4*5egyZ;9?*pU>g#ML1>GuVe3gj
z!5o4|3qAB;4?TEjZ*5Lq?ZH!^2XDzS1lk2t^t4EAODRYdlud<_Kx8FE2^2(`9@b}l
z=52RoclKrU`++c<ndkrbIM08coi}GPIyJDEbCe>xb88t%+JBn65xd<}@An7J&;PR*
zyB)U|i<#I#9i&?d@BA-s9J&6#RP2egtQGMCi#f+6fzh*h)m8pz@RhI5p3SRzynn2f
znG^rApQ6RP6@6vWBqO;Kz`N2rjhzI$b8DI6_-B>2m->%gWwU$TzIeNgodn~LyL@G9
z#Y@uNN9*Yy0e>WS$J;9-Y$cibQRgKUKduw4%$!sb!P_CWYRkMor=IxpAR|e?em+w5
zdvs;yq~^+MNBrGK>lts`d;9h!NeBCVq4k+ELFMAcpNo9}oBhj4<rQI8e$a}GGB4?P
zyK}tltu;Stxv24JS4n_sE8<|k&$m3NeAv9C<IOxY?th&qg&N%&+8vK@krDvsmunv&
z>Tz^fnO4MC(~kD1{XBpx0er{NzF)R_nO4M0;holw_NSdI0lYg`QGVG*j>GGX?``wX
zKTkpr16y?*9XGz#4q>a?pLYIpou^uL9G&*~v<poDG_JI{S~*LZ9URL9&9~WQni+2+
z0TL3_DSuCvUrLguC$IUIn`LHsP#w*THwjU>7Lc|f?_j^LW3I%NHdmb|%P%!Oc}-^O
zWp_r9cEo1~$1=VVz&@->+j)R?u~)k31h24;Yj?bB1nAkk>N@m^ay{HG6Zd+2J@F<f
zI&B1qQ$A?;Zb$rA-+bX70geV=NgaM3pf{jgyMKN6`n}L)AOHTFZ{DAud|LTDtru16
zXm)(6&I5Gne#(!dw?apv*}}F{we0EgusWI@&raY4$JM|Kjs&>iNPr9OT-^_V_)>pA
z02-6}`vK6HRGkO##-eelzaIdN;V9sOBLM&a000000001hcAC!*J3*h5z|}yVtyFs&
z^nW?1Y}7jIZHrWXJZ{n*Z;${wTfye>vu0{my8V1&Z`r7I*4q}T{7mF}>qA7|C#DZ9
z<{a~{R@ta^*4vgw>jMC!+H7Il8TtOT<Na&jMzIr^0<(o}XX9B`C#yee<5|}CC*O_W
zAyFw{I$u&b33M;9x)}kQ#95ei>}galet-GMv8R$WG*MF5Sh>@?#_nloqLf%WdB8#w
znD-ccFnL?gm$&qE=Z(Jo_wSnP+Pnen^3-J=<_}#D!7yI~LldQ{Pb7(puYgkv*Y7y@
zZ(dQU|5(|*?$BwJ&V0J_M)z-C(evf4SZy#b#yHF$y5`U4hn)wbw=(7FABk?XjDG+s
zcYbd4l14rps#$jZuMMpg-quWlh3j`JLwJ;}->~0-WVZf+#hhba>h)lX1W26etla3O
zs#|}l|5$5<x00fD>U@6Ksi(t&;!F}GodA3V=&Umr3a4A`j`ZKdcO^+n#V&pQL%Gwn
z6K`uy((c?^MoqXNL;_gs&YjnAT~R}LCBDJV3VJiDsW-_{fWyEhv9H?IlMMEYJiV8O
zlf*ti0B?sa6?+u4HAbx`PP~b+xAJE01Tq2yNOCKSn>;~3+uRR;7OHkXK%6>~jN^Wj
iVFV|Wa0Ce#I@AACgQ>-7tBDW*0000<MNUMnLSTZ=ErHws

delta 1110
zcmV-c1gZPL3ZDs(F@IS}L_t(|obBB|XcJK!!13Q%$!M1b3yM%J2(5Hb{8Oq^3oW!$
z#|jP(b?l&<I=Q-Jb?By}2pXu;PNnz{7cqrOYC&3162x{ahI43Nc=s>4%iZPjlJ93p
z`|ka&*ZaM^yt{X~v*g%NVZs)J>@00qA|jhh!;!ap_WWtz@_*uw-;uXtq)@gZ2X&B>
zBEiYOJACN)eYu<qwX7ZSLxl-jH3B798g$e@9R1~4XRb6TFRK4!b)n{6_Bvd=Q`u9;
zB$kM?0l0U1r_me1&eDcep1N7z_R8shj=K5ZCq40c9la4uz3B7QZ5A&gGXDI7`8|M$
zGx7S)2--=iJb!FiQt?w#lhuV<y&<?0qHDCw{dZc4?*^8L$otzj8h(zhF4UUttSsWk
zpMS92+ulD=6%mpB>OkQ7R2{#1QRBN}44~8hIgz6sp?1FCjtf(kbiAG%_x3g`4_hy6
zyy@x<pwW)luMT*Y`_&IBOFCYaA-)q~D#d*_WF3!Sp??|xx|d@N5cW7as7^cL8_8n(
zO+OFdXaJt$XwN^}xK2CbMS_!-#rB)d(E!|ot1$m;oa69T<NGuI``sk)FtA<6(NW`@
z4G7!4{igGt>pa%3<7m_4O&8bz5MQOVRzFLbADy)P%5{33G~;zNfQ0xZ<>ktrh=|P3
zobfDI%YW2zzjdS;uNp*sF2J-dZ@)UwF*9+M(whBpWl!d3&WL(-)05#Ri}?KLq~+-W
z^usFC&I4pc-{~p|Zb6C5I^NL(<Vu5%L!U77;d-5@^YN|3t47gjJwTNDe%*H#@%QfE
zarOX*qrXHt{5(LvPra-?{Bt&N*_BTpJ!N06U4O6tJTJQq*O7L-QRe|Vb)53-*2Tb{
zXmNeZZdmttdC)r2j%N_q<CqQXaWsG)M+4|_U3EPGqBH(_0K{Yb^#F*+sPh2sSj1=i
z^#F*6qktYq0{{R30000000028^rU#z_WL;r%m$`JB`Rvd{Nk3&xx^E%&;U}RlIC|4
z?0=|nJ4+i@tLsCCTD=8-P@HME^alVWVsU-TzVYaf?f$lJTnqvYu(-Zue|?*m+S(iW
z`Zn+R%6A;xB+39P`66=E2xKm?b<+c+#D2PH>#t$$zPoJeuOcF2(-rBPJW6`s<eZF6
zR}$M!Zm^I7^&F!MGb6ISvMH~=|CI+nzkfB|*Xjvqr)E#dLGi$G6Abk+Fg9Ijct?_`
z=mApj>ib_25!qhZj1;H74tG#IaFjnOUbUayx@gUgPbZpu5qf~sJUw@*-i3#G_bd7{
zkkq?>s4!uxhk8Ap{Y=hG(dzkozqp~ogq_BG03QK{a6cq7DKvnT#C^90o%d%t*e?+J
ztX(Tf(;wvNo*GUP1Bw)>#4VR|p}TMuqYw7d90bw>q%2DERed*gJpc^D^^*YwD3cHc
c2p9B*|AfsRsESjFHvj+t07*qoM6N<$g6u3fVgLXD

diff --git a/GreatSpringGameJam/Content/Tilesets/World.tsx b/GreatSpringGameJam/Content/Tilesets/World.tsx
index 64d2339..f1de25d 100644
--- a/GreatSpringGameJam/Content/Tilesets/World.tsx
+++ b/GreatSpringGameJam/Content/Tilesets/World.tsx
@@ -41,6 +41,11 @@
    <object id="1" x="0" y="0" width="16" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="20">
+  <properties>
+   <property name="GrownVersion" type="int" value="28"/>
+  </properties>
+ </tile>
  <tile id="21">
   <properties>
    <property name="GrownVersion" type="int" value="29"/>
@@ -51,4 +56,13 @@
    <property name="GrownVersion" type="int" value="30"/>
   </properties>
  </tile>
+ <tile id="28">
+  <properties>
+   <property name="JumpPad" type="bool" value="true"/>
+  </properties>
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="8" width="13" height="8"/>
+   <object id="2" x="1" y="8" width="13" height="8"/>
+  </objectgroup>
+ </tile>
 </tileset>
diff --git a/GreatSpringGameJam/Entity.cs b/GreatSpringGameJam/Entity.cs
index 570f352..51a315e 100644
--- a/GreatSpringGameJam/Entity.cs
+++ b/GreatSpringGameJam/Entity.cs
@@ -1,9 +1,11 @@
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using MLEM.Extended.Tiled;
 using MLEM.Extensions;
 using MLEM.Startup;
 using MLEM.Textures;
+using MonoGame.Extended.Tiled;
 using RectangleF = MonoGame.Extended.RectangleF;
 
 namespace GreatSpringGameJam {
@@ -26,17 +28,28 @@ namespace GreatSpringGameJam {
         public virtual void Draw(GameTime time, SpriteBatch batch) {
         }
 
-        protected void Collide(Func<RectangleF> getArea, ref Vector2 velocity, out bool onGround) {
+        protected void Collide(Func<RectangleF> getArea, ref Vector2 velocity, ref bool onGround) {
+            // if we're not on the ground, we should prioritize x collisions to be pushed out of walls first
+            var penetrations = this.Map.Collisions.GetPenetrations(getArea, prioritizeX: !onGround);
             onGround = false;
-            foreach (var (normal, penetration) in this.Map.Collisions.GetPenetrations(getArea)) {
-                if (penetration.Equals(0, 0.015F))
-                    continue;
+            foreach (var (normal, penetration) in penetrations) {
                 this.Position -= normal * penetration;
-                velocity *= new Vector2(Math.Abs(normal.Y), Math.Abs(normal.X));
-                if (normal.Y > 0)
+                if (normal.Y > 0) {
                     onGround = true;
+                    var below = this.GetTileBelow();
+                    if (below != null && below.Properties.GetBool("JumpPad") && velocity.Y > 0) {
+                        velocity.Y = -velocity.Y;
+                        continue;
+                    }
+                }
+                velocity *= new Vector2(Math.Abs(normal.Y), Math.Abs(normal.X));
             }
         }
 
+        protected TiledMapTilesetTile GetTileBelow() {
+            var tile = this.Map.GetTile("Ground", (this.Position.X + 0.5F).Floor(), (this.Position.Y + 1).Floor());
+            return !tile.IsBlank ? this.Map.GetTilesetTile(tile) : null;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/GreatSpringGameJam/GreatSpringGameJam.csproj b/GreatSpringGameJam/GreatSpringGameJam.csproj
index 6b749b1..9cf0eaf 100644
--- a/GreatSpringGameJam/GreatSpringGameJam.csproj
+++ b/GreatSpringGameJam/GreatSpringGameJam.csproj
@@ -9,9 +9,9 @@
 
     <ItemGroup>
         <PackageReference Include="Contentless" Version="3.0.5" />
-        <PackageReference Include="MLEM" Version="5.0.0-64" />
-        <PackageReference Include="MLEM.Extended" Version="5.0.0-64" />
-        <PackageReference Include="MLEM.Startup" Version="5.0.0-64" />
+        <PackageReference Include="MLEM" Version="5.0.0-66" />
+        <PackageReference Include="MLEM.Extended" Version="5.0.0-66" />
+        <PackageReference Include="MLEM.Startup" Version="5.0.0-66" />
         <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
         <PackageReference Include="MonoGame.Extended.Content.Pipeline" Version="3.8.0" />
         <PackageReference Include="MonoGame.Extended.Tiled" Version="3.8.0" />
diff --git a/GreatSpringGameJam/Player.cs b/GreatSpringGameJam/Player.cs
index 2ed323a..dba8e30 100644
--- a/GreatSpringGameJam/Player.cs
+++ b/GreatSpringGameJam/Player.cs
@@ -4,11 +4,13 @@ using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using MLEM.Animations;
 using MLEM.Extended.Extensions;
+using MLEM.Extended.Tiled;
 using MLEM.Extensions;
 using MLEM.Input;
 using MLEM.Startup;
 using MLEM.Textures;
 using MonoGame.Extended;
+using MonoGame.Extended.Tiled;
 using RectangleF = MLEM.Misc.RectangleF;
 
 namespace GreatSpringGameJam {
@@ -25,6 +27,7 @@ namespace GreatSpringGameJam {
         private TimeSpan jumpTime;
         private bool facingRight;
         private HeldItem heldItem;
+        private float currJumpHeight;
 
         public Player(Map map, Vector2 position) : base(map, position) {
             this.animations = new SpriteAnimationGroup();
@@ -34,6 +37,13 @@ namespace GreatSpringGameJam {
 
         public override void Update(GameTime time) {
             base.Update(time);
+            float jumpHeight;
+            var tileBelow = this.GetTileBelow();
+            if (tileBelow != null && tileBelow.Properties.GetBool("JumpPad")) {
+                jumpHeight = 0.25F;
+            } else {
+                jumpHeight = 0.15F;
+            }
 
             // input
             var move = 0F;
@@ -50,20 +60,22 @@ namespace GreatSpringGameJam {
 
             if (MlemGame.Input.IsAnyDown(Keys.Up, Keys.Space)) {
                 // only start jumping if we just started pressing the buttons
-                if (this.onGround && MlemGame.Input.IsAnyPressed(Keys.Up, Keys.Space))
+                if (this.onGround && MlemGame.Input.IsAnyPressed(Keys.Up, Keys.Space)) {
                     this.jumpTime = TimeSpan.FromSeconds(0.3F);
+                    this.currJumpHeight = jumpHeight;
+                }
                 this.jumpTime -= time.ElapsedGameTime;
                 if (this.jumpTime > TimeSpan.Zero)
-                    this.velocity.Y = -0.15F;
+                    this.velocity.Y = -this.currJumpHeight;
             } else {
                 this.jumpTime = TimeSpan.Zero;
             }
 
             // movement and collisions
             this.Position += this.velocity;
-            this.Collide(() => this.Bounds.ToExtended(), ref this.velocity, out this.onGround);
-            this.velocity *= new Vector2(this.onGround ? 0.5F : 0.6F, 0.9F);
-            this.velocity.Y += 0.02F;
+            this.Collide(() => this.Bounds.ToExtended(), ref this.velocity, ref this.onGround);
+            this.velocity *= new Vector2(this.onGround ? 0.5F : 0.6F, 0.95F);
+            this.velocity.Y += 0.015F;
 
             // item usage
             var rot = this.GetHeldRotation();
diff --git a/GreatSpringGameJam/WaterDrop.cs b/GreatSpringGameJam/WaterDrop.cs
index 8827349..37f9e34 100644
--- a/GreatSpringGameJam/WaterDrop.cs
+++ b/GreatSpringGameJam/WaterDrop.cs
@@ -11,6 +11,7 @@ namespace GreatSpringGameJam {
         private readonly bool growsPlants;
         private Vector2 velocity;
         private TimeSpan timeToLive;
+        private bool onGround;
 
         public WaterDrop(Map map, Vector2 position, Vector2 velocity) : base(map, position) {
             this.velocity = velocity;
@@ -22,8 +23,8 @@ namespace GreatSpringGameJam {
             base.Update(time);
 
             this.Position += this.velocity;
-            this.Collide(() => new RectangleF(this.Position - new Vector2(1 / 16F), new Vector2(2 / 16F)), ref this.velocity, out var onGround);
-            if (onGround)
+            this.Collide(() => new RectangleF(this.Position - new Vector2(1 / 16F), new Vector2(2 / 16F)), ref this.velocity, ref this.onGround);
+            if (this.onGround)
                 this.velocity = Vector2.Zero;
             this.velocity.Y += 0.008F;