Player, Enemy AnimationsHEADmaster

Collision Changes

3 files changed, 83 insertions, 24 deletions

diff --git a/raw/level1.png b/raw/level1.png
new file mode 100644
index 0000000..9a1bf89
--- /dev/null
+++ b/raw/level1.png
diff --git a/raw/level1.tmx b/raw/level1.tmx
index 3b69392..78258a8 100644
--- a/raw/level1.tmx
+++ b/raw/level1.tmx
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.2" orientation="orthogonal" renderorder="right-down" width="32" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="47">
+<map version="1.8" tiledversion="1.8.2" orientation="orthogonal" renderorder="right-down" width="32" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="73">
  <editorsettings>
   <export target="../assets/maps/level1.lua" format="lua"/>
  </editorsettings>
  <tileset firstgid="1" name="tileset" tilewidth="16" tileheight="16" tilecount="1024" columns="32">
   <image source="../assets/images/tileset.png" width="512" height="512"/>
+  <tile id="8">
+   <animation>
+    <frame tileid="8" duration="1000"/>
+    <frame tileid="9" duration="1000"/>
+   </animation>
+  </tile>
   <wangsets>
    <wangset name="white_path" type="mixed" tile="-1">
     <wangcolor name="whitePath_terrain" color="#ff0000" tile="-1" probability="1"/>
@@ -24,6 +30,42 @@
    </wangset>
   </wangsets>
  </tileset>
+ <layer id="7" name="water" width="32" height="32">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,0,0,0,0,9,9,9,9,9,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,9,9,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,9,9,0,0,9,9,9,9,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,0,0,0,0,0,9,9,9,9,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,0,0,0,0,0,0,0,9,9,9,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,9,9,9,9,0,9,9,9,9,9,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,9,9,9,9,0,9,9,9,9,9,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,9,9,9,9,0,9,9,9,9,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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="1" name="ground" width="32" height="32">
   <data encoding="csv">
 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
@@ -32,29 +74,29 @@
 6,7,7,6,0,0,7,6,6,6,0,0,8,8,0,0,0,0,8,8,8,8,8,8,8,8,8,8,8,8,6,6,
 6,7,7,6,163,165,6,6,6,6,6,0,0,7,7,0,163,165,8,8,0,7,8,8,7,8,8,8,8,8,8,6,
 6,7,7,6,195,197,6,6,6,7,6,6,0,8,7,0,195,197,8,8,0,7,7,7,7,7,7,8,8,8,8,6,
-6,7,6,6,195,197,0,6,6,6,8,8,8,8,7,7,195,197,0,8,8,7,7,7,7,7,7,8,0,8,0,6,
-6,6,0,0,195,197,8,7,7,8,8,8,8,7,0,7,195,197,8,8,8,8,8,8,8,7,7,7,8,8,0,6,
-6,6,6,0,195,197,8,8,7,7,7,7,7,7,7,7,195,197,0,8,8,8,8,8,7,8,8,8,8,8,0,6,
-6,6,6,7,195,193,165,0,8,8,7,7,7,7,7,0,195,197,7,7,8,8,8,8,8,8,8,7,8,0,7,6,
-6,6,6,6,227,162,197,0,0,0,0,0,0,0,0,0,195,197,8,7,7,8,8,8,8,8,7,7,8,7,7,6,
-6,6,7,0,0,195,193,164,164,164,164,164,164,164,164,164,194,197,8,7,7,8,8,8,8,8,8,7,7,7,7,6,
-6,6,7,7,7,227,228,228,228,228,162,161,228,228,228,228,228,229,7,7,8,7,8,8,0,7,0,8,8,7,0,6,
-6,6,7,7,7,7,7,7,7,7,195,197,8,6,6,8,8,8,7,7,8,7,8,7,7,7,7,7,7,7,7,6,
-6,0,7,7,7,7,163,164,165,7,195,197,6,6,6,6,6,6,7,8,7,7,7,7,7,7,7,7,7,7,7,7,
-6,0,7,7,6,163,194,196,197,6,195,197,6,6,6,6,6,6,163,164,164,165,7,7,7,7,7,7,7,7,7,7,
-6,0,7,6,6,195,196,196,193,165,195,197,6,6,6,6,163,164,194,196,196,193,165,7,7,0,0,0,0,7,7,6,
-6,7,7,6,6,227,162,196,196,193,194,193,164,164,164,164,194,196,196,196,196,196,197,7,7,0,0,0,0,0,6,6,
-6,7,7,7,7,163,194,196,196,196,196,196,196,196,196,196,196,196,196,196,196,161,229,7,7,7,7,7,7,7,6,6,
-6,7,7,7,6,195,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,193,165,7,7,7,7,7,0,0,6,6,
-6,7,7,7,6,227,228,162,196,161,162,196,196,196,196,196,196,196,196,196,161,228,229,7,0,7,7,0,0,6,6,6,
-6,7,7,7,7,7,7,227,228,229,227,228,228,228,228,228,228,228,228,228,229,7,7,7,7,7,7,7,6,6,0,6,
-6,7,7,7,7,6,7,7,6,6,6,7,6,6,6,6,0,7,7,7,7,0,7,7,7,7,7,7,6,6,7,6,
-6,7,7,7,7,7,7,7,7,7,7,7,7,7,6,6,6,6,0,7,7,7,0,7,7,7,7,6,6,0,0,6,
-7,7,7,7,7,7,7,0,7,6,6,0,7,7,7,0,7,7,7,7,7,7,0,0,0,0,7,6,7,0,0,6,
-0,0,6,6,7,6,6,6,0,7,6,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,6,7,0,0,0,6,
-7,7,0,7,7,8,8,6,7,6,6,7,7,7,7,7,7,7,7,7,7,7,0,7,7,7,6,7,7,7,0,6,
-7,7,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,6,6,7,7,6,
-7,8,8,8,7,7,7,8,8,7,7,7,7,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,6,7,6,
+6,7,6,6,195,197,0,6,6,6,8,8,8,8,7,7,195,197,0,8,8,163,164,165,7,7,7,8,0,8,0,6,
+6,6,0,0,195,197,8,7,7,8,8,8,8,7,0,7,195,197,8,8,8,195,196,193,164,165,7,7,8,8,0,6,
+6,6,6,0,195,197,8,8,7,7,7,7,7,7,7,7,195,197,0,8,163,194,196,161,162,193,165,8,8,8,0,6,
+6,6,6,7,195,193,165,0,8,8,7,7,7,7,7,0,195,197,7,163,194,161,162,197,227,162,197,7,8,0,7,6,
+6,6,6,6,227,162,197,0,0,0,0,0,0,0,0,0,195,193,164,194,161,229,195,197,8,195,197,7,8,7,7,6,
+6,6,7,0,0,195,193,164,164,164,164,164,164,164,164,164,194,196,196,196,193,165,227,229,165,195,197,7,7,7,7,6,
+6,6,7,7,7,227,228,228,228,228,162,161,228,228,228,228,162,196,196,196,196,193,164,194,193,194,197,8,8,7,0,6,
+6,6,7,7,7,7,7,7,7,7,195,197,8,6,6,8,195,196,196,196,196,196,196,196,196,196,197,7,7,7,7,6,
+6,0,7,7,7,7,163,164,165,7,195,197,6,6,6,6,227,228,162,196,196,196,196,196,196,196,197,7,7,7,7,7,
+6,0,7,7,6,163,194,196,197,6,195,197,6,6,6,163,164,164,194,196,196,161,228,228,162,196,197,7,7,7,7,7,
+6,0,7,6,6,195,196,196,193,165,195,197,6,6,163,194,196,196,196,196,196,193,165,7,195,196,193,165,0,7,7,6,
+6,7,7,6,6,227,162,196,196,193,194,193,164,164,194,196,196,196,196,196,196,196,193,164,194,196,196,197,0,0,6,6,
+6,7,7,7,163,164,194,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,197,7,7,6,6,
+6,7,7,7,195,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,161,228,228,228,229,0,0,6,6,
+6,7,7,7,195,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,197,0,7,7,0,0,6,6,6,
+6,7,7,7,195,196,196,196,196,196,161,228,228,162,196,161,228,228,228,162,196,196,196,197,7,7,7,7,6,6,0,6,
+6,7,7,7,195,196,196,196,196,196,197,7,6,195,196,197,0,7,163,194,196,196,196,197,7,7,7,7,6,6,7,6,
+6,7,7,7,195,196,196,196,196,196,193,164,164,194,196,193,164,164,194,196,161,162,161,229,7,7,7,6,6,0,0,6,
+7,7,7,7,195,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,197,227,229,0,0,0,7,6,7,0,0,6,
+0,0,6,6,195,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,197,7,0,0,0,0,6,7,0,0,0,6,
+7,7,0,7,227,162,196,196,196,196,196,196,196,196,196,196,196,196,196,161,229,7,0,7,7,7,6,7,7,7,0,6,
+7,7,0,7,7,227,228,228,228,228,228,162,196,161,228,228,228,228,228,229,7,7,7,7,7,7,6,6,6,7,7,6,
+7,8,8,8,7,7,7,8,8,7,7,227,228,229,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,6,7,6,
 6,7,7,7,7,7,7,7,6,6,6,6,6,6,6,7,7,7,0,7,7,7,7,7,7,7,7,7,6,6,0,6,
 6,8,8,8,8,8,8,8,8,8,8,8,8,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,6,
 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6
@@ -181,5 +223,22 @@
   <object id="22" x="256" y="48" width="6.9375" height="16"/>
   <object id="23" x="280.969" y="48" width="6.9375" height="16"/>
   <object id="24" x="263.375" y="54.875" width="17.25" height="9.0625"/>
+  <object id="55" x="346.75" y="155" width="11" height="40.25"/>
+  <object id="56" x="330.75" y="170.75" width="14.25" height="8.5"/>
+  <object id="57" x="358.75" y="186.75" width="26.5" height="9"/>
+  <object id="58" x="379.25" y="140.5" width="8.25" height="36.75"/>
+  <object id="59" x="387.75" y="155" width="15" height="23"/>
+  <object id="60" x="395" y="178.5" width="8.5" height="16.5"/>
+  <object id="61" x="379.5" y="178" width="5" height="7.75"/>
+  <object id="62" x="188.909" y="203.818" width="36.1818" height="70.5455"/>
+  <object id="64" x="225.818" y="203.455" width="16.7273" height="55.0909"/>
+  <object id="65" x="242.909" y="203.636" width="16" height="39.6364"/>
+  <object id="66" x="260.182" y="234.727" width="30.9091" height="8.90909"/>
+  <object id="67" x="173" y="346.333" width="36" height="23"/>
+  <object id="68" x="253" y="347" width="36.3333" height="23.3333"/>
+  <object id="69" x="290.333" y="348" width="16.6667" height="7.33333"/>
+  <object id="70" x="347.636" y="250.727" width="40.7273" height="7.81818"/>
+  <object id="71" x="363.455" y="259.636" width="24.7273" height="15.0909"/>
+  <object id="72" x="182" y="356.364" width="14.3636" height="3.63636"/>
  </objectgroup>
 </map>
diff --git a/raw/tileset.aseprite b/raw/tileset.aseprite
index c5e0e49..d5f8f6b 100644
--- a/raw/tileset.aseprite
+++ b/raw/tileset.aseprite