From 817e9a32bc9928f2760e3c62e742cfd0f5d92673 Mon Sep 17 00:00:00 2001
From: Philipp Neumann <philipp.neumann@autodesk.com>
Date: Sat, 26 Dec 2020 19:04:10 +0100
Subject: [PATCH] Banner

---
 main.json                          |  15 ++++++++++++++-
 mueseum.tmx                        |   5 ++++-
 tiles/chaos_vermittlung_banner.png | Bin 0 -> 564 bytes
 tiles/chaos_vermittlung_logo.png   | Bin 0 -> 731 bytes
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 tiles/chaos_vermittlung_banner.png
 create mode 100644 tiles/chaos_vermittlung_logo.png

diff --git a/main.json b/main.json
index 79083f5..03a92a6 100644
--- a/main.json
+++ b/main.json
@@ -195,7 +195,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, 11, 3051, 12, 0, 0, 0, 5, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 3, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 3109, 3110, 0, 0, 0, 3109, 3110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 3051, 12, 0, 0, 0, 5, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 3, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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":14,
          "id":4,
          "name":"phones",
@@ -341,6 +341,19 @@
          "tilecount":91,
          "tileheight":32,
          "tilewidth":32
+        }, 
+        {
+         "columns":2,
+         "firstgid":3109,
+         "image":"tiles\/chaos_vermittlung_banner.png",
+         "imageheight":32,
+         "imagewidth":64,
+         "margin":0,
+         "name":"chaos_vermittlung_banner",
+         "spacing":0,
+         "tilecount":2,
+         "tileheight":32,
+         "tilewidth":32
         }],
  "tilewidth":32,
  "type":"map",
diff --git a/mueseum.tmx b/mueseum.tmx
index 9a3e395..ea8557e 100644
--- a/mueseum.tmx
+++ b/mueseum.tmx
@@ -30,6 +30,9 @@
  <tileset firstgid="3018" name="minideko" tilewidth="32" tileheight="32" tilecount="91" columns="7">
   <image source="tiles/tiles.rc3.world/deco/minideko.png" width="224" height="416"/>
  </tileset>
+ <tileset firstgid="3109" name="chaos_vermittlung_banner" tilewidth="32" tileheight="32" tilecount="2" columns="2">
+  <image source="tiles/chaos_vermittlung_banner.png" width="64" height="32"/>
+ </tileset>
  <layer id="8" name="collides" width="17" height="14">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -289,7 +292,7 @@
  </layer>
  <layer id="4" name="phones" width="17" height="14">
   <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,3109,3110,0,0,0,3109,3110,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,11,3051,12,0,0,0,5,0,0,0,0,2,0,0,0,
diff --git a/tiles/chaos_vermittlung_banner.png b/tiles/chaos_vermittlung_banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1be529b9c3a620ca6e62d9507840b6cc51cbb45
GIT binary patch
literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00001b5ch_0Itp)
z=>Px$?ny*JRA_<inZZtjKoExiZHXp58xKZsgBag}7%x77Z|57Bcx$3*<AEpW$;PB1
zD=|G7-$2^&P@zD9Ldy<K?U!u2Wm%S){h3)7;K2Vz{QXi}H{e(j05Ay@PELXEFV^8B
z`#}JRh$yOa6i1pg4MEcobZJ^FV`gkbC-wjl9-f}DXlG*HjjKX*N=|HsG8@?y;8-%A
z{iryWY)=6IAcVlaQ)DCWv!65joGM5Z=zs8b9CimdmW1c4!gkMBacbm%)d5uv<8%Ux
z0}NwXFPr^!eRaUH5;P1zo|Q{K57(BM1oisVgkkjoAPhN1*$fs1Bm<voSC0eH`5INg
zqkvt8#Q{gh^H%y+LAwJS%fxUTtQ_}zg}eJt^hXN)(W0IgB!}ZbYf5BLKsWWz^Hpr<
z%i}pf9e_HEdZwKNtwFGC)pv7cVm@1SP7#`dq0qd{$S2AKgR#PF2K0JB_#@)uoC?tP
z2o%kJUK(_5iQDUom2+HMrktW97O<wls%wBGgSQV2cd|r_1J=FqW$}E4*Y~ucdCt<I
zf>vTcmLg>oInlA23y6&?pziF~rRi&@(jXCSwJ%u3_`2@`W!Kq61sNNcX)w8EtaEde
zGsR`ev$0VH0M&PWwq?^8kX1nIpT=5d|GxtqSi>*I&z(;rHKx}90000<MNUMnLSTa6
CTKfwC

literal 0
HcmV?d00001

diff --git a/tiles/chaos_vermittlung_logo.png b/tiles/chaos_vermittlung_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a2e33871fa025b1f797a29e37c78666f14f86a1
GIT binary patch
literal 731
zcmV<10wn#3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%l}SWFR9J=WR!wNrU>JVVl`ITd@irJHp``0TFXEx#FlZH=U_5w{?X+ElT|_~q
z7ZrB&s)tPmq6f!3h=>Qlb>f7<gxS+vx0af<V|p4@)TKW(9zv2YX_|gn*MqR<^pWrV
z-sgGWJbAwWhxp%ctUm%p=>q^ryr@gOr~|-qCfq-)aGfO|n*g4@>Hz@6qe5w?27RXn
zUE+m00KERdVQiv<0un>4wU&5Mw*?qoaK{`dl9%i?N$wVrT4f!vtq`IO-2N7(iaUR*
zLLEzu*dVZyHIjN&@9x4%HjLOHU2ZC=rQHw`u^P4DM68BviNT3J9c7LBm^T<OI6lAw
z@UPy>kYS4QT6#d;)3LT$0GZeiOL^6b&Hp|C0dq4EYq~7uRT>QzUQ9<?P9|Rg=^{`r
zGmv;u4?=Es;qJ|!TDsVVfce>8Jh)S8%SQ9Fy}tWQvyC^OfGcO<s9uhWRHS75_1n9Q
z5dVd17rkSfcHr&HBUEIqFnPlufBZavfPvUiJb7eTnC-6bo18rR@m&v{fXOM~*1f7B
zL=^rktQQ&%nJrFbR4tWJHS!sWg?0P$y*g^-cB5fbd|Br3@V-%fz0NpfyGgXY5a+i~
zV&w8)To~p6I6dt!;m9~JI?h3nHQ!IKnHl}!a|M+#Ip&_)dyWoluCY*L|F6y@Pi<_~
zLm|D|)rIa_l|eEtK#qznhZRW<5FQvh2dsXs06^2~y(*WZB9d{TAx4gh)|wp8i)j|8
z&w2>>Ui7~?XlDS4_g}Xfo+VFK@MGKNvIOLF#&x@&vAek8B=QpLxTJFS)!z26OHe~f
zyr`Ro1YC0<X!SwimD^H6Lmu=l@XKR%A<!%6M0Xs6i1x3iU639)#6JWeJi7<iBL4sY
N002ovPDHLkV1lt4RG9z(

literal 0
HcmV?d00001