did some changes...

kobaltoxid · Dec 20, 2020 · 591667a · 591667a
1 parent cf79faf
commit 591667a
Show file tree

Hide file tree

Showing 15 changed files with 2,489 additions and 157 deletions.
diff --git a/assets/ShowPicture_teacher.asp.jpg b/assets/ShowPicture_teacher.asp.jpg
diff --git a/assets/fixed_size.tmx b/assets/fixed_size.tmx
@@ -7,6 +7,9 @@
   <image source="Black.png" width="512" height="512"/>
  </tileset>
  <layer id="1" name="Tile Layer 1" width="64" height="48">
+  <properties>
+   <property name="collidable" type="bool" value="true"/>
+  </properties>
   <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,
@@ -59,6 +62,13 @@
 </data>
  </layer>
  <objectgroup id="2" name="Spawn Point" tintcolor="#0d0000">
-  <object id="4" name="Player" x="304" y="592" width="16" height="16"/>
+  <properties>
+   <property name="collidable" type="bool" value="false"/>
+  </properties>
+  <object id="4" name="Player" x="305.75" y="593.813" width="12.125" height="12.6875">
+   <properties>
+    <property name="collidable" type="bool" value="false"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/assets/index.png b/assets/index.png
diff --git a/assets/pp.lua b/assets/pp.lua
@@ -52,7 +52,9 @@ return {
       opacity = 1,
       offsetx = 0,
       offsety = 0,
-      properties = {},
+      properties = {
+        ["collidable"] = true
+      },
       encoding = "lua",
       data = {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -115,20 +117,24 @@ return {
       offsetx = 0,
       offsety = 0,
       tintcolor = { 13, 0, 0 },
-      properties = {},
+      properties = {
+        ["collidable"] = false
+      },
       objects = {
         {
           id = 4,
           name = "Player",
           type = "",
           shape = "rectangle",
-          x = 304,
-          y = 592,
-          width = 16,
-          height = 16,
+          x = 305.75,
+          y = 593.813,
+          width = 12.125,
+          height = 12.6875,
           rotation = 0,
           visible = true,
-          properties = {}
+          properties = {
+            ["collidable"] = false
+          }
         }
       }
     }