Connect the new Kolchak Maps.

3 files changed, 41 insertions, 21 deletions

diff --git a/maps/027-1.tmx b/maps/027-1.tmx
index ccfe66c8..735bef9e 100644
--- a/maps/027-1.tmx
+++ b/maps/027-1.tmx
@@ -2026,15 +2026,14 @@
     <property name="dest_y" value="42"/>
    </properties>
   </object>
-  <object id="537" name="Scholarship Instutite" type="warp" x="3424" y="1888" width="32" height="32">
+  <object id="537" name="Scholarship Institute" type="warp" x="3424" y="1888" width="32" height="32">
    <properties>
-    <property name="dest_map" value="000-0"/>
-    <property name="dest_x" value="22"/>
-    <property name="dest_y" value="22"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="027-4"/>
+    <property name="dest_x" value="29"/>
+    <property name="dest_y" value="34"/>
    </properties>
   </object>
-  <object id="538" name="Scholarship Instutite" type="warp" x="3264" y="2208" width="32" height="32">
+  <object id="538" name="Scholarship Institute" type="warp" x="3264" y="2208" width="32" height="32">
    <properties>
     <property name="dest_map" value="000-0"/>
     <property name="dest_x" value="22"/>
@@ -2042,20 +2041,18 @@
     <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
-  <object id="539" name="Physical Sciences Instutite" type="warp" x="1472" y="3200" width="32" height="32">
+  <object id="539" name="Physical Sciences Institute" type="warp" x="1472" y="3200" width="32" height="32">
    <properties>
-    <property name="dest_map" value="000-0"/>
-    <property name="dest_x" value="22"/>
-    <property name="dest_y" value="22"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="027-3"/>
+    <property name="dest_x" value="27"/>
+    <property name="dest_y" value="25"/>
    </properties>
   </object>
-  <object id="540" name="Physical Sciences Instutite" type="warp" x="1280" y="3680" width="32" height="32">
+  <object id="540" name="Physical Sciences Institute" type="warp" x="1280" y="3680" width="32" height="32">
    <properties>
-    <property name="dest_map" value="000-0"/>
-    <property name="dest_x" value="22"/>
-    <property name="dest_y" value="22"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="027-3"/>
+    <property name="dest_x" value="24"/>
+    <property name="dest_y" value="39"/>
    </properties>
   </object>
   <object id="541" name="Student Quarters Office" type="warp" x="3840" y="4192" width="32" height="32">
diff --git a/maps/027-3.tmx b/maps/027-3.tmx
index b1feda96..60407a37 100644
--- a/maps/027-3.tmx
+++ b/maps/027-3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="60" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="1">
+<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="60" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="3">
  <properties>
   <property name="author" value="Donald Horn"/>
   <property name="license" value="CC BY SA 3.0"/>
@@ -598,5 +598,20 @@
 </data>
  </layer>
  <objectgroup id="10" name="Objects" visible="0"/>
- <objectgroup id="11" name="Warps" visible="0"/>
+ <objectgroup id="11" name="Warps" visible="0">
+  <object id="1" name="To Academy" type="warp" x="864" y="832" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="027-1"/>
+    <property name="dest_x" value="46"/>
+    <property name="dest_y" value="101"/>
+   </properties>
+  </object>
+  <object id="2" name="To Academy" type="warp" x="768" y="1280" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="027-1"/>
+    <property name="dest_x" value="40"/>
+    <property name="dest_y" value="116"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>
diff --git a/maps/027-4.tmx b/maps/027-4.tmx
index 216f256f..a55f4e16 100644
--- a/maps/027-4.tmx
+++ b/maps/027-4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="60" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="16" nextobjectid="3">
+<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="60" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="16" nextobjectid="4">
  <properties>
   <property name="author" value="Donald Horn"/>
   <property name="license" value="CC BY SA 3.0"/>
@@ -480,7 +480,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
 </data>
  </layer>
- <layer id="3" name="Collision" width="60" height="60" visible="0">
+ <layer id="3" name="Collision" width="60" height="60">
   <data encoding="csv">
 258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,
 258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,
@@ -609,5 +609,13 @@
 </data>
  </layer>
  <objectgroup id="9" name="Objects" visible="0"/>
- <objectgroup color="#000000" id="6" name="Warps" visible="0"/>
+ <objectgroup color="#000000" id="6" name="Warps">
+  <object id="3" name="To Academy" type="warp" x="896" y="1120" width="64" height="32">
+   <properties>
+    <property name="dest_map" value="027-1"/>
+    <property name="dest_x" value="107"/>
+    <property name="dest_y" value="60"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>