From 31dc0e443efc0aae48e11a0d98e699dbed5c7dcf Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 10 Feb 2021 12:11:27 -0500
Subject: Added fade out around map change

Also moved script system first in the loop so that the camera can catch up before rendering. Also added a map change from map 2 back to map 1.
---
 res/maps/map1.tmx | 5 ++++-
 res/maps/map2.tmx | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'res/maps')

diff --git a/res/maps/map1.tmx b/res/maps/map1.tmx
index 282b2ed..8afb909 100644
--- a/res/maps/map1.tmx
+++ b/res/maps/map1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="9">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="10">
  <tileset firstgid="1" name="fromRom" tilewidth="16" tileheight="16" tilecount="240" columns="10">
   <image source="map1_tiles.png" width="160" height="384"/>
   <tile id="77">
@@ -784,6 +784,9 @@
     <property name="script" value="map1_off_right"/>
    </properties>
   </object>
+  <object id="9" name="fromRight" type="warp" x="748.667" y="382.667">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Layer 0" width="48" height="32">
   <data encoding="csv">
diff --git a/res/maps/map2.tmx b/res/maps/map2.tmx
index 5bbe0c6..0f2e624 100644
--- a/res/maps/map2.tmx
+++ b/res/maps/map2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="2">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="3">
  <tileset firstgid="1" name="fromRom" tilewidth="16" tileheight="16" tilecount="180" columns="10">
   <image source="map2_tiles.png" width="160" height="288"/>
   <tile id="61">
@@ -640,6 +640,11 @@
   <object id="1" name="fromLeft" type="warp" x="16" y="364.667">
    <point/>
   </object>
+  <object id="2" name="moveToLeft" type="trigger" x="-20.3333" y="304" width="22.6667" height="91.6667">
+   <properties>
+    <property name="script" value="map2_off_left"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer id="1" name="Layer 0" width="64" height="64">
   <data encoding="csv">
-- 
cgit 1.4.1