From 31299e79130fe75219cd0e2b821d524d999c332a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 11 Nov 2018 20:32:11 +0100
Subject: [PATCH] resources: more test level elements

---
 dist/resources/map/test.json                  |  61 ++++++++++--------
 .../sprite/tile/stone/border/bottom_left.png  | Bin 0 -> 930 bytes
 .../sprite/tile/stone/border/bottom_right.png | Bin 0 -> 927 bytes
 dist/resources/sprite/tile/water.png          | Bin 0 -> 778 bytes
 4 files changed, 34 insertions(+), 27 deletions(-)
 create mode 100644 dist/resources/sprite/tile/stone/border/bottom_left.png
 create mode 100644 dist/resources/sprite/tile/stone/border/bottom_right.png
 create mode 100644 dist/resources/sprite/tile/water.png

diff --git a/dist/resources/map/test.json b/dist/resources/map/test.json
index c4f4f22..ec3b3fb 100644
--- a/dist/resources/map/test.json
+++ b/dist/resources/map/test.json
@@ -13,41 +13,44 @@
 		"stone/wall/top_left_inner",
 		"stone/wall/top_right_inner",
 		"stone/wall/bottom_right_inner",
-		"stone/wall/bottom_left_inner"
+		"stone/wall/bottom_left_inner",
+		"water",
+		"stone/border/bottom_right",
+		"stone/border/bottom_left"
 	],
 	"layers": [
 		{
 			"tiles": [
-				[0,  7, 3, 3, 3,  3, 3, 3,  3, 3, 3, 3,  8, 0],
-				[0,  6, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1,  4, 0],
-				[0,  6, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1,  4, 0],
-				[0,  6, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1,  4, 0],
-				[3, 11, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1, 12, 3],
-				[1,  1, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1,  1, 1],
-				[1,  1, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1,  1, 1],
-				[5, 14, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1, 13, 5],
-				[0,  6, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1,  4, 0],
-				[0,  6, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1,  4, 0],
-				[0,  6, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1,  4, 0],
-				[0, 10, 5, 5, 5, 14, 1, 1, 13, 5, 5, 5,  9, 0],
-				[0,  0, 0, 0, 0,  6, 1, 1,  4, 0, 0, 0,  0, 0]
+				[0,  7, 3, 3, 3,  3,  3,  3,  3, 3, 3, 3,  8, 0],
+				[0,  6, 1, 1, 1,  1, 15, 15,  1, 1, 1, 1,  4, 0],
+				[0,  6, 1, 1, 1,  1,  1,  1,  1, 1, 1, 1,  4, 0],
+				[0,  6, 1, 1, 1,  1,  1,  1,  1, 1, 1, 1,  4, 0],
+				[3, 11, 1, 1, 1,  1,  1,  1,  1, 1, 1, 1, 12, 3],
+				[1,  1, 1, 1, 1,  1,  1,  1,  1, 1, 1, 1,  1, 1],
+				[1,  1, 1, 1, 1,  1,  1,  1,  1, 1, 1, 1,  1, 1],
+				[5, 14, 1, 1, 1,  1,  1,  1,  1, 1, 1, 1, 13, 5],
+				[0,  6, 1, 1, 1,  1,  1,  1,  1, 1, 1, 1,  4, 0],
+				[0,  6, 1, 1, 1,  1,  1,  1,  1, 1, 1, 1,  4, 0],
+				[0,  6, 1, 1, 1,  1,  1,  1,  1, 1, 1, 1,  4, 0],
+				[0, 10, 5, 5, 5, 14,  1,  1, 13, 5, 5, 5,  9, 0],
+				[0,  0, 0, 0, 0,  6,  1,  1,  4, 0, 0, 0,  0, 0]
 			]
 		},
 		{
 			"tiles": [
-				[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-				[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-				[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-				[0, 0, 0, 0, 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, 2, 2, 2, 2],
-				[2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
-				[0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0],
-				[0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0],
-				[0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0],
-				[0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0],
-				[0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0],
-				[0, 0, 0, 0, 0, 0, 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, 17, 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],
+				[2, 2, 2, 2, 2, 2,  2,  2, 2, 2, 2, 2, 2, 2],
+				[2, 2, 2, 2, 2, 2,  2,  2, 2, 2, 2, 2, 2, 2],
+				[0, 0, 0, 0, 0, 0,  2,  2, 0, 0, 0, 0, 0, 0],
+				[0, 0, 0, 0, 0, 0,  2,  2, 0, 0, 0, 0, 0, 0],
+				[0, 0, 0, 0, 0, 0,  2,  2, 0, 0, 0, 0, 0, 0],
+				[0, 0, 0, 0, 0, 0,  2,  2, 0, 0, 0, 0, 0, 0],
+				[0, 0, 0, 0, 0, 0,  2,  2, 0, 0, 0, 0, 0, 0],
+				[0, 0, 0, 0, 0, 0,  2,  2, 0, 0, 0, 0, 0, 0]
 			]
 		}
 	],
@@ -56,6 +59,10 @@
 			"type": "polygon",
 			"vertices": [
 				[ 2,  1],
+				[ 6,  1],
+				[ 6,  2],
+				[ 8,  2],
+				[ 8,  1],
 				[12,  1],
 				[12,  5],
 				[14,  5],
diff --git a/dist/resources/sprite/tile/stone/border/bottom_left.png b/dist/resources/sprite/tile/stone/border/bottom_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed9be55aac8b88ecbf1556a5f614eb5a131d3ee3
GIT binary patch
literal 930
zcmV;T16}-yP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg0009IdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1Y?lG`8*{m&_S1SBB@$Ki9PH|X*Eu$^SP-8S*Y
zW`Z<ApogB&#EoA+r~84AGJ6-)Qp_=Wd?AO-1xoUdZya*Bkq_H^`{<a-eYwDp0x7%E
z!m%oc{pKI<5(j;;K>BHe+{5t4z*Y`Bd;SB_oc9=y>m0v1dzy3Xw<{qc4ROEJ9>U#@
zfn!CMWZM=o3_pc#+sGKn7vCuO?whX|jWRKbpA@J&Dl}<Ohiue<G4No6WNs{*Es1gF
zCSFLw8Z_A?OP3@pjfaQ?Cw#|3Tim?GYm^YV6I_{a7-7qQhkNGm%9yix<cJ8jrz2Ou
z#k_c+l}1@J+&~D;gE!q0d>i-AeIQoApl)eSxM1;hKcXr<YD=~P5cnzNUSDK=vBq1K
z1jJT=Apr$Gk|;&;#%x4EIDw!7<Sc<J7$8;d0Leilf}4aoLTv0Y+I(4gx8tdRAC)Ku
zZn6}R6@sFEEF{!WQPH5PQB9L(EiOt7QDcl2*PAOQ7ECRgS+Z;;NeW3*OqNp0sbtQA
zC#gAR%PHqv3SySviWclH@F=Bnl^UwnSgod-YiTH-7Mix$tfiJ)>D;A<u03|^spnn>
z4V01_Vd#j%MjCmPiCUX7!_*n4%{22Ych(M8{~9M)qk}cxm|A{zXAM@fb<lPMtv;iR
zGcd-1z_=|2P|&<M^NB*>#oXe|XU3~g21s4pbn?Yf1chM`>!dq(59VIx%^}y%c;i=?
zbBnqQm}58O6K`Lz)>kKN8)N$`TsifE*Eh6O<;tTvWwgK2YUyFkSnDwrPSE&_bZ0kw
zkb`e<fW}<{2hv>v2WZ?Sa4@+`-~fla1kOTq2^^qtm%xE^m%v#$x&#iSy95rF+$C@z
z-6e2<#$5u(^Q#9vf%9e?Io*$*!+EETobE?2!TEL@Io*$5h4Z~Oa=IU#fb)$ua=IU#
zgLAfxobE?o!+|P1(mz!9)Z<0fegB9Z^t!<^xexkVs(b&4U3Gt%C;nJvyyoBWGrm$5
z#PY!a000SaNLh0L01FcU01FcV0GgZ_0000vNkl<ZNXKIg|1ZM8!0?8_l#zifz{Efy
z7&TzjfKdZR4Hz|G)PTWd01J$9`aeYmhzzI~-cV!!0KfzVoHVI|0{{R307*qoM6N<$
Eg4X$@p8x;=

literal 0
HcmV?d00001

diff --git a/dist/resources/sprite/tile/stone/border/bottom_right.png b/dist/resources/sprite/tile/stone/border/bottom_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..71782d2470cb21d45c75e5020901ee10a00deba3
GIT binary patch
literal 927
zcmV;Q17Q4#P)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg0009IdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O?N$a^oNjhW~SlJp%eda2yO~W^b^^-xu3S(>B{C
zjn_;N1G0FnM=)(z|NI`|7al5<f|}=4Qi^!AXyJ-Mj&IL;*nN(oZvEw<qo;6pfnfz!
z_DR=cRgU?Kf4W)(y0bv`;RU&F!?zoIJ?1&`J4K^i_jvo9<2OdnW32nvRZU1k+COUF
zB3#12aY2@3do7_keulAct)S&tV<U|{wz!}*B$-L#Af+Ct(x8<(Y@-H^$}2l8b7R@&
zvN#uR5`{!(qromkx@2K#yo!hh;j0$f_AT3fjWTxb1Xm^mBfRou3*R|B(gu=?91-E`
z>BtpyF;5OO(<rlt8-UO_xY?HAOS?Yd2CRUfZE4Q<z#5l5#A5VTTe1~^z|Ua!`XcX>
z8gEsi*xMk61PEdxF-jDj*@;v*15kx>7Ucy5$c#HgvWg_I$*3djjdz?jUpC(7aa6#^
zB#DDfkqTI<hWc^MsG(|NYG%pYvK6Z#Nz!B~B~SCrRToz`Pwt+*c+HYETTa<?&L!8v
zMQ|joq~ax)QfkGXRYSFkw<|nqU3ig27hBTeOJ2%S8_K6?vzD5-+)AsRyL9c=Q}>>G
z>2;+Qr4&|OZB47Mc`a)lsI?(OhmACR<WWYwQah-AYEMw3gBow7rk`J_Vb*;H+CtF0
zXKXS9F;)U`p9E0QJekEzsyxX}X0b3%g)v0hWYa0uKnVzSCAL9Vc5mb!<`$6a@3`?J
z<ibRE0yz$=eBgG6TAw#z+lcL_aON}$PTx}0NNrwhm%*#{yFiXpRgn!x57<a;Pj&WK
zO3RINI7QBPfgY9v8%~k)WuRx|z=o5c{VULua%=`V2io00&&z=gCqerh=tpwUg_EFt
z2=r4qGtf!UZUem_=YQNsugN+6K6+Wsx%bf-a?ZPtoWdz`PP&h_<b+e?oN*srScN-s
z;D90i>7e2d55qIgUk$_89#ifdzEeC`ZMxkK!~N;!hvD@Q`!MW!cL4a4s)WC9u0wD&
z;68N#000SaNLh0L01FcU01FcV0GgZ_0000sNkl<ZNXKLBVIU8j{x8D7!0?8FiGe~e
zYQU%gqXvu`FlxZ40fWl`mec<!G(cp)z3_%Y0|1`&24>=~=?DM-002ovPDHLkV1jDU
Bta1PV

literal 0
HcmV?d00001

diff --git a/dist/resources/sprite/tile/water.png b/dist/resources/sprite/tile/water.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a965436f949a880bbdbe6872afad4b1b817c460
GIT binary patch
literal 778
zcmV+l1NHogP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{0007odQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=HGj@=*(hTmC5mw;~=mP5Em-9eY%pCl(|Iz8%4
zHI@1jti%y9w()18gz@A14Bs%wGY2)#siYJ!v}oaqha8_{ocfrfsQdjf=)6;S`GTPZ
zT8>HA^R1lo5Bqd!IC}Ad?A-#n!tmR`Ue9@s{7Xh|SB&R&&TGz|=N!lGswR{n9h*8r
zgohg#Zm5#%%M!$K8J>NY0?Dz)MjCr;af37}#3XT&QV&#V(x49As3Aw?!4A#bSoXOr
z&V`#qA<-o?*`-LAEG&(Oh-eVLa-ltL+2b|Jh};RLOmIe6@<$0D8GJ_OY!Njg!tUv;
z74l+U9B7qM)*WU5Li6Nidx0NvjqnDnfS~PV&e&j$+u>p}diIv=4Ir>H=%c^L`=Z8s
zmndQzk|6<tm`IEgMQ3&*70v)ukvWU<1_ETp9Z9l^B(T8|S+TLkX}4wLV;)BZd`yx!
z*c7RNrE2IO*Nh&jCZ=YV%q?578j>VUmQwPx&RlhIb@Sxz*^AdKS+nJoJ?C6<EnEag
z(n=~`aw(-&#H<>sRjjVCsCDB_Hr;GXn{Rn5TWx5crp;Pv-f}CgcJ9)(TTk74?xoj3
z1FaN>4jXCs$fJxp(Q8wtPMc}^%(KjTQ9G&rCVxSVPHMc9T6TU>!>s#qw7a17ow3CX
z#8?T$eGx!I^I{e=sq!MXn8m_46~;)?7Mo7721-DvgV-ir?4IO4%`KqTA93T)kP8dl
zKOo0p$UAN?sP*+FY&)^z6t0>^!RZ@>@SN+cL8Z00o*AFPFX-@92e+f!(e3DVbUV5o
z-H!gdBboStDEJ%u3Ft>w9G?X!k^lez32;bRa{vGf6951U69E94oEQKA04qsEK~zY`
z?ae^}06+u)FfNWH(#d=!_-zH2)f1Oq91{ox0)apv5C{ZYKCXWOK*AzUJOBUy07*qo
IM6N<$f*2iRx&QzG

literal 0
HcmV?d00001