summaryrefslogtreecommitdiff
path: root/maps/010-2.tmx
diff options
context:
space:
mode:
authorchristopherchay <chay.c2.christopher@gmail.com>2019-02-09 15:13:22 -0500
committerchristopherchay <chay.c2.christopher@gmail.com>2019-02-09 15:13:22 -0500
commit758bf6e6037b145d52656e1f4cce2559db59ba0e (patch)
tree7ede1e6bcf6f9e0f850afa665cd7d04baa638ffb /maps/010-2.tmx
parent7fe28b1ce236ccbfd0262646b3647dfcb19eabce (diff)
parentc6f0d9e089c507fa9ba9cf6918f5a8d36984e10a (diff)
downloadclientdata-758bf6e6037b145d52656e1f4cce2559db59ba0e.tar.gz
clientdata-758bf6e6037b145d52656e1f4cce2559db59ba0e.tar.bz2
clientdata-758bf6e6037b145d52656e1f4cce2559db59ba0e.tar.xz
clientdata-758bf6e6037b145d52656e1f4cce2559db59ba0e.zip
Merge branch 'master' of gitlab.com:TMW2/clientdata
Diffstat (limited to 'maps/010-2.tmx')
-rw-r--r--maps/010-2.tmx12
1 files changed, 10 insertions, 2 deletions
diff --git a/maps/010-2.tmx b/maps/010-2.tmx
index dee94102..9f055013 100644
--- a/maps/010-2.tmx
+++ b/maps/010-2.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="284" height="150" tilewidth="32" tileheight="32" nextobjectid="160">
+<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="284" height="150" tilewidth="32" tileheight="32" nextobjectid="161">
<properties>
<property name="authors" value="Saulc"/>
<property name="license" value="GPL 3.0"/>
@@ -1772,7 +1772,7 @@
<object id="157" name="Margin" type="fixme" x="8448" y="3168" width="640" height="640"/>
<object id="159" name="Margin" type="fixme" x="384" y="3424" width="640" height="640"/>
</objectgroup>
- <objectgroup color="#204a87" name="Spawn">
+ <objectgroup color="#204a87" name="Spawn" visible="0">
<object id="134" name="Snake" type="Spawn" x="3648" y="3200" width="544" height="160">
<properties>
<property name="death" value="300000"/>
@@ -1944,6 +1944,7 @@
<property name="dest_map" value="010-1"/>
<property name="dest_x" value="124"/>
<property name="dest_y" value="25"/>
+ <property name="npc_id" value="SCRIPT"/>
</properties>
</object>
<object id="105" name="to cave" type="warp" x="3456" y="4128" width="32" height="32">
@@ -2114,5 +2115,12 @@
<property name="dest_y" value="105"/>
</properties>
</object>
+ <object id="160" name="SCRIPT OVERRIDE" type="warp" x="2976" y="3968" width="288" height="32">
+ <properties>
+ <property name="dest_map" value="004-2"/>
+ <property name="dest_x" value="71"/>
+ <property name="dest_y" value="70"/>
+ </properties>
+ </object>
</objectgroup>
</map>