From c41e88370dc80c22cfd14bcf5de702cc82cb782e Mon Sep 17 00:00:00 2001
From: gparant <g.parant@thecodingmachine.com>
Date: Mon, 11 May 2020 20:53:23 +0200
Subject: [PATCH] Fix position layer in map lyon

---
 back/src/Assets/Maps/Floor0/floor0.json | 16 ++++-----
 back/src/Assets/Maps/Lyon/lyon.json     | 46 +++++++++++++++++--------
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/back/src/Assets/Maps/Floor0/floor0.json b/back/src/Assets/Maps/Floor0/floor0.json
index 001cde1c..aee04a49 100644
--- a/back/src/Assets/Maps/Floor0/floor0.json
+++ b/back/src/Assets/Maps/Floor0/floor0.json
@@ -22,7 +22,7 @@
          "name":"background",
          "opacity":1,
          "type":"tilelayer",
-         "visible":false,
+         "visible":true,
          "width":46,
          "x":0,
          "y":0
@@ -34,7 +34,7 @@
          "name":"start",
          "opacity":1,
          "type":"tilelayer",
-         "visible":false,
+         "visible":true,
          "width":46,
          "x":0,
          "y":0
@@ -52,7 +52,7 @@
                  "value":"\/Floor1\/floor1.json"
                 }],
          "type":"tilelayer",
-         "visible":false,
+         "visible":true,
          "width":46,
          "x":0,
          "y":0
@@ -94,7 +94,7 @@
          "name":"top",
          "opacity":1,
          "type":"tilelayer",
-         "visible":false,
+         "visible":true,
          "width":46,
          "x":0,
          "y":0
@@ -106,7 +106,7 @@
          "name":"book",
          "opacity":1,
          "type":"tilelayer",
-         "visible":false,
+         "visible":true,
          "width":46,
          "x":0,
          "y":0
@@ -118,7 +118,7 @@
          "name":"ordi",
          "opacity":1,
          "type":"tilelayer",
-         "visible":false,
+         "visible":true,
          "width":46,
          "x":0,
          "y":0
@@ -130,7 +130,7 @@
          "objects":[],
          "opacity":1,
          "type":"objectgroup",
-         "visible":false,
+         "visible":true,
          "x":0,
          "y":0
         }, 
@@ -147,7 +147,7 @@
                  "value":3
                 }],
          "type":"tilelayer",
-         "visible":false,
+         "visible":true,
          "width":46,
          "x":0,
          "y":0
diff --git a/back/src/Assets/Maps/Lyon/lyon.json b/back/src/Assets/Maps/Lyon/lyon.json
index 5b98d5d9..69fdff1d 100644
--- a/back/src/Assets/Maps/Lyon/lyon.json
+++ b/back/src/Assets/Maps/Lyon/lyon.json
@@ -52,22 +52,11 @@
          "name":"bottom",
          "opacity":1,
          "type":"tilelayer",
-         "visible":false,
+         "visible":true,
          "width":15,
          "x":0,
          "y":0
         }, 
-        {
-         "draworder":"topdown",
-         "id":3,
-         "name":"floorLayer",
-         "objects":[],
-         "opacity":1,
-         "type":"objectgroup",
-         "visible":false,
-         "x":0,
-         "y":0
-        }, 
         {
          "data":[0, 0, 0, 29, 29, 29, 29, 29, 29, 30, 2, 3, 0, 0, 0, 0, 0, 0, 45, 45, 45, 45, 45, 45, 46, 18, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 35, 0, 0, 0, 0, 0, 0, 0, 0, 53, 53, 0, 0, 0, 248, 180, 0, 0, 0, 0, 0, 0, 0, 115, 52, 53, 116, 0, 0, 95, 196, 0, 0, 0, 0, 0, 0, 0, 0, 68, 69, 0, 0, 0, 111, 212, 0, 0, 0, 0, 0, 0, 0, 0, 49, 50, 0, 0, 0, 248, 228, 0, 0, 0, 0, 0, 0, 0, 0, 65, 66, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 114, 0, 0, 0, 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 115, 53, 0, 0, 0, 0, 0, 0, 0, 113, 0, 113, 0, 0, 0, 0, 53, 0, 0, 0, 0, 0, 0, 49, 50, 49, 50, 53, 0, 0, 0, 53, 0, 0, 0, 0, 0, 0, 49, 50, 49, 50, 69, 116, 0, 115, 53, 0, 0, 0, 0, 0, 0, 65, 66, 65, 66, 213, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 114, 0, 114, 0, 229, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":16,
@@ -80,6 +69,17 @@
          "x":0,
          "y":0
         }, 
+        {
+         "draworder":"topdown",
+         "id":3,
+         "name":"floorLayer",
+         "objects":[],
+         "opacity":1,
+         "type":"objectgroup",
+         "visible":true,
+         "x":0,
+         "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, 191, 190, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 207, 206, 0, 0, 0, 0, 231, 0, 0, 0, 0, 0, 0, 0, 0, 175, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 190, 0, 0, 0, 0, 0, 165, 0, 0, 0, 0, 0, 0, 0, 0, 206, 176, 0, 0, 0, 0, 181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 190, 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, 243, 244, 243, 244, 206, 0, 0, 0, 230, 0, 0, 0, 0, 0, 0, 175, 0, 241, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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,
@@ -93,7 +93,7 @@
                  "value":3
                 }],
          "type":"tilelayer",
-         "visible":false,
+         "visible":true,
          "width":15,
          "x":0,
          "y":0
@@ -105,7 +105,7 @@
          "name":"override",
          "opacity":1,
          "type":"tilelayer",
-         "visible":false,
+         "visible":true,
          "width":15,
          "x":0,
          "y":0
@@ -570,6 +570,15 @@
                          "value":true
                         }]
                 }, 
+                {
+                 "id":212,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
                 {
                  "id":214,
                  "properties":[
@@ -578,6 +587,15 @@
                          "type":"bool",
                          "value":true
                         }]
+                }, 
+                {
+                 "id":228,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
                 }],
          "tilewidth":32
         },