From 2aa3e84cf739a5036b39ddc3b32f1571d2a0b8bc Mon Sep 17 00:00:00 2001
From: remoitnane <remoit(DOT)nane(AT)gmail(DOT)com>
Date: Mon, 26 Jul 2010 21:11:39 -0700
Subject: Clean up some spawns and restore a warp

Signed-off-by: Jared Adams <jaxad0127@gmail.com>
---
 maps/007-1.tmx |  2 +-
 maps/008-1.tmx |  2 +-
 maps/009-1.tmx |  2 +-
 maps/010-1.tmx |  2 +-
 maps/011-1.tmx |  2 +-
 maps/012-1.tmx |  2 +-
 maps/013-1.tmx |  2 +-
 maps/014-1.tmx |  2 +-
 maps/018-1.tmx |  2 +-
 maps/018-3.tmx |  2 +-
 maps/025-1.tmx |  2 +-
 maps/028-1.tmx | 13 ++++++++++---
 12 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/maps/007-1.tmx b/maps/007-1.tmx
index 28a95cd5..3be2bb12 100644
--- a/maps/007-1.tmx
+++ b/maps/007-1.tmx
@@ -69,7 +69,7 @@
     <property name="DEST_Y" value="3152"/>
    </properties>
   </object>
-  <object name="Flower" type="spawn" x="0" y="0">
+  <object name="PinkFlower" type="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index ef33b94d..fe271a1c 100644
--- a/maps/008-1.tmx
+++ b/maps/008-1.tmx
@@ -111,7 +111,7 @@
     <property name="dest_y" value="752"/>
    </properties>
   </object>
-  <object name="Flower" type="spawn" x="0" y="0">
+  <object name="PinkFlower" type="spawn" x="0" y="0">
    <properties>
     <property name="eA_spawn" value="20"/>
     <property name="max_beings" value="10"/>
diff --git a/maps/009-1.tmx b/maps/009-1.tmx
index 63a37196..b8d985fd 100644
--- a/maps/009-1.tmx
+++ b/maps/009-1.tmx
@@ -144,7 +144,7 @@
     <property name="monster_id" value="35"/>
    </properties>
   </object>
-  <object name="Flower" type="spawn" x="800" y="1216" width="320" height="448">
+  <object name="PinkFlower" type="spawn" x="800" y="1216" width="320" height="448">
    <properties>
     <property name="eA_death" value="250"/>
     <property name="max_beings" value="2"/>
diff --git a/maps/010-1.tmx b/maps/010-1.tmx
index 15f40d86..eca0242a 100644
--- a/maps/010-1.tmx
+++ b/maps/010-1.tmx
@@ -104,7 +104,7 @@
     <property name="dest_y" value="1712"/>
    </properties>
   </object>
-  <object name="Flower" type="spawn" x="0" y="0">
+  <object name="PinkFlower" type="spawn" x="0" y="0">
    <properties>
     <property name="eA_spawn" value="50"/>
     <property name="max_beings" value="30"/>
diff --git a/maps/011-1.tmx b/maps/011-1.tmx
index 478625b5..b1a99b29 100644
--- a/maps/011-1.tmx
+++ b/maps/011-1.tmx
@@ -98,7 +98,7 @@
     <property name="monster_id" value="11"/>
    </properties>
   </object>
-  <object name="Flower" type="spawn" x="0" y="0">
+  <object name="PinkFlower" type="spawn" x="0" y="0">
    <properties>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="12"/>
diff --git a/maps/012-1.tmx b/maps/012-1.tmx
index 62b0b3be..3a73ac47 100644
--- a/maps/012-1.tmx
+++ b/maps/012-1.tmx
@@ -141,7 +141,7 @@
     <property name="dest_y" value="4464"/>
    </properties>
   </object>
-  <object name="Flower" type="spawn" x="0" y="0">
+  <object name="PinkFlower" type="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="100"/>
     <property name="max_beings" value="13"/>
diff --git a/maps/013-1.tmx b/maps/013-1.tmx
index d91c92d2..19645453 100644
--- a/maps/013-1.tmx
+++ b/maps/013-1.tmx
@@ -77,7 +77,7 @@
     <property name="dest_y" value="1312"/>
    </properties>
   </object>
-  <object name="Flower" type="spawn" x="0" y="0">
+  <object name="PinkFlower" type="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="100"/>
     <property name="max_beings" value="13"/>
diff --git a/maps/014-1.tmx b/maps/014-1.tmx
index e112e057..31e2a188 100644
--- a/maps/014-1.tmx
+++ b/maps/014-1.tmx
@@ -80,7 +80,7 @@
     <property name="monster_id" value="11"/>
    </properties>
   </object>
-  <object name="Flower" type="spawn" x="0" y="0">
+  <object name="PinkFlower" type="spawn" x="0" y="0">
    <properties>
     <property name="max_beings" value="25"/>
     <property name="monster_id" value="12"/>
diff --git a/maps/018-1.tmx b/maps/018-1.tmx
index 7c6d5365..28dbbc63 100644
--- a/maps/018-1.tmx
+++ b/maps/018-1.tmx
@@ -182,7 +182,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object name="Flower" type="spawn" x="3616" y="1696" width="448" height="224">
+  <object name="PinkFlower" type="spawn" x="3616" y="1696" width="448" height="224">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
diff --git a/maps/018-3.tmx b/maps/018-3.tmx
index ba33ee33..3a648e1a 100644
--- a/maps/018-3.tmx
+++ b/maps/018-3.tmx
@@ -242,7 +242,7 @@
     <property name="monster_id" value="10"/>
    </properties>
   </object>
-  <object name="Flower" type="spawn" x="864" y="4992" width="128" height="96">
+  <object name="PinkFlower" type="spawn" x="864" y="4992" width="128" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="60000"/>
diff --git a/maps/025-1.tmx b/maps/025-1.tmx
index d8696c8e..1b6f8e5f 100644
--- a/maps/025-1.tmx
+++ b/maps/025-1.tmx
@@ -140,7 +140,7 @@
     <property name="monster_id" value="23"/>
    </properties>
   </object>
-  <object name="Flower" type="spawn" x="640" y="640" width="3424" height="2688">
+  <object name="PinkFlower" type="spawn" x="640" y="640" width="3424" height="2688">
    <properties>
     <property name="eA_death" value="5000"/>
     <property name="eA_spawn" value="20000"/>
diff --git a/maps/028-1.tmx b/maps/028-1.tmx
index 10af2915..5122d68e 100644
--- a/maps/028-1.tmx
+++ b/maps/028-1.tmx
@@ -106,7 +106,7 @@
     <property name="eA_death" value="1200"/>
     <property name="eA_spawn" value="100000"/>
     <property name="max_beings" value="18"/>
-    <property name="monster_id" value="15"/>
+    <property name="monster_id" value="31"/>
    </properties>
   </object>
   <object name="Sea Slime" type="spawn" x="1088" y="2240" width="736" height="352">
@@ -114,10 +114,10 @@
     <property name="eA_death" value="1200"/>
     <property name="eA_spawn" value="100000"/>
     <property name="max_beings" value="18"/>
-    <property name="monster_id" value="15"/>
+    <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object name="squirrel" type="spawn" x="736" y="3232" width="32" height="32">
+  <object name="Squirrel" type="spawn" x="736" y="3232" width="32" height="32">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="300000"/>
@@ -157,5 +157,12 @@
     <property name="monster_id" value="43"/>
    </properties>
   </object>
+  <object name="To028-3" type="warp" x="3648" y="3904" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="028-3"/>
+    <property name="dest_x" value="1056"/>
+    <property name="dest_y" value="2496"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
-- 
cgit v1.2.3-60-g2f50