From 6d4781464353cfa6f218950a1e18d942283f2639 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Fri, 25 Dec 2020 02:18:54 +0100
Subject: [PATCH] Restructure tilesets and map.

---
 main.json       |  49 ++++++++++++++++++++++++++++--------------------
 tiles/ascii.png | Bin 1444 -> 0 bytes
 2 files changed, 29 insertions(+), 20 deletions(-)
 delete mode 100644 tiles/ascii.png

diff --git a/main.json b/main.json
index 908d525..bf33136 100644
--- a/main.json
+++ b/main.json
@@ -10,7 +10,7 @@
  "infinite":false,
  "layers":[
         {
-         "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, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":16,
          "id":2,
          "name":"start",
@@ -22,7 +22,7 @@
          "y":0
         }, 
         {
-         "data":[2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 2, 2, 2, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 1, 2, 2, 2, 2, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 1, 2, 2, 2, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
+         "data":[3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, 3, 2, 2, 2, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, 3, 2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, 3, 3, 2, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 3, 2, 3, 2, 2, 3, 2, 2, 2, 3, 2, 2, 2, 3, 2, 3, 3, 2, 3, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 3, 2, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
          "height":16,
          "id":1,
          "name":"main",
@@ -34,7 +34,7 @@
          "y":0
         }, 
         {
-         "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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":16,
          "id":4,
          "name":"link",
@@ -70,36 +70,45 @@
  "tileheight":32,
  "tilesets":[
         {
-         "columns":2,
+         "columns":1,
          "firstgid":1,
-         "image":"tiles\/ascii.png",
+         "image":"tiles\/tile_questionmark.png",
          "imageheight":32,
-         "imagewidth":64,
+         "imagewidth":32,
          "margin":0,
-         "name":"ascii",
+         "name":"tile_questionmark",
          "spacing":0,
-         "tilecount":2,
+         "tilecount":1,
+         "tileheight":32,
+         "tilewidth":32
+        }, 
+        {
+         "columns":1,
+         "firstgid":2,
+         "image":"tiles\/tile_dot.png",
+         "imageheight":32,
+         "imagewidth":32,
+         "margin":0,
+         "name":"tile_dot",
+         "spacing":0,
+         "tilecount":1,
          "tileheight":32,
-         "tiles":[
-                {
-                 "id":1,
-                 "properties":[
-                        {
-                         "name":"collides",
-                         "type":"bool",
-                         "value":true
-                        }]
-                }],
          "tilewidth":32
         }, 
         {
          "columns":1,
          "firstgid":3,
-         "image":"tiles\/tile_questionmark.png",
+         "image":"tiles\/tile_hash.png",
          "imageheight":32,
          "imagewidth":32,
          "margin":0,
-         "name":"tile_questionmark",
+         "name":"tile_hash",
+         "properties":[
+                {
+                 "name":"collides",
+                 "type":"bool",
+                 "value":true
+                }],
          "spacing":0,
          "tilecount":1,
          "tileheight":32,
diff --git a/tiles/ascii.png b/tiles/ascii.png
deleted file mode 100644
index e175679ea1c15c33b898379a9adbc2f450af6f5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1444
zcmV;V1zY-wP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00009a7bBm001r{
z001r{0eGc9b^rhcR!KxbRA@uxSw~AIO%N_~&N*Q^2%@N<B6=`^EP|rqK?Fs-dk}wu
zf~??0@a9Pn6h#C@aoLL)5HT#~fEZECIjpI-pJsc$S$%cpdtsOPzHMmUv8TJI>#3@z
zs#*&oV!Z#g&GN66{HNfC2cWF1jHafhXl!hZK7IQ1Tl57NFl2XdaA3>J%k1Ulg*`t%
zv#zc#W@TlidDeh{09IUF%#xFnnWd$r)_h|M52aL8RIt0dI|0Dc(-UiHX<-%?7Fq(a
z&dyGDadE*G7Z+JhPL9@m;{wpz+bc8=04^^tS$cZ9mN4S|(b16tT0=v_hieSO0ZB<o
zG&(v;{P48CzD|98eUz4#MqJ~<?>9F$X?%QK7YA5dTPySI?Cd^V^Uq9OTmQaExw*NN
zn3za5Ha6tt<wap(VZ{Ac`CwpRAT>8P3y`+9wrF*Am3DV`-yF!@-JLj3DC6J1fB$a)
zu(Y&9hlhs*L7{c2d3kzIPfy~UK;`A-^!WHloEzx&_Lk1i&uL?0gBBJRgq66sxRBZc
zPESui1OWDBh(rjc3M(iqETp)&IEspjBDMK4_Wm*P4xJOF01j4!UyQA+tkAb_--weU
z?eFi??CdOk`SOKsZf+D{bP>y+43$n!PHb{=QV<y$*EHMS-WEj2O<F_*bi6m!#iE~0
zhER|xw;Zt^5u&H3hjD9ThT#CUokBZ~j*emoT3lOOqx}4Q3JD3J=;&ziiyj&pN`8KR
z1ox1p5A%QRKJssH13D}uBO`-SQc}o}06=hV1quKsCntjV&__l_e(`BnS64xr;o;$e
zKdP&%DIp<2fWWm*$H&Lw8SVtZ0T9S_XJ<!nhG7Aa7654v4i4TWGVT_H4kAP=Dk>5H
zz;Zx<1qB7d_W_i@zduDpL<qo!hlgoqX2zHRKvVYi_KMJZdwaU$FTx;%ht?4#K!Rsy
zXJY-_+}xXe43h|{PnMdRs>E`bv8j0f9wOia>GRju*CH}})C}PQ2zhmNbrcg5BjUTW
zv$L=ODTt4c4`pU%($&?Ki1(QDUi0wqP+q|Wu*UEJpybWV%OhJ`Tji`$c(_ANO$}95
zRSDC6cz6&o{Qmx4bO;DdBhJHGyuG~@@<d{#)eK<)I6MTC0K5)k00CV#nEC4_{a&uc
zFG44x0D!_bzy%;g)Ec}}q_1DUk|8odUteFL;jFAIC8S9(AQ(?(L`V2i3usEaYVb^D
zk8(ex)BXMZ#sEMq2v~e*XozBCW5qBcKx1R0$P3`#{IWxUglF&szcdj^6A~OZH@9D+
z2S9_s>Y_^hE#v}*Z~^t9P~51w049qn5H6x_NN8k-;CQaDucwld5-|<)+uGX1cu-If
z0a&;W@&W7*V2}%#4FEQdkB=AG*Yx!CzY0}a#H3DwKzOf($9jY}8R9^KXvp>?7XZlG
z+FFtA$#<|8kYsRhu!uDBe!;9_h%-0iB`o8_!niN7$jC^u_Th(nvyN+Bxd-g-?$*68
zzbjB~kT}sX?kbvV%}#_$OG`z`3iIPvRg|5bt)*Dq@6|2<P3mpXt|UP)zMi#a1Ay=%
zO;BD;=sl?3c`#>n-LADxT|puTKwhBL%;tcmrY2E>q6!-r7@)zyL9K7;e$TJM33r6h
z;Kam)?se+=0dZe%)ASQleu^;;0OJhHI3b$7hpD}Joz6ag{>&;XD;fSb@ZR@dk8`V3
zxTCeTRqs0EUW@A$T+ZWVvjRYSd%G?G%;o^S=JhA%sS6)dq0`h^{#O7X@j>Z4KR-_$
y9UZ!`H$*L<>!dm+ArV4J4NJg1;zu{ha=RaZ>sB-wZ%+mQ0000<MNUMnLSTZi+@Amd

-- 
2.30.2