Merge remote-tracking branch 'wushin/unify-warps'

13 files changed, 43 insertions, 39 deletions

diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index 7ce8fd2f..931a0b10 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -372,11 +372,12 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="ToOutside" type="script_warp" x="608" y="896" width="32" height="32">
+  <object id="1" name="ToOutside" type="warp" x="608" y="896" width="32" height="32">
    <properties>
     <property name="dest_map" value="000-1"/>
     <property name="dest_x" value="93"/>
     <property name="dest_y" value="100"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="2" name="To Nard's Room" type="warp" x="1056" y="896" width="32" height="32">
@@ -384,6 +385,7 @@
     <property name="dest_map" value="000-2-3"/>
     <property name="dest_x" value="20"/>
     <property name="dest_y" value="27"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="3" name="To Second Deck" type="warp" x="992" y="800" width="32" height="32">
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index 5196d1c1..bef6b500 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -409,11 +409,12 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Ship's Hold" type="script_warp" x="2304" y="1088" width="32" height="32">
+  <object id="1" name="To Ship's Hold" type="warp" x="2304" y="1088" width="32" height="32">
    <properties>
     <property name="dest_map" value="000-2-2"/>
     <property name="dest_x" value="48"/>
     <property name="dest_y" value="28"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="2" name="To First Deck" type="warp" x="2304" y="960" width="32" height="32">
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index 79f2b2de..65dbdfeb 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -496,18 +496,20 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Second Deck" type="script_warp" x="1536" y="928" width="32" height="28">
+  <object id="1" name="To Second Deck" type="warp" x="1536" y="928" width="32" height="28">
    <properties>
     <property name="dest_map" value="000-2-1"/>
     <property name="dest_x" value="61"/>
     <property name="dest_y" value="34"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
-  <object id="2" name="To ..." type="script_warp" x="740" y="992" width="28" height="32">
+  <object id="2" name="To ..." type="warp" x="740" y="992" width="28" height="32">
    <properties>
     <property name="dest_map" value="000-2-2"/>
     <property name="dest_x" value="1"/>
     <property name="dest_y" value="1"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 4842a763..b239971f 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1719,7 +1719,7 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Library" type="ani_warp" x="1632" y="2560" width="32" height="32">
+  <object id="1" name="To Library" type="warp" x="1632" y="2560" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-4"/>
     <property name="dest_x" value="48"/>
@@ -1729,7 +1729,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="2" name="To Moon's House" type="ani_warp" x="2240" y="2464" width="32" height="32">
+  <object id="2" name="To Moon's House" type="warp" x="2240" y="2464" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-2"/>
     <property name="dest_x" value="38"/>
@@ -1739,7 +1739,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="3" name="To Light Armor Shop West" type="ani_warp" x="1632" y="2080" width="32" height="32">
+  <object id="3" name="To Light Armor Shop West" type="warp" x="1632" y="2080" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-0"/>
     <property name="dest_x" value="30"/>
@@ -1749,7 +1749,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="4" name="To Light Armor Shop East" type="ani_warp" x="1760" y="2272" width="32" height="32">
+  <object id="4" name="To Light Armor Shop East" type="warp" x="1760" y="2272" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-0"/>
     <property name="dest_x" value="37"/>
@@ -1759,7 +1759,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="5" name="To Harbourmaster Lodge" type="ani_warp" x="5376" y="3136" width="32" height="32">
+  <object id="5" name="To Harbourmaster Lodge" type="warp" x="5376" y="3136" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-16"/>
     <property name="dest_x" value="32"/>
@@ -1798,7 +1798,7 @@
     <property name="dest_y" value="31"/>
    </properties>
   </object>
-  <object id="11" name="To RedPlush's INN" type="ani_warp" x="3776" y="2816" width="32" height="32">
+  <object id="11" name="To RedPlush's INN" type="warp" x="3776" y="2816" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-28"/>
     <property name="dest_x" value="29"/>
@@ -1808,7 +1808,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="12" name="To Dock Warehouse" type="ani_warp" x="5824" y="2368" width="32" height="32">
+  <object id="12" name="To Dock Warehouse" type="warp" x="5824" y="2368" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-18"/>
     <property name="dest_x" value="39"/>
@@ -1818,7 +1818,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="13" name="To Alchemy Lab" type="ani_warp" x="5216" y="2240" width="32" height="32">
+  <object id="13" name="To Alchemy Lab" type="warp" x="5216" y="2240" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-26"/>
     <property name="dest_x" value="28"/>
@@ -1828,7 +1828,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="14" name="To Geo and Meorwen's House" type="ani_warp" x="4224" y="2144" width="32" height="32">
+  <object id="14" name="To Geo and Meorwen's House" type="warp" x="4224" y="2144" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-15"/>
     <property name="dest_x" value="34"/>
@@ -1838,7 +1838,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="15" name="To Blacksmith" type="ani_warp" x="3232" y="3424" width="32" height="32">
+  <object id="15" name="To Blacksmith" type="warp" x="3232" y="3424" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-27"/>
     <property name="dest_x" value="35"/>
@@ -1848,7 +1848,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="16" name="To Town Hall" type="ani_warp" x="2848" y="2080" width="32" height="32">
+  <object id="16" name="To Town Hall" type="warp" x="2848" y="2080" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-7"/>
     <property name="dest_x" value="36"/>
@@ -1865,7 +1865,7 @@
     <property name="dest_y" value="45"/>
    </properties>
   </object>
-  <object id="18" name="To Noble House #1" type="ani_warp" x="4544" y="960" width="32" height="32">
+  <object id="18" name="To Noble House #1" type="warp" x="4544" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-12"/>
     <property name="dest_x" value="34"/>
@@ -1875,7 +1875,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="19" name="To Noble House #2" type="ani_warp" x="4096" y="960" width="32" height="32">
+  <object id="19" name="To Noble House #2" type="warp" x="4096" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-1"/>
     <property name="dest_x" value="37"/>
@@ -1885,7 +1885,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="20" name="To Merchant Hall North" type="ani_warp" x="3328" y="1024" width="32" height="32">
+  <object id="20" name="To Merchant Hall North" type="warp" x="3328" y="1024" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-19"/>
     <property name="dest_x" value="41"/>
@@ -1895,7 +1895,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="21" name="To Merchant Hall" type="ani_warp" x="3424" y="1568" width="32" height="32">
+  <object id="21" name="To Merchant Hall" type="warp" x="3424" y="1568" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-20"/>
     <property name="dest_x" value="33"/>
@@ -1905,7 +1905,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="22" name="To Noble House #3" type="ani_warp" x="4736" y="1728" width="32" height="32">
+  <object id="22" name="To Noble House #3" type="warp" x="4736" y="1728" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-11"/>
     <property name="dest_x" value="46"/>
@@ -1915,7 +1915,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="23" name="To Noble House #4 East" type="ani_warp" x="4320" y="1568" width="32" height="32">
+  <object id="23" name="To Noble House #4 East" type="warp" x="4320" y="1568" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-10"/>
     <property name="dest_x" value="51"/>
@@ -1925,7 +1925,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="24" name="To Noble House #4 West" type="ani_warp" x="3776" y="1568" width="32" height="32">
+  <object id="24" name="To Noble House #4 West" type="warp" x="3776" y="1568" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-10"/>
     <property name="dest_x" value="27"/>
@@ -1935,7 +1935,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="25" name="ToLeftBuildingStairway" type="ani_warp" x="1568" y="3072" width="32" height="32">
+  <object id="25" name="ToLeftBuildingStairway" type="warp" x="1568" y="3072" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-31"/>
     <property name="dest_x" value="32"/>
diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index ad0c9fde..38f5bcb3 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -567,7 +567,7 @@
     <property name="dest_y" value="33"/>
    </properties>
   </object>
-  <object id="2" name="To Storage" type="ani_warp" x="1312" y="768" width="32" height="32">
+  <object id="2" name="To Storage" type="warp" x="1312" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-25"/>
     <property name="dest_x" value="29"/>
@@ -591,7 +591,7 @@
     <property name="dest_y" value="27"/>
    </properties>
   </object>
-  <object id="5" name="To Artis South" type="ani_warp" x="1312" y="1504" width="32" height="32">
+  <object id="5" name="To Artis South" type="warp" x="1312" y="1504" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="104"/>
diff --git a/maps/001-2-20.tmx b/maps/001-2-20.tmx
index a4054c45..e22cad8c 100644
--- a/maps/001-2-20.tmx
+++ b/maps/001-2-20.tmx
@@ -430,7 +430,7 @@
     <property name="dest_y" value="50"/>
    </properties>
   </object>
-  <object id="2" name="To main hall" type="ani_warp" x="928" y="800" width="32" height="32">
+  <object id="2" name="To main hall" type="warp" x="928" y="800" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-19"/>
     <property name="dest_x" value="41"/>
diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx
index 99394986..0e1b6c5f 100644
--- a/maps/001-2-22.tmx
+++ b/maps/001-2-22.tmx
@@ -412,11 +412,12 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Ship's Hold" type="script_warp" x="2304" y="1088" width="32" height="32">
+  <object id="1" name="To Ship's Hold" type="warp" x="2304" y="1088" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-23"/>
     <property name="dest_x" value="48"/>
     <property name="dest_y" value="28"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="2" name="To First Deck" type="warp" x="2304" y="960" width="32" height="32">
diff --git a/maps/001-2-23.tmx b/maps/001-2-23.tmx
index 1fede02c..5b127b3b 100644
--- a/maps/001-2-23.tmx
+++ b/maps/001-2-23.tmx
@@ -506,11 +506,12 @@
     <property name="dest_y" value="35"/>
    </properties>
   </object>
-  <object id="2" name="To ..." type="script_warp" x="736" y="992" width="32" height="32">
+  <object id="2" name="To ..." type="warp" x="736" y="992" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-23"/>
     <property name="dest_x" value="1"/>
     <property name="dest_y" value="1"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-32.tmx b/maps/001-2-32.tmx
index 4e3f7f32..7d301524 100644
--- a/maps/001-2-32.tmx
+++ b/maps/001-2-32.tmx
@@ -489,11 +489,12 @@
     <property name="dest_y" value="33"/>
    </properties>
   </object>
-  <object id="24" name="To Fight Room" type="script_warp" x="1056" y="928" width="32" height="32">
+  <object id="24" name="To Fight Room" type="warp" x="1056" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-35"/>
     <property name="dest_x" value="24"/>
     <property name="dest_y" value="29"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="27" name="graphics/particles/warp.xml" type="particle_effect" x="1056" y="928" width="32" height="32"/>
diff --git a/maps/001-2-33.tmx b/maps/001-2-33.tmx
index 907ed7b5..5b68df69 100644
--- a/maps/001-2-33.tmx
+++ b/maps/001-2-33.tmx
@@ -804,7 +804,7 @@
 </data>
  </layer>
  <objectgroup name="Object" opacity="0.87">
-  <object id="35" name="To Left Chamber" type="ani_warp" x="928" y="1024" width="32" height="32">
+  <object id="35" name="To Left Chamber" type="warp" x="928" y="1024" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-34"/>
     <property name="dest_x" value="29"/>
@@ -814,7 +814,7 @@
     <property name="trigger_y" value="2"/>
    </properties>
   </object>
-  <object id="36" name="To Right Chamber" type="ani_warp" x="1248" y="1024" width="32" height="32">
+  <object id="36" name="To Right Chamber" type="warp" x="1248" y="1024" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-32"/>
     <property name="dest_x" value="27"/>
diff --git a/maps/001-2-34.tmx b/maps/001-2-34.tmx
index 45a9d051..932d62a0 100644
--- a/maps/001-2-34.tmx
+++ b/maps/001-2-34.tmx
@@ -489,11 +489,12 @@
     <property name="dest_y" value="33"/>
    </properties>
   </object>
-  <object id="24" name="To Training Room" type="script_warp" x="736" y="928" width="32" height="32">
+  <object id="24" name="To Training Room" type="warp" x="736" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-36"/>
     <property name="dest_x" value="36"/>
     <property name="dest_y" value="30"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index 4413f485..f6d1734a 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -476,7 +476,7 @@
     <property name="dest_y" value="36"/>
    </properties>
   </object>
-  <object id="3" name="To Library Warehouse" type="ani_warp" x="1664" y="864" width="32" height="32">
+  <object id="3" name="To Library Warehouse" type="warp" x="1664" y="864" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-5"/>
     <property name="dest_x" value="28"/>
diff --git a/maps/objecttypes.xml b/maps/objecttypes.xml
index 31d1b5a9..72915863 100644
--- a/maps/objecttypes.xml
+++ b/maps/objecttypes.xml
@@ -4,12 +4,7 @@
   <property name="dest_map" type="string"/>
   <property name="dest_x" type="string"/>
   <property name="dest_y" type="string"/>
- </objecttype>
- <objecttype name="ani_warp" color="#00ff7f">
-  <property name="dest_map" type="string"/>
-  <property name="dest_x" type="string"/>
-  <property name="dest_y" type="string"/>
-  <property name="npc_id" type="string"/>
+  <property name="npc_id" type="string" default="WARP"/>
   <property name="trigger_x" type="string"/>
   <property name="trigger_y" type="string"/>
  </objecttype>