From 71be91b5c03b09139465723ffb56ed8fd6d5a0fe Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 24 Oct 2020 12:35:47 +0000
Subject: CONTENT III - Super Merge Request Part 1/2 on content for Novemember
 11th deadline

---
 maps/009-1.tmx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'maps/009-1.tmx')

diff --git a/maps/009-1.tmx b/maps/009-1.tmx
index 1288140f..b349371a 100644
--- a/maps/009-1.tmx
+++ b/maps/009-1.tmx
@@ -2590,7 +2590,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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>
  </layer>
- <layer id="47" name="Collision" width="270" height="230">
+ <layer id="47" name="Collision" width="270" height="230" visible="0">
   <data encoding="csv">
 1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,2372,1403,1403,2372,2372,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
 1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,2372,2372,1403,1403,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
@@ -2647,7 +2647,7 @@
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,2372,2372,2372,2372,1405,1405,1405,1405,2372,2372,2372,1405,1405,1405,2372,2372,2372,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,2373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1403,1403,1403,2372,1403,1403,1403,1405,1405,1405,1405,1405,2372,2372,2372,2372,2372,1405,1405,1405,2372,2372,2372,1405,1405,1405,2372,2372,2372,2372,2372,2372,0,2373,0,0,0,0,2372,2372,0,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,2372,0,0,0,0,0,2372,2372,2372,0,2373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,2372,1403,2372,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,2372,2372,2372,2372,2372,2372,1405,1405,2372,2372,2372,2372,2372,1405,1405,2372,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,2373,0,2373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,2372,1403,1403,2372,2372,2372,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
-1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,2372,2372,2372,2372,1405,1405,2372,2372,2372,2372,2372,2372,1405,1405,1405,2372,2372,0,0,0,0,0,0,2375,2375,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,2372,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,2372,1403,1403,1403,2372,2372,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,
+1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,2372,2372,2372,2372,1405,1405,2372,2372,2372,2372,2372,2372,1405,1405,1405,2372,2372,0,0,0,0,0,0,2375,2375,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,0,0,0,0,0,0,0,2372,0,0,0,0,2372,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,2372,1403,1403,1403,2372,2372,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,2372,2372,2372,1405,1405,2372,2372,2372,2372,2372,2372,1405,1405,1405,1405,1405,2373,0,0,2372,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,0,0,0,0,2372,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,2372,2372,2372,1403,2372,2372,1403,1403,1403,2372,
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,2372,1403,1403,1405,1405,0,0,0,0,0,0,0,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,1404,0,0,2375,2375,0,0,0,0,0,0,0,0,0,0,0,0,2373,2372,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2373,2373,2373,2373,2372,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,1403,1403,2372,2372,1403,1403,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1405,1405,1405,0,0,0,0,0,0,0,0,1405,1405,1405,1405,2373,0,0,0,0,2372,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,2372,2372,2372,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,
@@ -3058,7 +3058,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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>
  </layer>
- <objectgroup id="37" name="Objects" visible="0">
+ <objectgroup id="37" name="Objects">
   <object id="1" name="To West Woodland" type="warp" x="5760" y="992" width="64" height="32">
    <properties>
     <property name="dest_map" value="008-1-1"/>
-- 
cgit v1.2.3-60-g2f50