Integrated the map changes from tmw/trunk into the maps in tmwdata.

1 files changed, 142 insertions, 0 deletions

diff --git a/maps/new_1-1.tmx b/maps/new_1-1.tmx
index a006c486..306bf1d0 100644
--- a/maps/new_1-1.tmx
+++ b/maps/new_1-1.tmx
@@ -54,4 +54,146 @@
    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
   </data>
  </layer>
+ <objectgroup name="Objects" width="0" height="0">
+  <object name="ToTulimshar" type="WARP" x="1792" y="384" width="160" height="32">
+   <properties>
+    <property name="DEST_MAP">
+     3
+    </property>
+    <property name="DEST_Y">
+     2576
+    </property>
+    <property name="DEST_X">
+     1424
+    </property>
+   </properties>
+  </object>
+  <object name="Maggot" type="SPAWN" x="0" y="0" width="0" height="0">
+   <properties>
+    <property name="SPAWN_RATE">
+     10
+    </property>
+    <property name="MAX_BEINGS">
+     20
+    </property>
+    <property name="MONSTER_ID">
+     1002
+    </property>
+   </properties>
+  </object>
+  <object name="npc1" type="NPC" x="1712" y="688" width="0" height="0">
+   <properties>
+    <property name="SCRIPT">
+     local nb_times = 1
+     function npc_handler(npc, ch)
+       do_message(npc, ch, "You know what?")
+       do_message(npc, ch, string.format("I have already asked this question %d times today.", nb_times))
+       nb_times = nb_times + 1
+     end
+    </property>
+    <property name="NPC_ID">
+     107
+    </property>
+   </properties>
+  </object>
+  <object name="npc2" type="NPC" x="1712" y="752" width="0" height="0">
+   <properties>
+    <property name="SCRIPT">
+     function npc_handler(npc, ch)
+       do_message(npc, ch, "Don't you think the guy behind me is my evil twin?")
+     end
+    </property>
+    <property name="NPC_ID">
+     107
+    </property>
+   </properties>
+  </object>
+  <object name="Ishyah" type="NPC" x="624" y="3184" width="0" height="0">
+   <properties>
+    <property name="SCRIPT">
+     function npc_handler(npc, ch)
+       local v = do_choice(npc, ch, "Buy", "Sell")
+       if v == 1 then
+         tmw.npc_trade(npc, ch, false, { {525, 0, 800}, {531, 0, 3000}, {530, 0, 8000}, {1199, 0, 3} })
+       elseif v == 2 then
+         tmw.npc_trade(npc, ch, true, { {525, 0, 400}, {531, 0, 1500}, {530, 0, 4000}, {1199, 0, 1} })
+       end
+     end
+    </property>
+    <property name="NPC_ID">
+     109
+    </property>
+   </properties>
+  </object>
+  <object name="Samuel the Nomad" type="NPC" x="496" y="2160" width="0" height="0">
+   <properties>
+    <property name="SCRIPT">
+     function npc_handler(npc, ch)
+       do_message(npc, ch, "This is really a nice place.\nDon't you think so?")
+     end
+    </property>
+    <property name="NPC_ID">
+     132
+    </property>
+   </properties>
+  </object>
+  <object name="Elijah the Nomad" type="NPC" x="592" y="2192" width="0" height="0">
+   <properties>
+    <property name="SCRIPT">
+     function npc_handler(npc, ch)
+       do_message(npc, ch, "If I only had a tent...")
+     end
+    </property>
+    <property name="NPC_ID">
+     128
+    </property>
+   </properties>
+  </object>
+  <object name="Other npcs" type="SCRIPT" x="0" y="0" width="0" height="0">
+   <properties>
+    <property name="FILENAME">
+     test.lua
+    </property>
+   </properties>
+  </object>
+  <object name="ToEastDesert" type="WARP" x="3456" y="2496" width="64" height="96">
+   <properties>
+    <property name="DEST_MAP">
+     7
+    </property>
+    <property name="DEST_Y">
+     1296
+    </property>
+    <property name="DEST_X">
+     704
+    </property>
+   </properties>
+  </object>
+  <object name="ToWestDesert" type="WARP" x="352" y="2080" width="64" height="160">
+   <properties>
+    <property name="DEST_MAP">
+     15
+    </property>
+    <property name="DEST_Y">
+     2112
+    </property>
+    <property name="DEST_X">
+     5376
+    </property>
+   </properties>
+  </object>
+  <object name="ToCave" type="WARP" x="640" y="3048" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP">
+     2
+    </property>
+    <property name="DEST_Y">
+     1024
+    </property>
+    <property name="DEST_X">
+     1200
+    </property>
+   </properties>
+  </object>
+ </objectgroup>
 </map>