From 6f757c66f4873c5d5c83e4fdb0abe5b609d5e76f Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Mon, 18 Jul 2016 18:51:38 +0200
Subject: [PATCH] Updated to version code 43. Maps now save the spawn area ID,
 to have better control over which are activated or not. All maps refactored
 to have unique spawn area id. Spawn group now defined in "spawngroup"
 property instead of name (id).

---
 AndorsTrail/AndroidManifest.xml               |   2 +-
 AndorsTrail/res/xml/blackwater_mountain1.tmx  |  15 +-
 AndorsTrail/res/xml/blackwater_mountain12.tmx |  26 +-
 AndorsTrail/res/xml/blackwater_mountain14.tmx |  24 +-
 AndorsTrail/res/xml/blackwater_mountain15.tmx |  26 +-
 AndorsTrail/res/xml/blackwater_mountain16.tmx |  50 ++-
 AndorsTrail/res/xml/blackwater_mountain17.tmx |  33 +-
 AndorsTrail/res/xml/blackwater_mountain18.tmx |  39 +-
 AndorsTrail/res/xml/blackwater_mountain2.tmx  |   8 +-
 AndorsTrail/res/xml/blackwater_mountain20.tmx |  22 +-
 AndorsTrail/res/xml/blackwater_mountain29.tmx |  43 +-
 AndorsTrail/res/xml/blackwater_mountain30.tmx |  47 +-
 AndorsTrail/res/xml/blackwater_mountain32.tmx |  56 ++-
 AndorsTrail/res/xml/blackwater_mountain33.tmx |  23 +-
 AndorsTrail/res/xml/blackwater_mountain34.tmx |  55 ++-
 AndorsTrail/res/xml/blackwater_mountain36.tmx |  31 +-
 AndorsTrail/res/xml/blackwater_mountain37.tmx |  37 +-
 AndorsTrail/res/xml/blackwater_mountain38.tmx |  37 +-
 AndorsTrail/res/xml/blackwater_mountain39.tmx |  32 +-
 .../res/xml/blackwater_mountain39a.tmx        |  42 +-
 AndorsTrail/res/xml/blackwater_mountain4.tmx  |  15 +-
 AndorsTrail/res/xml/blackwater_mountain40.tmx |  19 +-
 AndorsTrail/res/xml/blackwater_mountain41.tmx | 116 +++--
 AndorsTrail/res/xml/blackwater_mountain42.tmx |  89 ++--
 AndorsTrail/res/xml/blackwater_mountain43.tmx |  91 +++-
 AndorsTrail/res/xml/blackwater_mountain44.tmx |  49 ++-
 AndorsTrail/res/xml/blackwater_mountain45.tmx |  37 +-
 AndorsTrail/res/xml/blackwater_mountain5.tmx  |  27 +-
 AndorsTrail/res/xml/blackwater_mountain50.tmx |  37 +-
 AndorsTrail/res/xml/blackwater_mountain51.tmx |  21 +-
 AndorsTrail/res/xml/blackwater_mountain52.tmx |  26 +-
 AndorsTrail/res/xml/blackwater_mountain5a.tmx |  31 +-
 AndorsTrail/res/xml/blackwater_mountain7.tmx  |  43 +-
 AndorsTrail/res/xml/blackwater_mountain7a.tmx |  27 +-
 AndorsTrail/res/xml/blackwater_mountain9.tmx  |  27 +-
 AndorsTrail/res/xml/catacombs2.tmx            |  31 +-
 AndorsTrail/res/xml/catacombs3.tmx            |  39 +-
 AndorsTrail/res/xml/clearing_level1.tmx       | 105 +++--
 AndorsTrail/res/xml/clearing_level2.tmx       | 104 +++--
 AndorsTrail/res/xml/crossglen_cave.tmx        |  86 ++--
 AndorsTrail/res/xml/crossroads.tmx            |  45 +-
 AndorsTrail/res/xml/fallhaven_prison.tmx      | 104 +++--
 AndorsTrail/res/xml/fallhaven_sw.tmx          |  23 +-
 AndorsTrail/res/xml/fields1.tmx               |  19 +-
 AndorsTrail/res/xml/fields12.tmx              |   7 +-
 AndorsTrail/res/xml/fields5.tmx               | 105 +++--
 AndorsTrail/res/xml/fields6.tmx               |  26 +-
 AndorsTrail/res/xml/flagstone0.tmx            |  46 +-
 AndorsTrail/res/xml/flagstone1.tmx            | 100 +++--
 AndorsTrail/res/xml/flagstone2.tmx            | 131 +++---
 AndorsTrail/res/xml/flagstone3.tmx            | 117 +++--
 AndorsTrail/res/xml/flagstone_inner.tmx       | 122 +++--
 AndorsTrail/res/xml/flagstone_upper.tmx       | 103 +++--
 AndorsTrail/res/xml/gargoylecave1.tmx         | 108 +++--
 AndorsTrail/res/xml/gargoylecave2.tmx         | 117 +++--
 AndorsTrail/res/xml/gargoylecave3.tmx         | 100 +++--
 AndorsTrail/res/xml/hauntedhouse3.tmx         |  22 +-
 AndorsTrail/res/xml/houseatcrossroads1.tmx    |  94 ++--
 AndorsTrail/res/xml/jan_pitcave1.tmx          |  92 ++--
 AndorsTrail/res/xml/jan_pitcave2.tmx          | 131 +++---
 AndorsTrail/res/xml/lodar0.tmx                |  41 +-
 AndorsTrail/res/xml/lodar10.tmx               |  14 +-
 AndorsTrail/res/xml/lodar11.tmx               |  79 +++-
 AndorsTrail/res/xml/lodar12.tmx               |  65 ++-
 AndorsTrail/res/xml/lodar12cave0.tmx          |  37 +-
 AndorsTrail/res/xml/lodar12cave1.tmx          |  45 +-
 AndorsTrail/res/xml/lodar13.tmx               |  23 +-
 AndorsTrail/res/xml/lodar14.tmx               |  80 +++-
 AndorsTrail/res/xml/lodar16.tmx               |  66 ++-
 AndorsTrail/res/xml/lodar17.tmx               |  41 +-
 AndorsTrail/res/xml/lodar18.tmx               |  63 ++-
 AndorsTrail/res/xml/lodar19.tmx               |  40 +-
 AndorsTrail/res/xml/lodar1cave0.tmx           |  40 +-
 AndorsTrail/res/xml/lodar2.tmx                |  75 +++-
 AndorsTrail/res/xml/lodar20.tmx               |  58 ++-
 AndorsTrail/res/xml/lodar21.tmx               |  34 +-
 AndorsTrail/res/xml/lodar3.tmx                |  59 ++-
 AndorsTrail/res/xml/lodar4.tmx                |  40 +-
 AndorsTrail/res/xml/lodar5.tmx                |  10 +-
 AndorsTrail/res/xml/lodar5cave0.tmx           | 102 ++++-
 AndorsTrail/res/xml/lodar5cave1.tmx           |  18 +-
 AndorsTrail/res/xml/lodar5cave2.tmx           |  20 +-
 AndorsTrail/res/xml/lodar6.tmx                |  27 +-
 AndorsTrail/res/xml/lodar7.tmx                | 111 ++++-
 AndorsTrail/res/xml/lodar8.tmx                | 127 ++++--
 AndorsTrail/res/xml/lodar8cave0.tmx           |  37 +-
 AndorsTrail/res/xml/lodar9.tmx                |  54 ++-
 AndorsTrail/res/xml/lodarcave0.tmx            |  42 +-
 AndorsTrail/res/xml/lodarcave1.tmx            |  51 ++-
 AndorsTrail/res/xml/lodarcave2.tmx            |  16 +-
 AndorsTrail/res/xml/lodarcave3.tmx            |  75 +++-
 AndorsTrail/res/xml/lodarcave4.tmx            |  36 +-
 AndorsTrail/res/xml/lodarcave4a.tmx           | 415 +++++++++---------
 AndorsTrail/res/xml/lodarcave5.tmx            |  39 +-
 AndorsTrail/res/xml/lodarcave6.tmx            |  36 +-
 AndorsTrail/res/xml/lodarcave7.tmx            |  22 +-
 AndorsTrail/res/xml/lodarhouse0.tmx           |   5 +-
 AndorsTrail/res/xml/loneford10.tmx            |  87 ++--
 AndorsTrail/res/xml/loneford3.tmx             |  87 ++--
 AndorsTrail/res/xml/loneford4.tmx             |  86 ++--
 AndorsTrail/res/xml/lonelyhouse1.tmx          |  84 ++--
 AndorsTrail/res/xml/lostmine0.tmx             |  29 +-
 AndorsTrail/res/xml/lostmine1.tmx             |  53 ++-
 AndorsTrail/res/xml/lostmine10.tmx            |  39 +-
 AndorsTrail/res/xml/lostmine11.tmx            |  30 +-
 AndorsTrail/res/xml/lostmine2.tmx             | 126 +++++-
 AndorsTrail/res/xml/lostmine2a.tmx            |  21 +-
 AndorsTrail/res/xml/lostmine3.tmx             |  59 ++-
 AndorsTrail/res/xml/lostmine5.tmx             |  36 +-
 AndorsTrail/res/xml/lostmine6.tmx             |  29 +-
 AndorsTrail/res/xml/lostmine7.tmx             |  96 +++-
 AndorsTrail/res/xml/lostmine8.tmx             |  25 +-
 AndorsTrail/res/xml/lostmine9.tmx             | 101 ++++-
 AndorsTrail/res/xml/minerhouse0.tmx           |  15 +-
 AndorsTrail/res/xml/minerhouse1.tmx           |  15 +-
 AndorsTrail/res/xml/minerhouse2.tmx           |   9 +-
 AndorsTrail/res/xml/minerhouse3.tmx           |  21 +-
 AndorsTrail/res/xml/minerhouse4.tmx           |  14 +-
 AndorsTrail/res/xml/minerhouse5.tmx           |  17 +-
 AndorsTrail/res/xml/minerhouse7.tmx           |  11 +-
 AndorsTrail/res/xml/minerhouse8.tmx           |  30 +-
 AndorsTrail/res/xml/minerhouse9.tmx           |  14 +-
 AndorsTrail/res/xml/mountaincave0.tmx         |  91 ++--
 AndorsTrail/res/xml/mountaincave1.tmx         |  93 ++--
 AndorsTrail/res/xml/mountaincave2.tmx         |  95 ++--
 AndorsTrail/res/xml/mountainlake0.tmx         |  97 ++--
 AndorsTrail/res/xml/mountainlake1.tmx         | 112 ++---
 AndorsTrail/res/xml/mountainlake10.tmx        | 111 ++---
 AndorsTrail/res/xml/mountainlake10a.tmx       |  11 +-
 AndorsTrail/res/xml/mountainlake11.tmx        |  25 +-
 AndorsTrail/res/xml/mountainlake12.tmx        |   8 +-
 AndorsTrail/res/xml/mountainlake13.tmx        | 101 ++---
 AndorsTrail/res/xml/mountainlake2.tmx         | 103 ++---
 AndorsTrail/res/xml/mountainlake3.tmx         | 113 ++---
 AndorsTrail/res/xml/mountainlake4.tmx         | 100 ++---
 AndorsTrail/res/xml/mountainlake5.tmx         | 113 ++---
 AndorsTrail/res/xml/mountainlake6.tmx         |  93 ++--
 AndorsTrail/res/xml/mountainlake7.tmx         |  99 ++---
 AndorsTrail/res/xml/mountainlake8.tmx         | 112 ++---
 AndorsTrail/res/xml/mountainlake9.tmx         | 110 ++---
 AndorsTrail/res/xml/oldcave0.tmx              |  43 +-
 AndorsTrail/res/xml/oldcave1.tmx              |  58 ++-
 AndorsTrail/res/xml/pwcave0.tmx               |  91 ++--
 AndorsTrail/res/xml/pwcave1.tmx               | 106 ++---
 AndorsTrail/res/xml/pwcave2.tmx               |  41 +-
 AndorsTrail/res/xml/pwcave2a.tmx              |  12 +-
 AndorsTrail/res/xml/pwcave3.tmx               | 123 +++---
 AndorsTrail/res/xml/pwcave4.tmx               | 105 +++--
 AndorsTrail/res/xml/remgard_prison.tmx        | 104 +++--
 AndorsTrail/res/xml/remgard_tavern0.tmx       |  35 +-
 AndorsTrail/res/xml/remgard_tavern1.tmx       |  45 +-
 AndorsTrail/res/xml/road1.tmx                 |  22 +-
 AndorsTrail/res/xml/road4.tmx                 |  37 +-
 AndorsTrail/res/xml/road4_gargoylecave.tmx    |  31 +-
 AndorsTrail/res/xml/roadbeforecrossroads.tmx  |  32 +-
 AndorsTrail/res/xml/roadbeforecrossroads2.tmx |  40 +-
 AndorsTrail/res/xml/roadbeforecrossroads4.tmx |   6 +-
 AndorsTrail/res/xml/roadbeforecrossroads5.tmx |  23 +-
 AndorsTrail/res/xml/roadbeforecrossroads6.tmx |  30 +-
 AndorsTrail/res/xml/roadbeforecrossroads7.tmx |  17 +-
 AndorsTrail/res/xml/roadbeforecrossroads8.tmx |  21 +-
 AndorsTrail/res/xml/roadbeforecrossroads9.tmx |  50 ++-
 AndorsTrail/res/xml/roadcave0.tmx             |  34 +-
 AndorsTrail/res/xml/roadcave1.tmx             |  65 ++-
 AndorsTrail/res/xml/roadtocarntower2.tmx      |  32 +-
 AndorsTrail/res/xml/shortcut_lodar0.tmx       |  36 +-
 AndorsTrail/res/xml/shortcut_lodar1.tmx       |  12 +-
 AndorsTrail/res/xml/shortcut_lodar2.tmx       |  49 ++-
 AndorsTrail/res/xml/shortcut_lodar3.tmx       |  48 +-
 AndorsTrail/res/xml/shortcut_lodar4.tmx       |  20 +-
 AndorsTrail/res/xml/snakecave1.tmx            |  95 ++--
 AndorsTrail/res/xml/snakecave2.tmx            |  98 +++--
 AndorsTrail/res/xml/snakecave3.tmx            |  95 ++--
 AndorsTrail/res/xml/stoutford_church.tmx      |  31 +-
 AndorsTrail/res/xml/stoutford_sw.tmx          |  20 +-
 AndorsTrail/res/xml/vilegard_chapel.tmx       |  98 +++--
 AndorsTrail/res/xml/waterway0.tmx             |  97 ++--
 AndorsTrail/res/xml/waterway1.tmx             |  23 +-
 AndorsTrail/res/xml/waterway10.tmx            |  16 +-
 AndorsTrail/res/xml/waterway11.tmx            |  17 +-
 AndorsTrail/res/xml/waterway11_east.tmx       |  15 +-
 AndorsTrail/res/xml/waterway12.tmx            |  13 +-
 AndorsTrail/res/xml/waterway14.tmx            |   7 +-
 AndorsTrail/res/xml/waterway15.tmx            |  86 ++--
 AndorsTrail/res/xml/waterway3.tmx             |  16 +-
 AndorsTrail/res/xml/waterway4.tmx             |  10 +-
 AndorsTrail/res/xml/waterway5.tmx             |  19 +-
 AndorsTrail/res/xml/waterway6.tmx             |  12 +-
 AndorsTrail/res/xml/waterway7.tmx             |  92 ++--
 AndorsTrail/res/xml/waterway8.tmx             |  23 +-
 AndorsTrail/res/xml/waterway9.tmx             | 114 ++---
 AndorsTrail/res/xml/waterwaycave.tmx          | 102 +++--
 AndorsTrail/res/xml/waytobrimhaven2.tmx       |  88 ++--
 AndorsTrail/res/xml/waytobrimhaven3.tmx       |  91 ++--
 AndorsTrail/res/xml/waytobrimhavencave0.tmx   |  93 ++--
 AndorsTrail/res/xml/waytobrimhavencave1.tmx   | 114 ++---
 AndorsTrail/res/xml/waytobrimhavencave2.tmx   |  25 +-
 AndorsTrail/res/xml/waytobrimhavencave3.tmx   |  60 +--
 AndorsTrail/res/xml/waytobrimhavencave3a.tmx  | 112 ++---
 AndorsTrail/res/xml/waytobrimhavencave3b.tmx  |  87 ++--
 AndorsTrail/res/xml/waytobrimhavencave4.tmx   |  94 ++--
 AndorsTrail/res/xml/waytolake0.tmx            | 104 ++---
 AndorsTrail/res/xml/waytolake1.tmx            | 108 ++---
 AndorsTrail/res/xml/waytolake2.tmx            | 106 ++---
 AndorsTrail/res/xml/waytolake3.tmx            | 101 ++---
 AndorsTrail/res/xml/waytolake4.tmx            | 134 +++---
 AndorsTrail/res/xml/waytolake5.tmx            | 109 ++---
 AndorsTrail/res/xml/waytolostmine0.tmx        |  71 ++-
 AndorsTrail/res/xml/waytolostmine1.tmx        |  98 ++++-
 AndorsTrail/res/xml/waytolostmine2.tmx        |  48 +-
 AndorsTrail/res/xml/waytolostmine3.tmx        |  59 ++-
 AndorsTrail/res/xml/waytominingtown0.tmx      |  14 +-
 AndorsTrail/res/xml/waytominingtown1.tmx      |  18 +-
 AndorsTrail/res/xml/waytominingtown3.tmx      |  43 +-
 AndorsTrail/res/xml/waytomountaincave0.tmx    |  88 ++--
 AndorsTrail/res/xml/waytomountaincave1.tmx    |  89 ++--
 AndorsTrail/res/xml/waytomountaincave2.tmx    |  98 +++--
 AndorsTrail/res/xml/wild0.tmx                 |  34 +-
 AndorsTrail/res/xml/wild1.tmx                 |  27 +-
 AndorsTrail/res/xml/wild11_clearing.tmx       |  14 +-
 AndorsTrail/res/xml/wild13.tmx                |  20 +-
 AndorsTrail/res/xml/wild14_cave.tmx           |  43 +-
 AndorsTrail/res/xml/wild2.tmx                 |  20 +-
 AndorsTrail/res/xml/wild3.tmx                 |  16 +-
 AndorsTrail/res/xml/wild4.tmx                 |  15 +-
 AndorsTrail/res/xml/wild5.tmx                 |   8 +-
 AndorsTrail/res/xml/wild9.tmx                 |  27 +-
 AndorsTrail/res/xml/woodcave0.tmx             |  77 +++-
 AndorsTrail/res/xml/woodcave1.tmx             |  85 ++--
 AndorsTrail/res/xml/woodsettlement0.tmx       |  32 +-
 .../AndorsTrail/AndorsTrailApplication.java   |   4 +-
 .../controller/ConversationController.java    |   4 +-
 .../controller/MonsterMovementController.java |   1 +
 .../model/map/MonsterSpawnArea.java           |   6 +-
 .../AndorsTrail/model/map/PredefinedMap.java  |  28 +-
 .../model/map/TMXMapTranslator.java           |   5 +-
 .../LegacySavegameFormatReaderForPlayer.java  |   2 +-
 237 files changed, 8465 insertions(+), 4666 deletions(-)

diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 0e416a2dc..26146496f 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -3,7 +3,7 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="42"
+	android:versionCode="43"
 	android:versionName="0.7.2dev"
 	android:installLocation="auto"
 	>
diff --git a/AndorsTrail/res/xml/blackwater_mountain1.tmx b/AndorsTrail/res/xml/blackwater_mountain1.tmx
index 78193ff49..f2cfb2ca0 100644
--- a/AndorsTrail/res/xml/blackwater_mountain1.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,13 +162,23 @@
   <object name="forestboar4" type="spawn" x="128" y="352" width="448" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestboar4"/>
+   </properties>
+  </object>
+  <object name="gornaud_1" type="spawn" x="192" y="64" width="64" height="96">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_1" type="spawn" x="352" y="64" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
    </properties>
   </object>
-  <object name="gornaud_1" type="spawn" x="192" y="64" width="64" height="96"/>
-  <object name="gornaud_1" type="spawn" x="352" y="64" width="96" height="32"/>
   <object name="forestwolf2" type="spawn" x="64" y="160" width="512" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestwolf2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/blackwater_mountain12.tmx b/AndorsTrail/res/xml/blackwater_mountain12.tmx
index f4868e22b..2b2862447 100644
--- a/AndorsTrail/res/xml/blackwater_mountain12.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain12.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="28" height="27" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -143,7 +144,7 @@
    eJztU1sKwCAM8wi7lPe/0tiHIGW1ebh9GSi4ok3apf1qrZ84sTkexPOcG98x5/BlyHSxfaB8M2+mQ623uovO9iu4/b3VYPNKj+hbtL9MI8OpeF7xt7oHMx+im9G1mn8FZZaVbhbOjFVkflM85Ghz9g+5g+wWWqPaX+Q+Mif0LauP6ZPpD61T6dnhe8dPzn+M+zPOCsefcQM8v6C1
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="east" type="mapchange" x="864" y="544" width="32" height="96">
    <properties>
     <property name="map" value="blackwater_mountain10"/>
@@ -163,15 +164,28 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="restless_dead_1" type="spawn" x="352" y="704" width="128" height="96"/>
-  <object name="forestboar4" type="spawn" x="480" y="128" width="288" height="288"/>
-  <object name="forestboar4" type="spawn" x="704" y="576" width="32" height="32"/>
+ <objectgroup name="Spawn">
+  <object name="restless_dead_1" type="spawn" x="352" y="704" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="restless_dead_1"/>
+   </properties>
+  </object>
+  <object name="forestboar4" type="spawn" x="480" y="128" width="288" height="288">
+   <properties>
+    <property name="spawngroup" value="forestboar4"/>
+   </properties>
+  </object>
+  <object name="forestboar4_1" type="spawn" x="704" y="576" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="forestboar4"/>
+   </properties>
+  </object>
   <object name="primwolf1" type="spawn" x="288" y="480" width="320" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="primwolf1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain14.tmx b/AndorsTrail/res/xml/blackwater_mountain14.tmx
index 81122ce85..0888f9278 100644
--- a/AndorsTrail/res/xml/blackwater_mountain14.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain14.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -143,7 +144,7 @@
    eJy9klEOwCAMQj3CLuX9r7T4Z4wIrLgm/dmQV6r9aa1f7FE3/RPc5Iyq11yq30nr+iA2KsRAXKVWLTuX4CI9Ov/lfh2uOyf6n+BW3ijTVfKqns5sil7VOPOv3xSeM5+bN7VrtqvE23LzsjPurlEl8zIu2vXO32FWupq3wlXu5O/sc7+gZoQn
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="west" type="mapchange" x="0" y="160" width="32" height="64">
    <properties>
     <property name="map" value="blackwater_mountain10"/>
@@ -163,24 +164,35 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
+ <objectgroup name="Spawn">
   <object name="primwolf1" type="spawn" x="96" y="64" width="192" height="384">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="primwolf1"/>
+   </properties>
+  </object>
+  <object name="bwm_agent_3" type="spawn" x="768" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="bwm_agent_3"/>
+   </properties>
+  </object>
+  <object name="primwolf1_1" type="spawn" x="384" y="416" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="primwolf1"/>
    </properties>
   </object>
-  <object name="bwm_agent_3" type="spawn" x="768" y="192" width="32" height="32"/>
-  <object name="primwolf1" type="spawn" x="384" y="416" width="32" height="32"/>
   <object name="forestboar4" type="spawn" x="352" y="96" width="320" height="320">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestboar4"/>
    </properties>
   </object>
-  <object name="primwolf1" type="spawn" x="704" y="320" width="192" height="256">
+  <object name="primwolf1_2" type="spawn" x="704" y="320" width="192" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="primwolf1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain15.tmx b/AndorsTrail/res/xml/blackwater_mountain15.tmx
index 5f2d93a8e..695b01105 100644
--- a/AndorsTrail/res/xml/blackwater_mountain15.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain15.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -143,7 +144,7 @@
    eJzdk9EJADEIQzvCLdX9V7rfIkZf7vCnglCkMTG2+1lrX5JnxLqDjeHgTj7ag/BXPSawxLsKN4XtZlW+dxF5VW2SN9b+zJv5ps4Olv43pVX5TIJoJvcotupHNdJdZnrcv1rt66tm19Os3s1V+UWwzptV+QKHgFaq
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="96" y="928" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain14"/>
@@ -169,24 +170,35 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="gornaud_2" type="spawn" x="96" y="864" width="32" height="32"/>
-  <object name="gornaud_2" type="spawn" x="288" y="576" width="64" height="64"/>
+ <objectgroup name="Spawn">
+  <object name="gornaud_2" type="spawn" x="96" y="864" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
+  <object name="gornaud_2_1" type="spawn" x="288" y="576" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
   <object name="gornaud_1" type="spawn" x="32" y="224" width="128" height="544">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_1"/>
    </properties>
   </object>
-  <object name="gornaud_1" type="spawn" x="160" y="96" width="288" height="416">
+  <object name="gornaud_1_1" type="spawn" x="160" y="96" width="288" height="416">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="gornaud_1"/>
    </properties>
   </object>
-  <object name="gornaud_2" type="spawn" x="96" y="704" width="224" height="160">
+  <object name="gornaud_2_2" type="spawn" x="96" y="704" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain16.tmx b/AndorsTrail/res/xml/blackwater_mountain16.tmx
index f827124ca..d38c8aa3e 100644
--- a/AndorsTrail/res/xml/blackwater_mountain16.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain16.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -143,7 +144,7 @@
    eJzFk9ENACEIQx3Bpdx/JX+NaaEV7zQhkeijQGD01sYHth7n734q7G0e+RU2ixv5jFW1UK4o9+iusOu7q8tYFi+aP6Qb9S9jVV1nF26wbDZZrc5OnHAu8ypPlWW7VmUVfdarjD2psdIblKPbm79tAjViW/o=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="west" type="mapchange" x="0" y="160" width="32" height="96">
    <properties>
     <property name="map" value="blackwater_mountain15"/>
@@ -158,37 +159,62 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
+ <objectgroup name="Spawn">
   <object name="gornaud_1" type="spawn" x="192" y="672" width="96" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_1"/>
    </properties>
   </object>
-  <object name="gornaud_2" type="spawn" x="32" y="288" width="64" height="64"/>
-  <object name="gornaud_2" type="spawn" x="128" y="192" width="32" height="128"/>
-  <object name="gornaud_2" type="spawn" x="32" y="352" width="160" height="192">
+  <object name="gornaud_2" type="spawn" x="32" y="288" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
+  <object name="gornaud_2_1" type="spawn" x="128" y="192" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
+  <object name="gornaud_2_2" type="spawn" x="32" y="352" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object name="gornaud_1" type="spawn" x="224" y="256" width="96" height="192"/>
-  <object name="gornaud_2" type="spawn" x="224" y="448" width="96" height="96">
+  <object name="gornaud_1_1" type="spawn" x="224" y="256" width="96" height="192">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_2_3" type="spawn" x="224" y="448" width="96" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object name="gornaud_2" type="spawn" x="96" y="32" width="352" height="160">
+  <object name="gornaud_2_4" type="spawn" x="96" y="32" width="352" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object name="gornaud_1" type="spawn" x="320" y="160" width="128" height="352"/>
-  <object name="gornaud_1" type="spawn" x="96" y="544" width="224" height="128"/>
-  <object name="gornaud_2" type="spawn" x="64" y="768" width="160" height="128">
+  <object name="gornaud_1_2" type="spawn" x="320" y="160" width="128" height="352">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_3" type="spawn" x="96" y="544" width="224" height="128">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_2_5" type="spawn" x="64" y="768" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain17.tmx b/AndorsTrail/res/xml/blackwater_mountain17.tmx
index 8d61962a5..d04c71908 100644
--- a/AndorsTrail/res/xml/blackwater_mountain17.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain17.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -121,7 +122,7 @@
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="5045" name="map_transition_5" tilewidth="32" tileheight="32">
-  <image source="../../../Project template/drawable/map_transition_5.png" width="512" height="256"/>
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="5173" name="map_transition_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
@@ -158,7 +159,7 @@
    eJxzFWBgcB2hGAYIqcHGpsQ8bIAYteSahw8Qayax9hID6BEuxMQXMXoAQKouKA==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="96" y="288" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain15"/>
@@ -172,11 +173,27 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="gornaud_3" type="spawn" x="384" y="224" width="32" height="32"/>
-  <object name="gornaud_2" type="spawn" x="96" y="160" width="128" height="128"/>
-  <object name="bwm_agent_4" type="spawn" x="256" y="224" width="32" height="32"/>
-  <object name="gornaud_2" type="spawn" x="416" y="96" width="128" height="192"/>
+ <objectgroup name="Spawn">
+  <object name="gornaud_3" type="spawn" x="384" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="gornaud_3"/>
+   </properties>
+  </object>
+  <object name="gornaud_2" type="spawn" x="96" y="160" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
+  <object name="bwm_agent_4" type="spawn" x="256" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="bwm_agent_4"/>
+   </properties>
+  </object>
+  <object name="gornaud_2_1" type="spawn" x="416" y="96" width="128" height="192">
+   <properties>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain18.tmx b/AndorsTrail/res/xml/blackwater_mountain18.tmx
index b524637e7..88631eabe 100644
--- a/AndorsTrail/res/xml/blackwater_mountain18.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain18.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="22" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcIViEHAVIA8PhF5iAS59lNg5kOFEjr+R9RITnsNJLzZ5fHGJLxwHOg1RQy+usCJVLzaATw6bvcQAUv1Gql5iMACZHUy0
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="96" y="0" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain17"/>
@@ -154,21 +155,39 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="gornaud_3" type="spawn" x="128" y="288" width="32" height="96"/>
-  <object name="gornaud_3" type="spawn" x="64" y="224" width="32" height="160"/>
-  <object name="gornaud_3" type="spawn" x="128" y="96" width="256" height="32"/>
-  <object name="gornaud_2" type="spawn" x="160" y="224" width="64" height="32"/>
-  <object name="gornaud_2" type="spawn" x="224" y="224" width="224" height="448">
+ <objectgroup name="Spawn">
+  <object name="gornaud_3" type="spawn" x="128" y="288" width="32" height="96">
    <properties>
-    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="gornaud_3"/>
    </properties>
   </object>
-  <object name="gornaud_2" type="spawn" x="128" y="576" width="160" height="96">
+  <object name="gornaud_3_1" type="spawn" x="64" y="224" width="32" height="160">
+   <properties>
+    <property name="spawngroup" value="gornaud_3"/>
+   </properties>
+  </object>
+  <object name="gornaud_3_2" type="spawn" x="128" y="96" width="256" height="32">
+   <properties>
+    <property name="spawngroup" value="gornaud_3"/>
+   </properties>
+  </object>
+  <object name="gornaud_2" type="spawn" x="160" y="224" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
+  <object name="gornaud_2_1" type="spawn" x="224" y="224" width="224" height="448">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
+  <object name="gornaud_2_2" type="spawn" x="128" y="576" width="160" height="96">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain2.tmx b/AndorsTrail/res/xml/blackwater_mountain2.tmx
index 51fcf1eda..fb336101c 100644
--- a/AndorsTrail/res/xml/blackwater_mountain2.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="10" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,9 +162,14 @@
   <object name="gornaud_1" type="spawn" x="32" y="64" width="576" height="192">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_1" type="spawn" x="320" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
    </properties>
   </object>
-  <object name="gornaud_1" type="spawn" x="320" y="224" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain20.tmx b/AndorsTrail/res/xml/blackwater_mountain20.tmx
index 04116502b..63d6d2f8d 100644
--- a/AndorsTrail/res/xml/blackwater_mountain20.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain20.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="10" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB0gjAsQq5YSM6mtjhQ3wtQSG0a0UEdIPTF+wOZnaocfpWaS4hdsGACF1Swq
   </data>
  </layer>
- <objectgroup name="Mapevents" width="10" height="20">
+ <objectgroup name="Mapevents">
   <object name="down" type="mapchange" x="32" y="96" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain19"/>
@@ -154,14 +155,23 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="10" height="20">
-  <object name="wyrm_1" type="spawn" x="96" y="96" width="160" height="192"/>
-  <object name="wyrm_1" type="spawn" x="128" y="288" width="32" height="128"/>
-  <object name="wyrm_1" type="spawn" x="64" y="448" width="224" height="160">
+ <objectgroup name="Spawn">
+  <object name="wyrm_1" type="spawn" x="96" y="96" width="160" height="192">
+   <properties>
+    <property name="spawngroup" value="wyrm_1"/>
+   </properties>
+  </object>
+  <object name="wyrm_1_1" type="spawn" x="128" y="288" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="wyrm_1"/>
+   </properties>
+  </object>
+  <object name="wyrm_1_2" type="spawn" x="64" y="448" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="10" height="20"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain29.tmx b/AndorsTrail/res/xml/blackwater_mountain29.tmx
index 784c62ac2..a3d74c7a5 100644
--- a/AndorsTrail/res/xml/blackwater_mountain29.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain29.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="22" height="16" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -150,13 +151,41 @@
   <object name="sign_blackwater29" type="sign" x="288" y="448" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="guthbered" type="spawn" x="576" y="128" width="32" height="32"/>
-  <object name="guthbered_guard" type="spawn" x="544" y="128" width="32" height="32"/>
-  <object name="guthbered_guard" type="spawn" x="608" y="128" width="32" height="32"/>
-  <object name="prim_guard2" type="spawn" x="448" y="352" width="192" height="128"/>
-  <object name="prim_guard1" type="spawn" x="288" y="128" width="192" height="32"/>
-  <object name="prim_guard3" type="spawn" x="64" y="256" width="32" height="32"/>
-  <object name="prim_guard4" type="spawn" x="192" y="96" width="32" height="32"/>
+  <object name="guthbered" type="spawn" x="576" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="guthbered"/>
+   </properties>
+  </object>
+  <object name="guthbered_guard" type="spawn" x="544" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="guthbered_guard"/>
+   </properties>
+  </object>
+  <object name="guthbered_guard_1" type="spawn" x="608" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="guthbered_guard"/>
+   </properties>
+  </object>
+  <object name="prim_guard2" type="spawn" x="448" y="352" width="192" height="128">
+   <properties>
+    <property name="spawngroup" value="prim_guard2"/>
+   </properties>
+  </object>
+  <object name="prim_guard1" type="spawn" x="288" y="128" width="192" height="32">
+   <properties>
+    <property name="spawngroup" value="prim_guard1"/>
+   </properties>
+  </object>
+  <object name="prim_guard3" type="spawn" x="64" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="prim_guard3"/>
+   </properties>
+  </object>
+  <object name="prim_guard4" type="spawn" x="192" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="prim_guard4"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain30.tmx b/AndorsTrail/res/xml/blackwater_mountain30.tmx
index 616907fde..7e5027370 100644
--- a/AndorsTrail/res/xml/blackwater_mountain30.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain30.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -158,7 +159,7 @@
    eJxzFWBgcB3hGAZG7aWuHdS2lxj9+ACx5sPUUqIfnz58YYPNDZSEDbIYIb+hy+FzLzH2UguQGs/o/kA2g5r2Uitf0AMPtL3khDWl9hKyY6DDhFL/EBN2yGqItRddD7pd5ABq+JMa5tMbAwAuBpLD
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="800" y="256" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain39a"/>
@@ -180,23 +181,49 @@
   <object name="sign_blackwater30" type="sign" x="256" y="576" width="32" height="32"/>
   <object name="sign_bwm30_grave" type="sign" x="608" y="192" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="bwm_agent_5" type="spawn" x="192" y="320" width="32" height="32"/>
-  <object name="wyrm_1" type="spawn" x="480" y="160" width="224" height="192"/>
+ <objectgroup name="Spawn">
+  <object name="bwm_agent_5" type="spawn" x="192" y="320" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="bwm_agent_5"/>
+   </properties>
+  </object>
+  <object name="wyrm_1" type="spawn" x="480" y="160" width="224" height="192">
+   <properties>
+    <property name="spawngroup" value="wyrm_1"/>
+   </properties>
+  </object>
   <object name="wyrm_2" type="spawn" x="736" y="288" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_2"/>
    </properties>
   </object>
-  <object name="wyrm_3" type="spawn" x="64" y="256" width="64" height="96"/>
-  <object name="wyrm_2" type="spawn" x="768" y="416" width="32" height="32"/>
-  <object name="wyrm_2" type="spawn" x="704" y="544" width="32" height="32"/>
-  <object name="wyrm_2" type="spawn" x="320" y="512" width="352" height="96"/>
-  <object name="wyrm_2" type="spawn" x="160" y="64" width="64" height="160">
+  <object name="wyrm_3" type="spawn" x="64" y="256" width="64" height="96">
+   <properties>
+    <property name="spawngroup" value="wyrm_3"/>
+   </properties>
+  </object>
+  <object name="wyrm_2_1" type="spawn" x="768" y="416" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2_2" type="spawn" x="704" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2_3" type="spawn" x="320" y="512" width="352" height="96">
+   <properties>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2_4" type="spawn" x="160" y="64" width="64" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain32.tmx b/AndorsTrail/res/xml/blackwater_mountain32.tmx
index bfd813772..90c2b118b 100644
--- a/AndorsTrail/res/xml/blackwater_mountain32.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain32.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -158,7 +159,7 @@
    eJztlMsNhDAMRClhm6L/lva0F8sz85wlEkJYigT48+KJw/k5jvNhq7MU93sndSl/ssfqm8Q6o2ylBa1BuCRP1XD7TczuXLp6JL5qQ7ip70nchOn0U/OmeCtMl09shUe4yr+bu9qni3X16jfHJbUp1/Wr7hc9o8k5pZ6Sr8atcmtNes4THdKzy1exJDfxulzCInue5k77vprr5kHlV7/Tm8w/vSd03Y1b9VD6Ot3Vc+qX1LnCyEz+43d6dTOc7hTVP/2v3rV/fQGSTav/
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="east" type="mapchange" x="928" y="96" width="32" height="64">
    <properties>
     <property name="map" value="blackwater_mountain30"/>
@@ -173,47 +174,74 @@
   </object>
   <object name="sign_blackwater32" type="sign" x="832" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="wyrm_2" type="spawn" x="832" y="672" width="32" height="32"/>
-  <object name="wyrm_2" type="spawn" x="608" y="32" width="320" height="256">
+ <objectgroup name="Spawn">
+  <object name="wyrm_2" type="spawn" x="832" y="672" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2_1" type="spawn" x="608" y="32" width="320" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="wyrm_2"/>
    </properties>
   </object>
   <object name="wyrm_3" type="spawn" x="320" y="160" width="96" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_3"/>
    </properties>
   </object>
-  <object name="wyrm_3" type="spawn" x="96" y="512" width="352" height="160">
+  <object name="wyrm_3_1" type="spawn" x="96" y="512" width="352" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_3"/>
    </properties>
   </object>
-  <object name="wyrm_3" type="spawn" x="64" y="736" width="704" height="128">
+  <object name="wyrm_3_2" type="spawn" x="64" y="736" width="704" height="128">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="wyrm_3"/>
    </properties>
   </object>
-  <object name="wyrm_3" type="spawn" x="288" y="448" width="64" height="64"/>
-  <object name="wyrm_3" type="spawn" x="480" y="224" width="320" height="224">
+  <object name="wyrm_3_3" type="spawn" x="288" y="448" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="wyrm_3"/>
+   </properties>
+  </object>
+  <object name="wyrm_3_4" type="spawn" x="480" y="224" width="320" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="wyrm_3"/>
    </properties>
   </object>
-  <object name="wyrm_3" type="spawn" x="608" y="448" width="32" height="96"/>
-  <object name="wyrm_2" type="spawn" x="768" y="736" width="160" height="128"/>
-  <object name="wyrm_3" type="spawn" x="352" y="672" width="32" height="32"/>
-  <object name="wyrm_3" type="spawn" x="32" y="384" width="192" height="288">
+  <object name="wyrm_3_5" type="spawn" x="608" y="448" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="wyrm_3"/>
+   </properties>
+  </object>
+  <object name="wyrm_2_2" type="spawn" x="768" y="736" width="160" height="128">
+   <properties>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+  <object name="wyrm_3_6" type="spawn" x="352" y="672" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_3"/>
+   </properties>
+  </object>
+  <object name="wyrm_3_7" type="spawn" x="32" y="384" width="192" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_3"/>
    </properties>
   </object>
-  <object name="wyrm_2" type="spawn" x="480" y="512" width="416" height="160">
+  <object name="wyrm_2_3" type="spawn" x="480" y="512" width="416" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="wyrm_2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain33.tmx b/AndorsTrail/res/xml/blackwater_mountain33.tmx
index a6db785af..c35b639fd 100644
--- a/AndorsTrail/res/xml/blackwater_mountain33.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain33.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB2BGAZIUY9M4zIPHRCjjhTz8AF0fYTMJMVOavkBVxgS435i/ECK+4g1j9g0QKp5pKRTaphFa/dRaiYhgE0tvvSErpeQWZQCaqQ/XGrxmUFqGqUmBgCUyFdU
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="64" y="96" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain12"/>
@@ -168,19 +169,29 @@
   <object name="sign_bwm33_grave" type="sign" x="448" y="576" width="32" height="32"/>
   <object name="sign_bwm33_grave" type="sign" x="384" y="576" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0" visible="0">
+ <objectgroup name="Spawn" visible="0">
   <object name="restless_dead_1" type="spawn" x="64" y="160" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="restless_dead_1"/>
    </properties>
   </object>
-  <object name="restless_dead_1" type="spawn" x="256" y="160" width="64" height="32"/>
-  <object name="restless_dead_2" type="spawn" x="224" y="512" width="96" height="32"/>
-  <object name="restless_dead_1" type="spawn" x="320" y="96" width="288" height="512">
+  <object name="restless_dead_1_1" type="spawn" x="256" y="160" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="restless_dead_1"/>
+   </properties>
+  </object>
+  <object name="restless_dead_2" type="spawn" x="224" y="512" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="restless_dead_2"/>
+   </properties>
+  </object>
+  <object name="restless_dead_1_2" type="spawn" x="320" y="96" width="288" height="512">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="restless_dead_1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain34.tmx b/AndorsTrail/res/xml/blackwater_mountain34.tmx
index a718e5fe7..0d8427dcf 100644
--- a/AndorsTrail/res/xml/blackwater_mountain34.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain34.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB3FKICeemH6yVGLzV58ZhEDaGEvJf4dDHE0UHpH08bgj6OB0kvtsMJlFrGA2vbSGwMAWx53NA==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="256" y="128" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain33"/>
@@ -154,15 +155,47 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="restless_dead_1" type="spawn" x="224" y="320" width="32" height="32"/>
-  <object name="restless_dead_2" type="spawn" x="224" y="608" width="32" height="32"/>
-  <object name="restless_dead_2" type="spawn" x="160" y="384" width="160" height="224"/>
-  <object name="restless_dead_2" type="spawn" x="192" y="192" width="96" height="128"/>
-  <object name="restless_dead_2" type="spawn" x="160" y="832" width="32" height="32"/>
-  <object name="restless_dead_1" type="spawn" x="288" y="256" width="64" height="32"/>
-  <object name="restless_dead_1" type="spawn" x="288" y="832" width="64" height="32"/>
-  <object name="restless_dead_1" type="spawn" x="192" y="640" width="96" height="256"/>
+ <objectgroup name="Spawn">
+  <object name="restless_dead_1" type="spawn" x="224" y="320" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="restless_dead_1"/>
+   </properties>
+  </object>
+  <object name="restless_dead_2" type="spawn" x="224" y="608" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="restless_dead_2"/>
+   </properties>
+  </object>
+  <object name="restless_dead_2_1" type="spawn" x="160" y="384" width="160" height="224">
+   <properties>
+    <property name="spawngroup" value="restless_dead_2"/>
+   </properties>
+  </object>
+  <object name="restless_dead_2_2" type="spawn" x="192" y="192" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="restless_dead_2"/>
+   </properties>
+  </object>
+  <object name="restless_dead_2_3" type="spawn" x="160" y="832" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="restless_dead_2"/>
+   </properties>
+  </object>
+  <object name="restless_dead_1_1" type="spawn" x="288" y="256" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="restless_dead_1"/>
+   </properties>
+  </object>
+  <object name="restless_dead_1_2" type="spawn" x="288" y="832" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="restless_dead_1"/>
+   </properties>
+  </object>
+  <object name="restless_dead_1_3" type="spawn" x="192" y="640" width="96" height="256">
+   <properties>
+    <property name="spawngroup" value="restless_dead_1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain36.tmx b/AndorsTrail/res/xml/blackwater_mountain36.tmx
index a5ae71eac..3834cca0a 100644
--- a/AndorsTrail/res/xml/blackwater_mountain36.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain36.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="11" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB3CGBkQowYdYFOHzwx8dpPqFmL9h00cAOwqHI8=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="160" y="288" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain32"/>
@@ -154,11 +155,27 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="wyrm_4" type="spawn" x="224" y="224" width="32" height="32"/>
-  <object name="wyrm_4" type="spawn" x="96" y="224" width="32" height="32"/>
-  <object name="wyrm_4" type="spawn" x="64" y="192" width="32" height="64"/>
-  <object name="wyrm_4" type="spawn" x="256" y="192" width="32" height="64"/>
+ <objectgroup name="Spawn">
+  <object name="wyrm_4" type="spawn" x="224" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_4"/>
+   </properties>
+  </object>
+  <object name="wyrm_4_1" type="spawn" x="96" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_4"/>
+   </properties>
+  </object>
+  <object name="wyrm_4_2" type="spawn" x="64" y="192" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="wyrm_4"/>
+   </properties>
+  </object>
+  <object name="wyrm_4_3" type="spawn" x="256" y="192" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="wyrm_4"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain37.tmx b/AndorsTrail/res/xml/blackwater_mountain37.tmx
index b1ec37560..828612e2d 100644
--- a/AndorsTrail/res/xml/blackwater_mountain37.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain37.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB3CGAQo0Yuun5B5hACp7qXELHzmUSs8BlIvTAyfubj0EROm+OwlJp6okX5BGACE4zrG
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="96" y="96" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain36"/>
@@ -154,12 +155,32 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="wyrm_4" type="spawn" x="160" y="160" width="32" height="32"/>
-  <object name="wyrm_3" type="spawn" x="288" y="192" width="32" height="32"/>
-  <object name="wyrm_4" type="spawn" x="352" y="256" width="64" height="160"/>
-  <object name="wyrm_3" type="spawn" x="256" y="416" width="96" height="32"/>
-  <object name="wyrm_4" type="spawn" x="160" y="384" width="64" height="32"/>
+ <objectgroup name="Spawn">
+  <object name="wyrm_4" type="spawn" x="160" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_4"/>
+   </properties>
+  </object>
+  <object name="wyrm_3" type="spawn" x="288" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_3"/>
+   </properties>
+  </object>
+  <object name="wyrm_4_1" type="spawn" x="352" y="256" width="64" height="160">
+   <properties>
+    <property name="spawngroup" value="wyrm_4"/>
+   </properties>
+  </object>
+  <object name="wyrm_3_1" type="spawn" x="256" y="416" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_3"/>
+   </properties>
+  </object>
+  <object name="wyrm_4_2" type="spawn" x="160" y="384" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_4"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain38.tmx b/AndorsTrail/res/xml/blackwater_mountain38.tmx
index 5f1fd534f..c0f8ab14f 100644
--- a/AndorsTrail/res/xml/blackwater_mountain38.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain38.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="19" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB3FIwZjA5Sahc7GZR8+dYTcSAwgxgxi7CPVHcSopzQeiLEXV5iT6jZSw4fcuCM1jeETI9cP5KZ3etpNiZsJ5ceBsJeQucTYS2r6ganH5wZyACn+JcduUsOHVLcS6x9Sw4gaaYaaGADPmYEq
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="19">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="896" y="224" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain37"/>
@@ -157,14 +158,34 @@
   <object name="sign_blackwater38_2" type="sign" x="224" y="192" width="32" height="32"/>
   <object name="sign_blackwater38_3" type="sign" x="96" y="544" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="19">
-  <object name="wyrm_4" type="spawn" x="576" y="160" width="32" height="32"/>
-  <object name="wyrm_4" type="spawn" x="256" y="288" width="64" height="32"/>
-  <object name="wyrm_4" type="spawn" x="32" y="288" width="64" height="160"/>
-  <object name="bwm_agent_6" type="spawn" x="768" y="480" width="32" height="32"/>
-  <object name="wyrm_4" type="spawn" x="352" y="160" width="192" height="224"/>
+ <objectgroup name="Spawn">
+  <object name="wyrm_4" type="spawn" x="576" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_4"/>
+   </properties>
+  </object>
+  <object name="wyrm_4_1" type="spawn" x="256" y="288" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_4"/>
+   </properties>
+  </object>
+  <object name="wyrm_4_2" type="spawn" x="32" y="288" width="64" height="160">
+   <properties>
+    <property name="spawngroup" value="wyrm_4"/>
+   </properties>
+  </object>
+  <object name="bwm_agent_6" type="spawn" x="768" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="bwm_agent_6"/>
+   </properties>
+  </object>
+  <object name="wyrm_4_3" type="spawn" x="352" y="160" width="192" height="224">
+   <properties>
+    <property name="spawngroup" value="wyrm_4"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="30" height="19">
+ <objectgroup name="Keys">
   <object name="bwm_agent:60" type="key" x="640" y="384" width="64" height="96">
    <properties>
     <property name="phrase" value="keyarea_bwm_agent_60"/>
diff --git a/AndorsTrail/res/xml/blackwater_mountain39.tmx b/AndorsTrail/res/xml/blackwater_mountain39.tmx
index 185b94950..232633da6 100644
--- a/AndorsTrail/res/xml/blackwater_mountain39.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain39.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB3FGBgZkKMXnU2ueeh60AE2NYT8QyygNHxIMZfYcCHVnQNlHqVpiFruQ1aPbgY5ZhILKEkTxJqJzS/E5iNi3EZp+ifWXlLNIyfuqWEeNgwAbm9goA==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="128" y="608" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain39a"/>
@@ -153,16 +154,29 @@
     <property name="place" value="up"/>
    </properties>
   </object>
-  <object name="wyrm_1" type="spawn" x="64" y="416" width="256" height="160"/>
- </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="wyrm_2" type="spawn" x="192" y="192" width="64" height="32"/>
-  <object name="wyrm_2" type="spawn" x="256" y="96" width="288" height="128"/>
-  <object name="wyrm_2" type="spawn" x="160" y="224" width="448" height="352">
+  <object name="wyrm_1" type="spawn" x="64" y="416" width="256" height="160">
    <properties>
-    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="wyrm_1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Spawn">
+  <object name="wyrm_2" type="spawn" x="192" y="192" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2_1" type="spawn" x="256" y="96" width="288" height="128">
+   <properties>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2_2" type="spawn" x="160" y="224" width="448" height="352">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain39a.tmx b/AndorsTrail/res/xml/blackwater_mountain39a.tmx
index 13db3dd27..990e156b0 100644
--- a/AndorsTrail/res/xml/blackwater_mountain39a.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain39a.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -200,7 +201,7 @@
    eJzbKMbAsJEIDALEqCMWD0XzkAE+fYT0YgOkqsflBnLMIzdciTWD1HCnlnnEuI8U+0gF5LoNl9hgDWdapgVq6CHHbZTELbFmDYZwptQcAKp5720=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="320" y="0" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain39"/>
@@ -214,36 +215,53 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
-  <object name="wyrm_2" type="spawn" x="320" y="64" width="32" height="64"/>
-  <object name="wyrm_2" type="spawn" x="480" y="448" width="32" height="32"/>
+ <objectgroup name="Spawn">
+  <object name="wyrm_2" type="spawn" x="320" y="64" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2_1" type="spawn" x="480" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
   <object name="wyrm_1" type="spawn" x="352" y="96" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_1"/>
    </properties>
   </object>
-  <object name="wyrm_2" type="spawn" x="32" y="96" width="224" height="288">
+  <object name="wyrm_2_2" type="spawn" x="32" y="96" width="224" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_2"/>
    </properties>
   </object>
-  <object name="wyrm_1" type="spawn" x="288" y="320" width="32" height="64"/>
-  <object name="wyrm_2" type="spawn" x="352" y="288" width="192" height="160">
+  <object name="wyrm_1_1" type="spawn" x="288" y="320" width="32" height="64">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_1"/>
    </properties>
   </object>
-  <object name="wyrm_2" type="spawn" x="128" y="448" width="224" height="160">
+  <object name="wyrm_2_3" type="spawn" x="352" y="288" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_2"/>
    </properties>
   </object>
-  <object name="wyrm_2" type="spawn" x="384" y="480" width="128" height="64">
+  <object name="wyrm_2_4" type="spawn" x="128" y="448" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2_5" type="spawn" x="384" y="480" width="128" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
- <objectgroup name="Replace" width="20" height="20"/>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain4.tmx b/AndorsTrail/res/xml/blackwater_mountain4.tmx
index 78e7613e5..edbaa969a 100644
--- a/AndorsTrail/res/xml/blackwater_mountain4.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain4.tmx
@@ -159,20 +159,27 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="gornaud_2" type="spawn" x="192" y="224" width="96" height="96"/>
-  <object name="gornaud_2" type="spawn" x="32" y="128" width="416" height="96">
+  <object name="gornaud_2" type="spawn" x="192" y="224" width="96" height="96">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object name="gornaud_2" type="spawn" x="32" y="320" width="384" height="96">
+  <object name="gornaud_2_1" type="spawn" x="32" y="128" width="416" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
+  <object name="gornaud_2_2" type="spawn" x="32" y="320" width="384" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
   <object name="halvor" type="spawn" x="416" y="288" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
+    <property name="spawngroup" value="halvor"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/blackwater_mountain40.tmx b/AndorsTrail/res/xml/blackwater_mountain40.tmx
index 60cf3569b..704a7e8d3 100644
--- a/AndorsTrail/res/xml/blackwater_mountain40.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain40.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="11" height="11" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -143,7 +144,7 @@
    eJxzFWBgcEXDIIAuhgtTUy02QIpaXHqQxZFpYuzAZgY11dIDAwCFFB7i
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="160" y="0" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain14"/>
@@ -157,9 +158,17 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="kazaul_1" type="spawn" x="160" y="192" width="32" height="32"/>
-  <object name="kazaul_1" type="spawn" x="224" y="128" width="96" height="128"/>
+ <objectgroup name="Spawn">
+  <object name="kazaul_1" type="spawn" x="160" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="kazaul_1"/>
+   </properties>
+  </object>
+  <object name="kazaul_1_1" type="spawn" x="224" y="128" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="kazaul_1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain41.tmx b/AndorsTrail/res/xml/blackwater_mountain41.tmx
index 51dd9e680..44d0bc0d4 100644
--- a/AndorsTrail/res/xml/blackwater_mountain41.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain41.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -156,12 +156,36 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="kazaul_1" type="spawn" x="32" y="672" width="128" height="160"/>
-  <object name="kazaul_1" type="spawn" x="576" y="224" width="352" height="160"/>
-  <object name="kazaul_1" type="spawn" x="96" y="224" width="32" height="32"/>
-  <object name="kazaul_1" type="spawn" x="320" y="256" width="32" height="32"/>
-  <object name="kazaul_1" type="spawn" x="512" y="608" width="32" height="32"/>
-  <object name="kazaul_1" type="spawn" x="320" y="736" width="160" height="96"/>
+  <object name="kazaul_1" type="spawn" x="32" y="672" width="128" height="160">
+   <properties>
+    <property name="spawngroup" value="kazaul_1"/>
+   </properties>
+  </object>
+  <object name="kazaul_1_1" type="spawn" x="576" y="224" width="352" height="160">
+   <properties>
+    <property name="spawngroup" value="kazaul_1"/>
+   </properties>
+  </object>
+  <object name="kazaul_1_2" type="spawn" x="96" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="kazaul_1"/>
+   </properties>
+  </object>
+  <object name="kazaul_1_3" type="spawn" x="320" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="kazaul_1"/>
+   </properties>
+  </object>
+  <object name="kazaul_1_4" type="spawn" x="512" y="608" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="kazaul_1"/>
+   </properties>
+  </object>
+  <object name="kazaul_1_5" type="spawn" x="320" y="736" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="kazaul_1"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain42.tmx b/AndorsTrail/res/xml/blackwater_mountain42.tmx
index d7d79509e..073d8cc0b 100644
--- a/AndorsTrail/res/xml/blackwater_mountain42.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain42.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -153,26 +153,31 @@
  <objectgroup name="Spawn" visible="0">
   <object name="kazaul_guardian" type="spawn" x="480" y="640" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="kazaul_guardian"/>
    </properties>
   </object>
   <object name="kazaul_1" type="spawn" x="672" y="416" width="256" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="kazaul_1"/>
    </properties>
   </object>
   <object name="kazaul_2" type="spawn" x="672" y="96" width="192" height="832">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="kazaul_2"/>
    </properties>
   </object>
-  <object name="kazaul_2" type="spawn" x="32" y="96" width="288" height="480">
+  <object name="kazaul_2_1" type="spawn" x="32" y="96" width="288" height="480">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="kazaul_2"/>
    </properties>
   </object>
-  <object name="kazaul_1" type="spawn" x="32" y="448" width="288" height="480">
+  <object name="kazaul_1_1" type="spawn" x="32" y="448" width="288" height="480">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="kazaul_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/blackwater_mountain43.tmx b/AndorsTrail/res/xml/blackwater_mountain43.tmx
index 494414353..4cfb82382 100644
--- a/AndorsTrail/res/xml/blackwater_mountain43.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain43.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,7 +156,7 @@
    eJztk9sNwCAIRR2hS7n/Sk3/GsO9PATb2JIQUQMHUPrRWv91iV5itcczJFbuPS6zPTlKua3kVtSLpJqr9bOCq8VCPbH0i/lZuGhuIuyvcUf/mZylO7SPCutPJVfiaww2iyw+sjM1WvMu3Lf0eXZ2UTx2xnJFK7vzzuLO9aL8tL/o/YMRLmLMcL3vm8W11PsU1xLLI8zXw8/WEzeLqQI=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="west" type="mapchange" x="896" y="896" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain38"/>
@@ -175,21 +176,77 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="blackwater_guest1" type="spawn" x="480" y="96" width="192" height="160"/>
-  <object name="blackwater_guest2" type="spawn" x="512" y="96" width="224" height="192"/>
-  <object name="blackwater_cook" type="spawn" x="832" y="128" width="32" height="32"/>
-  <object name="mazeg" type="spawn" x="832" y="416" width="32" height="32"/>
-  <object name="keneg" type="spawn" x="384" y="384" width="320" height="256"/>
-  <object name="waeges" type="spawn" x="224" y="448" width="64" height="64"/>
-  <object name="blackwater_fighter" type="spawn" x="160" y="288" width="32" height="32"/>
-  <object name="blackwater_fighter" type="spawn" x="256" y="288" width="32" height="32"/>
-  <object name="blackwater_pupil" type="spawn" x="160" y="704" width="32" height="32"/>
-  <object name="ungorm" type="spawn" x="128" y="640" width="320" height="32"/>
-  <object name="blackwater_pupil" type="spawn" x="384" y="704" width="32" height="32"/>
-  <object name="blackwater_pupil" type="spawn" x="320" y="704" width="32" height="32"/>
-  <object name="blackwater_fighter" type="spawn" x="64" y="320" width="96" height="192"/>
-  <object name="blackwater_entranceguard" type="spawn" x="704" y="736" width="32" height="32"/>
+ <objectgroup name="Spawn">
+  <object name="blackwater_guest1" type="spawn" x="480" y="96" width="192" height="160">
+   <properties>
+    <property name="spawngroup" value="blackwater_guest1"/>
+   </properties>
+  </object>
+  <object name="blackwater_guest2" type="spawn" x="512" y="96" width="224" height="192">
+   <properties>
+    <property name="spawngroup" value="blackwater_guest2"/>
+   </properties>
+  </object>
+  <object name="blackwater_cook" type="spawn" x="832" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_cook"/>
+   </properties>
+  </object>
+  <object name="mazeg" type="spawn" x="832" y="416" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="mazeg"/>
+   </properties>
+  </object>
+  <object name="keneg" type="spawn" x="384" y="384" width="320" height="256">
+   <properties>
+    <property name="spawngroup" value="keneg"/>
+   </properties>
+  </object>
+  <object name="waeges" type="spawn" x="224" y="448" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="waeges"/>
+   </properties>
+  </object>
+  <object name="blackwater_fighter" type="spawn" x="160" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_fighter"/>
+   </properties>
+  </object>
+  <object name="blackwater_fighter_1" type="spawn" x="256" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_fighter"/>
+   </properties>
+  </object>
+  <object name="blackwater_pupil" type="spawn" x="160" y="704" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_pupil"/>
+   </properties>
+  </object>
+  <object name="ungorm" type="spawn" x="128" y="640" width="320" height="32">
+   <properties>
+    <property name="spawngroup" value="ungorm"/>
+   </properties>
+  </object>
+  <object name="blackwater_pupil_1" type="spawn" x="384" y="704" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_pupil"/>
+   </properties>
+  </object>
+  <object name="blackwater_pupil_2" type="spawn" x="320" y="704" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_pupil"/>
+   </properties>
+  </object>
+  <object name="blackwater_fighter_2" type="spawn" x="64" y="320" width="96" height="192">
+   <properties>
+    <property name="spawngroup" value="blackwater_fighter"/>
+   </properties>
+  </object>
+  <object name="blackwater_entranceguard" type="spawn" x="704" y="736" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_entranceguard"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain44.tmx b/AndorsTrail/res/xml/blackwater_mountain44.tmx
index e7d49d621..348bddd3d 100644
--- a/AndorsTrail/res/xml/blackwater_mountain44.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain44.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB2BGAYIyeMDpKglxTyYmYTY2PiE/IqLTYp5w9F9hOKDlHRFK/Oole5JiRdq+pcQwGcnujixYUsr8wj5lxqAUH4hVz81MQD4nFmn
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="576" y="96" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain43"/>
@@ -161,16 +162,44 @@
   <object name="rest1" type="rest" x="32" y="128" width="32" height="32"/>
   <object name="rest3" type="rest" x="32" y="256" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="blackwater_sleephall" type="spawn" x="64" y="96" width="32" height="32"/>
-  <object name="herec" type="spawn" x="160" y="288" width="32" height="32"/>
-  <object name="iducus" type="spawn" x="64" y="448" width="128" height="64"/>
-  <object name="blackwater_priest" type="spawn" x="512" y="288" width="32" height="32"/>
-  <object name="blackwater_pupil" type="spawn" x="544" y="544" width="32" height="32"/>
-  <object name="blackwater_guard1" type="spawn" x="448" y="128" width="96" height="32"/>
-  <object name="blackwater_guard1" type="spawn" x="448" y="512" width="32" height="32"/>
+ <objectgroup name="Spawn">
+  <object name="blackwater_sleephall" type="spawn" x="64" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_sleephall"/>
+   </properties>
+  </object>
+  <object name="herec" type="spawn" x="160" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="herec"/>
+   </properties>
+  </object>
+  <object name="iducus" type="spawn" x="64" y="448" width="128" height="64">
+   <properties>
+    <property name="spawngroup" value="iducus"/>
+   </properties>
+  </object>
+  <object name="blackwater_priest" type="spawn" x="512" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_priest"/>
+   </properties>
+  </object>
+  <object name="blackwater_pupil" type="spawn" x="544" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_pupil"/>
+   </properties>
+  </object>
+  <object name="blackwater_guard1" type="spawn" x="448" y="128" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_guard1"/>
+   </properties>
+  </object>
+  <object name="blackwater_guard1_1" type="spawn" x="448" y="512" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_guard1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0">
+ <objectgroup name="Keys">
   <object name="nondisplay:16" type="key" x="224" y="160" width="32" height="160">
    <properties>
     <property name="phrase" value="bwm_sleephall_1"/>
diff --git a/AndorsTrail/res/xml/blackwater_mountain45.tmx b/AndorsTrail/res/xml/blackwater_mountain45.tmx
index 8187766b6..84c690ae6 100644
--- a/AndorsTrail/res/xml/blackwater_mountain45.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain45.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcMWBQQCXHCFMa73oarABdHF0vdjUEKMXlxpCepHFifULMf4mRi8l9hIKB2z+x6VuoPXiikNi/EWMveRgACA0KC4=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="416" y="128" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain44"/>
@@ -155,12 +156,32 @@
   </object>
   <object name="sign_blackwater45" type="sign" x="96" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="blackwater_throneguard" type="spawn" x="224" y="224" width="32" height="32"/>
-  <object name="blackwater_bossguard" type="spawn" x="64" y="256" width="32" height="32"/>
-  <object name="blackwater_bossguard" type="spawn" x="64" y="384" width="32" height="32"/>
-  <object name="harlenn" type="spawn" x="64" y="320" width="32" height="32"/>
-  <object name="blackwater_guard1" type="spawn" x="256" y="352" width="192" height="96"/>
+ <objectgroup name="Spawn">
+  <object name="blackwater_throneguard" type="spawn" x="224" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_throneguard"/>
+   </properties>
+  </object>
+  <object name="blackwater_bossguard" type="spawn" x="64" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_bossguard"/>
+   </properties>
+  </object>
+  <object name="blackwater_bossguard_1" type="spawn" x="64" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="blackwater_bossguard"/>
+   </properties>
+  </object>
+  <object name="harlenn" type="spawn" x="64" y="320" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="harlenn"/>
+   </properties>
+  </object>
+  <object name="blackwater_guard1" type="spawn" x="256" y="352" width="192" height="96">
+   <properties>
+    <property name="spawngroup" value="blackwater_guard1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain5.tmx b/AndorsTrail/res/xml/blackwater_mountain5.tmx
index ea19f449e..31581251f 100644
--- a/AndorsTrail/res/xml/blackwater_mountain5.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain5.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,7 +156,7 @@
    eJxjYBgFo2AUDCQAAAOEAAE=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="west" type="mapchange" x="0" y="224" width="32" height="96">
    <properties>
     <property name="map" value="blackwater_mountain5a"/>
@@ -182,12 +183,24 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="bwm_agent_1" type="spawn" x="96" y="224" width="224" height="160"/>
-  <object name="puny_caverat" type="spawn" x="320" y="192" width="96" height="96"/>
-  <object name="puny_caverat" type="spawn" x="64" y="160" width="224" height="192"/>
+ <objectgroup name="Spawn">
+  <object name="bwm_agent_1" type="spawn" x="96" y="224" width="224" height="160">
+   <properties>
+    <property name="spawngroup" value="bwm_agent_1"/>
+   </properties>
+  </object>
+  <object name="puny_caverat" type="spawn" x="320" y="192" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="puny_caverat"/>
+   </properties>
+  </object>
+  <object name="puny_caverat_1" type="spawn" x="64" y="160" width="224" height="192">
+   <properties>
+    <property name="spawngroup" value="puny_caverat"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0">
+ <objectgroup name="Keys">
   <object name="bwm_agent:10" type="key" x="320" y="128" width="96" height="32">
    <properties>
     <property name="phrase" value="keyarea_bwm_agent_1"/>
@@ -197,5 +210,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Replace" width="15" height="15"/>
+ <objectgroup name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain50.tmx b/AndorsTrail/res/xml/blackwater_mountain50.tmx
index ee35fe2d7..be24cc26c 100644
--- a/AndorsTrail/res/xml/blackwater_mountain50.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain50.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB2iGBnA+Og0sjw2fbjUYlMzGPQi+w8Xm5BedHNwyWNzDzGAmnoJmUOsf0nVSwpAT1v40ig2N2JL1/jSN6G8QIp7iTWDlLxIql5SMACCAzB7
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="exit" type="mapchange" x="224" y="576" width="32" height="32"/>
   <object name="entry1" type="mapchange" x="64" y="512" width="32" height="32">
    <properties>
@@ -157,12 +158,32 @@
   <object name="sign_blackwater50_right" type="sign" x="352" y="512" width="32" height="32"/>
   <object name="sign_blackwater50_left" type="sign" x="96" y="512" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="throdna" type="spawn" x="224" y="128" width="32" height="32"/>
-  <object name="blackwater_acolyte" type="spawn" x="32" y="128" width="160" height="320"/>
-  <object name="blackwater_acolyte" type="spawn" x="288" y="128" width="160" height="320"/>
-  <object name="throdna_guard" type="spawn" x="192" y="128" width="32" height="32"/>
-  <object name="throdna_guard" type="spawn" x="256" y="128" width="32" height="32"/>
+ <objectgroup name="Spawn">
+  <object name="throdna" type="spawn" x="224" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="throdna"/>
+   </properties>
+  </object>
+  <object name="blackwater_acolyte" type="spawn" x="32" y="128" width="160" height="320">
+   <properties>
+    <property name="spawngroup" value="blackwater_acolyte"/>
+   </properties>
+  </object>
+  <object name="blackwater_acolyte_1" type="spawn" x="288" y="128" width="160" height="320">
+   <properties>
+    <property name="spawngroup" value="blackwater_acolyte"/>
+   </properties>
+  </object>
+  <object name="throdna_guard" type="spawn" x="192" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="throdna_guard"/>
+   </properties>
+  </object>
+  <object name="throdna_guard_1" type="spawn" x="256" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="throdna_guard"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain51.tmx b/AndorsTrail/res/xml/blackwater_mountain51.tmx
index c6a34b3c6..908ea5af3 100644
--- a/AndorsTrail/res/xml/blackwater_mountain51.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain51.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="14" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -170,7 +171,7 @@
    eJxjYBgFo4B4AAACMAAB
   </data>
  </layer>
- <objectgroup name="Mapevents" width="14" height="10">
+ <objectgroup name="Mapevents">
   <object name="east" type="mapchange" x="320" y="256" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain31"/>
@@ -184,12 +185,20 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="14" height="10">
-  <object name="restless_dead_1" type="spawn" x="64" y="128" width="160" height="96"/>
-  <object name="restless_dead_1" type="spawn" x="256" y="128" width="160" height="96"/>
+ <objectgroup name="Spawn">
+  <object name="restless_dead_1" type="spawn" x="64" y="128" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="restless_dead_1"/>
+   </properties>
+  </object>
+  <object name="restless_dead_1_1" type="spawn" x="256" y="128" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="restless_dead_1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="14" height="10"/>
- <objectgroup name="Replace" width="14" height="10">
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace">
   <object name="quest:100" type="replace" x="96" y="128" width="160" height="96">
    <properties>
     <property name="Walkable" value="Walkable_replace"/>
diff --git a/AndorsTrail/res/xml/blackwater_mountain52.tmx b/AndorsTrail/res/xml/blackwater_mountain52.tmx
index 24e03dea6..bc9e1b43b 100644
--- a/AndorsTrail/res/xml/blackwater_mountain52.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain52.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,7 +156,7 @@
    eJxzFWBgcB3FA4JhgF5mowN8+ohRS4p+cgEpdlHDfnQziPEfsf6nZvjQK11R0yxqYAAJcEVm
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="10">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="928" y="96" width="32" height="64">
    <properties>
     <property name="map" value="blackwater_mountain51"/>
@@ -177,15 +178,24 @@
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="restless_dead_1" type="spawn" x="672" y="160" width="224" height="128"/>
- </objectgroup>
- <objectgroup name="Spawn" width="30" height="10">
-  <object name="restless_dead_1" type="spawn" x="256" y="96" width="416" height="192">
+  <object name="restless_dead_1" type="spawn" x="672" y="160" width="224" height="128">
    <properties>
-    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="restless_dead_1"/>
    </properties>
   </object>
-  <object name="blackwater_guard2" type="spawn" x="64" y="96" width="160" height="192"/>
  </objectgroup>
- <objectgroup name="Keys" width="30" height="10"/>
+ <objectgroup name="Spawn">
+  <object name="restless_dead_1_1" type="spawn" x="256" y="96" width="416" height="192">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="restless_dead_1"/>
+   </properties>
+  </object>
+  <object name="blackwater_guard2" type="spawn" x="64" y="96" width="160" height="192">
+   <properties>
+    <property name="spawngroup" value="blackwater_guard2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain5a.tmx b/AndorsTrail/res/xml/blackwater_mountain5a.tmx
index 05c018ca6..010fc337a 100644
--- a/AndorsTrail/res/xml/blackwater_mountain5a.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain5a.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="18" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -200,7 +201,7 @@
    eJzbKMbAsHEU0wSDADXNIcY8YtUgA0JqiHUjIfXYAC63E2M3KeYREzbUNA9ZPzZ16Hbg8i8uQKw6fICSNENt86iZT6iFB4N5APWD2OI=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="18">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="224" y="544" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain4"/>
@@ -214,21 +215,35 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="18">
-  <object name="gornaud_1" type="spawn" x="64" y="256" width="96" height="160"/>
-  <object name="gornaud_1" type="spawn" x="160" y="384" width="32" height="32"/>
+ <objectgroup name="Spawn">
+  <object name="gornaud_1" type="spawn" x="64" y="256" width="96" height="160">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_1" type="spawn" x="160" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
   <object name="gornaud_2" type="spawn" x="160" y="128" width="128" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object name="gornaud_1" type="spawn" x="352" y="160" width="224" height="320">
+  <object name="gornaud_1_2" type="spawn" x="352" y="160" width="224" height="320">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_2_1" type="spawn" x="192" y="384" width="192" height="128">
+   <properties>
+    <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object name="gornaud_2" type="spawn" x="192" y="384" width="192" height="128"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="18"/>
- <objectgroup name="Replace" width="20" height="18"/>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain7.tmx b/AndorsTrail/res/xml/blackwater_mountain7.tmx
index 3e4aa5f5e..f79877175 100644
--- a/AndorsTrail/res/xml/blackwater_mountain7.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain7.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,7 +156,7 @@
    eJzFU9sRgCAMYwSXcv+V/PKHa14FlDtPrDRp2nBfY9w/PWixf9XZ97zKc3lZnYwLaVzldXSheIKjsFCsM9+qRykvwlW8c+1Mg+Phas/OnuJlPaq+d/I6bzUftNg9SnkT/sTfiV73PqczYbxOHV0vKL3u6uSf9FXShxmTxVbv/hd+rnJSvpS32u/kTXNYze5sEhykMzm3wss8jfri8Dr9dmOKt8pj/Uvnp7BVTa6fnfm5epFv3N7P2IqX6VHYqTcdHIbfmaGL110IJ9XQeR71bJdp
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="west" type="mapchange" x="64" y="448" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain6"/>
@@ -181,13 +182,37 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="gornaud_1" type="spawn" x="32" y="64" width="192" height="160"/>
-  <object name="gornaud_1" type="spawn" x="416" y="64" width="160" height="128"/>
-  <object name="gornaud_1" type="spawn" x="480" y="352" width="160" height="160"/>
-  <object name="gornaud_1" type="spawn" x="704" y="352" width="160" height="160"/>
-  <object name="gornaud_1" type="spawn" x="160" y="512" width="160" height="128"/>
-  <object name="gornaud_1" type="spawn" x="32" y="768" width="160" height="128"/>
+ <objectgroup name="Spawn">
+  <object name="gornaud_1" type="spawn" x="32" y="64" width="192" height="160">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_1" type="spawn" x="416" y="64" width="160" height="128">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_2" type="spawn" x="480" y="352" width="160" height="160">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_3" type="spawn" x="704" y="352" width="160" height="160">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_4" type="spawn" x="160" y="512" width="160" height="128">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_5" type="spawn" x="32" y="768" width="160" height="128">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain7a.tmx b/AndorsTrail/res/xml/blackwater_mountain7a.tmx
index 191b8ced2..b51c064a6 100644
--- a/AndorsTrail/res/xml/blackwater_mountain7a.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain7a.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -200,7 +201,7 @@
    eJzbKMbAsBEJw8BGMdIxNfUiAxifHL3Y3IRPnhT3E7KHkF5SzcLnH0rsI0cvOWFEql50+3CFCbF68QFc8UBILzlpHR0DAJctd7c=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="15" height="15">
+ <objectgroup name="Mapevents">
   <object name="up" type="mapchange" x="352" y="352" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain9"/>
@@ -214,11 +215,23 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="15" height="15">
-  <object name="gornaud_1" type="spawn" x="128" y="64" width="64" height="96"/>
-  <object name="gornaud_1" type="spawn" x="256" y="64" width="160" height="64"/>
-  <object name="gornaud_1" type="spawn" x="192" y="384" width="128" height="64"/>
+ <objectgroup name="Spawn">
+  <object name="gornaud_1" type="spawn" x="128" y="64" width="64" height="96">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_1" type="spawn" x="256" y="64" width="160" height="64">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_2" type="spawn" x="192" y="384" width="128" height="64">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="15" height="15"/>
- <objectgroup name="Replace" width="15" height="15"/>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain9.tmx b/AndorsTrail/res/xml/blackwater_mountain9.tmx
index 287b86896..75684c308 100644
--- a/AndorsTrail/res/xml/blackwater_mountain9.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain9.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="19" height="12" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -210,7 +211,7 @@
    eJxjYBgFo2AUDBYAAAOQAAE=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="19" height="12">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="448" y="64" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain10"/>
@@ -230,13 +231,25 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="19" height="12">
-  <object name="gornaud_1" type="spawn" x="128" y="160" width="128" height="128"/>
-  <object name="bwm_agent_2" type="spawn" x="320" y="128" width="32" height="32"/>
-  <object name="gornaud_1" type="spawn" x="320" y="192" width="160" height="160"/>
+ <objectgroup name="Spawn">
+  <object name="gornaud_1" type="spawn" x="128" y="160" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object name="bwm_agent_2" type="spawn" x="320" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="bwm_agent_2"/>
+   </properties>
+  </object>
+  <object name="gornaud_1_1" type="spawn" x="320" y="192" width="160" height="160">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="19" height="12"/>
- <objectgroup name="Replace" width="19" height="12">
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace">
   <object name="futurequest:10" type="replace" x="0" y="192" width="192" height="128">
    <properties>
     <property name="Objects" value="Objects_replace"/>
diff --git a/AndorsTrail/res/xml/catacombs2.tmx b/AndorsTrail/res/xml/catacombs2.tmx
index a2586d741..f2858689f 100644
--- a/AndorsTrail/res/xml/catacombs2.tmx
+++ b/AndorsTrail/res/xml/catacombs2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB2hGB3gk8cnhs0sUgEhe0nxCy45csOG2uaR4mdixAm5E1mOFLXkmEeMXaSmF3LTBD6347KHGuaR4z5cYYnNPGzqiEkXuNxGjL3Ehh8ue/G5EZcYOWkFXS+tMQCTmVNY
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="down" type="mapchange" x="544" y="544" width="32" height="32">
    <properties>
     <property name="map" value="catacombs3"/>
@@ -163,22 +164,36 @@
   <object name="sign_catacombs2_papers2" type="sign" x="384" y="576" width="32" height="32"/>
   <object name="sign_catacombs2_papers1" type="sign" x="160" y="288" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn rats" width="0" height="0" visible="0">
+ <objectgroup name="Spawn rats" visible="0">
   <object name="catacombrat1" type="spawn" x="64" y="96" width="480" height="512">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="catacombrat1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn guards" width="0" height="0" visible="0">
-  <object name="catacombguard2" type="spawn" x="224" y="128" width="128" height="32"/>
-  <object name="catacombguard2" type="spawn" x="32" y="96" width="160" height="288"/>
-  <object name="catacombguard2" type="spawn" x="416" y="96" width="192" height="448">
+ <objectgroup name="Spawn guards" visible="0">
+  <object name="catacombguard2" type="spawn" x="224" y="128" width="128" height="32">
+   <properties>
+    <property name="spawngroup" value="catacombguard2"/>
+   </properties>
+  </object>
+  <object name="catacombguard2_1" type="spawn" x="32" y="96" width="160" height="288">
+   <properties>
+    <property name="spawngroup" value="catacombguard2"/>
+   </properties>
+  </object>
+  <object name="catacombguard2_2" type="spawn" x="416" y="96" width="192" height="448">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="catacombguard2"/>
+   </properties>
+  </object>
+  <object name="catacombguard2_3" type="spawn" x="256" y="256" width="160" height="352">
+   <properties>
+    <property name="spawngroup" value="catacombguard2"/>
    </properties>
   </object>
-  <object name="catacombguard2" type="spawn" x="256" y="256" width="160" height="352"/>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/catacombs3.tmx b/AndorsTrail/res/xml/catacombs3.tmx
index 901cf3064..5d6eb299c 100644
--- a/AndorsTrail/res/xml/catacombs3.tmx
+++ b/AndorsTrail/res/xml/catacombs3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB3mGARwiSHLwQC55qHrJ2QeNj3o4uiAGLOINZNYMwiZRYqb8LmNUJgT4wdc8YPLPHLTD6E4JMduUs0hNh2Rqpcc8wjFDSlipNiHy82k+IuQfmIAKWmfVLNIdT8hc6iJAYfNVgA=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="544" y="64" width="32" height="32">
    <properties>
     <property name="map" value="catacombs4"/>
@@ -156,32 +157,48 @@
   <object name="sign_catacombs3_grave1" type="sign" x="224" y="96" width="32" height="32"/>
   <object name="sign_catacombs3_grave2" type="sign" x="448" y="416" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn rats" width="0" height="0" visible="0">
+ <objectgroup name="Spawn rats" visible="0">
   <object name="catacombrat1" type="spawn" x="64" y="128" width="544" height="480">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="catacombrat1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn guards" width="0" height="0" visible="0">
-  <object name="catacombguard3" type="spawn" x="288" y="320" width="32" height="32"/>
-  <object name="catacombguard2" type="spawn" x="32" y="288" width="32" height="64"/>
-  <object name="catacombguard2" type="spawn" x="64" y="128" width="224" height="128"/>
-  <object name="catacombguard3" type="spawn" x="64" y="384" width="224" height="224">
+ <objectgroup name="Spawn guards" visible="0">
+  <object name="catacombguard3" type="spawn" x="288" y="320" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="catacombguard3"/>
    </properties>
   </object>
-  <object name="catacombguard3" type="spawn" x="320" y="96" width="288" height="224">
+  <object name="catacombguard2" type="spawn" x="32" y="288" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="catacombguard2"/>
+   </properties>
+  </object>
+  <object name="catacombguard2_1" type="spawn" x="64" y="128" width="224" height="128">
+   <properties>
+    <property name="spawngroup" value="catacombguard2"/>
+   </properties>
+  </object>
+  <object name="catacombguard3_1" type="spawn" x="64" y="384" width="224" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="catacombguard3"/>
+   </properties>
+  </object>
+  <object name="catacombguard3_2" type="spawn" x="320" y="96" width="288" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="catacombguard3"/>
    </properties>
   </object>
-  <object name="catacombguard2" type="spawn" x="320" y="384" width="288" height="224">
+  <object name="catacombguard2_2" type="spawn" x="320" y="384" width="288" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="catacombguard2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/clearing_level1.tmx b/AndorsTrail/res/xml/clearing_level1.tmx
index 12d85c412..b8eb2abd1 100644
--- a/AndorsTrail/res/xml/clearing_level1.tmx
+++ b/AndorsTrail/res/xml/clearing_level1.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="16" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="16">
   <data encoding="base64" compression="zlib">
@@ -159,28 +159,41 @@
   <object name="pack1" type="spawn" x="448" y="160" width="160" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="pack1"/>
    </properties>
   </object>
-  <object name="pack1" type="spawn" x="448" y="384" width="64" height="32">
+  <object name="pack1_1" type="spawn" x="448" y="384" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pack1"/>
    </properties>
   </object>
-  <object name="pack2" type="spawn" x="192" y="384" width="32" height="32"/>
-  <object name="pack1" type="spawn" x="256" y="384" width="96" height="96">
+  <object name="pack2" type="spawn" x="192" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="pack2"/>
+   </properties>
+  </object>
+  <object name="pack1_2" type="spawn" x="256" y="384" width="96" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pack1"/>
    </properties>
   </object>
-  <object name="pack1" type="spawn" x="64" y="64" width="320" height="192">
+  <object name="pack1_3" type="spawn" x="64" y="64" width="320" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="pack1"/>
    </properties>
   </object>
-  <object name="pack2" type="spawn" x="32" y="224" width="32" height="32"/>
-  <object name="pack1" type="spawn" x="32" y="288" width="64" height="32">
+  <object name="pack2_1" type="spawn" x="32" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="pack2"/>
+   </properties>
+  </object>
+  <object name="pack1_4" type="spawn" x="32" y="288" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pack1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/clearing_level2.tmx b/AndorsTrail/res/xml/clearing_level2.tmx
index 03fdd4a45..697bb26d9 100644
--- a/AndorsTrail/res/xml/clearing_level2.tmx
+++ b/AndorsTrail/res/xml/clearing_level2.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="15" height="15">
   <data encoding="base64" compression="zlib">
@@ -152,33 +152,47 @@
  <objectgroup name="Spawn">
   <object name="pack_boss" type="spawn" x="320" y="384" width="96" height="64">
    <properties>
+    <property name="spawngroup" value="pack_boss"/>
    </properties>
   </object>
   <object name="pack3" type="spawn" x="352" y="320" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pack3"/>
+   </properties>
+  </object>
+  <object name="pack3_1" type="spawn" x="384" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="pack3"/>
    </properties>
   </object>
-  <object name="pack3" type="spawn" x="384" y="256" width="32" height="32"/>
   <object name="pack2" type="spawn" x="224" y="192" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pack2"/>
    </properties>
   </object>
-  <object name="pack2" type="spawn" x="224" y="96" width="224" height="96">
+  <object name="pack2_1" type="spawn" x="224" y="96" width="224" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pack2"/>
    </properties>
   </object>
-  <object name="pack2" type="spawn" x="32" y="320" width="224" height="128">
+  <object name="pack2_2" type="spawn" x="32" y="320" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pack2"/>
    </properties>
   </object>
-  <object name="pack3" type="spawn" x="224" y="256" width="32" height="32"/>
-  <object name="pack2" type="spawn" x="32" y="224" width="64" height="32">
+  <object name="pack3_2" type="spawn" x="224" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="pack3"/>
+   </properties>
+  </object>
+  <object name="pack2_3" type="spawn" x="32" y="224" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pack2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/crossglen_cave.tmx b/AndorsTrail/res/xml/crossglen_cave.tmx
index bb276cd8a..ce9030691 100644
--- a/AndorsTrail/res/xml/crossglen_cave.tmx
+++ b/AndorsTrail/res/xml/crossglen_cave.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -154,20 +154,24 @@
   <object name="crossglen_caverat" type="spawn" x="128" y="352" width="384" height="160">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="crossglen_caverat"/>
    </properties>
   </object>
   <object name="crossglen_caverat2" type="spawn" x="544" y="288" width="64" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="crossglen_caverat2"/>
    </properties>
   </object>
   <object name="crossglen_caveboss" type="spawn" x="64" y="129" width="34" height="32">
    <properties>
+    <property name="spawngroup" value="crossglen_caveboss"/>
    </properties>
   </object>
-  <object name="crossglen_caverat" type="spawn" x="224" y="96" width="352" height="128">
+  <object name="crossglen_caverat_1" type="spawn" x="224" y="96" width="352" height="128">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="crossglen_caverat"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/crossroads.tmx b/AndorsTrail/res/xml/crossroads.tmx
index a8f3cbc9d..8d4bc462c 100644
--- a/AndorsTrail/res/xml/crossroads.tmx
+++ b/AndorsTrail/res/xml/crossroads.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -203,23 +204,53 @@
   <object name="sign_crossroads_n" type="sign" x="640" y="128" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn uniques">
-  <object name="fieldwasp_unique" type="spawn" x="32" y="64" width="256" height="352"/>
-  <object name="fanamor" type="spawn" x="64" y="736" width="32" height="32"/>
-  <object name="benbyr" type="spawn" x="416" y="352" width="32" height="32"/>
-  <object name="crossroads_guard" type="spawn" x="544" y="384" width="32" height="32"/>
-  <object name="crossroads_guard" type="spawn" x="704" y="320" width="32" height="32"/>
+  <object name="fieldwasp_unique" type="spawn" x="32" y="64" width="256" height="352">
+   <properties>
+    <property name="spawngroup" value="fieldwasp_unique"/>
+   </properties>
+  </object>
+  <object name="fanamor" type="spawn" x="64" y="736" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fanamor"/>
+   </properties>
+  </object>
+  <object name="benbyr" type="spawn" x="416" y="352" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="benbyr"/>
+   </properties>
+  </object>
+  <object name="crossroads_guard" type="spawn" x="544" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="crossroads_guard"/>
+   </properties>
+  </object>
+  <object name="crossroads_guard_1" type="spawn" x="704" y="320" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="crossroads_guard"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn monsters">
   <object name="forestboar3" type="spawn" x="64" y="800" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestboar3"/>
+   </properties>
+  </object>
+  <object name="forestboar3_1" type="spawn" x="288" y="864" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="forestboar3"/>
+   </properties>
+  </object>
+  <object name="forestboar3_2" type="spawn" x="160" y="544" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="forestboar3"/>
    </properties>
   </object>
-  <object name="forestboar3" type="spawn" x="288" y="864" width="32" height="32"/>
-  <object name="forestboar3" type="spawn" x="160" y="544" width="96" height="64"/>
   <object name="fieldwasp_0" type="spawn" x="32" y="64" width="256" height="352">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fieldwasp_0"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/fallhaven_prison.tmx b/AndorsTrail/res/xml/fallhaven_prison.tmx
index 6292442ba..9b9c3142c 100644
--- a/AndorsTrail/res/xml/fallhaven_prison.tmx
+++ b/AndorsTrail/res/xml/fallhaven_prison.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="15" height="10">
   <data encoding="base64" compression="zlib">
@@ -150,10 +150,26 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="fallhaven_prisoner" type="spawn" x="288" y="96" width="160" height="96"/>
-  <object name="fallhaven_guard" type="spawn" x="416" y="224" width="32" height="32"/>
-  <object name="fallhaven_guard" type="spawn" x="32" y="224" width="32" height="32"/>
-  <object name="fallhaven_warden" type="spawn" x="96" y="128" width="32" height="32"/>
+  <object name="fallhaven_prisoner" type="spawn" x="288" y="96" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="fallhaven_prisoner"/>
+   </properties>
+  </object>
+  <object name="fallhaven_guard" type="spawn" x="416" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fallhaven_guard"/>
+   </properties>
+  </object>
+  <object name="fallhaven_guard_1" type="spawn" x="32" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fallhaven_guard"/>
+   </properties>
+  </object>
+  <object name="fallhaven_warden" type="spawn" x="96" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fallhaven_warden"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/fallhaven_sw.tmx b/AndorsTrail/res/xml/fallhaven_sw.tmx
index 2df42b5d4..3b038cf28 100644
--- a/AndorsTrail/res/xml/fallhaven_sw.tmx
+++ b/AndorsTrail/res/xml/fallhaven_sw.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -213,20 +214,34 @@
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
  <objectgroup name="Citizens" visible="0">
-  <object name="fallhaven_citizen3" type="spawn" x="320" y="64" width="576" height="256"/>
+  <object name="fallhaven_citizen3" type="spawn" x="320" y="64" width="576" height="256">
+   <properties>
+    <property name="spawngroup" value="fallhaven_citizen3"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="NPCs, Monsters">
-  <object name="fallhaven_lumberjack" type="spawn" x="416" y="256" width="32" height="32"/>
+  <object name="fallhaven_lumberjack" type="spawn" x="416" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fallhaven_lumberjack"/>
+   </properties>
+  </object>
   <object name="forestant" type="spawn" x="64" y="384" width="288" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestant"/>
    </properties>
   </object>
-  <object name="forestant" type="spawn" x="640" y="416" width="256" height="192">
+  <object name="forestant_1" type="spawn" x="640" y="416" width="256" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestant"/>
+   </properties>
+  </object>
+  <object name="vacor" type="spawn" x="128" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="vacor"/>
    </properties>
   </object>
-  <object name="vacor" type="spawn" x="128" y="128" width="32" height="32"/>
  </objectgroup>
 </map>
diff --git a/AndorsTrail/res/xml/fields1.tmx b/AndorsTrail/res/xml/fields1.tmx
index 8a4f11136..d841d104e 100644
--- a/AndorsTrail/res/xml/fields1.tmx
+++ b/AndorsTrail/res/xml/fields1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -177,32 +178,40 @@
   <object name="sign_fields1" type="sign" x="416" y="416" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn uniques">
-  <object name="tinlyn_lostsheep1" type="spawn" x="64" y="64" width="832" height="832"/>
+  <object name="tinlyn_lostsheep1" type="spawn" x="64" y="64" width="832" height="832">
+   <properties>
+    <property name="spawngroup" value="tinlyn_lostsheep1"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn monsters" visible="0">
   <object name="fieldcritter_0" type="spawn" x="64" y="64" width="224" height="544">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fieldcritter_0"/>
    </properties>
   </object>
   <object name="fieldcritter_1" type="spawn" x="512" y="64" width="384" height="320">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fieldcritter_1"/>
    </properties>
   </object>
-  <object name="fieldcritter_1" type="spawn" x="416" y="512" width="480" height="416">
+  <object name="fieldcritter_1_1" type="spawn" x="416" y="512" width="480" height="416">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fieldcritter_1"/>
    </properties>
   </object>
-  <object name="fieldcritter_0" type="spawn" x="64" y="448" width="128" height="448">
+  <object name="fieldcritter_0_1" type="spawn" x="64" y="448" width="128" height="448">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fieldcritter_0"/>
    </properties>
   </object>
-  <object name="fieldcritter_0" type="spawn" x="448" y="256" width="256" height="192">
+  <object name="fieldcritter_0_2" type="spawn" x="448" y="256" width="256" height="192">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="fieldcritter_0"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/fields12.tmx b/AndorsTrail/res/xml/fields12.tmx
index 744c96908..bdaf9b015 100644
--- a/AndorsTrail/res/xml/fields12.tmx
+++ b/AndorsTrail/res/xml/fields12.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="19" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,16 +162,18 @@
   <object name="frog_2" type="spawn" x="64" y="256" width="320" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="frog_2"/>
    </properties>
   </object>
   <object name="frog_3" type="spawn" x="96" y="128" width="320" height="192">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="frog_3"/>
    </properties>
   </object>
-  <object name="frog_2" type="spawn" x="256" y="64" width="288" height="320">
+  <object name="frog_2_1" type="spawn" x="256" y="64" width="288" height="320">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="frog_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/fields5.tmx b/AndorsTrail/res/xml/fields5.tmx
index fb91d16c3..865f48fc4 100644
--- a/AndorsTrail/res/xml/fields5.tmx
+++ b/AndorsTrail/res/xml/fields5.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -159,12 +159,29 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="fieldcritter_1" type="spawn" x="256" y="704" width="352" height="192"/>
-  <object name="fieldcritter_0" type="spawn" x="512" y="800" width="352" height="96"/>
-  <object name="fieldcritter_1" type="spawn" x="640" y="224" width="256" height="192"/>
-  <object name="fieldcritter_0" type="spawn" x="704" y="288" width="192" height="288"/>
+  <object name="fieldcritter_1" type="spawn" x="256" y="704" width="352" height="192">
+   <properties>
+    <property name="spawngroup" value="fieldcritter_1"/>
+   </properties>
+  </object>
+  <object name="fieldcritter_0" type="spawn" x="512" y="800" width="352" height="96">
+   <properties>
+    <property name="spawngroup" value="fieldcritter_0"/>
+   </properties>
+  </object>
+  <object name="fieldcritter_1_1" type="spawn" x="640" y="224" width="256" height="192">
+   <properties>
+    <property name="spawngroup" value="fieldcritter_1"/>
+   </properties>
+  </object>
+  <object name="fieldcritter_0_1" type="spawn" x="704" y="288" width="192" height="288">
+   <properties>
+    <property name="spawngroup" value="fieldcritter_0"/>
+   </properties>
+  </object>
   <object name="feygard_bridgeguard" type="spawn" x="416" y="512" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="feygard_bridgeguard"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/fields6.tmx b/AndorsTrail/res/xml/fields6.tmx
index 8f32cd57f..042ac2e47 100644
--- a/AndorsTrail/res/xml/fields6.tmx
+++ b/AndorsTrail/res/xml/fields6.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="28" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -165,15 +166,32 @@
   <object name="sign_fields6" type="sign" x="480" y="768" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="tinlyn" type="spawn" x="384" y="640" width="32" height="32"/>
+  <object name="tinlyn" type="spawn" x="384" y="640" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="tinlyn"/>
+   </properties>
+  </object>
   <object name="tinlyn_sheep" type="spawn" x="192" y="416" width="256" height="224">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="tinlyn_sheep"/>
+   </properties>
+  </object>
+  <object name="fieldcritter_0" type="spawn" x="64" y="96" width="416" height="192">
+   <properties>
+    <property name="spawngroup" value="fieldcritter_0"/>
+   </properties>
+  </object>
+  <object name="fieldcritter_0_1" type="spawn" x="608" y="704" width="288" height="128">
+   <properties>
+    <property name="spawngroup" value="fieldcritter_0"/>
+   </properties>
+  </object>
+  <object name="fieldcritter_0_2" type="spawn" x="512" y="256" width="160" height="192">
+   <properties>
+    <property name="spawngroup" value="fieldcritter_0"/>
    </properties>
   </object>
-  <object name="fieldcritter_0" type="spawn" x="64" y="96" width="416" height="192"/>
-  <object name="fieldcritter_0" type="spawn" x="608" y="704" width="288" height="128"/>
-  <object name="fieldcritter_0" type="spawn" x="512" y="256" width="160" height="192"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/flagstone0.tmx b/AndorsTrail/res/xml/flagstone0.tmx
index b05392b9f..9a39f41b7 100644
--- a/AndorsTrail/res/xml/flagstone0.tmx
+++ b/AndorsTrail/res/xml/flagstone0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -164,28 +165,59 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="forestboar3" type="spawn" x="832" y="160" width="32" height="32"/>
+  <object name="forestboar3" type="spawn" x="832" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="forestboar3"/>
+   </properties>
+  </object>
   <object name="forestboar2" type="spawn" x="480" y="160" width="352" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestboar2"/>
+   </properties>
+  </object>
+  <object name="forestboar3_1" type="spawn" x="352" y="128" width="160" height="128">
+   <properties>
+    <property name="spawngroup" value="forestboar3"/>
    </properties>
   </object>
-  <object name="forestboar3" type="spawn" x="352" y="128" width="160" height="128"/>
   <object name="forestbeetle" type="spawn" x="64" y="448" width="224" height="448">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="forestbeetle"/>
    </properties>
   </object>
   <object name="forestwolf1" type="spawn" x="64" y="96" width="288" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestwolf1"/>
+   </properties>
+  </object>
+  <object name="cavesnake2_boss" type="spawn" x="608" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="cavesnake2_boss"/>
+   </properties>
+  </object>
+  <object name="flagstone_sentry" type="spawn" x="384" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="flagstone_sentry"/>
+   </properties>
+  </object>
+  <object name="prisoner1" type="spawn" x="768" y="512" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="prisoner1"/>
+   </properties>
+  </object>
+  <object name="cavesnake2_boss_1" type="spawn" x="864" y="672" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="cavesnake2_boss"/>
+   </properties>
+  </object>
+  <object name="forestserpent1" type="spawn" x="864" y="768" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="forestserpent1"/>
    </properties>
   </object>
-  <object name="cavesnake2_boss" type="spawn" x="608" y="384" width="32" height="32"/>
-  <object name="flagstone_sentry" type="spawn" x="384" y="288" width="32" height="32"/>
-  <object name="prisoner1" type="spawn" x="768" y="512" width="32" height="32"/>
-  <object name="cavesnake2_boss" type="spawn" x="864" y="672" width="32" height="32"/>
-  <object name="forestserpent1" type="spawn" x="864" y="768" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/flagstone1.tmx b/AndorsTrail/res/xml/flagstone1.tmx
index 97187a2ea..8c2c1ce53 100644
--- a/AndorsTrail/res/xml/flagstone1.tmx
+++ b/AndorsTrail/res/xml/flagstone1.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="11" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="11">
   <data encoding="base64" compression="zlib">
@@ -158,17 +158,31 @@
  <objectgroup name="Spawn">
   <object name="prisoner2" type="spawn" x="352" y="96" width="128" height="96">
    <properties>
+    <property name="spawngroup" value="prisoner2"/>
+   </properties>
+  </object>
+  <object name="prisoner2_1" type="spawn" x="32" y="96" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="prisoner2"/>
+   </properties>
+  </object>
+  <object name="skeleton2" type="spawn" x="128" y="256" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="skeleton2"/>
+   </properties>
+  </object>
+  <object name="undead1" type="spawn" x="288" y="256" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="undead1"/>
    </properties>
   </object>
-  <object name="prisoner2" type="spawn" x="32" y="96" width="128" height="96"/>
-  <object name="skeleton2" type="spawn" x="128" y="256" width="64" height="32"/>
-  <object name="undead1" type="spawn" x="288" y="256" width="64" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
  <objectgroup name="Spawn2" visible="0">
   <object name="undeadrat1" type="spawn" x="64" y="224" width="544" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="undeadrat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/flagstone2.tmx b/AndorsTrail/res/xml/flagstone2.tmx
index 4708adb0b..ef039e685 100644
--- a/AndorsTrail/res/xml/flagstone2.tmx
+++ b/AndorsTrail/res/xml/flagstone2.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="11" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="11" height="30">
   <data encoding="base64" compression="zlib">
@@ -159,23 +159,56 @@
  <objectgroup name="Spawn">
   <object name="flagstone_guard1" type="spawn" x="224" y="320" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="flagstone_guard1"/>
+   </properties>
+  </object>
+  <object name="skeleton2" type="spawn" x="224" y="384" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="skeleton2"/>
+   </properties>
+  </object>
+  <object name="undead1" type="spawn" x="288" y="576" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="undead1"/>
+   </properties>
+  </object>
+  <object name="skeletonmaster" type="spawn" x="192" y="672" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="skeletonmaster"/>
+   </properties>
+  </object>
+  <object name="undead1_1" type="spawn" x="32" y="640" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="undead1"/>
+   </properties>
+  </object>
+  <object name="undead1_2" type="spawn" x="64" y="576" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="undead1"/>
+   </properties>
+  </object>
+  <object name="skeleton1" type="spawn" x="128" y="832" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="skeleton1"/>
+   </properties>
+  </object>
+  <object name="prisoner2" type="spawn" x="64" y="96" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="prisoner2"/>
+   </properties>
+  </object>
+  <object name="cavesnake2_boss" type="spawn" x="160" y="96" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="cavesnake2_boss"/>
    </properties>
   </object>
-  <object name="skeleton2" type="spawn" x="224" y="384" width="32" height="64"/>
-  <object name="undead1" type="spawn" x="288" y="576" width="32" height="32"/>
-  <object name="skeletonmaster" type="spawn" x="192" y="672" width="64" height="32"/>
-  <object name="undead1" type="spawn" x="32" y="640" width="32" height="128"/>
-  <object name="undead1" type="spawn" x="64" y="576" width="96" height="64"/>
-  <object name="skeleton1" type="spawn" x="128" y="832" width="64" height="32"/>
-  <object name="prisoner2" type="spawn" x="64" y="96" width="96" height="32"/>
-  <object name="cavesnake2_boss" type="spawn" x="160" y="96" width="96" height="128"/>
  </objectgroup>
  <objectgroup name="Keys">
   <object name="flagstone:40" type="key" x="224" y="288" width="32" height="32">
    <properties>
     <property name="phrase" value="flagstone_key_demon"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="flagstone"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="40"/>
    </properties>
   </object>
diff --git a/AndorsTrail/res/xml/flagstone3.tmx b/AndorsTrail/res/xml/flagstone3.tmx
index ba3cc92e8..ce6e5d505 100644
--- a/AndorsTrail/res/xml/flagstone3.tmx
+++ b/AndorsTrail/res/xml/flagstone3.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="13" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="13">
   <data encoding="base64" compression="zlib">
@@ -156,26 +156,49 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="skeleton3" type="spawn" x="544" y="160" width="32" height="64"/>
-  <object name="cavesnake2_boss" type="spawn" x="512" y="288" width="32" height="32"/>
+  <object name="skeleton3" type="spawn" x="544" y="160" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="skeleton3"/>
+   </properties>
+  </object>
+  <object name="cavesnake2_boss" type="spawn" x="512" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="cavesnake2_boss"/>
+   </properties>
+  </object>
   <object name="skeleton2" type="spawn" x="384" y="320" width="160" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="skeleton2"/>
    </properties>
   </object>
-  <object name="undead1" type="spawn" x="352" y="256" width="32" height="32"/>
-  <object name="skeleton2" type="spawn" x="192" y="96" width="192" height="96">
+  <object name="undead1" type="spawn" x="352" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="undead1"/>
+   </properties>
+  </object>
+  <object name="skeleton2_1" type="spawn" x="192" y="96" width="192" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="skeleton2"/>
    </properties>
   </object>
-  <object name="skeleton3" type="spawn" x="192" y="192" width="32" height="32"/>
-  <object name="undead1" type="spawn" x="32" y="128" width="32" height="160">
+  <object name="skeleton3_1" type="spawn" x="192" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="skeleton3"/>
+   </properties>
+  </object>
+  <object name="undead1_1" type="spawn" x="32" y="128" width="32" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="undead1"/>
+   </properties>
+  </object>
+  <object name="cavesnake2_boss_1" type="spawn" x="32" y="288" width="192" height="96">
+   <properties>
+    <property name="spawngroup" value="cavesnake2_boss"/>
    </properties>
   </object>
-  <object name="cavesnake2_boss" type="spawn" x="32" y="288" width="192" height="96"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/flagstone_inner.tmx b/AndorsTrail/res/xml/flagstone_inner.tmx
index 59f2febbb..4ef51c1fd 100644
--- a/AndorsTrail/res/xml/flagstone_inner.tmx
+++ b/AndorsTrail/res/xml/flagstone_inner.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="17" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="17">
   <data encoding="base64" compression="zlib">
@@ -162,22 +162,48 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="prisoner2" type="spawn" x="512" y="96" width="96" height="96"/>
-  <object name="prisoner1" type="spawn" x="384" y="96" width="96" height="96"/>
-  <object name="undead1" type="spawn" x="352" y="256" width="32" height="32"/>
-  <object name="skeleton2" type="spawn" x="288" y="160" width="32" height="32"/>
-  <object name="undead1" type="spawn" x="64" y="128" width="160" height="128">
+  <object name="prisoner2" type="spawn" x="512" y="96" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="prisoner2"/>
+   </properties>
+  </object>
+  <object name="prisoner1" type="spawn" x="384" y="96" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="prisoner1"/>
+   </properties>
+  </object>
+  <object name="undead1" type="spawn" x="352" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="undead1"/>
+   </properties>
+  </object>
+  <object name="skeleton2" type="spawn" x="288" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="skeleton2"/>
+   </properties>
+  </object>
+  <object name="undead1_1" type="spawn" x="64" y="128" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="undead1"/>
    </properties>
   </object>
-  <object name="undead1" type="spawn" x="64" y="288" width="32" height="32"/>
-  <object name="undead1" type="spawn" x="32" y="384" width="224" height="128">
+  <object name="undead1_2" type="spawn" x="64" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="undead1"/>
+   </properties>
+  </object>
+  <object name="undead1_3" type="spawn" x="32" y="384" width="224" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="undead1"/>
+   </properties>
+  </object>
+  <object name="undead1_4" type="spawn" x="384" y="224" width="224" height="64">
+   <properties>
+    <property name="spawngroup" value="undead1"/>
    </properties>
   </object>
-  <object name="undead1" type="spawn" x="384" y="224" width="224" height="64"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/flagstone_upper.tmx b/AndorsTrail/res/xml/flagstone_upper.tmx
index 63a98f9ce..334b6db7c 100644
--- a/AndorsTrail/res/xml/flagstone_upper.tmx
+++ b/AndorsTrail/res/xml/flagstone_upper.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="12" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="12">
   <data encoding="base64" compression="zlib">
@@ -150,23 +150,38 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="prisoner1" type="spawn" x="480" y="224" width="128" height="128"/>
-  <object name="prisoner2" type="spawn" x="32" y="224" width="128" height="128"/>
+  <object name="prisoner1" type="spawn" x="480" y="224" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="prisoner1"/>
+   </properties>
+  </object>
+  <object name="prisoner2" type="spawn" x="32" y="224" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="prisoner2"/>
+   </properties>
+  </object>
   <object name="skeleton2" type="spawn" x="192" y="96" width="192" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="skeleton2"/>
    </properties>
   </object>
   <object name="flagstone_guard0" type="spawn" x="544" y="96" width="64" height="64">
    <properties>
+    <property name="spawngroup" value="flagstone_guard0"/>
    </properties>
   </object>
-  <object name="skeleton2" type="spawn" x="512" y="96" width="32" height="64">
+  <object name="skeleton2_1" type="spawn" x="512" y="96" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="skeleton2"/>
+   </properties>
+  </object>
+  <object name="skeleton3" type="spawn" x="320" y="128" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
-  <object name="skeleton3" type="spawn" x="320" y="128" width="128" height="96"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/gargoylecave1.tmx b/AndorsTrail/res/xml/gargoylecave1.tmx
index 6b20c3a8c..48450a6ab 100644
--- a/AndorsTrail/res/xml/gargoylecave1.tmx
+++ b/AndorsTrail/res/xml/gargoylecave1.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -159,17 +159,35 @@
   <object name="shadowgarg1" type="spawn" x="256" y="448" width="320" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="shadowgarg1"/>
    </properties>
   </object>
-  <object name="shadowgarg1" type="spawn" x="544" y="256" width="32" height="160"/>
-  <object name="shadowgarg1" type="spawn" x="384" y="192" width="32" height="32"/>
-  <object name="shadowgarg2" type="spawn" x="128" y="256" width="32" height="128"/>
-  <object name="shadowgarg2" type="spawn" x="32" y="160" width="256" height="96">
+  <object name="shadowgarg1_1" type="spawn" x="544" y="256" width="32" height="160">
+   <properties>
+    <property name="spawngroup" value="shadowgarg1"/>
+   </properties>
+  </object>
+  <object name="shadowgarg1_2" type="spawn" x="384" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="shadowgarg1"/>
+   </properties>
+  </object>
+  <object name="shadowgarg2" type="spawn" x="128" y="256" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="shadowgarg2"/>
+   </properties>
+  </object>
+  <object name="shadowgarg2_1" type="spawn" x="32" y="160" width="256" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="shadowgarg2"/>
+   </properties>
+  </object>
+  <object name="shadowgarg1_3" type="spawn" x="416" y="128" width="160" height="128">
+   <properties>
+    <property name="spawngroup" value="shadowgarg1"/>
    </properties>
   </object>
-  <object name="shadowgarg1" type="spawn" x="416" y="128" width="160" height="128"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/gargoylecave2.tmx b/AndorsTrail/res/xml/gargoylecave2.tmx
index 407792011..7f2e60ad9 100644
--- a/AndorsTrail/res/xml/gargoylecave2.tmx
+++ b/AndorsTrail/res/xml/gargoylecave2.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -162,17 +162,42 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="shadowgarg1" type="spawn" x="512" y="512" width="32" height="32"/>
-  <object name="shadowgarg2" type="spawn" x="224" y="512" width="32" height="32"/>
+  <object name="shadowgarg1" type="spawn" x="512" y="512" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="shadowgarg1"/>
+   </properties>
+  </object>
+  <object name="shadowgarg2" type="spawn" x="224" y="512" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="shadowgarg2"/>
+   </properties>
+  </object>
   <object name="shadowgarg3" type="spawn" x="32" y="128" width="256" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="shadowgarg3"/>
+   </properties>
+  </object>
+  <object name="shadowgarg3_1" type="spawn" x="320" y="128" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="shadowgarg3"/>
+   </properties>
+  </object>
+  <object name="shadowgarg4" type="spawn" x="448" y="64" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="shadowgarg4"/>
+   </properties>
+  </object>
+  <object name="shadowgarg3_2" type="spawn" x="416" y="128" width="128" height="160">
+   <properties>
+    <property name="spawngroup" value="shadowgarg3"/>
+   </properties>
+  </object>
+  <object name="shadowgarg2_1" type="spawn" x="288" y="480" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="shadowgarg2"/>
    </properties>
   </object>
-  <object name="shadowgarg3" type="spawn" x="320" y="128" width="64" height="32"/>
-  <object name="shadowgarg4" type="spawn" x="448" y="64" width="32" height="32"/>
-  <object name="shadowgarg3" type="spawn" x="416" y="128" width="128" height="160"/>
-  <object name="shadowgarg2" type="spawn" x="288" y="480" width="96" height="64"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/gargoylecave3.tmx b/AndorsTrail/res/xml/gargoylecave3.tmx
index 472d0d39c..e86ce1ff9 100644
--- a/AndorsTrail/res/xml/gargoylecave3.tmx
+++ b/AndorsTrail/res/xml/gargoylecave3.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="11" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="11" height="20">
   <data encoding="base64" compression="zlib">
@@ -152,16 +152,30 @@
  <objectgroup name="Spawn">
   <object name="maelveon" type="spawn" x="160" y="128" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="maelveon"/>
+   </properties>
+  </object>
+  <object name="shadowgarg4" type="spawn" x="160" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="shadowgarg4"/>
+   </properties>
+  </object>
+  <object name="shadowgarg4_1" type="spawn" x="128" y="224" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="shadowgarg4"/>
    </properties>
   </object>
-  <object name="shadowgarg4" type="spawn" x="160" y="192" width="32" height="32"/>
-  <object name="shadowgarg4" type="spawn" x="128" y="224" width="96" height="96"/>
   <object name="shadowgarg3" type="spawn" x="32" y="320" width="288" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="shadowgarg3"/>
+   </properties>
+  </object>
+  <object name="shadowgarg4_2" type="spawn" x="128" y="544" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="shadowgarg4"/>
    </properties>
   </object>
-  <object name="shadowgarg4" type="spawn" x="128" y="544" width="96" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/hauntedhouse3.tmx b/AndorsTrail/res/xml/hauntedhouse3.tmx
index 75ef264c3..2c05b8e1e 100644
--- a/AndorsTrail/res/xml/hauntedhouse3.tmx
+++ b/AndorsTrail/res/xml/hauntedhouse3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -157,31 +158,44 @@
   <object name="sign_hh3_grave" type="sign" x="384" y="448" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="catacombguard3" type="spawn" x="352" y="256" width="32" height="32"/>
+  <object name="catacombguard3" type="spawn" x="352" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="catacombguard3"/>
+   </properties>
+  </object>
   <object name="catacombguard2" type="spawn" x="288" y="352" width="128" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="catacombguard2"/>
    </properties>
   </object>
-  <object name="minorhaunt2" type="spawn" x="224" y="256" width="32" height="32"/>
-  <object name="minorhaunt2" type="spawn" x="32" y="352" width="224" height="256">
+  <object name="minorhaunt2" type="spawn" x="224" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="minorhaunt2"/>
+   </properties>
+  </object>
+  <object name="minorhaunt2_1" type="spawn" x="32" y="352" width="224" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="minorhaunt2"/>
    </properties>
   </object>
   <object name="haunt3" type="spawn" x="352" y="96" width="192" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="haunt3"/>
    </properties>
   </object>
-  <object name="haunt3" type="spawn" x="512" y="256" width="64" height="256">
+  <object name="haunt3_1" type="spawn" x="512" y="256" width="64" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="haunt3"/>
    </properties>
   </object>
   <object name="skeleton1" type="spawn" x="672" y="192" width="96" height="352">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="skeleton1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/houseatcrossroads1.tmx b/AndorsTrail/res/xml/houseatcrossroads1.tmx
index 847f1e5b7..7cd200fb6 100644
--- a/AndorsTrail/res/xml/houseatcrossroads1.tmx
+++ b/AndorsTrail/res/xml/houseatcrossroads1.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="16" height="12" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="16" height="12">
   <data encoding="base64" compression="zlib">
@@ -159,28 +159,36 @@
  <objectgroup name="Spawn">
   <object name="crossroads_guest" type="spawn" x="160" y="96" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="crossroads_guest"/>
    </properties>
   </object>
   <object name="crossroads_sleepguard" type="spawn" x="32" y="192" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="crossroads_sleepguard"/>
    </properties>
   </object>
   <object name="crossroads_backguard" type="spawn" x="448" y="192" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="crossroads_backguard"/>
    </properties>
   </object>
-  <object name="crossroads_guest" type="spawn" x="320" y="288" width="32" height="32">
+  <object name="crossroads_guest_1" type="spawn" x="320" y="288" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="crossroads_guest"/>
+   </properties>
+  </object>
+  <object name="crossroads_rat" type="spawn" x="384" y="96" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="crossroads_rat"/>
    </properties>
   </object>
-  <object name="crossroads_rat" type="spawn" x="384" y="96" width="96" height="64"/>
  </objectgroup>
  <objectgroup name="Keys">
   <object name="nondisplay:17" type="key" x="224" y="96" width="64" height="64">
    <properties>
     <property name="phrase" value="crossroads_sleep"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="nondisplay"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="17"/>
    </properties>
   </object>
diff --git a/AndorsTrail/res/xml/jan_pitcave1.tmx b/AndorsTrail/res/xml/jan_pitcave1.tmx
index 1d4ae7c2e..4bdd26eef 100644
--- a/AndorsTrail/res/xml/jan_pitcave1.tmx
+++ b/AndorsTrail/res/xml/jan_pitcave1.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="10" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="10" height="10">
   <data encoding="base64" compression="zlib">
@@ -156,8 +156,16 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="pitcave1" type="spawn" x="128" y="256" width="96" height="32"/>
-  <object name="pitcave1" type="spawn" x="128" y="96" width="160" height="32"/>
+  <object name="pitcave1" type="spawn" x="128" y="256" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="pitcave1"/>
+   </properties>
+  </object>
+  <object name="pitcave1_1" type="spawn" x="128" y="96" width="160" height="32">
+   <properties>
+    <property name="spawngroup" value="pitcave1"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/jan_pitcave2.tmx b/AndorsTrail/res/xml/jan_pitcave2.tmx
index c5ce07b76..980700c98 100644
--- a/AndorsTrail/res/xml/jan_pitcave2.tmx
+++ b/AndorsTrail/res/xml/jan_pitcave2.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -160,32 +160,61 @@
   <object name="pitcave1" type="spawn" x="544" y="96" width="256" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pitcave1"/>
    </properties>
   </object>
-  <object name="pitcave2" type="spawn" x="288" y="256" width="32" height="32"/>
-  <object name="pitcave2" type="spawn" x="544" y="320" width="384" height="224">
+  <object name="pitcave2" type="spawn" x="288" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="pitcave2"/>
+   </properties>
+  </object>
+  <object name="pitcave2_1" type="spawn" x="544" y="320" width="384" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pitcave2"/>
    </properties>
   </object>
-  <object name="pitcave2" type="spawn" x="32" y="256" width="128" height="288"/>
-  <object name="pitcave2" type="spawn" x="480" y="672" width="96" height="32"/>
-  <object name="pitcave2" type="spawn" x="224" y="416" width="224" height="512">
+  <object name="pitcave2_2" type="spawn" x="32" y="256" width="128" height="288">
+   <properties>
+    <property name="spawngroup" value="pitcave2"/>
+   </properties>
+  </object>
+  <object name="pitcave2_3" type="spawn" x="480" y="672" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="pitcave2"/>
+   </properties>
+  </object>
+  <object name="pitcave2_4" type="spawn" x="224" y="416" width="224" height="512">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="pitcave2"/>
    </properties>
   </object>
-  <object name="pitcave2_boss" type="spawn" x="736" y="736" width="128" height="64"/>
-  <object name="pitcave1" type="spawn" x="64" y="736" width="128" height="128"/>
-  <object name="pitcave2" type="spawn" x="64" y="96" width="192" height="128">
+  <object name="pitcave2_boss" type="spawn" x="736" y="736" width="128" height="64">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pitcave2_boss"/>
    </properties>
   </object>
-  <object name="pitcave2" type="spawn" x="384" y="192" width="160" height="96"/>
-  <object name="pitcave2" type="spawn" x="672" y="672" width="128" height="224">
+  <object name="pitcave1_1" type="spawn" x="64" y="736" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="pitcave1"/>
+   </properties>
+  </object>
+  <object name="pitcave2_5" type="spawn" x="64" y="96" width="192" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pitcave2"/>
+   </properties>
+  </object>
+  <object name="pitcave2_6" type="spawn" x="384" y="192" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="pitcave2"/>
+   </properties>
+  </object>
+  <object name="pitcave2_7" type="spawn" x="672" y="672" width="128" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pitcave2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar0.tmx b/AndorsTrail/res/xml/lodar0.tmx
index cebe3f7a7..875e0e8ca 100644
--- a/AndorsTrail/res/xml/lodar0.tmx
+++ b/AndorsTrail/res/xml/lodar0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -173,53 +174,71 @@
   <object name="forestfly1" type="spawn" x="64" y="768" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="lodar0_g" type="spawn" x="576" y="800" width="32" height="32"/>
-  <object name="forestfly1" type="spawn" x="128" y="832" width="32" height="64">
+  <object name="lodar0_g" type="spawn" x="576" y="800" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="lodar0_g"/>
+   </properties>
+  </object>
+  <object name="forestfly1_1" type="spawn" x="128" y="832" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="256" y="768" width="288" height="160">
+  <object name="forestfly1_2" type="spawn" x="256" y="768" width="288" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="640" y="672" width="288" height="256">
+  <object name="forestfly1_3" type="spawn" x="640" y="672" width="288" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="448" y="256" width="96" height="224">
+  <object name="forestfly1_4" type="spawn" x="448" y="256" width="96" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="hanklbit1" type="spawn" x="480" y="480" width="32" height="32"/>
-  <object name="hanklbit1" type="spawn" x="192" y="352" width="224" height="192">
+  <object name="hanklbit1" type="spawn" x="480" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit1"/>
+   </properties>
+  </object>
+  <object name="hanklbit1_1" type="spawn" x="192" y="352" width="224" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="288" y="96" width="416" height="160">
+  <object name="forestfly1_5" type="spawn" x="288" y="96" width="416" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="672" y="192" width="224" height="352">
+  <object name="forestfly1_6" type="spawn" x="672" y="192" width="224" height="352">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="480" y="512" width="320" height="160">
+  <object name="forestfly1_7" type="spawn" x="480" y="512" width="320" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="288" y="544" width="192" height="160">
+  <object name="forestfly1_8" type="spawn" x="288" y="544" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar10.tmx b/AndorsTrail/res/xml/lodar10.tmx
index 19ce20cd0..5385bc987 100644
--- a/AndorsTrail/res/xml/lodar10.tmx
+++ b/AndorsTrail/res/xml/lodar10.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="25" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,10 +162,19 @@
   <object name="khakin1" type="spawn" x="64" y="224" width="416" height="480">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="khakin1"/>
+   </properties>
+  </object>
+  <object name="khakin1_1" type="spawn" x="320" y="384" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="khakin1"/>
+   </properties>
+  </object>
+  <object name="morkins" type="spawn" x="224" y="64" width="160" height="160">
+   <properties>
+    <property name="spawngroup" value="morkins"/>
    </properties>
   </object>
-  <object name="khakin1" type="spawn" x="320" y="384" width="64" height="32"/>
-  <object name="morkins" type="spawn" x="224" y="64" width="160" height="160"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodar11.tmx b/AndorsTrail/res/xml/lodar11.tmx
index 3ea53a67c..607c6665a 100644
--- a/AndorsTrail/res/xml/lodar11.tmx
+++ b/AndorsTrail/res/xml/lodar11.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -200,54 +201,102 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="hanklbit1" type="spawn" x="448" y="96" width="32" height="32"/>
-  <object name="hanklbit1" type="spawn" x="448" y="160" width="32" height="32"/>
+  <object name="hanklbit1" type="spawn" x="448" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit1"/>
+   </properties>
+  </object>
+  <object name="hanklbit1_1" type="spawn" x="448" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit1"/>
+   </properties>
+  </object>
   <object name="forestfly2" type="spawn" x="384" y="352" width="128" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly2"/>
    </properties>
   </object>
   <object name="forestfly1" type="spawn" x="384" y="192" width="160" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="512" y="352" width="224" height="96">
+  <object name="forestfly1_1" type="spawn" x="512" y="352" width="224" height="96">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
+   </properties>
+  </object>
+  <object name="lodar_fg3" type="spawn" x="736" y="384" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="lodar_fg3"/>
    </properties>
   </object>
-  <object name="lodar_fg3" type="spawn" x="736" y="384" width="96" height="96"/>
   <object name="yjacket1" type="spawn" x="64" y="544" width="96" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="yjacket1"/>
    </properties>
   </object>
   <object name="yjacket2" type="spawn" x="128" y="256" width="160" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="yjacket2"/>
    </properties>
   </object>
-  <object name="yjacket1" type="spawn" x="160" y="416" width="192" height="192">
+  <object name="yjacket1_1" type="spawn" x="160" y="416" width="192" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="yjacket1"/>
    </properties>
   </object>
-  <object name="morkins" type="spawn" x="768" y="288" width="32" height="32"/>
-  <object name="morkins" type="spawn" x="864" y="96" width="32" height="32"/>
-  <object name="morkin3" type="spawn" x="896" y="160" width="32" height="128"/>
-  <object name="morkin1" type="spawn" x="832" y="320" width="64" height="64"/>
-  <object name="morkins" type="spawn" x="768" y="736" width="96" height="64"/>
-  <object name="morkin3" type="spawn" x="768" y="896" width="64" height="32"/>
-  <object name="morkin2" type="spawn" x="544" y="704" width="64" height="32"/>
-  <object name="morkin1" type="spawn" x="576" y="544" width="320" height="128">
+  <object name="morkins" type="spawn" x="768" y="288" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="morkins"/>
    </properties>
   </object>
-  <object name="morkin1" type="spawn" x="512" y="768" width="128" height="160">
+  <object name="morkins_1" type="spawn" x="864" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="morkins"/>
+   </properties>
+  </object>
+  <object name="morkin3" type="spawn" x="896" y="160" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="morkin3"/>
+   </properties>
+  </object>
+  <object name="morkin1" type="spawn" x="832" y="320" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkins_2" type="spawn" x="768" y="736" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="morkins"/>
+   </properties>
+  </object>
+  <object name="morkin3_1" type="spawn" x="768" y="896" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="morkin3"/>
+   </properties>
+  </object>
+  <object name="morkin2" type="spawn" x="544" y="704" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="morkin2"/>
+   </properties>
+  </object>
+  <object name="morkin1_1" type="spawn" x="576" y="544" width="320" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin1_2" type="spawn" x="512" y="768" width="128" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="morkin1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar12.tmx b/AndorsTrail/res/xml/lodar12.tmx
index 158c4fd17..191511544 100644
--- a/AndorsTrail/res/xml/lodar12.tmx
+++ b/AndorsTrail/res/xml/lodar12.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -182,24 +183,66 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="morkin_cr" type="spawn" x="96" y="96" width="32" height="32"/>
-  <object name="morkins" type="spawn" x="64" y="640" width="96" height="128"/>
-  <object name="morkin1" type="spawn" x="64" y="768" width="224" height="128"/>
-  <object name="morkin4" type="spawn" x="160" y="96" width="96" height="96"/>
+  <object name="morkin_cr" type="spawn" x="96" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="morkin_cr"/>
+   </properties>
+  </object>
+  <object name="morkins" type="spawn" x="64" y="640" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="morkins"/>
+   </properties>
+  </object>
+  <object name="morkin1" type="spawn" x="64" y="768" width="224" height="128">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin4" type="spawn" x="160" y="96" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="morkin4"/>
+   </properties>
+  </object>
   <object name="morkin3" type="spawn" x="256" y="64" width="128" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="morkin3"/>
    </properties>
   </object>
-  <object name="morkin2" type="spawn" x="448" y="192" width="32" height="96"/>
-  <object name="morkin2" type="spawn" x="448" y="320" width="32" height="32"/>
-  <object name="morkin1" type="spawn" x="448" y="384" width="32" height="32"/>
-  <object name="morkin3" type="spawn" x="320" y="544" width="32" height="32"/>
-  <object name="morkin1" type="spawn" x="128" y="256" width="224" height="192"/>
-  <object name="morkin1" type="spawn" x="64" y="448" width="160" height="128"/>
-  <object name="morkin2" type="spawn" x="192" y="640" width="224" height="128">
+  <object name="morkin2" type="spawn" x="448" y="192" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="morkin2"/>
+   </properties>
+  </object>
+  <object name="morkin2_1" type="spawn" x="448" y="320" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="morkin2"/>
+   </properties>
+  </object>
+  <object name="morkin1_1" type="spawn" x="448" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin3_1" type="spawn" x="320" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="morkin3"/>
+   </properties>
+  </object>
+  <object name="morkin1_2" type="spawn" x="128" y="256" width="224" height="192">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin1_3" type="spawn" x="64" y="448" width="160" height="128">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin2_2" type="spawn" x="192" y="640" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="morkin2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar12cave0.tmx b/AndorsTrail/res/xml/lodar12cave0.tmx
index 3583f3140..838c6efe4 100644
--- a/AndorsTrail/res/xml/lodar12cave0.tmx
+++ b/AndorsTrail/res/xml/lodar12cave0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,21 +156,43 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="cryptmist1" type="spawn" x="128" y="128" width="32" height="32"/>
-  <object name="cryptmist2" type="spawn" x="256" y="160" width="32" height="32"/>
-  <object name="cryptmist1" type="spawn" x="64" y="192" width="32" height="64"/>
-  <object name="cryptmist1" type="spawn" x="96" y="352" width="64" height="32"/>
-  <object name="cryptmist2" type="spawn" x="32" y="256" width="64" height="32">
+  <object name="cryptmist1" type="spawn" x="128" y="128" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cryptmist1"/>
+   </properties>
+  </object>
+  <object name="cryptmist2" type="spawn" x="256" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="cryptmist2"/>
+   </properties>
+  </object>
+  <object name="cryptmist1_1" type="spawn" x="64" y="192" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="cryptmist1"/>
+   </properties>
+  </object>
+  <object name="cryptmist1_2" type="spawn" x="96" y="352" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="cryptmist1"/>
+   </properties>
+  </object>
+  <object name="cryptmist2_1" type="spawn" x="32" y="256" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cryptmist2"/>
+   </properties>
+  </object>
+  <object name="cryptmist1_3" type="spawn" x="160" y="320" width="288" height="128">
+   <properties>
+    <property name="spawngroup" value="cryptmist1"/>
    </properties>
   </object>
-  <object name="cryptmist1" type="spawn" x="160" y="320" width="288" height="128"/>
  </objectgroup>
  <objectgroup name="Spawn_bats" visible="0">
   <object name="cavebat1" type="spawn" x="32" y="96" width="416" height="352">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar12cave1.tmx b/AndorsTrail/res/xml/lodar12cave1.tmx
index cbb728a51..97b5af1d0 100644
--- a/AndorsTrail/res/xml/lodar12cave1.tmx
+++ b/AndorsTrail/res/xml/lodar12cave1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="25" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,23 +156,53 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="cryptmist3" type="spawn" x="32" y="96" width="256" height="128"/>
-  <object name="cryptmist2" type="spawn" x="288" y="512" width="32" height="64"/>
-  <object name="cryptmist2" type="spawn" x="160" y="704" width="64" height="32"/>
-  <object name="cryptmist2" type="spawn" x="480" y="352" width="32" height="32"/>
-  <object name="cryptmist3" type="spawn" x="480" y="384" width="128" height="192"/>
+  <object name="cryptmist3" type="spawn" x="32" y="96" width="256" height="128">
+   <properties>
+    <property name="spawngroup" value="cryptmist3"/>
+   </properties>
+  </object>
+  <object name="cryptmist2" type="spawn" x="288" y="512" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="cryptmist2"/>
+   </properties>
+  </object>
+  <object name="cryptmist2_1" type="spawn" x="160" y="704" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="cryptmist2"/>
+   </properties>
+  </object>
+  <object name="cryptmist2_2" type="spawn" x="480" y="352" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="cryptmist2"/>
+   </properties>
+  </object>
+  <object name="cryptmist3_1" type="spawn" x="480" y="384" width="128" height="192">
+   <properties>
+    <property name="spawngroup" value="cryptmist3"/>
+   </properties>
+  </object>
   <object name="cryptmist1" type="spawn" x="256" y="256" width="288" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cryptmist1"/>
+   </properties>
+  </object>
+  <object name="cryptmist3_2" type="spawn" x="64" y="384" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="cryptmist3"/>
+   </properties>
+  </object>
+  <object name="cryptmist1_1" type="spawn" x="192" y="352" width="160" height="160">
+   <properties>
+    <property name="spawngroup" value="cryptmist1"/>
    </properties>
   </object>
-  <object name="cryptmist3" type="spawn" x="64" y="384" width="96" height="96"/>
-  <object name="cryptmist1" type="spawn" x="192" y="352" width="160" height="160"/>
  </objectgroup>
  <objectgroup name="Spawn_bats" visible="0">
   <object name="cavebat1" type="spawn" x="32" y="96" width="576" height="672">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar13.tmx b/AndorsTrail/res/xml/lodar13.tmx
index 4f1ccd34a..b13618b02 100644
--- a/AndorsTrail/res/xml/lodar13.tmx
+++ b/AndorsTrail/res/xml/lodar13.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="12" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -159,16 +160,26 @@
   <object name="rest1" type="rest" x="448" y="192" width="32" height="64"/>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="aulowenn" type="spawn" x="480" y="128" width="32" height="32"/>
-  <object name="erumen_f1" type="spawn" x="160" y="64" width="128" height="128"/>
-  <object name="erumen_f1" type="spawn" x="128" y="192" width="256" height="160">
+  <object name="aulowenn" type="spawn" x="480" y="128" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="aulowenn"/>
    </properties>
   </object>
-  <object name="erumen_f1" type="spawn" x="544" y="128" width="352" height="192">
+  <object name="erumen_f1" type="spawn" x="160" y="64" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="erumen_f1"/>
+   </properties>
+  </object>
+  <object name="erumen_f1_1" type="spawn" x="128" y="192" width="256" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_f1"/>
+   </properties>
+  </object>
+  <object name="erumen_f1_2" type="spawn" x="544" y="128" width="352" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
  </objectgroup>
@@ -176,8 +187,8 @@
   <object name="lodar13_rest:60" type="key" x="448" y="192" width="32" height="64">
    <properties>
     <property name="phrase" value="lodar13_rest"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="lodar13_rest"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="60"/>
    </properties>
   </object>
diff --git a/AndorsTrail/res/xml/lodar14.tmx b/AndorsTrail/res/xml/lodar14.tmx
index ce56e1936..1c76b2ab0 100644
--- a/AndorsTrail/res/xml/lodar14.tmx
+++ b/AndorsTrail/res/xml/lodar14.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="19" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -196,58 +197,107 @@
   <object name="yjacket2" type="spawn" x="448" y="352" width="128" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="yjacket2"/>
+   </properties>
+  </object>
+  <object name="yjacket1" type="spawn" x="480" y="544" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="yjacket1"/>
+   </properties>
+  </object>
+  <object name="yjacket1_1" type="spawn" x="512" y="576" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="yjacket1"/>
+   </properties>
+  </object>
+  <object name="erumen_f1" type="spawn" x="64" y="288" width="64" height="128">
+   <properties>
+    <property name="spawngroup" value="erumen_f1"/>
+   </properties>
+  </object>
+  <object name="erumen_f1_1" type="spawn" x="96" y="416" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
-  <object name="yjacket1" type="spawn" x="480" y="544" width="64" height="32"/>
-  <object name="yjacket1" type="spawn" x="512" y="576" width="32" height="128"/>
-  <object name="erumen_f1" type="spawn" x="64" y="288" width="64" height="128"/>
-  <object name="erumen_f1" type="spawn" x="96" y="416" width="32" height="32"/>
   <object name="forestfly1" type="spawn" x="64" y="448" width="128" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="erumen_f1" type="spawn" x="160" y="608" width="32" height="32"/>
-  <object name="erumen_f1" type="spawn" x="64" y="640" width="192" height="192">
+  <object name="erumen_f1_2" type="spawn" x="160" y="608" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="erumen_f1"/>
+   </properties>
+  </object>
+  <object name="erumen_f1_3" type="spawn" x="64" y="640" width="192" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="32" y="640" width="384" height="192">
+  <object name="forestfly1_1" type="spawn" x="32" y="640" width="384" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="tiqui" type="spawn" x="320" y="544" width="32" height="32"/>
-  <object name="yjacket2" type="spawn" x="128" y="64" width="96" height="32">
+  <object name="tiqui" type="spawn" x="320" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="tiqui"/>
+   </properties>
+  </object>
+  <object name="yjacket2_1" type="spawn" x="128" y="64" width="96" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="yjacket2"/>
+   </properties>
+  </object>
+  <object name="hanklbit1" type="spawn" x="192" y="96" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit1"/>
    </properties>
   </object>
-  <object name="hanklbit1" type="spawn" x="192" y="96" width="64" height="32"/>
   <object name="yjacket3" type="spawn" x="192" y="160" width="160" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="yjacket3"/>
    </properties>
   </object>
-  <object name="yjacket3" type="spawn" x="320" y="352" width="32" height="32"/>
-  <object name="yjacket3" type="spawn" x="384" y="384" width="32" height="32"/>
-  <object name="yjacket2" type="spawn" x="224" y="416" width="96" height="128">
+  <object name="yjacket3_1" type="spawn" x="320" y="352" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="yjacket3"/>
+   </properties>
+  </object>
+  <object name="yjacket3_2" type="spawn" x="384" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="yjacket3"/>
+   </properties>
+  </object>
+  <object name="yjacket2_2" type="spawn" x="224" y="416" width="96" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="yjacket2"/>
    </properties>
   </object>
   <object name="yjacket4" type="spawn" x="352" y="736" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="yjacket4"/>
    </properties>
   </object>
-  <object name="yjacket2" type="spawn" x="384" y="96" width="160" height="160">
+  <object name="yjacket2_3" type="spawn" x="384" y="96" width="160" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="yjacket2"/>
+   </properties>
+  </object>
+  <object name="zortaks" type="spawn" x="352" y="64" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="zortaks"/>
    </properties>
   </object>
-  <object name="zortaks" type="spawn" x="352" y="64" width="64" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
  <objectgroup name="Replace">
diff --git a/AndorsTrail/res/xml/lodar16.tmx b/AndorsTrail/res/xml/lodar16.tmx
index 6e7958206..b3675316d 100644
--- a/AndorsTrail/res/xml/lodar16.tmx
+++ b/AndorsTrail/res/xml/lodar16.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -188,58 +189,95 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="yjacket2" type="spawn" x="64" y="192" width="64" height="64"/>
-  <object name="yjacket2" type="spawn" x="32" y="384" width="96" height="192">
+  <object name="yjacket2" type="spawn" x="64" y="192" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="yjacket2"/>
+   </properties>
+  </object>
+  <object name="yjacket2_1" type="spawn" x="32" y="384" width="96" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="yjacket2"/>
    </properties>
   </object>
   <object name="yjacket4" type="spawn" x="64" y="576" width="224" height="224">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="yjacket4"/>
    </properties>
   </object>
   <object name="vscale1" type="spawn" x="192" y="64" width="128" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale1"/>
    </properties>
   </object>
-  <object name="vscale1" type="spawn" x="288" y="160" width="32" height="32"/>
-  <object name="vscaleb1" type="spawn" x="512" y="64" width="96" height="64"/>
-  <object name="vscale1" type="spawn" x="352" y="128" width="32" height="64"/>
-  <object name="vscale1" type="spawn" x="256" y="224" width="192" height="192">
+  <object name="vscale1_1" type="spawn" x="288" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="vscale1"/>
+   </properties>
+  </object>
+  <object name="vscaleb1" type="spawn" x="512" y="64" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="vscaleb1"/>
+   </properties>
+  </object>
+  <object name="vscale1_2" type="spawn" x="352" y="128" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="vscale1"/>
+   </properties>
+  </object>
+  <object name="vscale1_3" type="spawn" x="256" y="224" width="192" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="vscale1"/>
    </properties>
   </object>
-  <object name="vscale1" type="spawn" x="352" y="416" width="64" height="64">
+  <object name="vscale1_4" type="spawn" x="352" y="416" width="64" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale1"/>
    </properties>
   </object>
-  <object name="vscaleb1" type="spawn" x="384" y="640" width="32" height="224">
+  <object name="vscaleb1_1" type="spawn" x="384" y="640" width="32" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscaleb1"/>
    </properties>
   </object>
-  <object name="vscale1" type="spawn" x="288" y="480" width="192" height="160">
+  <object name="vscale1_5" type="spawn" x="288" y="480" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale1"/>
    </properties>
   </object>
-  <object name="vscale2" type="spawn" x="480" y="416" width="64" height="64"/>
-  <object name="vscaleb1" type="spawn" x="480" y="544" width="352" height="160">
+  <object name="vscale2" type="spawn" x="480" y="416" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="vscale2"/>
+   </properties>
+  </object>
+  <object name="vscaleb1_2" type="spawn" x="480" y="544" width="352" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscaleb1"/>
    </properties>
   </object>
-  <object name="vscale2" type="spawn" x="640" y="384" width="32" height="96"/>
-  <object name="vscale1" type="spawn" x="704" y="128" width="160" height="192">
+  <object name="vscale2_1" type="spawn" x="640" y="384" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="vscale2"/>
+   </properties>
+  </object>
+  <object name="vscale1_6" type="spawn" x="704" y="128" width="160" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="vscale1"/>
+   </properties>
+  </object>
+  <object name="vscale1_7" type="spawn" x="576" y="352" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="vscale1"/>
    </properties>
   </object>
-  <object name="vscale1" type="spawn" x="576" y="352" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodar17.tmx b/AndorsTrail/res/xml/lodar17.tmx
index ca9baf292..753dc220d 100644
--- a/AndorsTrail/res/xml/lodar17.tmx
+++ b/AndorsTrail/res/xml/lodar17.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="19" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -164,39 +165,65 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="vscaleb2" type="spawn" x="128" y="64" width="128" height="128"/>
+  <object name="vscaleb2" type="spawn" x="128" y="64" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="vscaleb2"/>
+   </properties>
+  </object>
   <object name="vscale2" type="spawn" x="256" y="64" width="256" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="vscale2"/>
+   </properties>
+  </object>
+  <object name="hanklbit2" type="spawn" x="704" y="64" width="160" height="128">
+   <properties>
+    <property name="spawngroup" value="hanklbit2"/>
    </properties>
   </object>
-  <object name="hanklbit2" type="spawn" x="704" y="64" width="160" height="128"/>
   <object name="hanklbit3" type="spawn" x="704" y="192" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit3"/>
+   </properties>
+  </object>
+  <object name="hanklbit3_1" type="spawn" x="704" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit3"/>
+   </properties>
+  </object>
+  <object name="brtender1" type="spawn" x="672" y="352" width="224" height="192">
+   <properties>
+    <property name="spawngroup" value="brtender1"/>
+   </properties>
+  </object>
+  <object name="hanklbit2_1" type="spawn" x="704" y="384" width="160" height="128">
+   <properties>
+    <property name="spawngroup" value="hanklbit2"/>
    </properties>
   </object>
-  <object name="hanklbit3" type="spawn" x="704" y="288" width="32" height="32"/>
-  <object name="brtender1" type="spawn" x="672" y="352" width="224" height="192"/>
-  <object name="hanklbit2" type="spawn" x="704" y="384" width="160" height="128"/>
   <object name="hanklbit4" type="spawn" x="416" y="384" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit4"/>
    </properties>
   </object>
-  <object name="hanklbit4" type="spawn" x="352" y="480" width="32" height="64">
+  <object name="hanklbit4_1" type="spawn" x="352" y="480" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit4"/>
    </properties>
   </object>
-  <object name="hanklbit2" type="spawn" x="256" y="512" width="32" height="64">
+  <object name="hanklbit2_2" type="spawn" x="256" y="512" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit2"/>
    </properties>
   </object>
   <object name="hanklbit1" type="spawn" x="64" y="448" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar18.tmx b/AndorsTrail/res/xml/lodar18.tmx
index 1cae19351..775acb09c 100644
--- a/AndorsTrail/res/xml/lodar18.tmx
+++ b/AndorsTrail/res/xml/lodar18.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -194,35 +195,75 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="zortak1" type="spawn" x="64" y="256" width="64" height="128"/>
-  <object name="zortak2" type="spawn" x="192" y="384" width="32" height="64"/>
-  <object name="zortaks" type="spawn" x="64" y="448" width="192" height="160"/>
+  <object name="zortak1" type="spawn" x="64" y="256" width="64" height="128">
+   <properties>
+    <property name="spawngroup" value="zortak1"/>
+   </properties>
+  </object>
+  <object name="zortak2" type="spawn" x="192" y="384" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="zortak2"/>
+   </properties>
+  </object>
+  <object name="zortaks" type="spawn" x="64" y="448" width="192" height="160">
+   <properties>
+    <property name="spawngroup" value="zortaks"/>
+   </properties>
+  </object>
   <object name="vscale2" type="spawn" x="96" y="832" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale2"/>
    </properties>
   </object>
-  <object name="vscale2" type="spawn" x="192" y="768" width="32" height="64">
+  <object name="vscale2_1" type="spawn" x="192" y="768" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale2"/>
    </properties>
   </object>
   <object name="vscale3" type="spawn" x="256" y="672" width="640" height="224">
    <properties>
     <property name="quantity" value="6"/>
+    <property name="spawngroup" value="vscale3"/>
    </properties>
   </object>
-  <object name="morkins" type="spawn" x="352" y="512" width="128" height="64"/>
-  <object name="morkin1" type="spawn" x="576" y="544" width="96" height="32"/>
-  <object name="morkin1" type="spawn" x="672" y="512" width="224" height="96"/>
-  <object name="morkin1" type="spawn" x="640" y="352" width="32" height="32"/>
-  <object name="morkins" type="spawn" x="736" y="160" width="160" height="192">
+  <object name="morkins" type="spawn" x="352" y="512" width="128" height="64">
+   <properties>
+    <property name="spawngroup" value="morkins"/>
+   </properties>
+  </object>
+  <object name="morkin1" type="spawn" x="576" y="544" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin1_1" type="spawn" x="672" y="512" width="224" height="96">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin1_2" type="spawn" x="640" y="352" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkins_1" type="spawn" x="736" y="160" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="morkins"/>
+   </properties>
+  </object>
+  <object name="morkin1_3" type="spawn" x="608" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin2" type="spawn" x="512" y="64" width="384" height="96">
+   <properties>
+    <property name="spawngroup" value="morkin2"/>
    </properties>
   </object>
-  <object name="morkin1" type="spawn" x="608" y="192" width="32" height="32"/>
-  <object name="morkin2" type="spawn" x="512" y="64" width="384" height="96"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodar19.tmx b/AndorsTrail/res/xml/lodar19.tmx
index e44792a2d..24f0acc1b 100644
--- a/AndorsTrail/res/xml/lodar19.tmx
+++ b/AndorsTrail/res/xml/lodar19.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -167,61 +168,84 @@
   <object name="vscale3" type="spawn" x="608" y="64" width="192" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale3"/>
    </properties>
   </object>
   <object name="vscale4" type="spawn" x="832" y="64" width="64" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale4"/>
    </properties>
   </object>
-  <object name="vscale3" type="spawn" x="768" y="192" width="32" height="64">
+  <object name="vscale3_1" type="spawn" x="768" y="192" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale3"/>
    </properties>
   </object>
   <object name="vscale2" type="spawn" x="384" y="192" width="384" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="vscale2"/>
+   </properties>
+  </object>
+  <object name="vscaleb2" type="spawn" x="96" y="160" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="vscaleb2"/>
    </properties>
   </object>
-  <object name="vscaleb2" type="spawn" x="96" y="160" width="128" height="96"/>
   <object name="vscaleb1" type="spawn" x="224" y="160" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscaleb1"/>
+   </properties>
+  </object>
+  <object name="hanklbit3" type="spawn" x="384" y="416" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit3"/>
    </properties>
   </object>
-  <object name="hanklbit3" type="spawn" x="384" y="416" width="32" height="32"/>
   <object name="hanklbit2" type="spawn" x="416" y="352" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit2"/>
    </properties>
   </object>
-  <object name="hanklbit2" type="spawn" x="576" y="416" width="256" height="192">
+  <object name="hanklbit2_1" type="spawn" x="576" y="416" width="256" height="192">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="hanklbit2"/>
    </properties>
   </object>
   <object name="hanklbit1" type="spawn" x="672" y="320" width="224" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit1"/>
    </properties>
   </object>
-  <object name="hanklbit2" type="spawn" x="320" y="416" width="32" height="64">
+  <object name="hanklbit2_2" type="spawn" x="320" y="416" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit2"/>
    </properties>
   </object>
-  <object name="hanklbit2" type="spawn" x="256" y="416" width="32" height="64">
+  <object name="hanklbit2_3" type="spawn" x="256" y="416" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit2"/>
    </properties>
   </object>
-  <object name="hanklbit3" type="spawn" x="64" y="384" width="192" height="192">
+  <object name="hanklbit3_1" type="spawn" x="64" y="384" width="192" height="192">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="hanklbit3"/>
+   </properties>
+  </object>
+  <object name="brtender2" type="spawn" x="64" y="352" width="128" height="224">
+   <properties>
+    <property name="spawngroup" value="brtender2"/>
    </properties>
   </object>
-  <object name="brtender2" type="spawn" x="64" y="352" width="128" height="224"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodar1cave0.tmx b/AndorsTrail/res/xml/lodar1cave0.tmx
index 12f2e3f6e..7866c37fd 100644
--- a/AndorsTrail/res/xml/lodar1cave0.tmx
+++ b/AndorsTrail/res/xml/lodar1cave0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="19" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB1CGASoaRYyoIWZtHIvLjlKzKVmWNPCjbQ0j9I4w2UeueGIrAfdXaS6EZteUv2L7h5scuS4Cd1+Yt2Ezw+k+o3U9EGOebjMp6aZxGAAlQdlmw==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="up lodar1cave0" type="mapchange" x="128" y="64" width="32" height="32">
    <properties>
     <property name="map" value="lodar1"/>
@@ -154,26 +155,45 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="mudfiend" type="spawn" x="224" y="128" width="64" height="64"/>
-  <object name="mudfiend" type="spawn" x="320" y="224" width="32" height="160"/>
-  <object name="mudfiend" type="spawn" x="448" y="160" width="128" height="192">
+ <objectgroup name="Spawn">
+  <object name="mudfiend" type="spawn" x="224" y="128" width="64" height="64">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
-  <object name="mudfiend" type="spawn" x="128" y="480" width="32" height="32"/>
-  <object name="mudfiend" type="spawn" x="192" y="416" width="32" height="128"/>
-  <object name="mudfiend" type="spawn" x="288" y="384" width="192" height="192">
+  <object name="mudfiend_1" type="spawn" x="320" y="224" width="32" height="160">
+   <properties>
+    <property name="spawngroup" value="mudfiend"/>
+   </properties>
+  </object>
+  <object name="mudfiend_2" type="spawn" x="448" y="160" width="128" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
+   </properties>
+  </object>
+  <object name="mudfiend_3" type="spawn" x="128" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="mudfiend"/>
+   </properties>
+  </object>
+  <object name="mudfiend_4" type="spawn" x="192" y="416" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="mudfiend"/>
+   </properties>
+  </object>
+  <object name="mudfiend_5" type="spawn" x="288" y="384" width="192" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
   <object name="cavebat1" type="spawn" x="64" y="128" width="512" height="448">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodar2.tmx b/AndorsTrail/res/xml/lodar2.tmx
index d4163b07f..d3564e583 100644
--- a/AndorsTrail/res/xml/lodar2.tmx
+++ b/AndorsTrail/res/xml/lodar2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -167,79 +168,117 @@
   <object name="forestfly1" type="spawn" x="64" y="704" width="128" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="hanklbit1" type="spawn" x="192" y="800" width="32" height="32"/>
-  <object name="hanklbit1" type="spawn" x="352" y="832" width="32" height="32"/>
-  <object name="forestfly1" type="spawn" x="416" y="736" width="224" height="192">
+  <object name="hanklbit1" type="spawn" x="192" y="800" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit1"/>
+   </properties>
+  </object>
+  <object name="hanklbit1_1" type="spawn" x="352" y="832" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit1"/>
+   </properties>
+  </object>
+  <object name="forestfly1_1" type="spawn" x="416" y="736" width="224" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="lodar_fg1" type="spawn" x="672" y="832" width="32" height="32"/>
-  <object name="forestfly1" type="spawn" x="768" y="768" width="128" height="96">
+  <object name="lodar_fg1" type="spawn" x="672" y="832" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="lodar_fg1"/>
+   </properties>
+  </object>
+  <object name="forestfly1_2" type="spawn" x="768" y="768" width="128" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly2" type="spawn" x="800" y="736" width="32" height="32"/>
-  <object name="forestfly1" type="spawn" x="672" y="544" width="128" height="96">
+  <object name="forestfly2" type="spawn" x="800" y="736" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="forestfly2"/>
+   </properties>
+  </object>
+  <object name="forestfly1_3" type="spawn" x="672" y="544" width="128" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="736" y="640" width="96" height="96">
+  <object name="forestfly1_4" type="spawn" x="736" y="640" width="96" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="576" y="480" width="160" height="64">
+  <object name="forestfly1_5" type="spawn" x="576" y="480" width="160" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="brtender1" type="spawn" x="448" y="320" width="192" height="128"/>
-  <object name="forestfly1" type="spawn" x="320" y="544" width="128" height="128">
+  <object name="brtender1" type="spawn" x="448" y="320" width="192" height="128">
+   <properties>
+    <property name="spawngroup" value="brtender1"/>
+   </properties>
+  </object>
+  <object name="forestfly1_6" type="spawn" x="320" y="544" width="128" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="96" y="448" width="160" height="160">
+  <object name="forestfly1_7" type="spawn" x="96" y="448" width="160" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly2" type="spawn" x="128" y="384" width="64" height="32">
+  <object name="forestfly2_1" type="spawn" x="128" y="384" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly2"/>
    </properties>
   </object>
-  <object name="forestfly2" type="spawn" x="128" y="320" width="64" height="32">
+  <object name="forestfly2_2" type="spawn" x="128" y="320" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly2"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="224" y="224" width="160" height="64">
+  <object name="forestfly1_8" type="spawn" x="224" y="224" width="160" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="384" y="128" width="320" height="160">
+  <object name="forestfly1_9" type="spawn" x="384" y="128" width="320" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="hanklbit1" type="spawn" x="736" y="256" width="64" height="64">
+  <object name="hanklbit1_2" type="spawn" x="736" y="256" width="64" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit1"/>
    </properties>
   </object>
   <object name="khakin3" type="spawn" x="736" y="96" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="khakin3"/>
+   </properties>
+  </object>
+  <object name="lodar_fg2" type="spawn" x="800" y="320" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="lodar_fg2"/>
    </properties>
   </object>
-  <object name="lodar_fg2" type="spawn" x="800" y="320" width="96" height="96"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodar20.tmx b/AndorsTrail/res/xml/lodar20.tmx
index eca0d1c51..cf0bbe4a9 100644
--- a/AndorsTrail/res/xml/lodar20.tmx
+++ b/AndorsTrail/res/xml/lodar20.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -191,33 +192,66 @@
   <object name="vscale2" type="spawn" x="416" y="864" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale2"/>
    </properties>
   </object>
   <object name="vscale1" type="spawn" x="416" y="800" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale1"/>
    </properties>
   </object>
-  <object name="morkins" type="spawn" x="128" y="544" width="192" height="128"/>
-  <object name="morkin1" type="spawn" x="64" y="576" width="64" height="32"/>
-  <object name="morkin1" type="spawn" x="320" y="576" width="160" height="192">
+  <object name="morkins" type="spawn" x="128" y="544" width="192" height="128">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="morkins"/>
    </properties>
   </object>
-  <object name="morkin1" type="spawn" x="320" y="544" width="32" height="32"/>
-  <object name="morkin1" type="spawn" x="320" y="480" width="32" height="32"/>
-  <object name="morkin1" type="spawn" x="160" y="352" width="288" height="128"/>
-  <object name="morkin1" type="spawn" x="64" y="288" width="96" height="96"/>
-  <object name="morkin1" type="spawn" x="128" y="192" width="288" height="64">
+  <object name="morkin1" type="spawn" x="64" y="576" width="64" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="morkin1"/>
    </properties>
   </object>
-  <object name="morkins" type="spawn" x="352" y="64" width="64" height="32"/>
-  <object name="vscale2" type="spawn" x="64" y="768" width="160" height="128">
+  <object name="morkin1_1" type="spawn" x="320" y="576" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin1_2" type="spawn" x="320" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin1_3" type="spawn" x="320" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin1_4" type="spawn" x="160" y="352" width="288" height="128">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin1_5" type="spawn" x="64" y="288" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkin1_6" type="spawn" x="128" y="192" width="288" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="morkin1"/>
+   </properties>
+  </object>
+  <object name="morkins_1" type="spawn" x="352" y="64" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="morkins"/>
+   </properties>
+  </object>
+  <object name="vscale2_1" type="spawn" x="64" y="768" width="160" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar21.tmx b/AndorsTrail/res/xml/lodar21.tmx
index 0486976dc..3eb30ee88 100644
--- a/AndorsTrail/res/xml/lodar21.tmx
+++ b/AndorsTrail/res/xml/lodar21.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -164,24 +165,47 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="morkins" type="spawn" x="224" y="64" width="96" height="64"/>
-  <object name="brtender1" type="spawn" x="416" y="384" width="96" height="96"/>
+  <object name="morkins" type="spawn" x="224" y="64" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="morkins"/>
+   </properties>
+  </object>
+  <object name="brtender1" type="spawn" x="416" y="384" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="brtender1"/>
+   </properties>
+  </object>
   <object name="hanklbit3" type="spawn" x="64" y="384" width="128" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit3"/>
+   </properties>
+  </object>
+  <object name="hanklbit4" type="spawn" x="224" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit4"/>
+   </properties>
+  </object>
+  <object name="hanklbit4_1" type="spawn" x="320" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit4"/>
+   </properties>
+  </object>
+  <object name="vscale3" type="spawn" x="288" y="160" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="vscale3"/>
    </properties>
   </object>
-  <object name="hanklbit4" type="spawn" x="224" y="480" width="32" height="32"/>
-  <object name="hanklbit4" type="spawn" x="320" y="448" width="32" height="32"/>
-  <object name="vscale3" type="spawn" x="288" y="160" width="32" height="64"/>
   <object name="vscale1" type="spawn" x="256" y="224" width="128" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale1"/>
    </properties>
   </object>
   <object name="vscale2" type="spawn" x="352" y="64" width="160" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar3.tmx b/AndorsTrail/res/xml/lodar3.tmx
index b4bb2c0db..676ed5285 100644
--- a/AndorsTrail/res/xml/lodar3.tmx
+++ b/AndorsTrail/res/xml/lodar3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -176,43 +177,77 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="forestfly2" type="spawn" x="384" y="352" width="96" height="96"/>
-  <object name="forestfly1" type="spawn" x="416" y="448" width="32" height="32"/>
-  <object name="forestfly1" type="spawn" x="384" y="480" width="256" height="96">
+  <object name="forestfly2" type="spawn" x="384" y="352" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="forestfly2"/>
+   </properties>
+  </object>
+  <object name="forestfly1" type="spawn" x="416" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="forestfly1"/>
+   </properties>
+  </object>
+  <object name="forestfly1_1" type="spawn" x="384" y="480" width="256" height="96">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="khakin2" type="spawn" x="768" y="224" width="128" height="192"/>
-  <object name="khakin2" type="spawn" x="832" y="224" width="96" height="96"/>
-  <object name="khakin1" type="spawn" x="864" y="416" width="32" height="64"/>
-  <object name="khakin1" type="spawn" x="672" y="480" width="224" height="96">
+  <object name="khakin2" type="spawn" x="768" y="224" width="128" height="192">
+   <properties>
+    <property name="spawngroup" value="khakin2"/>
+   </properties>
+  </object>
+  <object name="khakin2_1" type="spawn" x="832" y="224" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="khakin2"/>
+   </properties>
+  </object>
+  <object name="khakin1" type="spawn" x="864" y="416" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="khakin1"/>
+   </properties>
+  </object>
+  <object name="khakin1_1" type="spawn" x="672" y="480" width="224" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="khakin1"/>
    </properties>
   </object>
-  <object name="khakin2" type="spawn" x="672" y="416" width="64" height="32">
+  <object name="khakin2_2" type="spawn" x="672" y="416" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="khakin2"/>
    </properties>
   </object>
-  <object name="khakin1" type="spawn" x="480" y="256" width="256" height="160">
+  <object name="khakin1_2" type="spawn" x="480" y="256" width="256" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="khakin1"/>
+   </properties>
+  </object>
+  <object name="khakin2_3" type="spawn" x="384" y="256" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="khakin2"/>
    </properties>
   </object>
-  <object name="khakin2" type="spawn" x="384" y="256" width="96" height="64"/>
   <object name="khakin3" type="spawn" x="352" y="256" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="khakin3"/>
    </properties>
   </object>
-  <object name="khakin3" type="spawn" x="32" y="128" width="320" height="192">
+  <object name="khakin3_1" type="spawn" x="32" y="128" width="320" height="192">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="khakin3"/>
+   </properties>
+  </object>
+  <object name="khakin3_2" type="spawn" x="160" y="352" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="khakin3"/>
    </properties>
   </object>
-  <object name="khakin3" type="spawn" x="160" y="352" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodar4.tmx b/AndorsTrail/res/xml/lodar4.tmx
index 920fa4799..bd9d86b15 100644
--- a/AndorsTrail/res/xml/lodar4.tmx
+++ b/AndorsTrail/res/xml/lodar4.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="25" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -187,54 +188,75 @@
   <object name="sign_lodar4" type="sign" x="768" y="384" width="96" height="64"/>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="forestfly1" type="spawn" x="64" y="96" width="64" height="96"/>
+  <object name="forestfly1" type="spawn" x="64" y="96" width="64" height="96">
+   <properties>
+    <property name="spawngroup" value="forestfly1"/>
+   </properties>
+  </object>
   <object name="hanklbit1" type="spawn" x="128" y="160" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit1"/>
    </properties>
   </object>
   <object name="forestfly2" type="spawn" x="224" y="352" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly2"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="64" y="416" width="384" height="224">
+  <object name="forestfly1_1" type="spawn" x="64" y="416" width="384" height="224">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="480" y="384" width="224" height="160">
+  <object name="forestfly1_2" type="spawn" x="480" y="384" width="224" height="160">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="640" y="544" width="192" height="96">
+  <object name="forestfly1_3" type="spawn" x="640" y="544" width="192" height="96">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="416" y="96" width="192" height="192">
+  <object name="forestfly1_4" type="spawn" x="416" y="96" width="192" height="192">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="608" y="96" width="288" height="224">
+  <object name="forestfly1_5" type="spawn" x="608" y="96" width="288" height="224">
    <properties>
     <property name="quantity" value="6"/>
+    <property name="spawngroup" value="forestfly1"/>
+   </properties>
+  </object>
+  <object name="forestfly2_1" type="spawn" x="768" y="480" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="forestfly2"/>
    </properties>
   </object>
-  <object name="forestfly2" type="spawn" x="768" y="480" width="64" height="32"/>
   <object name="yjacket1" type="spawn" x="864" y="480" width="32" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="yjacket1"/>
    </properties>
   </object>
-  <object name="yjacket1" type="spawn" x="640" y="672" width="256" height="64">
+  <object name="yjacket1_1" type="spawn" x="640" y="672" width="256" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="yjacket1"/>
+   </properties>
+  </object>
+  <object name="brtender1" type="spawn" x="256" y="448" width="224" height="192">
+   <properties>
+    <property name="spawngroup" value="brtender1"/>
    </properties>
   </object>
-  <object name="brtender1" type="spawn" x="256" y="448" width="224" height="192"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
  <objectgroup name="Replace">
diff --git a/AndorsTrail/res/xml/lodar5.tmx b/AndorsTrail/res/xml/lodar5.tmx
index b1b44abb6..8cde83f5f 100644
--- a/AndorsTrail/res/xml/lodar5.tmx
+++ b/AndorsTrail/res/xml/lodar5.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,26 +162,31 @@
   <object name="forestfly1" type="spawn" x="64" y="128" width="192" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
   <object name="hanklbit1" type="spawn" x="256" y="192" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="320" y="128" width="320" height="288">
+  <object name="forestfly1_1" type="spawn" x="320" y="128" width="320" height="288">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="672" y="192" width="32" height="64">
+  <object name="forestfly1_2" type="spawn" x="672" y="192" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
   <object name="caveburr1" type="spawn" x="672" y="288" width="192" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar5cave0.tmx b/AndorsTrail/res/xml/lodar5cave0.tmx
index ba99e1e78..2fd5e9725 100644
--- a/AndorsTrail/res/xml/lodar5cave0.tmx
+++ b/AndorsTrail/res/xml/lodar5cave0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="29" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -158,79 +159,136 @@
   <object name="cavebat1" type="spawn" x="32" y="160" width="224" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
   <object name="caveburr1" type="spawn" x="320" y="128" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
-  <object name="cavebat1" type="spawn" x="384" y="96" width="256" height="160">
+  <object name="cavebat1_1" type="spawn" x="384" y="96" width="256" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
-  <object name="caveburr1" type="spawn" x="576" y="384" width="64" height="32">
+  <object name="caveburr1_1" type="spawn" x="576" y="384" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
-  <object name="caveburr2" type="spawn" x="480" y="480" width="32" height="32"/>
-  <object name="caveburr1" type="spawn" x="352" y="480" width="32" height="32"/>
-  <object name="caveburr1" type="spawn" x="224" y="512" width="128" height="128"/>
-  <object name="caveburr1" type="spawn" x="128" y="576" width="32" height="64">
+  <object name="caveburr2" type="spawn" x="480" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="caveburr2"/>
+   </properties>
+  </object>
+  <object name="caveburr1_2" type="spawn" x="352" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="caveburr1"/>
+   </properties>
+  </object>
+  <object name="caveburr1_3" type="spawn" x="224" y="512" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="caveburr1"/>
+   </properties>
+  </object>
+  <object name="caveburr1_4" type="spawn" x="128" y="576" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
-  <object name="caveburr2" type="spawn" x="32" y="544" width="96" height="128"/>
-  <object name="caveburr1" type="spawn" x="64" y="704" width="32" height="32"/>
-  <object name="caveburr1" type="spawn" x="192" y="768" width="32" height="64">
+  <object name="caveburr2_1" type="spawn" x="32" y="544" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="caveburr2"/>
+   </properties>
+  </object>
+  <object name="caveburr1_5" type="spawn" x="64" y="704" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="caveburr1"/>
+   </properties>
+  </object>
+  <object name="caveburr1_6" type="spawn" x="192" y="768" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
-  <object name="cavebat1" type="spawn" x="256" y="768" width="160" height="96">
+  <object name="cavebat1_2" type="spawn" x="256" y="768" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
-  <object name="caveburr1" type="spawn" x="480" y="640" width="128" height="192"/>
-  <object name="caveburr1" type="spawn" x="672" y="608" width="32" height="32"/>
-  <object name="cavebat1" type="spawn" x="704" y="512" width="128" height="192">
+  <object name="caveburr1_7" type="spawn" x="480" y="640" width="128" height="192">
+   <properties>
+    <property name="spawngroup" value="caveburr1"/>
+   </properties>
+  </object>
+  <object name="caveburr1_8" type="spawn" x="672" y="608" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="caveburr1"/>
+   </properties>
+  </object>
+  <object name="cavebat1_3" type="spawn" x="704" y="512" width="128" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
-  <object name="caveburr1" type="spawn" x="704" y="96" width="32" height="224">
+  <object name="caveburr1_9" type="spawn" x="704" y="96" width="32" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
-  <object name="caveburr1" type="spawn" x="736" y="352" width="32" height="160">
+  <object name="caveburr1_10" type="spawn" x="736" y="352" width="32" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
-  <object name="caveburr1" type="spawn" x="736" y="96" width="160" height="32">
+  <object name="caveburr1_11" type="spawn" x="736" y="96" width="160" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
-  <object name="caveburr1" type="spawn" x="896" y="160" width="32" height="192"/>
-  <object name="cavebat1" type="spawn" x="864" y="352" width="64" height="32">
+  <object name="caveburr1_12" type="spawn" x="896" y="160" width="32" height="192">
+   <properties>
+    <property name="spawngroup" value="caveburr1"/>
+   </properties>
+  </object>
+  <object name="cavebat1_4" type="spawn" x="864" y="352" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
-  <object name="caveburr1" type="spawn" x="896" y="384" width="32" height="320"/>
-  <object name="cavebat1" type="spawn" x="640" y="736" width="288" height="128">
+  <object name="caveburr1_13" type="spawn" x="896" y="384" width="32" height="320">
+   <properties>
+    <property name="spawngroup" value="caveburr1"/>
+   </properties>
+  </object>
+  <object name="cavebat1_5" type="spawn" x="640" y="736" width="288" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
+   </properties>
+  </object>
+  <object name="cavebat1_6" type="spawn" x="576" y="288" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="cavebat1"/>
+   </properties>
+  </object>
+  <object name="caveburr1_14" type="spawn" x="416" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
-  <object name="cavebat1" type="spawn" x="576" y="288" width="32" height="64"/>
-  <object name="caveburr1" type="spawn" x="416" y="480" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodar5cave1.tmx b/AndorsTrail/res/xml/lodar5cave1.tmx
index 3278e37dd..4e5d26d4a 100644
--- a/AndorsTrail/res/xml/lodar5cave1.tmx
+++ b/AndorsTrail/res/xml/lodar5cave1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -158,18 +159,29 @@
   <object name="caveburr1" type="spawn" x="128" y="64" width="448" height="736">
    <properties>
     <property name="quantity" value="8"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
   <object name="cavebat1" type="spawn" x="96" y="96" width="512" height="736">
    <properties>
     <property name="quantity" value="7"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
-  <object name="cavebat2" type="spawn" x="416" y="640" width="32" height="32"/>
-  <object name="caveburr2" type="spawn" x="224" y="832" width="32" height="32"/>
-  <object name="caveburr1" type="spawn" x="128" y="832" width="32" height="64">
+  <object name="cavebat2" type="spawn" x="416" y="640" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="cavebat2"/>
+   </properties>
+  </object>
+  <object name="caveburr2" type="spawn" x="224" y="832" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="caveburr2"/>
+   </properties>
+  </object>
+  <object name="caveburr1_1" type="spawn" x="128" y="832" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar5cave2.tmx b/AndorsTrail/res/xml/lodar5cave2.tmx
index 3453cf359..9e246acd5 100644
--- a/AndorsTrail/res/xml/lodar5cave2.tmx
+++ b/AndorsTrail/res/xml/lodar5cave2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -153,39 +154,50 @@
   <object name="cavebat2" type="spawn" x="480" y="160" width="128" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat2"/>
    </properties>
   </object>
   <object name="caveburr2" type="spawn" x="288" y="96" width="256" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="caveburr2"/>
    </properties>
   </object>
-  <object name="caveburr2" type="spawn" x="224" y="128" width="32" height="64">
+  <object name="caveburr2_1" type="spawn" x="224" y="128" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr2"/>
    </properties>
   </object>
-  <object name="caveburr2" type="spawn" x="0" y="128" width="192" height="320">
+  <object name="caveburr2_2" type="spawn" x="0" y="128" width="192" height="320">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="caveburr2"/>
    </properties>
   </object>
   <object name="caveburr1" type="spawn" x="32" y="320" width="288" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
-  <object name="cavebat2" type="spawn" x="320" y="384" width="224" height="224">
+  <object name="cavebat2_1" type="spawn" x="320" y="384" width="224" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat2"/>
+   </properties>
+  </object>
+  <object name="caveburr2_3" type="spawn" x="288" y="352" width="256" height="256">
+   <properties>
+    <property name="spawngroup" value="caveburr2"/>
    </properties>
   </object>
-  <object name="caveburr2" type="spawn" x="288" y="352" width="256" height="256"/>
  </objectgroup>
  <objectgroup name="Spawn_bats" visible="0">
   <object name="cavebat1" type="spawn" x="32" y="96" width="480" height="512">
    <properties>
     <property name="quantity" value="7"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar6.tmx b/AndorsTrail/res/xml/lodar6.tmx
index ae01ee2b2..c807c0855 100644
--- a/AndorsTrail/res/xml/lodar6.tmx
+++ b/AndorsTrail/res/xml/lodar6.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="18" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,46 +162,52 @@
   <object name="erumen_f1" type="spawn" x="448" y="704" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
-  <object name="erumen_f1" type="spawn" x="320" y="640" width="32" height="32">
+  <object name="erumen_f1_1" type="spawn" x="320" y="640" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
   <object name="erumen_f2" type="spawn" x="288" y="64" width="128" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_f2"/>
    </properties>
   </object>
-  <object name="erumen_f1" type="spawn" x="192" y="128" width="192" height="160">
+  <object name="erumen_f1_2" type="spawn" x="192" y="128" width="192" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
-  <object name="erumen_f1" type="spawn" x="160" y="288" width="128" height="160">
+  <object name="erumen_f1_3" type="spawn" x="160" y="288" width="128" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
-  <object name="erumen_f1" type="spawn" x="64" y="448" width="128" height="192">
+  <object name="erumen_f1_4" type="spawn" x="64" y="448" width="128" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
-  <object name="erumen_f1" type="spawn" x="256" y="576" width="32" height="32">
+  <object name="erumen_f1_5" type="spawn" x="256" y="576" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
-  <object name="erumen_f1" type="spawn" x="256" y="832" width="64" height="32">
+  <object name="erumen_f1_6" type="spawn" x="256" y="832" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
-  <object name="erumen_f1" type="spawn" x="320" y="672" width="128" height="224">
+  <object name="erumen_f1_7" type="spawn" x="320" y="672" width="128" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar7.tmx b/AndorsTrail/res/xml/lodar7.tmx
index b7c2b1e86..2db1ad7ae 100644
--- a/AndorsTrail/res/xml/lodar7.tmx
+++ b/AndorsTrail/res/xml/lodar7.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -188,79 +189,143 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="yjacket1" type="spawn" x="704" y="96" width="32" height="32"/>
-  <object name="yjacket1" type="spawn" x="576" y="64" width="128" height="64">
+  <object name="yjacket1" type="spawn" x="704" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="yjacket1"/>
+   </properties>
+  </object>
+  <object name="yjacket1_1" type="spawn" x="576" y="64" width="128" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="yjacket1"/>
    </properties>
   </object>
-  <object name="yjacket1" type="spawn" x="96" y="288" width="160" height="96">
+  <object name="yjacket1_2" type="spawn" x="96" y="288" width="160" height="96">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="yjacket1"/>
    </properties>
   </object>
-  <object name="yjacket1" type="spawn" x="32" y="320" width="64" height="96">
+  <object name="yjacket1_3" type="spawn" x="32" y="320" width="64" height="96">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="yjacket1"/>
    </properties>
   </object>
-  <object name="erumen_f1" type="spawn" x="32" y="512" width="128" height="160"/>
-  <object name="erumen_f1" type="spawn" x="64" y="672" width="192" height="224">
+  <object name="erumen_f1" type="spawn" x="32" y="512" width="128" height="160">
    <properties>
-    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_f1"/>
    </properties>
   </object>
-  <object name="hanklbit2" type="spawn" x="224" y="384" width="32" height="32"/>
-  <object name="yjacket1" type="spawn" x="160" y="480" width="160" height="128">
+  <object name="erumen_f1_1" type="spawn" x="64" y="672" width="192" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_f1"/>
+   </properties>
+  </object>
+  <object name="hanklbit2" type="spawn" x="224" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit2"/>
+   </properties>
+  </object>
+  <object name="yjacket1_4" type="spawn" x="160" y="480" width="160" height="128">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="yjacket1"/>
    </properties>
   </object>
   <object name="hanklbit1" type="spawn" x="256" y="608" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hanklbit1"/>
    </properties>
   </object>
   <object name="yjacket2" type="spawn" x="224" y="640" width="192" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="yjacket2"/>
    </properties>
   </object>
-  <object name="yjacket1" type="spawn" x="288" y="800" width="32" height="32"/>
-  <object name="hanklbit1" type="spawn" x="288" y="832" width="96" height="64"/>
-  <object name="yjacket2" type="spawn" x="512" y="160" width="128" height="96">
+  <object name="yjacket1_5" type="spawn" x="288" y="800" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="yjacket1"/>
+   </properties>
+  </object>
+  <object name="hanklbit1_1" type="spawn" x="288" y="832" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="hanklbit1"/>
+   </properties>
+  </object>
+  <object name="yjacket2_1" type="spawn" x="512" y="160" width="128" height="96">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="yjacket2"/>
    </properties>
   </object>
-  <object name="yjacket2" type="spawn" x="288" y="224" width="224" height="128">
+  <object name="yjacket2_2" type="spawn" x="288" y="224" width="224" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="yjacket2"/>
    </properties>
   </object>
-  <object name="yjacket2" type="spawn" x="704" y="800" width="64" height="96">
+  <object name="yjacket2_3" type="spawn" x="704" y="800" width="64" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="yjacket2"/>
    </properties>
   </object>
   <object name="zortak1" type="spawn" x="448" y="576" width="224" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak1"/>
    </properties>
   </object>
-  <object name="zortaks" type="spawn" x="672" y="768" width="96" height="32"/>
-  <object name="zortaks" type="spawn" x="672" y="448" width="96" height="160"/>
-  <object name="zortak1" type="spawn" x="704" y="608" width="32" height="64"/>
-  <object name="zortak1" type="spawn" x="768" y="672" width="128" height="64"/>
-  <object name="zortaks" type="spawn" x="288" y="352" width="384" height="160">
+  <object name="zortaks" type="spawn" x="672" y="768" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="zortaks"/>
+   </properties>
+  </object>
+  <object name="zortaks_1" type="spawn" x="672" y="448" width="96" height="160">
+   <properties>
+    <property name="spawngroup" value="zortaks"/>
+   </properties>
+  </object>
+  <object name="zortak1_1" type="spawn" x="704" y="608" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="zortak1"/>
+   </properties>
+  </object>
+  <object name="zortak1_2" type="spawn" x="768" y="672" width="128" height="64">
+   <properties>
+    <property name="spawngroup" value="zortak1"/>
+   </properties>
+  </object>
+  <object name="zortaks_2" type="spawn" x="288" y="352" width="384" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortaks"/>
+   </properties>
+  </object>
+  <object name="zortak1_3" type="spawn" x="672" y="256" width="160" height="128">
+   <properties>
+    <property name="spawngroup" value="zortak1"/>
+   </properties>
+  </object>
+  <object name="zortak1_4" type="spawn" x="864" y="320" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="zortak1"/>
+   </properties>
+  </object>
+  <object name="zortak1_5" type="spawn" x="832" y="416" width="64" height="192">
+   <properties>
+    <property name="spawngroup" value="zortak1"/>
+   </properties>
+  </object>
+  <object name="zortak1_6" type="spawn" x="800" y="192" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="zortak1"/>
    </properties>
   </object>
-  <object name="zortak1" type="spawn" x="672" y="256" width="160" height="128"/>
-  <object name="zortak1" type="spawn" x="864" y="320" width="32" height="64"/>
-  <object name="zortak1" type="spawn" x="832" y="416" width="64" height="192"/>
-  <object name="zortak1" type="spawn" x="800" y="192" width="96" height="64"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodar8.tmx b/AndorsTrail/res/xml/lodar8.tmx
index dc6cc292c..1dbc78ca9 100644
--- a/AndorsTrail/res/xml/lodar8.tmx
+++ b/AndorsTrail/res/xml/lodar8.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -200,69 +201,139 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="lbridge" type="spawn" x="736" y="736" width="32" height="32"/>
+  <object name="lbridge" type="spawn" x="736" y="736" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="lbridge"/>
+   </properties>
+  </object>
   <object name="yjacket1" type="spawn" x="416" y="64" width="128" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="yjacket1"/>
    </properties>
   </object>
-  <object name="yjacket1" type="spawn" x="640" y="64" width="256" height="64">
+  <object name="yjacket1_1" type="spawn" x="640" y="64" width="256" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="yjacket1"/>
    </properties>
   </object>
-  <object name="zortak1" type="spawn" x="128" y="128" width="160" height="64"/>
-  <object name="zortak2" type="spawn" x="160" y="352" width="32" height="32"/>
-  <object name="zortak1" type="spawn" x="256" y="320" width="128" height="32"/>
-  <object name="zortak1" type="spawn" x="288" y="192" width="160" height="64"/>
-  <object name="zortak2" type="spawn" x="480" y="224" width="32" height="32"/>
-  <object name="zortak2" type="spawn" x="512" y="352" width="32" height="64">
+  <object name="zortak1" type="spawn" x="128" y="128" width="160" height="64">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak1"/>
    </properties>
   </object>
-  <object name="zortak1" type="spawn" x="576" y="256" width="32" height="32"/>
-  <object name="zortak2" type="spawn" x="672" y="256" width="32" height="32"/>
-  <object name="zortak1" type="spawn" x="736" y="160" width="160" height="128"/>
-  <object name="zortak2" type="spawn" x="640" y="384" width="96" height="32">
+  <object name="zortak2" type="spawn" x="160" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak2"/>
    </properties>
   </object>
-  <object name="hanklbit1" type="spawn" x="64" y="288" width="96" height="128"/>
-  <object name="zortak2" type="spawn" x="832" y="736" width="32" height="64">
+  <object name="zortak1_1" type="spawn" x="256" y="320" width="128" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak1"/>
    </properties>
   </object>
-  <object name="zortakb" type="spawn" x="128" y="448" width="96" height="96"/>
-  <object name="zortak2" type="spawn" x="160" y="576" width="32" height="96">
+  <object name="zortak1_2" type="spawn" x="288" y="192" width="160" height="64">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak1"/>
    </properties>
   </object>
-  <object name="zortak1" type="spawn" x="96" y="672" width="160" height="128">
+  <object name="zortak2_1" type="spawn" x="480" y="224" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak2"/>
    </properties>
   </object>
-  <object name="zortak2" type="spawn" x="288" y="672" width="96" height="32"/>
-  <object name="zortak1" type="spawn" x="416" y="608" width="32" height="32"/>
-  <object name="zortak1" type="spawn" x="448" y="480" width="192" height="128"/>
-  <object name="lodar_fg4" type="spawn" x="288" y="64" width="96" height="96"/>
-  <object name="zortak1" type="spawn" x="768" y="448" width="160" height="128">
+  <object name="zortak2_2" type="spawn" x="512" y="352" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak2"/>
+   </properties>
+  </object>
+  <object name="zortak1_3" type="spawn" x="576" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="zortak1"/>
+   </properties>
+  </object>
+  <object name="zortak2_3" type="spawn" x="672" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="zortak2"/>
+   </properties>
+  </object>
+  <object name="zortak1_4" type="spawn" x="736" y="160" width="160" height="128">
+   <properties>
+    <property name="spawngroup" value="zortak1"/>
+   </properties>
+  </object>
+  <object name="zortak2_4" type="spawn" x="640" y="384" width="96" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak2"/>
+   </properties>
+  </object>
+  <object name="hanklbit1" type="spawn" x="64" y="288" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="hanklbit1"/>
+   </properties>
+  </object>
+  <object name="zortak2_5" type="spawn" x="832" y="736" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak2"/>
+   </properties>
+  </object>
+  <object name="zortakb" type="spawn" x="128" y="448" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="zortakb"/>
+   </properties>
+  </object>
+  <object name="zortak2_6" type="spawn" x="160" y="576" width="32" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak2"/>
+   </properties>
+  </object>
+  <object name="zortak1_5" type="spawn" x="96" y="672" width="160" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak1"/>
+   </properties>
+  </object>
+  <object name="zortak2_7" type="spawn" x="288" y="672" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="zortak2"/>
+   </properties>
+  </object>
+  <object name="zortak1_6" type="spawn" x="416" y="608" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="zortak1"/>
+   </properties>
+  </object>
+  <object name="zortak1_7" type="spawn" x="448" y="480" width="192" height="128">
+   <properties>
+    <property name="spawngroup" value="zortak1"/>
+   </properties>
+  </object>
+  <object name="lodar_fg4" type="spawn" x="288" y="64" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="lodar_fg4"/>
+   </properties>
+  </object>
+  <object name="zortak1_8" type="spawn" x="768" y="448" width="160" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zortak1"/>
    </properties>
   </object>
   <object name="vscale1" type="spawn" x="608" y="704" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale1"/>
    </properties>
   </object>
-  <object name="vscale1" type="spawn" x="320" y="704" width="288" height="192">
+  <object name="vscale1_1" type="spawn" x="320" y="704" width="288" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="vscale1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar8cave0.tmx b/AndorsTrail/res/xml/lodar8cave0.tmx
index 4e241a6e1..d1a8fa6bc 100644
--- a/AndorsTrail/res/xml/lodar8cave0.tmx
+++ b/AndorsTrail/res/xml/lodar8cave0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="17" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,40 +156,51 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="mudfiend" type="spawn" x="224" y="352" width="32" height="32"/>
-  <object name="mudfiend" type="spawn" x="416" y="352" width="32" height="128">
+  <object name="mudfiend" type="spawn" x="224" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
-  <object name="mudfiend" type="spawn" x="288" y="480" width="128" height="32">
+  <object name="mudfiend_1" type="spawn" x="416" y="352" width="32" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
-  <object name="mudfiend" type="spawn" x="544" y="480" width="96" height="32">
+  <object name="mudfiend_2" type="spawn" x="288" y="480" width="128" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
-  <object name="mudfiend" type="spawn" x="512" y="352" width="32" height="128">
+  <object name="mudfiend_3" type="spawn" x="544" y="480" width="96" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
-  <object name="mudfiend" type="spawn" x="672" y="256" width="32" height="128">
+  <object name="mudfiend_4" type="spawn" x="512" y="352" width="32" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
-  <object name="mudfiend" type="spawn" x="640" y="416" width="32" height="64">
+  <object name="mudfiend_5" type="spawn" x="672" y="256" width="32" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
-  <object name="mudfiend" type="spawn" x="32" y="320" width="128" height="160">
+  <object name="mudfiend_6" type="spawn" x="640" y="416" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
+   </properties>
+  </object>
+  <object name="mudfiend_7" type="spawn" x="32" y="320" width="128" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
  </objectgroup>
@@ -196,16 +208,19 @@
   <object name="cavebat1" type="spawn" x="32" y="192" width="256" height="320">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
-  <object name="cavebat1" type="spawn" x="352" y="128" width="192" height="224">
+  <object name="cavebat1_1" type="spawn" x="352" y="128" width="192" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
-  <object name="cavebat1" type="spawn" x="640" y="128" width="96" height="128">
+  <object name="cavebat1_2" type="spawn" x="640" y="128" width="96" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodar9.tmx b/AndorsTrail/res/xml/lodar9.tmx
index 146dcd6a8..30a3f4ef6 100644
--- a/AndorsTrail/res/xml/lodar9.tmx
+++ b/AndorsTrail/res/xml/lodar9.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="25" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -179,70 +180,99 @@
   <object name="khakin1" type="spawn" x="736" y="224" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="khakin1"/>
+   </properties>
+  </object>
+  <object name="khakin1_1" type="spawn" x="704" y="416" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="khakin1"/>
    </properties>
   </object>
-  <object name="khakin1" type="spawn" x="704" y="416" width="96" height="128"/>
   <object name="khakin2" type="spawn" x="480" y="352" width="64" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="khakin2"/>
    </properties>
   </object>
-  <object name="khakin2" type="spawn" x="544" y="352" width="64" height="64">
+  <object name="khakin2_1" type="spawn" x="544" y="352" width="64" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="khakin2"/>
    </properties>
   </object>
   <object name="khakin3" type="spawn" x="608" y="352" width="64" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="khakin3"/>
    </properties>
   </object>
-  <object name="khakin1" type="spawn" x="672" y="352" width="64" height="64">
+  <object name="khakin1_2" type="spawn" x="672" y="352" width="64" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="khakin1"/>
    </properties>
   </object>
-  <object name="khakin2" type="spawn" x="160" y="224" width="288" height="160">
+  <object name="khakin2_2" type="spawn" x="160" y="224" width="288" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="khakin2"/>
    </properties>
   </object>
-  <object name="khakin2" type="spawn" x="64" y="448" width="32" height="32"/>
-  <object name="khakin3" type="spawn" x="64" y="160" width="96" height="192">
+  <object name="khakin2_3" type="spawn" x="64" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="khakin2"/>
+   </properties>
+  </object>
+  <object name="khakin3_1" type="spawn" x="64" y="160" width="96" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="khakin3"/>
    </properties>
   </object>
   <object name="forestfly1" type="spawn" x="64" y="672" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="160" y="640" width="64" height="64">
+  <object name="forestfly1_1" type="spawn" x="160" y="640" width="64" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="forestfly1" type="spawn" x="352" y="544" width="128" height="160">
+  <object name="forestfly1_2" type="spawn" x="352" y="544" width="128" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
-  <object name="hanklbit1" type="spawn" x="224" y="640" width="32" height="32"/>
-  <object name="hanklbit1" type="spawn" x="288" y="640" width="32" height="32"/>
-  <object name="forestfly1" type="spawn" x="480" y="448" width="192" height="128">
+  <object name="hanklbit1" type="spawn" x="224" y="640" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit1"/>
+   </properties>
+  </object>
+  <object name="hanklbit1_1" type="spawn" x="288" y="640" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hanklbit1"/>
+   </properties>
+  </object>
+  <object name="forestfly1_3" type="spawn" x="480" y="448" width="192" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestfly1"/>
    </properties>
   </object>
   <object name="forestfly2" type="spawn" x="416" y="704" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfly2"/>
    </properties>
   </object>
-  <object name="khakin2" type="spawn" x="160" y="384" width="288" height="160">
+  <object name="khakin2_4" type="spawn" x="160" y="384" width="288" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="khakin2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodarcave0.tmx b/AndorsTrail/res/xml/lodarcave0.tmx
index 9d24ceb58..a7d541319 100644
--- a/AndorsTrail/res/xml/lodarcave0.tmx
+++ b/AndorsTrail/res/xml/lodarcave0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -166,26 +167,49 @@
   <object name="sign_lodarcave0" type="sign" x="256" y="192" width="160" height="224"/>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="hirathil0" type="spawn" x="64" y="160" width="96" height="224"/>
-  <object name="hirathil0" type="spawn" x="32" y="96" width="160" height="160"/>
-  <object name="hirathil0" type="spawn" x="448" y="160" width="32" height="32"/>
-  <object name="hirathil0" type="spawn" x="480" y="128" width="32" height="64">
+  <object name="hirathil0" type="spawn" x="64" y="160" width="96" height="224">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="544" y="192" width="64" height="192"/>
-  <object name="hirathil0" type="spawn" x="512" y="384" width="32" height="64">
+  <object name="hirathil0_1" type="spawn" x="32" y="96" width="160" height="160">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_2" type="spawn" x="448" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_3" type="spawn" x="480" y="128" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_4" type="spawn" x="544" y="192" width="64" height="192">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_5" type="spawn" x="512" y="384" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_6" type="spawn" x="192" y="160" width="224" height="256">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="192" y="160" width="224" height="256"/>
  </objectgroup>
  <objectgroup name="Spawn_bats" visible="0">
   <object name="cavebat1" type="spawn" x="32" y="160" width="416" height="256">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodarcave1.tmx b/AndorsTrail/res/xml/lodarcave1.tmx
index 283002634..043e940b4 100644
--- a/AndorsTrail/res/xml/lodarcave1.tmx
+++ b/AndorsTrail/res/xml/lodarcave1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="18" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -158,31 +159,56 @@
   <object name="hirathil0" type="spawn" x="32" y="128" width="256" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="288" y="128" width="128" height="32"/>
-  <object name="hirathil0" type="spawn" x="448" y="256" width="32" height="32"/>
-  <object name="hirathil0" type="spawn" x="352" y="288" width="128" height="160"/>
-  <object name="hirathil0" type="spawn" x="192" y="288" width="32" height="32"/>
-  <object name="hirathil0" type="spawn" x="32" y="352" width="320" height="224">
+  <object name="hirathil0_1" type="spawn" x="288" y="128" width="128" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="256" y="576" width="32" height="32"/>
-  <object name="hirathil0" type="spawn" x="32" y="640" width="320" height="256">
+  <object name="hirathil0_2" type="spawn" x="448" y="256" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="384" y="640" width="32" height="64">
+  <object name="hirathil0_3" type="spawn" x="352" y="288" width="128" height="160">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="416" y="608" width="128" height="288">
+  <object name="hirathil0_4" type="spawn" x="192" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_5" type="spawn" x="32" y="352" width="320" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil1" type="spawn" x="256" y="576" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil0_6" type="spawn" x="32" y="640" width="320" height="256">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_7" type="spawn" x="384" y="640" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_8" type="spawn" x="416" y="608" width="128" height="288">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
  </objectgroup>
@@ -190,6 +216,7 @@
   <object name="cavebat1" type="spawn" x="32" y="128" width="512" height="768">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodarcave2.tmx b/AndorsTrail/res/xml/lodarcave2.tmx
index 54d43eefb..adbfef665 100644
--- a/AndorsTrail/res/xml/lodarcave2.tmx
+++ b/AndorsTrail/res/xml/lodarcave2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -158,22 +159,30 @@
   <object name="hirathil0" type="spawn" x="128" y="64" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
   <object name="hirathil1" type="spawn" x="160" y="128" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="32" y="320" width="384" height="256">
+  <object name="hirathil0_1" type="spawn" x="32" y="320" width="384" height="256">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="384" y="224" width="64" height="128"/>
-  <object name="hirathil0" type="spawn" x="224" y="544" width="64" height="32">
+  <object name="hirathil0_2" type="spawn" x="384" y="224" width="64" height="128">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_3" type="spawn" x="224" y="544" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
  </objectgroup>
@@ -181,6 +190,7 @@
   <object name="cavebat1" type="spawn" x="32" y="96" width="416" height="448">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodarcave3.tmx b/AndorsTrail/res/xml/lodarcave3.tmx
index 56fae5731..153a49e5f 100644
--- a/AndorsTrail/res/xml/lodarcave3.tmx
+++ b/AndorsTrail/res/xml/lodarcave3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -158,52 +159,96 @@
   <object name="hirathil0" type="spawn" x="448" y="96" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="32" y="352" width="128" height="192">
+  <object name="hirathil0_1" type="spawn" x="32" y="352" width="128" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="544" y="224" width="160" height="256">
+  <object name="hirathil0_2" type="spawn" x="544" y="224" width="160" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="672" y="160" width="128" height="96"/>
-  <object name="hirathil0" type="spawn" x="736" y="416" width="160" height="128">
+  <object name="hirathil0_3" type="spawn" x="672" y="160" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_4" type="spawn" x="736" y="416" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="608" y="640" width="32" height="32"/>
-  <object name="hirathil0" type="spawn" x="480" y="608" width="128" height="64"/>
-  <object name="hirathil0" type="spawn" x="128" y="672" width="192" height="224">
+  <object name="hirathil1" type="spawn" x="608" y="640" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil0_5" type="spawn" x="480" y="608" width="128" height="64">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_6" type="spawn" x="128" y="672" width="192" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="384" y="800" width="32" height="64"/>
-  <object name="hirathil0" type="spawn" x="704" y="800" width="96" height="64"/>
-  <object name="hirathil0" type="spawn" x="64" y="160" width="384" height="256">
+  <object name="hirathil1_1" type="spawn" x="384" y="800" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil0_7" type="spawn" x="704" y="800" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_8" type="spawn" x="64" y="160" width="384" height="256">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="704" y="416" width="32" height="32"/>
-  <object name="hirathil0" type="spawn" x="704" y="544" width="96" height="128"/>
-  <object name="hirathil1" type="spawn" x="288" y="576" width="192" height="128">
+  <object name="hirathil1_2" type="spawn" x="704" y="416" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil0_9" type="spawn" x="704" y="544" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil1_3" type="spawn" x="288" y="576" width="192" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil1_4" type="spawn" x="448" y="768" width="128" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil0_10" type="spawn" x="576" y="800" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="448" y="768" width="128" height="32"/>
-  <object name="hirathil0" type="spawn" x="576" y="800" width="96" height="96"/>
  </objectgroup>
  <objectgroup name="Spawn_bats" visible="0">
   <object name="cavebat1" type="spawn" x="32" y="64" width="704" height="480">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodarcave4.tmx b/AndorsTrail/res/xml/lodarcave4.tmx
index 1510104e7..bf9451ba7 100644
--- a/AndorsTrail/res/xml/lodarcave4.tmx
+++ b/AndorsTrail/res/xml/lodarcave4.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -164,34 +165,52 @@
   <object name="hirathil1" type="spawn" x="224" y="96" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="64" y="320" width="32" height="96"/>
-  <object name="hirathil0" type="spawn" x="224" y="256" width="192" height="224"/>
-  <object name="hirathil1" type="spawn" x="576" y="384" width="32" height="32"/>
-  <object name="hirathil1" type="spawn" x="512" y="416" width="224" height="160">
+  <object name="hirathil1_1" type="spawn" x="64" y="320" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil0" type="spawn" x="224" y="256" width="192" height="224">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil1_2" type="spawn" x="576" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil1_3" type="spawn" x="512" y="416" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="32" y="128" width="224" height="192">
+  <object name="hirathil1_4" type="spawn" x="32" y="128" width="224" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="128" y="480" width="128" height="128">
+  <object name="hirathil1_5" type="spawn" x="128" y="480" width="128" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="96" y="448" width="64" height="32">
+  <object name="hirathil0_1" type="spawn" x="96" y="448" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="352" y="128" width="384" height="256">
+  <object name="hirathil1_6" type="spawn" x="352" y="128" width="384" height="256">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
  </objectgroup>
@@ -199,6 +218,7 @@
   <object name="cavebat1" type="spawn" x="256" y="128" width="480" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodarcave4a.tmx b/AndorsTrail/res/xml/lodarcave4a.tmx
index fc098e32c..51b0e7cd0 100644
--- a/AndorsTrail/res/xml/lodarcave4a.tmx
+++ b/AndorsTrail/res/xml/lodarcave4a.tmx
@@ -1,202 +1,213 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
- </tileset>
- <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
- </tileset>
- <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
- </tileset>
- <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
- </tileset>
- <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
- </tileset>
- <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png" width="512" height="256"/>
- </tileset>
- <layer name="Ground" width="20" height="20">
-  <data encoding="base64" compression="zlib">
-   eJydlMENwjAMRasKwZFbVkhggxA2CGWETsQazFLGoohY+vrYSejhSVGVvH7HbsM4DMHgAgRa/0tauQFXWMcNrmllBu6wzsXJ+TVOxfXa18mUnzPLe1KHS5gpswefK+/Rsu3GLy2/V2rlPWeqyVW8Pb6k9EHb9zj++vDunNEbuSctH/dWznrFz3VxRs6G9cbieh505Kzmw5mUPLlkbfkwo2TCmeyZY8wiPqwVZ3LpcDmlf+j7OBjLFelupJ7Y8C0lh6B9sxM9r/lqcy53Y80K5hCfNUcWW/6vrd5sAWux9rwBEYuq3Q==
-  </data>
- </layer>
- <layer name="Objects" width="20" height="20">
-  <data encoding="base64" compression="zlib">
-   eJxjYKAvsOWmjjkzGRHs6TwIdhcjplpigBoTA8M2oDkOnAwMy4F0ApC/gwcipsoEUWPPjWk3LrNceFHFXkHdWAoVB5nZBDTHjYcBJxBngvgH5IZUAQaG10BalAlVHkxDzQC5NwzNzdjcNhtqXhmSG5HDTRxJbytU3BnNP8jgHdR+ZLfNQgsjmJ0g0MmIMBcbEEVzO0ytKha/T2OExAe6HpgaFjR3q6GpQzZzG5IbiQHIZnVi8Q/MjbPxxDEIwNJTBQ8iHpDF0AGyX98zoqbHWgGIn0Bu68Dinw4089DD5z8jxA2gdAkyo04AYiYymMaI6Q5c4DXUvjCoW94wYjeTVDCVEZKn7mCJe+T0C8qzsPAB+ecJD6Z6UNqG5cO3eOIKFK5FQPk5jJjpCBsAuYNQGCWh2UdMmOKyixrmkAoAZCMylw==
-  </data>
- </layer>
- <layer name="Above" width="20" height="20" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJwLE2BgCBvFo3gUj+JRPIpJxABVPZ9h
-  </data>
- </layer>
- <layer name="Walkable" width="20" height="20">
-  <data encoding="base64" compression="zlib">
-   eJztksERADAEBJWQpvTfkgo4K/KLmfuxuDk/Zv61LlVTXrVng1fdr/qoJ1nP5u90jvKUT8oXxev885qXFdmvWJRH57r3TXKkcl/52s0xYd5yiAIuGWRH
-  </data>
- </layer>
- <objectgroup name="Mapevents" width="0" height="0">
-  <object name="west" type="mapchange" x="0" y="448" width="32" height="96">
-   <properties>
-    <property name="map" value="lodarcave4"/>
-    <property name="place" value="east"/>
-   </properties>
-  </object>
-  <object name="down" type="mapchange" x="576" y="224" width="32" height="32">
-   <properties>
-    <property name="map" value="shortcut_lodar0"/>
-    <property name="place" value="up"/>
-   </properties>
-  </object>
- </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="hirazinn" type="spawn" x="288" y="256" width="64" height="64"/>
-  <object name="hirathil2" type="spawn" x="256" y="320" width="160" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="hirathil2" type="spawn" x="128" y="384" width="256" height="96">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="hirathil2" type="spawn" x="192" y="128" width="64" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="hirathil2" type="spawn" x="416" y="128" width="128" height="192">
-   <properties>
-    <property name="quantity" value="4"/>
-   </properties>
-  </object>
-  <object name="hirathil2" type="spawn" x="352" y="512" width="192" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
- </objectgroup>
- <objectgroup name="Spawn_bats" width="0" height="0">
-  <object name="cavebat2" type="spawn" x="128" y="96" width="416" height="512">
-   <properties>
-    <property name="quantity" value="4"/>
-   </properties>
-  </object>
- </objectgroup>
- <objectgroup name="Keys" width="0" height="0">
-  <object name="lodar2:35" type="key" x="64" y="448" width="32" height="96">
-   <properties>
-    <property name="phrase" value="sign_lodarcave4a"/>
-    <property name="requireId" value="lodar2"/>
-    <property name="requireType" value="questProgress"/>
-    <property name="requireValue" value="35"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJydlMENwjAMRasKwZFbVkhggxA2CGWETsQazFLGoohY+vrYSejhSVGVvH7HbsM4DMHgAgRa/0tauQFXWMcNrmllBu6wzsXJ+TVOxfXa18mUnzPLe1KHS5gpswefK+/Rsu3GLy2/V2rlPWeqyVW8Pb6k9EHb9zj++vDunNEbuSctH/dWznrFz3VxRs6G9cbieh505Kzmw5mUPLlkbfkwo2TCmeyZY8wiPqwVZ3LpcDmlf+j7OBjLFelupJ7Y8C0lh6B9sxM9r/lqcy53Y80K5hCfNUcWW/6vrd5sAWux9rwBEYuq3Q==
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJxjYKAvsOWmjjkzGRHs6TwIdhcjplpigBoTA8M2oDkOnAwMy4F0ApC/gwcipsoEUWPPjWk3LrNceFHFXkHdWAoVB5nZBDTHjYcBJxBngvgH5IZUAQaG10BalAlVHkxDzQC5NwzNzdjcNhtqXhmSG5HDTRxJbytU3BnNP8jgHdR+ZLfNQgsjmJ0g0MmIMBcbEEVzO0ytKha/T2OExAe6HpgaFjR3q6GpQzZzG5IbiQHIZnVi8Q/MjbPxxDEIwNJTBQ8iHpDF0AGyX98zoqbHWgGIn0Bu68Dinw4089DD5z8jxA2gdAkyo04AYiYymMaI6Q5c4DXUvjCoW94wYjeTVDCVEZKn7mCJe+T0C8qzsPAB+ecJD6Z6UNqG5cO3eOIKFK5FQPk5jJjpCBsAuYNQGCWh2UdMmOKyixrmkAoAZCMylw==
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="20" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJwLE2BgCBvFo3gUj+JRPIpJxABVPZ9h
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJztksERADAEBJWQpvTfkgo4K/KLmfuxuDk/Zv61LlVTXrVng1fdr/qoJ1nP5u90jvKUT8oXxev885qXFdmvWJRH57r3TXKkcl/52s0xYd5yiAIuGWRH
+  </data>
+ </layer>
+ <objectgroup name="Mapevents">
+  <object name="west" type="mapchange" x="0" y="448" width="32" height="96">
+   <properties>
+    <property name="map" value="lodarcave4"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object name="down" type="mapchange" x="576" y="224" width="32" height="32">
+   <properties>
+    <property name="map" value="shortcut_lodar0"/>
+    <property name="place" value="up"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn">
+  <object name="hirazinn" type="spawn" x="288" y="256" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="hirazinn"/>
+   </properties>
+  </object>
+  <object name="hirathil2" type="spawn" x="256" y="320" width="160" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil2"/>
+   </properties>
+  </object>
+  <object name="hirathil2_1" type="spawn" x="128" y="384" width="256" height="96">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="hirathil2"/>
+   </properties>
+  </object>
+  <object name="hirathil2_2" type="spawn" x="192" y="128" width="64" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil2"/>
+   </properties>
+  </object>
+  <object name="hirathil2_3" type="spawn" x="416" y="128" width="128" height="192">
+   <properties>
+    <property name="quantity" value="4"/>
+    <property name="spawngroup" value="hirathil2"/>
+   </properties>
+  </object>
+  <object name="hirathil2_4" type="spawn" x="352" y="512" width="192" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn_bats">
+  <object name="cavebat2" type="spawn" x="128" y="96" width="416" height="512">
+   <properties>
+    <property name="quantity" value="4"/>
+    <property name="spawngroup" value="cavebat2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys">
+  <object name="lodar2:35" type="key" x="64" y="448" width="32" height="96">
+   <properties>
+    <property name="phrase" value="sign_lodarcave4a"/>
+    <property name="requireId" value="lodar2"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="35"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/lodarcave5.tmx b/AndorsTrail/res/xml/lodarcave5.tmx
index fe67ebad3..38c05145e 100644
--- a/AndorsTrail/res/xml/lodarcave5.tmx
+++ b/AndorsTrail/res/xml/lodarcave5.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,40 +156,62 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="hirathil0" type="spawn" x="416" y="96" width="128" height="96"/>
+  <object name="hirathil0" type="spawn" x="416" y="96" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
   <object name="hirathil1" type="spawn" x="576" y="96" width="192" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil2" type="spawn" x="224" y="352" width="64" height="32"/>
-  <object name="hirathil1" type="spawn" x="288" y="288" width="160" height="192">
+  <object name="hirathil2" type="spawn" x="224" y="352" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil2"/>
+   </properties>
+  </object>
+  <object name="hirathil1_1" type="spawn" x="288" y="288" width="160" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="480" y="288" width="160" height="224">
+  <object name="hirathil0_1" type="spawn" x="480" y="288" width="160" height="224">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="32" y="64" width="192" height="544">
+  <object name="hirathil1_2" type="spawn" x="32" y="64" width="192" height="544">
    <properties>
     <property name="quantity" value="6"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="416" y="224" width="64" height="32">
+  <object name="hirathil1_3" type="spawn" x="416" y="224" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil1_4" type="spawn" x="544" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil1_5" type="spawn" x="608" y="512" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="544" y="128" width="32" height="32"/>
-  <object name="hirathil1" type="spawn" x="608" y="512" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn_bats" visible="0">
   <object name="cavebat1" type="spawn" x="32" y="64" width="736" height="512">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodarcave6.tmx b/AndorsTrail/res/xml/lodarcave6.tmx
index d0d93db84..8a53607a2 100644
--- a/AndorsTrail/res/xml/lodarcave6.tmx
+++ b/AndorsTrail/res/xml/lodarcave6.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="23" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -158,32 +159,53 @@
   <object name="hirathil1" type="spawn" x="416" y="64" width="128" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil2" type="spawn" x="448" y="224" width="32" height="96"/>
-  <object name="hirathil1" type="spawn" x="320" y="320" width="224" height="384">
+  <object name="hirathil2" type="spawn" x="448" y="224" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="hirathil2"/>
+   </properties>
+  </object>
+  <object name="hirathil1_1" type="spawn" x="320" y="320" width="224" height="384">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil2" type="spawn" x="352" y="128" width="64" height="32"/>
-  <object name="hirathil1" type="spawn" x="224" y="128" width="128" height="128"/>
-  <object name="hirathil1" type="spawn" x="32" y="256" width="256" height="256">
+  <object name="hirathil2_1" type="spawn" x="352" y="128" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil2"/>
+   </properties>
+  </object>
+  <object name="hirathil1_2" type="spawn" x="224" y="128" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil1_3" type="spawn" x="32" y="256" width="256" height="256">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil2_2" type="spawn" x="544" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil2"/>
    </properties>
   </object>
-  <object name="hirathil2" type="spawn" x="544" y="544" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn_bats" visible="0">
   <object name="cavebat1" type="spawn" x="32" y="128" width="288" height="384">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
-  <object name="cavebat1" type="spawn" x="320" y="320" width="224" height="384">
+  <object name="cavebat1_1" type="spawn" x="320" y="320" width="224" height="384">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodarcave7.tmx b/AndorsTrail/res/xml/lodarcave7.tmx
index 40d82f2b1..26c363edb 100644
--- a/AndorsTrail/res/xml/lodarcave7.tmx
+++ b/AndorsTrail/res/xml/lodarcave7.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,33 +156,46 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="hirathil2" type="spawn" x="64" y="160" width="32" height="32"/>
+  <object name="hirathil2" type="spawn" x="64" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil2"/>
+   </properties>
+  </object>
   <object name="hirathil1" type="spawn" x="96" y="128" width="96" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="32" y="320" width="256" height="288">
+  <object name="hirathil1_1" type="spawn" x="32" y="320" width="256" height="288">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="hirathil1"/>
    </properties>
   </object>
   <object name="hirathil0" type="spawn" x="320" y="416" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="352" y="224" width="96" height="256">
+  <object name="hirathil0_1" type="spawn" x="352" y="224" width="96" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="hirathil0_2" type="spawn" x="288" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="288" y="448" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn_bats" visible="0">
   <object name="cavebat1" type="spawn" x="32" y="192" width="256" height="416">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lodarhouse0.tmx b/AndorsTrail/res/xml/lodarhouse0.tmx
index 9d044bda8..300f49bb4 100644
--- a/AndorsTrail/res/xml/lodarhouse0.tmx
+++ b/AndorsTrail/res/xml/lodarhouse0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="26" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -158,11 +159,13 @@
   <object name="beetle2" type="spawn" x="32" y="64" width="288" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="beetle2"/>
    </properties>
   </object>
-  <object name="beetle2" type="spawn" x="64" y="320" width="736" height="288">
+  <object name="beetle2_1" type="spawn" x="64" y="320" width="736" height="288">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="beetle2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/loneford10.tmx b/AndorsTrail/res/xml/loneford10.tmx
index d7a61deed..28eaa28d7 100644
--- a/AndorsTrail/res/xml/loneford10.tmx
+++ b/AndorsTrail/res/xml/loneford10.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="11" height="11" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="11" height="11">
   <data encoding="base64" compression="zlib">
@@ -153,14 +153,17 @@
  <objectgroup name="Spawn">
   <object name="arngyr" type="spawn" x="160" y="288" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="arngyr"/>
    </properties>
   </object>
   <object name="loneford_guard0" type="spawn" x="32" y="160" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="loneford_guard0"/>
    </properties>
   </object>
-  <object name="loneford_guard0" type="spawn" x="192" y="160" width="32" height="32">
+  <object name="loneford_guard0_1" type="spawn" x="192" y="160" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="loneford_guard0"/>
    </properties>
   </object>
  </objectgroup>
@@ -168,8 +171,8 @@
   <object name="nondisplay:19" type="key" x="224" y="288" width="32" height="32">
    <properties>
     <property name="phrase" value="loneford_tavern_room"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="nondisplay"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="19"/>
    </properties>
   </object>
diff --git a/AndorsTrail/res/xml/loneford3.tmx b/AndorsTrail/res/xml/loneford3.tmx
index 71e4b8bc1..ff7f8f741 100644
--- a/AndorsTrail/res/xml/loneford3.tmx
+++ b/AndorsTrail/res/xml/loneford3.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="21" height="11" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="21" height="11">
   <data encoding="base64" compression="zlib">
@@ -158,23 +158,28 @@
  <objectgroup name="Spawn">
   <object name="grimion" type="spawn" x="64" y="128" width="480" height="64">
    <properties>
+    <property name="spawngroup" value="grimion"/>
    </properties>
   </object>
   <object name="kuldan" type="spawn" x="576" y="224" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="kuldan"/>
    </properties>
   </object>
   <object name="kuldan_guard" type="spawn" x="576" y="192" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="kuldan_guard"/>
    </properties>
   </object>
-  <object name="kuldan_guard" type="spawn" x="576" y="256" width="32" height="32">
+  <object name="kuldan_guard_1" type="spawn" x="576" y="256" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="kuldan_guard"/>
    </properties>
   </object>
   <object name="drunk" type="spawn" x="256" y="160" width="320" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="drunk"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/loneford4.tmx b/AndorsTrail/res/xml/loneford4.tmx
index 4e42756d8..cb8b0fcb0 100644
--- a/AndorsTrail/res/xml/loneford4.tmx
+++ b/AndorsTrail/res/xml/loneford4.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="13" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="13" height="10">
   <data encoding="base64" compression="zlib">
@@ -152,18 +152,22 @@
  <objectgroup name="Spawn">
   <object name="Talion" type="spawn" x="192" y="128" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="Talion"/>
    </properties>
   </object>
   <object name="loneford_chapelguard" type="spawn" x="32" y="96" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="loneford_chapelguard"/>
    </properties>
   </object>
-  <object name="loneford_chapelguard" type="spawn" x="352" y="96" width="32" height="32">
+  <object name="loneford_chapelguard_1" type="spawn" x="352" y="96" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="loneford_chapelguard"/>
    </properties>
   </object>
   <object name="Buceth" type="spawn" x="96" y="96" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="Buceth"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lonelyhouse1.tmx b/AndorsTrail/res/xml/lonelyhouse1.tmx
index a3f12fb03..66761bc7e 100644
--- a/AndorsTrail/res/xml/lonelyhouse1.tmx
+++ b/AndorsTrail/res/xml/lonelyhouse1.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="15" height="10">
   <data encoding="base64" compression="zlib">
@@ -155,11 +155,13 @@
   <object name="lonelyhouse_sp" type="spawn" x="32" y="160" width="416" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="lonelyhouse_sp"/>
    </properties>
   </object>
-  <object name="lonelyhouse_sp" type="spawn" x="96" y="96" width="352" height="192">
+  <object name="lonelyhouse_sp_1" type="spawn" x="96" y="96" width="352" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="lonelyhouse_sp"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lostmine0.tmx b/AndorsTrail/res/xml/lostmine0.tmx
index 865a2ef3c..e16c602cb 100644
--- a/AndorsTrail/res/xml/lostmine0.tmx
+++ b/AndorsTrail/res/xml/lostmine0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -166,33 +167,49 @@
   <object name="charwdg3" type="spawn" x="256" y="64" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object name="mazarth2" type="spawn" x="384" y="128" width="32" height="32"/>
-  <object name="charwdg3" type="spawn" x="416" y="192" width="64" height="32">
+  <object name="mazarth2" type="spawn" x="384" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="mazarth2"/>
+   </properties>
+  </object>
+  <object name="charwdg3_1" type="spawn" x="416" y="192" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="charwdg3_2" type="spawn" x="256" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object name="charwdg3" type="spawn" x="256" y="288" width="32" height="32"/>
   <object name="charwdg2" type="spawn" x="96" y="320" width="480" height="288">
    <properties>
     <property name="quantity" value="6"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="96" y="96" width="288" height="96">
+  <object name="charwdg2_1" type="spawn" x="96" y="96" width="288" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="mazarth1" type="spawn" x="128" y="320" width="384" height="256">
+   <properties>
+    <property name="spawngroup" value="mazarth1"/>
    </properties>
   </object>
-  <object name="mazarth1" type="spawn" x="128" y="320" width="384" height="256"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0">
   <object name="charwood2:15" type="key" x="224" y="224" width="96" height="32">
    <properties>
     <property name="phrase" value="sign_lostmine0"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="charwood2"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="15"/>
    </properties>
   </object>
diff --git a/AndorsTrail/res/xml/lostmine1.tmx b/AndorsTrail/res/xml/lostmine1.tmx
index 726030d91..36590904d 100644
--- a/AndorsTrail/res/xml/lostmine1.tmx
+++ b/AndorsTrail/res/xml/lostmine1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -161,31 +162,63 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="charwdg3" type="spawn" x="672" y="768" width="32" height="96"/>
-  <object name="charwdg2" type="spawn" x="704" y="672" width="192" height="64"/>
-  <object name="charwdg3" type="spawn" x="672" y="544" width="32" height="128"/>
-  <object name="charwdg2" type="spawn" x="544" y="704" width="64" height="64"/>
+  <object name="charwdg3" type="spawn" x="672" y="768" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="704" y="672" width="192" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg3_1" type="spawn" x="672" y="544" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="charwdg2_1" type="spawn" x="544" y="704" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
   <object name="charwdg1" type="spawn" x="224" y="608" width="320" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
-  <object name="mazarth1" type="spawn" x="192" y="640" width="288" height="192"/>
-  <object name="charwdg3" type="spawn" x="64" y="96" width="384" height="448">
+  <object name="mazarth1" type="spawn" x="192" y="640" width="288" height="192">
+   <properties>
+    <property name="spawngroup" value="mazarth1"/>
+   </properties>
+  </object>
+  <object name="charwdg3_2" type="spawn" x="64" y="96" width="384" height="448">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object name="charwdg3" type="spawn" x="352" y="544" width="64" height="64"/>
-  <object name="charwdg1" type="spawn" x="672" y="96" width="32" height="128"/>
-  <object name="charwdg2" type="spawn" x="704" y="128" width="160" height="224">
+  <object name="charwdg3_3" type="spawn" x="352" y="544" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="charwdg1_1" type="spawn" x="672" y="96" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg2_2" type="spawn" x="704" y="128" width="160" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg3" type="spawn" x="512" y="352" width="320" height="192">
+  <object name="charwdg3_4" type="spawn" x="512" y="352" width="320" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lostmine10.tmx b/AndorsTrail/res/xml/lostmine10.tmx
index 8b4178ab8..87e2c7a43 100644
--- a/AndorsTrail/res/xml/lostmine10.tmx
+++ b/AndorsTrail/res/xml/lostmine10.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="14" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcEXCMOAqQDomVy817EQH9HQ/TO9w1UcoXLDJ49NDCJDiBmLcNtjDd6D0UZIWiNULAF2fTbM=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="64" y="608" width="96" height="32">
    <properties>
     <property name="map" value="lostmine9"/>
@@ -154,30 +155,46 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
+ <objectgroup name="Spawn">
   <object name="fire3" type="spawn" x="64" y="416" width="32" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire3"/>
    </properties>
   </object>
-  <object name="fire4" type="spawn" x="96" y="320" width="160" height="64"/>
-  <object name="fire4" type="spawn" x="256" y="352" width="64" height="64"/>
-  <object name="fire3" type="spawn" x="352" y="288" width="64" height="32">
+  <object name="fire4" type="spawn" x="96" y="320" width="160" height="64">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire4"/>
    </properties>
   </object>
-  <object name="fire3" type="spawn" x="384" y="160" width="32" height="96"/>
-  <object name="fire3" type="spawn" x="224" y="96" width="128" height="32">
+  <object name="fire4_1" type="spawn" x="256" y="352" width="64" height="64">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire4"/>
    </properties>
   </object>
-  <object name="fire4" type="spawn" x="160" y="64" width="64" height="32">
+  <object name="fire3_1" type="spawn" x="352" y="288" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire3"/>
+   </properties>
+  </object>
+  <object name="fire3_2" type="spawn" x="384" y="160" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="fire3"/>
+   </properties>
+  </object>
+  <object name="fire3_3" type="spawn" x="224" y="96" width="128" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire3"/>
+   </properties>
+  </object>
+  <object name="fire4_2" type="spawn" x="160" y="64" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire4"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/lostmine11.tmx b/AndorsTrail/res/xml/lostmine11.tmx
index 66c3ebeab..8720a15eb 100644
--- a/AndorsTrail/res/xml/lostmine11.tmx
+++ b/AndorsTrail/res/xml/lostmine11.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="17" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,7 +156,7 @@
    eJxzFWBgcB3FODEIoLORxYg1Axeg1B2kmIPLblLdgs9cStQTawY++8gxA5878JmFHg/44poUd5Cin1D6IkY/IT+QEqeUpiFy9Q8WMwAQJlWr
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="32" y="608" width="64" height="32">
    <properties>
     <property name="map" value="lostmine10"/>
@@ -163,34 +164,47 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
+ <objectgroup name="Spawn">
   <object name="fire4" type="spawn" x="96" y="288" width="128" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fire4"/>
    </properties>
   </object>
-  <object name="fire4" type="spawn" x="224" y="448" width="32" height="64">
+  <object name="fire4_1" type="spawn" x="224" y="448" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire4"/>
    </properties>
   </object>
-  <object name="fire4" type="spawn" x="256" y="384" width="192" height="128">
+  <object name="fire4_2" type="spawn" x="256" y="384" width="192" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fire4"/>
    </properties>
   </object>
-  <object name="fire4" type="spawn" x="320" y="320" width="64" height="32">
+  <object name="fire4_3" type="spawn" x="320" y="320" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire4"/>
    </properties>
   </object>
   <object name="fire5" type="spawn" x="288" y="128" width="96" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire5"/>
+   </properties>
+  </object>
+  <object name="fire5_1" type="spawn" x="256" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fire5"/>
+   </properties>
+  </object>
+  <object name="thukuzun" type="spawn" x="128" y="128" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="thukuzun"/>
    </properties>
   </object>
-  <object name="fire5" type="spawn" x="256" y="160" width="32" height="32"/>
-  <object name="thukuzun" type="spawn" x="128" y="128" width="128" height="128"/>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/lostmine2.tmx b/AndorsTrail/res/xml/lostmine2.tmx
index 82850d3f1..ca632ea9f 100644
--- a/AndorsTrail/res/xml/lostmine2.tmx
+++ b/AndorsTrail/res/xml/lostmine2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -164,56 +165,135 @@
   <object name="mazarth2" type="spawn" x="224" y="768" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mazarth2"/>
+   </properties>
+  </object>
+  <object name="charwdg3" type="spawn" x="384" y="768" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="ashs2" type="spawn" x="288" y="384" width="32" height="160">
+   <properties>
+    <property name="spawngroup" value="ashs2"/>
    </properties>
   </object>
-  <object name="charwdg3" type="spawn" x="384" y="768" width="64" height="64"/>
-  <object name="ashs2" type="spawn" x="288" y="384" width="32" height="160"/>
   <object name="ashs1" type="spawn" x="288" y="576" width="32" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ashs1"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="288" y="704" width="32" height="64"/>
-  <object name="charwdg3" type="spawn" x="512" y="800" width="64" height="96"/>
-  <object name="charwdg2" type="spawn" x="608" y="768" width="64" height="64"/>
-  <object name="charwdg1" type="spawn" x="640" y="608" width="64" height="128"/>
-  <object name="ashs2" type="spawn" x="480" y="192" width="224" height="416">
+  <object name="charwdg2" type="spawn" x="288" y="704" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg3_1" type="spawn" x="512" y="800" width="64" height="96">
+   <properties>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="charwdg2_1" type="spawn" x="608" y="768" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg1" type="spawn" x="640" y="608" width="64" height="128">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="ashs2_1" type="spawn" x="480" y="192" width="224" height="416">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="ashs2"/>
    </properties>
   </object>
-  <object name="charwdg3" type="spawn" x="736" y="608" width="160" height="32">
+  <object name="charwdg3_2" type="spawn" x="736" y="608" width="160" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="896" y="672" width="32" height="32"/>
-  <object name="charwdg3" type="spawn" x="896" y="736" width="32" height="96"/>
-  <object name="ashs1" type="spawn" x="704" y="448" width="192" height="32">
+  <object name="charwdg2_2" type="spawn" x="896" y="672" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg3_3" type="spawn" x="896" y="736" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="ashs1_1" type="spawn" x="704" y="448" width="192" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ashs1"/>
    </properties>
   </object>
-  <object name="ashs2" type="spawn" x="320" y="352" width="160" height="32">
+  <object name="ashs2_2" type="spawn" x="320" y="352" width="160" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ashs2"/>
    </properties>
   </object>
-  <object name="ashs1" type="spawn" x="352" y="416" width="32" height="224"/>
-  <object name="ashs1" type="spawn" x="160" y="352" width="128" height="96"/>
-  <object name="ash3" type="spawn" x="128" y="544" width="96" height="96"/>
-  <object name="ash1" type="spawn" x="192" y="480" width="32" height="32"/>
-  <object name="ashs2" type="spawn" x="64" y="352" width="64" height="64"/>
-  <object name="ashs1" type="spawn" x="32" y="192" width="64" height="32">
+  <object name="ashs1_2" type="spawn" x="352" y="416" width="32" height="224">
+   <properties>
+    <property name="spawngroup" value="ashs1"/>
+   </properties>
+  </object>
+  <object name="ashs1_3" type="spawn" x="160" y="352" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="ashs1"/>
+   </properties>
+  </object>
+  <object name="ash3" type="spawn" x="128" y="544" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="ash3"/>
+   </properties>
+  </object>
+  <object name="ash1" type="spawn" x="192" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash1"/>
+   </properties>
+  </object>
+  <object name="ashs2_3" type="spawn" x="64" y="352" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="ashs2"/>
+   </properties>
+  </object>
+  <object name="ashs1_4" type="spawn" x="32" y="192" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ashs1"/>
+   </properties>
+  </object>
+  <object name="ashs2_4" type="spawn" x="192" y="160" width="160" height="64">
+   <properties>
+    <property name="spawngroup" value="ashs2"/>
+   </properties>
+  </object>
+  <object name="ashs2_5" type="spawn" x="384" y="128" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="ashs2"/>
+   </properties>
+  </object>
+  <object name="ash1_1" type="spawn" x="480" y="64" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="ash1"/>
+   </properties>
+  </object>
+  <object name="ash1_2" type="spawn" x="640" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash1"/>
+   </properties>
+  </object>
+  <object name="ash2" type="spawn" x="672" y="96" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="ash2"/>
    </properties>
   </object>
-  <object name="ashs2" type="spawn" x="192" y="160" width="160" height="64"/>
-  <object name="ashs2" type="spawn" x="384" y="128" width="64" height="64"/>
-  <object name="ash1" type="spawn" x="480" y="64" width="96" height="64"/>
-  <object name="ash1" type="spawn" x="640" y="96" width="32" height="32"/>
-  <object name="ash2" type="spawn" x="672" y="96" width="160" height="96"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/lostmine2a.tmx b/AndorsTrail/res/xml/lostmine2a.tmx
index f6156fbe2..361ba0a52 100644
--- a/AndorsTrail/res/xml/lostmine2a.tmx
+++ b/AndorsTrail/res/xml/lostmine2a.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="19" height="21" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -149,26 +150,38 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="charwdg3" type="spawn" x="64" y="480" width="96" height="96"/>
-  <object name="charwdg2" type="spawn" x="160" y="512" width="128" height="96"/>
-  <object name="charwdg3" type="spawn" x="256" y="384" width="32" height="128">
+  <object name="charwdg3" type="spawn" x="64" y="480" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="160" y="512" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg3_1" type="spawn" x="256" y="384" width="32" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
   <object name="mazarth1" type="spawn" x="64" y="96" width="448" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="mazarth1"/>
    </properties>
   </object>
   <object name="mazarth2" type="spawn" x="128" y="64" width="352" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="mazarth2"/>
    </properties>
   </object>
-  <object name="charwdg3" type="spawn" x="96" y="128" width="416" height="224">
+  <object name="charwdg3_2" type="spawn" x="96" y="128" width="416" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lostmine3.tmx b/AndorsTrail/res/xml/lostmine3.tmx
index 079a75193..d1b813f9c 100644
--- a/AndorsTrail/res/xml/lostmine3.tmx
+++ b/AndorsTrail/res/xml/lostmine3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="19" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,41 +156,75 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="ash1" type="spawn" x="96" y="768" width="32" height="128"/>
-  <object name="ash3" type="spawn" x="128" y="704" width="96" height="64"/>
-  <object name="ash1" type="spawn" x="256" y="608" width="288" height="288">
+  <object name="ash1" type="spawn" x="96" y="768" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="ash1"/>
+   </properties>
+  </object>
+  <object name="ash3" type="spawn" x="128" y="704" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="ash3"/>
+   </properties>
+  </object>
+  <object name="ash1_1" type="spawn" x="256" y="608" width="288" height="288">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object name="ash1" type="spawn" x="160" y="512" width="32" height="192">
+  <object name="ash1_2" type="spawn" x="160" y="512" width="32" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object name="ashs2" type="spawn" x="32" y="448" width="160" height="64"/>
-  <object name="ash1" type="spawn" x="64" y="416" width="32" height="32"/>
-  <object name="ash1" type="spawn" x="32" y="256" width="64" height="160">
+  <object name="ashs2" type="spawn" x="32" y="448" width="160" height="64">
+   <properties>
+    <property name="spawngroup" value="ashs2"/>
+   </properties>
+  </object>
+  <object name="ash1_3" type="spawn" x="64" y="416" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash1"/>
+   </properties>
+  </object>
+  <object name="ash1_4" type="spawn" x="32" y="256" width="64" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object name="ash3" type="spawn" x="96" y="288" width="32" height="32"/>
-  <object name="ash1" type="spawn" x="128" y="224" width="128" height="96">
+  <object name="ash3_1" type="spawn" x="96" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash3"/>
+   </properties>
+  </object>
+  <object name="ash1_5" type="spawn" x="128" y="224" width="128" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object name="ash1" type="spawn" x="224" y="96" width="64" height="64"/>
-  <object name="ash1" type="spawn" x="288" y="96" width="128" height="32"/>
-  <object name="ash1" type="spawn" x="416" y="96" width="160" height="288">
+  <object name="ash1_6" type="spawn" x="224" y="96" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="ash1"/>
+   </properties>
+  </object>
+  <object name="ash1_7" type="spawn" x="288" y="96" width="128" height="32">
+   <properties>
+    <property name="spawngroup" value="ash1"/>
+   </properties>
+  </object>
+  <object name="ash1_8" type="spawn" x="416" y="96" width="160" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
   <object name="ash2" type="spawn" x="384" y="384" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ash2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/lostmine5.tmx b/AndorsTrail/res/xml/lostmine5.tmx
index e9337a1c8..19f62d23b 100644
--- a/AndorsTrail/res/xml/lostmine5.tmx
+++ b/AndorsTrail/res/xml/lostmine5.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="12" height="29" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB0gDAKkqIUBYtXhUosujwvgMxddPy47kOWpaT42c4kNU3zuoDT8sfmflumBFmaTa/5gcg8xdqCnG3zqCQFi3EvILlLMp1eaobZ6ANTRVFc=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="up lostmine5" type="mapchange" x="224" y="64" width="32" height="32">
    <properties>
     <property name="map" value="lostmine4"/>
@@ -154,35 +155,52 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
+ <objectgroup name="Spawn">
   <object name="ash3" type="spawn" x="32" y="128" width="320" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="ash3"/>
    </properties>
   </object>
   <object name="ash2" type="spawn" x="0" y="128" width="352" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ash2"/>
    </properties>
   </object>
-  <object name="ash2" type="spawn" x="224" y="416" width="32" height="32"/>
-  <object name="ash2" type="spawn" x="192" y="480" width="32" height="32"/>
-  <object name="ash2" type="spawn" x="192" y="544" width="64" height="32">
+  <object name="ash2_1" type="spawn" x="224" y="416" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash2"/>
+   </properties>
+  </object>
+  <object name="ash2_2" type="spawn" x="192" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash2"/>
+   </properties>
+  </object>
+  <object name="ash2_3" type="spawn" x="192" y="544" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ash2"/>
    </properties>
   </object>
-  <object name="ash2" type="spawn" x="192" y="608" width="64" height="32">
+  <object name="ash2_4" type="spawn" x="192" y="608" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ash2"/>
    </properties>
   </object>
-  <object name="ash3" type="spawn" x="64" y="672" width="288" height="128">
+  <object name="ash3_1" type="spawn" x="64" y="672" width="288" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ash3"/>
+   </properties>
+  </object>
+  <object name="ash4" type="spawn" x="128" y="800" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash4"/>
    </properties>
   </object>
-  <object name="ash4" type="spawn" x="128" y="800" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/lostmine6.tmx b/AndorsTrail/res/xml/lostmine6.tmx
index f8da8ed83..f01ff05e9 100644
--- a/AndorsTrail/res/xml/lostmine6.tmx
+++ b/AndorsTrail/res/xml/lostmine6.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="12" height="19" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,20 +156,38 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="ash3" type="spawn" x="32" y="96" width="32" height="32"/>
-  <object name="ash3" type="spawn" x="64" y="192" width="32" height="32"/>
+  <object name="ash3" type="spawn" x="32" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash3"/>
+   </properties>
+  </object>
+  <object name="ash3_1" type="spawn" x="64" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash3"/>
+   </properties>
+  </object>
   <object name="ash4" type="spawn" x="64" y="224" width="64" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ash4"/>
    </properties>
   </object>
-  <object name="fire1" type="spawn" x="96" y="352" width="32" height="160"/>
-  <object name="ash4" type="spawn" x="160" y="288" width="160" height="160">
+  <object name="fire1" type="spawn" x="96" y="352" width="32" height="160">
+   <properties>
+    <property name="spawngroup" value="fire1"/>
+   </properties>
+  </object>
+  <object name="ash4_1" type="spawn" x="160" y="288" width="160" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="ash4"/>
+   </properties>
+  </object>
+  <object name="fire1_1" type="spawn" x="192" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fire1"/>
    </properties>
   </object>
-  <object name="fire1" type="spawn" x="192" y="448" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/lostmine7.tmx b/AndorsTrail/res/xml/lostmine7.tmx
index 932e0aa25..d803cb1df 100644
--- a/AndorsTrail/res/xml/lostmine7.tmx
+++ b/AndorsTrail/res/xml/lostmine7.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJzlktEJgDAMRB3Bpbr/SuKHUEp7fZeUihgQQZO85HLlPI7y4+eOrzCfuvadYTpR589YozzVW+VQnmKq2chcqueqPSmX1irm7FZUX+o/d0/qN+dGdM8IL+MjosXomzsvyX+L2eZFmfSOO5jEEy6z7uEwezNQrWqWo4vaU2nSy1vBdG65k+neYjVTBfFxljn719NG9SFc4nMS9J6E6dzE1VYxM953mLP6iO8jda5ndz4XMR3MNA==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="up lostmine7" type="mapchange" x="192" y="64" width="32" height="32">
    <properties>
     <property name="map" value="lostmine6"/>
@@ -154,54 +155,109 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0" visible="0">
-  <object name="ash4" type="spawn" x="192" y="128" width="32" height="32"/>
+ <objectgroup name="Spawn" visible="0">
+  <object name="ash4" type="spawn" x="192" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash4"/>
+   </properties>
+  </object>
   <object name="fire1" type="spawn" x="96" y="160" width="160" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire1"/>
    </properties>
   </object>
-  <object name="fire1" type="spawn" x="128" y="416" width="32" height="64"/>
-  <object name="fire1" type="spawn" x="32" y="480" width="128" height="224"/>
-  <object name="fire1" type="spawn" x="96" y="704" width="160" height="224">
+  <object name="fire1_1" type="spawn" x="128" y="416" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="fire1"/>
+   </properties>
+  </object>
+  <object name="fire1_2" type="spawn" x="32" y="480" width="128" height="224">
+   <properties>
+    <property name="spawngroup" value="fire1"/>
+   </properties>
+  </object>
+  <object name="fire1_3" type="spawn" x="96" y="704" width="160" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fire1"/>
+   </properties>
+  </object>
+  <object name="fire1_4" type="spawn" x="256" y="704" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="fire1"/>
+   </properties>
+  </object>
+  <object name="fire1_5" type="spawn" x="384" y="736" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fire1"/>
+   </properties>
+  </object>
+  <object name="ash4_1" type="spawn" x="416" y="704" width="64" height="160">
+   <properties>
+    <property name="spawngroup" value="ash4"/>
    </properties>
   </object>
-  <object name="fire1" type="spawn" x="256" y="704" width="64" height="32"/>
-  <object name="fire1" type="spawn" x="384" y="736" width="32" height="32"/>
-  <object name="ash4" type="spawn" x="416" y="704" width="64" height="160"/>
   <object name="fire2" type="spawn" x="512" y="704" width="320" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fire2"/>
    </properties>
   </object>
-  <object name="ash4" type="spawn" x="512" y="544" width="32" height="32"/>
-  <object name="fire1" type="spawn" x="288" y="416" width="192" height="160"/>
-  <object name="fire1" type="spawn" x="576" y="384" width="32" height="320">
+  <object name="ash4_2" type="spawn" x="512" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash4"/>
+   </properties>
+  </object>
+  <object name="fire1_6" type="spawn" x="288" y="416" width="192" height="160">
+   <properties>
+    <property name="spawngroup" value="fire1"/>
+   </properties>
+  </object>
+  <object name="fire1_7" type="spawn" x="576" y="384" width="32" height="320">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fire1"/>
    </properties>
   </object>
-  <object name="fire1" type="spawn" x="736" y="576" width="64" height="32"/>
-  <object name="fire1" type="spawn" x="640" y="544" width="96" height="96"/>
-  <object name="fire2" type="spawn" x="288" y="256" width="32" height="32"/>
-  <object name="fire1" type="spawn" x="352" y="128" width="192" height="160">
+  <object name="fire1_8" type="spawn" x="736" y="576" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="fire1"/>
+   </properties>
+  </object>
+  <object name="fire1_9" type="spawn" x="640" y="544" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="fire1"/>
+   </properties>
+  </object>
+  <object name="fire2_1" type="spawn" x="288" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fire2"/>
+   </properties>
+  </object>
+  <object name="fire1_10" type="spawn" x="352" y="128" width="192" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fire1"/>
    </properties>
   </object>
-  <object name="ash2" type="spawn" x="576" y="128" width="32" height="32"/>
-  <object name="fire1" type="spawn" x="640" y="96" width="224" height="288">
+  <object name="ash2" type="spawn" x="576" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ash2"/>
+   </properties>
+  </object>
+  <object name="fire1_11" type="spawn" x="640" y="96" width="224" height="288">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="fire1"/>
    </properties>
   </object>
-  <object name="fire1" type="spawn" x="672" y="384" width="32" height="160">
+  <object name="fire1_12" type="spawn" x="672" y="384" width="32" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/lostmine8.tmx b/AndorsTrail/res/xml/lostmine8.tmx
index 91c14d68d..1623e313b 100644
--- a/AndorsTrail/res/xml/lostmine8.tmx
+++ b/AndorsTrail/res/xml/lostmine8.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="13" height="19" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB0ADAK01IMOcMmRogefPaS6l1R7sLkPlxkDFeYDoYfUcCBWD75wxqUPlzpS44nc8EDHANfDPm0=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="up lostmine8" type="mapchange" x="128" y="64" width="32" height="32">
    <properties>
     <property name="map" value="lostmine7"/>
@@ -154,24 +155,34 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0" visible="0">
+ <objectgroup name="Spawn" visible="0">
   <object name="fire1" type="spawn" x="64" y="128" width="128" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fire1"/>
    </properties>
   </object>
-  <object name="fire1" type="spawn" x="288" y="128" width="96" height="32"/>
-  <object name="fire1" type="spawn" x="256" y="224" width="64" height="64"/>
-  <object name="fire1" type="spawn" x="192" y="288" width="32" height="128">
+  <object name="fire1_1" type="spawn" x="288" y="128" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="fire1"/>
+   </properties>
+  </object>
+  <object name="fire1_2" type="spawn" x="256" y="224" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="fire1"/>
+   </properties>
+  </object>
+  <object name="fire1_3" type="spawn" x="192" y="288" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="fire1"/>
    </properties>
   </object>
   <object name="fire2" type="spawn" x="192" y="416" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/lostmine9.tmx b/AndorsTrail/res/xml/lostmine9.tmx
index 5c3d17c49..4742ee318 100644
--- a/AndorsTrail/res/xml/lostmine9.tmx
+++ b/AndorsTrail/res/xml/lostmine9.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="28" height="28" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB3FJGNkMNjtI0UfNezBBvDpoSRM8Iljk6eVfbj8ORzsIxS/5NpFiVtJsYOa7iY3/GhhJ7HxNdD2wcRIcQ8xavHZR2rck+ouQmZTyz5y3USvtEcv+wiFG764oAemt50D4Ud84TwSwpxYe2mZ9gc6zNExAFjv1n8=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="up lostmine9" type="mapchange" x="800" y="800" width="32" height="32">
    <properties>
     <property name="map" value="lostmine8"/>
@@ -154,32 +155,94 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="fire2" type="spawn" x="640" y="832" width="128" height="32"/>
-  <object name="fire2" type="spawn" x="576" y="800" width="32" height="32"/>
-  <object name="fire3" type="spawn" x="480" y="736" width="64" height="64"/>
-  <object name="fire3" type="spawn" x="320" y="736" width="128" height="32"/>
-  <object name="fire2" type="spawn" x="192" y="640" width="96" height="128"/>
-  <object name="fire2" type="spawn" x="96" y="640" width="64" height="32"/>
-  <object name="fire3" type="spawn" x="64" y="512" width="32" height="64"/>
-  <object name="fire2" type="spawn" x="96" y="384" width="32" height="96"/>
-  <object name="fire3" type="spawn" x="128" y="320" width="192" height="64"/>
-  <object name="fire2" type="spawn" x="320" y="352" width="96" height="192"/>
-  <object name="fire2" type="spawn" x="448" y="512" width="64" height="32"/>
+ <objectgroup name="Spawn">
+  <object name="fire2" type="spawn" x="640" y="832" width="128" height="32">
+   <properties>
+    <property name="spawngroup" value="fire2"/>
+   </properties>
+  </object>
+  <object name="fire2_1" type="spawn" x="576" y="800" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fire2"/>
+   </properties>
+  </object>
+  <object name="fire3" type="spawn" x="480" y="736" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="fire3"/>
+   </properties>
+  </object>
+  <object name="fire3_1" type="spawn" x="320" y="736" width="128" height="32">
+   <properties>
+    <property name="spawngroup" value="fire3"/>
+   </properties>
+  </object>
+  <object name="fire2_2" type="spawn" x="192" y="640" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="fire2"/>
+   </properties>
+  </object>
+  <object name="fire2_3" type="spawn" x="96" y="640" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="fire2"/>
+   </properties>
+  </object>
+  <object name="fire3_2" type="spawn" x="64" y="512" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="fire3"/>
+   </properties>
+  </object>
+  <object name="fire2_4" type="spawn" x="96" y="384" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="fire2"/>
+   </properties>
+  </object>
+  <object name="fire3_3" type="spawn" x="128" y="320" width="192" height="64">
+   <properties>
+    <property name="spawngroup" value="fire3"/>
+   </properties>
+  </object>
+  <object name="fire2_5" type="spawn" x="320" y="352" width="96" height="192">
+   <properties>
+    <property name="spawngroup" value="fire2"/>
+   </properties>
+  </object>
+  <object name="fire2_6" type="spawn" x="448" y="512" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="fire2"/>
+   </properties>
+  </object>
   <object name="ash4" type="spawn" x="544" y="448" width="288" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ash4"/>
    </properties>
   </object>
-  <object name="fire2" type="spawn" x="224" y="192" width="32" height="128"/>
-  <object name="fire2" type="spawn" x="416" y="192" width="128" height="128">
+  <object name="fire2_7" type="spawn" x="224" y="192" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="fire2"/>
+   </properties>
+  </object>
+  <object name="fire2_8" type="spawn" x="416" y="192" width="128" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fire2"/>
+   </properties>
+  </object>
+  <object name="fire2_9" type="spawn" x="544" y="288" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="fire2"/>
+   </properties>
+  </object>
+  <object name="fire3_4" type="spawn" x="640" y="160" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="fire3"/>
+   </properties>
+  </object>
+  <object name="fire3_5" type="spawn" x="704" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fire3"/>
    </properties>
   </object>
-  <object name="fire2" type="spawn" x="544" y="288" width="96" height="32"/>
-  <object name="fire3" type="spawn" x="640" y="160" width="32" height="128"/>
-  <object name="fire3" type="spawn" x="704" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/minerhouse0.tmx b/AndorsTrail/res/xml/minerhouse0.tmx
index 4195a9edd..eeb7b942e 100644
--- a/AndorsTrail/res/xml/minerhouse0.tmx
+++ b/AndorsTrail/res/xml/minerhouse0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="8" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -152,15 +153,25 @@
   <object name="charwdg2" type="spawn" x="128" y="128" width="128" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
   <object name="charwdg3" type="spawn" x="256" y="96" width="192" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="charwdg2_1" type="spawn" x="480" y="96" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="falothen0" type="spawn" x="64" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="falothen0"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="480" y="96" width="128" height="128"/>
-  <object name="falothen0" type="spawn" x="64" y="160" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/minerhouse1.tmx b/AndorsTrail/res/xml/minerhouse1.tmx
index 7d0842f0c..758104d28 100644
--- a/AndorsTrail/res/xml/minerhouse1.tmx
+++ b/AndorsTrail/res/xml/minerhouse1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="8" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -152,13 +153,23 @@
   <object name="charwdg1" type="spawn" x="32" y="96" width="192" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="256" y="128" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg2_1" type="spawn" x="352" y="96" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="256" y="128" width="64" height="64"/>
-  <object name="charwdg2" type="spawn" x="352" y="96" width="64" height="64"/>
   <object name="charwdg3" type="spawn" x="448" y="96" width="128" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/minerhouse2.tmx b/AndorsTrail/res/xml/minerhouse2.tmx
index 46dcfbb68..41c26fb5a 100644
--- a/AndorsTrail/res/xml/minerhouse2.tmx
+++ b/AndorsTrail/res/xml/minerhouse2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="8" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -152,12 +153,18 @@
   <object name="charwdg2" type="spawn" x="64" y="96" width="320" height="96">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg2_1" type="spawn" x="384" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="384" y="160" width="32" height="32"/>
   <object name="charwdg1" type="spawn" x="448" y="128" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/minerhouse3.tmx b/AndorsTrail/res/xml/minerhouse3.tmx
index 2df4ccdcd..f59e9807e 100644
--- a/AndorsTrail/res/xml/minerhouse3.tmx
+++ b/AndorsTrail/res/xml/minerhouse3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="16" height="8" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -149,16 +150,26 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="charwdg1" type="spawn" x="32" y="96" width="96" height="128"/>
-  <object name="charwdg2" type="spawn" x="128" y="128" width="32" height="32"/>
-  <object name="charwdg2" type="spawn" x="192" y="160" width="32" height="64">
+  <object name="charwdg1" type="spawn" x="32" y="96" width="96" height="128">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="256" y="96" width="224" height="96">
+  <object name="charwdg2" type="spawn" x="128" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg2_1" type="spawn" x="192" y="160" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg2_2" type="spawn" x="256" y="96" width="224" height="96">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/minerhouse4.tmx b/AndorsTrail/res/xml/minerhouse4.tmx
index 6ce1ebbc7..4cb878595 100644
--- a/AndorsTrail/res/xml/minerhouse4.tmx
+++ b/AndorsTrail/res/xml/minerhouse4.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="26" height="8" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -153,17 +154,24 @@
   <object name="ccentip" type="spawn" x="192" y="128" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
-  <object name="ccentip" type="spawn" x="256" y="128" width="96" height="96">
+  <object name="ccentip_1" type="spawn" x="256" y="128" width="96" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
-  <object name="ccentip" type="spawn" x="512" y="192" width="96" height="32"/>
-  <object name="ccentip" type="spawn" x="544" y="96" width="224" height="96">
+  <object name="ccentip_2" type="spawn" x="512" y="192" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
+  <object name="ccentip_3" type="spawn" x="544" y="96" width="224" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/minerhouse5.tmx b/AndorsTrail/res/xml/minerhouse5.tmx
index b38e0ca6e..7cd7b3994 100644
--- a/AndorsTrail/res/xml/minerhouse5.tmx
+++ b/AndorsTrail/res/xml/minerhouse5.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="16" height="8" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -153,15 +154,25 @@
   <object name="ccentip" type="spawn" x="32" y="96" width="128" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
-  <object name="ccentip" type="spawn" x="192" y="96" width="96" height="128"/>
-  <object name="ccentip" type="spawn" x="320" y="128" width="160" height="64">
+  <object name="ccentip_1" type="spawn" x="192" y="96" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
+  <object name="ccentip_2" type="spawn" x="320" y="128" width="160" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
+  <object name="ccentip_3" type="spawn" x="288" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
-  <object name="ccentip" type="spawn" x="288" y="192" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/minerhouse7.tmx b/AndorsTrail/res/xml/minerhouse7.tmx
index a5739f34b..855b85531 100644
--- a/AndorsTrail/res/xml/minerhouse7.tmx
+++ b/AndorsTrail/res/xml/minerhouse7.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="16" height="8" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -152,14 +153,20 @@
   <object name="charwdg2" type="spawn" x="128" y="128" width="192" height="64">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="320" y="96" width="160" height="128">
+  <object name="charwdg2_1" type="spawn" x="320" y="96" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="fayvara0" type="spawn" x="32" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fayvara0"/>
    </properties>
   </object>
-  <object name="fayvara0" type="spawn" x="32" y="160" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/minerhouse8.tmx b/AndorsTrail/res/xml/minerhouse8.tmx
index d6700646b..6227d2b13 100644
--- a/AndorsTrail/res/xml/minerhouse8.tmx
+++ b/AndorsTrail/res/xml/minerhouse8.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="16" height="8" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -149,15 +150,32 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="charwdg3" type="spawn" x="64" y="128" width="96" height="64"/>
-  <object name="charwdg1" type="spawn" x="224" y="160" width="32" height="32"/>
-  <object name="charwdg2" type="spawn" x="288" y="128" width="64" height="64"/>
-  <object name="charwdg3" type="spawn" x="384" y="96" width="96" height="128">
+  <object name="charwdg3" type="spawn" x="64" y="128" width="96" height="64">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="charwdg1" type="spawn" x="224" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="288" y="128" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg3_1" type="spawn" x="384" y="96" width="96" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="charwdg1_1" type="spawn" x="192" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
-  <object name="charwdg1" type="spawn" x="192" y="192" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/minerhouse9.tmx b/AndorsTrail/res/xml/minerhouse9.tmx
index a532a3ebb..fe9273848 100644
--- a/AndorsTrail/res/xml/minerhouse9.tmx
+++ b/AndorsTrail/res/xml/minerhouse9.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="12" height="8" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -149,13 +150,22 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="charwdg2" type="spawn" x="64" y="96" width="64" height="64"/>
+  <object name="charwdg2" type="spawn" x="64" y="96" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
   <object name="charwdg1" type="spawn" x="160" y="128" width="96" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg2_1" type="spawn" x="256" y="96" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="256" y="96" width="96" height="128"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/mountaincave0.tmx b/AndorsTrail/res/xml/mountaincave0.tmx
index 0c875636c..7cb9a2991 100644
--- a/AndorsTrail/res/xml/mountaincave0.tmx
+++ b/AndorsTrail/res/xml/mountaincave0.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -159,22 +159,25 @@
  <objectgroup name="Spawn" visible="0">
   <object name="scaradon_1" type="spawn" x="448" y="544" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="scaradon_1"/>
    </properties>
   </object>
-  <object name="scaradon_1" type="spawn" x="288" y="320" width="288" height="224">
+  <object name="scaradon_1_1" type="spawn" x="288" y="320" width="288" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="scaradon_1"/>
    </properties>
   </object>
-  <object name="scaradon_1" type="spawn" x="64" y="96" width="480" height="192">
+  <object name="scaradon_1_2" type="spawn" x="64" y="96" width="480" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="scaradon_1"/>
    </properties>
   </object>
-  <object name="scaradon_1" type="spawn" x="288" y="288" width="64" height="32">
+  <object name="scaradon_1_3" type="spawn" x="288" y="288" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="scaradon_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountaincave1.tmx b/AndorsTrail/res/xml/mountaincave1.tmx
index 131eac658..693fdb9b7 100644
--- a/AndorsTrail/res/xml/mountaincave1.tmx
+++ b/AndorsTrail/res/xml/mountaincave1.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -166,26 +166,29 @@
   <object name="scaradon_1" type="spawn" x="352" y="224" width="224" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="scaradon_1"/>
    </properties>
   </object>
   <object name="scaradon_2" type="spawn" x="320" y="64" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="scaradon_2"/>
    </properties>
   </object>
-  <object name="scaradon_2" type="spawn" x="384" y="352" width="32" height="32">
+  <object name="scaradon_2_1" type="spawn" x="384" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="scaradon_2"/>
    </properties>
   </object>
-  <object name="scaradon_2" type="spawn" x="320" y="416" width="32" height="32">
+  <object name="scaradon_2_2" type="spawn" x="320" y="416" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="scaradon_2"/>
    </properties>
   </object>
-  <object name="scaradon_1" type="spawn" x="96" y="384" width="224" height="128">
+  <object name="scaradon_1_1" type="spawn" x="96" y="384" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="scaradon_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountaincave2.tmx b/AndorsTrail/res/xml/mountaincave2.tmx
index ee9eba775..3bb2c7e76 100644
--- a/AndorsTrail/res/xml/mountaincave2.tmx
+++ b/AndorsTrail/res/xml/mountaincave2.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="25" height="30">
   <data encoding="base64" compression="zlib">
@@ -163,32 +163,35 @@
  <objectgroup name="Spawn" visible="0">
   <object name="scaradon_3" type="spawn" x="352" y="288" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="scaradon_3"/>
    </properties>
   </object>
-  <object name="scaradon_3" type="spawn" x="416" y="288" width="32" height="32">
+  <object name="scaradon_3_1" type="spawn" x="416" y="288" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="scaradon_3"/>
    </properties>
   </object>
   <object name="scaradon_2" type="spawn" x="480" y="96" width="288" height="800">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="scaradon_2"/>
    </properties>
   </object>
-  <object name="scaradon_3" type="spawn" x="128" y="448" width="32" height="32">
+  <object name="scaradon_3_2" type="spawn" x="128" y="448" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="scaradon_3"/>
    </properties>
   </object>
-  <object name="scaradon_2" type="spawn" x="32" y="480" width="256" height="416">
+  <object name="scaradon_2_1" type="spawn" x="32" y="480" width="256" height="416">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="scaradon_2"/>
    </properties>
   </object>
   <object name="scaradon_1" type="spawn" x="32" y="64" width="288" height="384">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="scaradon_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake0.tmx b/AndorsTrail/res/xml/mountainlake0.tmx
index 135619e97..55faa37b9 100644
--- a/AndorsTrail/res/xml/mountainlake0.tmx
+++ b/AndorsTrail/res/xml/mountainlake0.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="30">
   <data encoding="base64" compression="zlib">
@@ -161,34 +161,35 @@
  <objectgroup name="Spawn">
   <object name="plaguespider_3" type="spawn" x="224" y="864" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_3"/>
    </properties>
   </object>
   <object name="plaguespider_2" type="spawn" x="320" y="736" width="128" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
   <object name="maonit_1" type="spawn" x="128" y="608" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="192" y="384" width="128" height="192">
+  <object name="plaguespider_2_1" type="spawn" x="192" y="384" width="128" height="192">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="maonit_1" type="spawn" x="416" y="128" width="32" height="96">
+  <object name="maonit_1_1" type="spawn" x="416" y="128" width="32" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
  </objectgroup>
  <objectgroup name="Spawn2">
-  <object name="plaguespider_3" type="spawn" x="32" y="128" width="448" height="256">
+  <object name="plaguespider_3_1" type="spawn" x="32" y="128" width="448" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake1.tmx b/AndorsTrail/res/xml/mountainlake1.tmx
index 02b4f686a..7c45f19c3 100644
--- a/AndorsTrail/res/xml/mountainlake1.tmx
+++ b/AndorsTrail/res/xml/mountainlake1.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -162,45 +162,51 @@
  <objectgroup name="Spawn" visible="0">
   <object name="maonit_1" type="spawn" x="512" y="512" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
-  <object name="maonit_1" type="spawn" x="672" y="576" width="224" height="128">
+  <object name="maonit_1_1" type="spawn" x="672" y="576" width="224" height="128">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
-  <object name="maonit_1" type="spawn" x="736" y="416" width="32" height="64">
+  <object name="maonit_1_2" type="spawn" x="736" y="416" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
-  <object name="maonit_1" type="spawn" x="448" y="96" width="288" height="384">
+  <object name="maonit_1_3" type="spawn" x="448" y="96" width="288" height="384">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
-  <object name="maonit_1" type="spawn" x="160" y="544" width="480" height="352">
+  <object name="maonit_1_4" type="spawn" x="160" y="544" width="480" height="352">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
-  <object name="maonit_1" type="spawn" x="192" y="416" width="32" height="32">
+  <object name="maonit_1_5" type="spawn" x="192" y="416" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
-  <object name="maonit_1" type="spawn" x="704" y="480" width="192" height="416">
+  <object name="maonit_1_6" type="spawn" x="704" y="480" width="192" height="416">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_1"/>
+   </properties>
+  </object>
+  <object name="maonit_cr" type="spawn" x="64" y="160" width="224" height="128">
+   <properties>
+    <property name="spawngroup" value="maonit_cr"/>
    </properties>
   </object>
-  <object name="maonit_cr" type="spawn" x="64" y="160" width="224" height="128"/>
  </objectgroup>
  <objectgroup name="Spawn2" visible="0">
   <object name="mwolf_1" type="spawn" x="64" y="64" width="832" height="832">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="mwolf_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake10.tmx b/AndorsTrail/res/xml/mountainlake10.tmx
index 0b16db0ee..56dcbdf64 100644
--- a/AndorsTrail/res/xml/mountainlake10.tmx
+++ b/AndorsTrail/res/xml/mountainlake10.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -167,54 +167,55 @@
  <objectgroup name="Spawn">
   <object name="mbrute_2" type="spawn" x="832" y="288" width="64" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
   <object name="mbrute_1" type="spawn" x="800" y="352" width="64" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_1"/>
    </properties>
   </object>
-  <object name="mbrute_1" type="spawn" x="640" y="608" width="64" height="64">
+  <object name="mbrute_1_1" type="spawn" x="640" y="608" width="64" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_1"/>
    </properties>
   </object>
-  <object name="mbrute_1" type="spawn" x="480" y="544" width="64" height="64">
+  <object name="mbrute_1_2" type="spawn" x="480" y="544" width="64" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_1"/>
    </properties>
   </object>
   <object name="mwolf_2" type="spawn" x="128" y="672" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_2"/>
    </properties>
   </object>
   <object name="mwolf_3" type="spawn" x="96" y="608" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_3"/>
    </properties>
   </object>
-  <object name="mwolf_3" type="spawn" x="96" y="544" width="32" height="32">
+  <object name="mwolf_3_1" type="spawn" x="96" y="544" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_3"/>
    </properties>
   </object>
-  <object name="mwolf_2" type="spawn" x="128" y="736" width="128" height="160">
+  <object name="mwolf_2_1" type="spawn" x="128" y="736" width="128" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_2"/>
    </properties>
   </object>
-  <object name="mwolf_3" type="spawn" x="64" y="192" width="416" height="352">
+  <object name="mwolf_3_2" type="spawn" x="64" y="192" width="416" height="352">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_3"/>
    </properties>
   </object>
  </objectgroup>
  <objectgroup name="Spawn2">
-  <object name="mwolf_2" type="spawn" x="64" y="128" width="832" height="768">
+  <object name="mwolf_2_2" type="spawn" x="64" y="128" width="832" height="768">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mwolf_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake10a.tmx b/AndorsTrail/res/xml/mountainlake10a.tmx
index 2cc1e080a..53eced15e 100644
--- a/AndorsTrail/res/xml/mountainlake10a.tmx
+++ b/AndorsTrail/res/xml/mountainlake10a.tmx
@@ -159,20 +159,27 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="mwolf_2" type="spawn" x="544" y="64" width="32" height="32"/>
+  <object name="mwolf_2" type="spawn" x="544" y="64" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="mwolf_2"/>
+   </properties>
+  </object>
   <object name="mwolf_1" type="spawn" x="160" y="64" width="384" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mwolf_1"/>
    </properties>
   </object>
-  <object name="mwolf_1" type="spawn" x="448" y="96" width="224" height="448">
+  <object name="mwolf_1_1" type="spawn" x="448" y="96" width="224" height="448">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="mwolf_1"/>
    </properties>
   </object>
   <object name="halvor" type="spawn" x="128" y="352" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
+    <property name="spawngroup" value="halvor"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake11.tmx b/AndorsTrail/res/xml/mountainlake11.tmx
index b1ce87628..a8e4a2f1a 100644
--- a/AndorsTrail/res/xml/mountainlake11.tmx
+++ b/AndorsTrail/res/xml/mountainlake11.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="25" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -160,42 +161,44 @@
  <objectgroup name="Spawn">
   <object name="mwolf_3" type="spawn" x="864" y="384" width="32" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_3"/>
    </properties>
   </object>
   <object name="mwolf_2" type="spawn" x="768" y="128" width="128" height="256">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_2"/>
    </properties>
   </object>
-  <object name="mwolf_3" type="spawn" x="672" y="544" width="192" height="32">
+  <object name="mwolf_3_1" type="spawn" x="672" y="544" width="192" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mwolf_3"/>
    </properties>
   </object>
-  <object name="mwolf_2" type="spawn" x="352" y="256" width="288" height="288">
+  <object name="mwolf_2_1" type="spawn" x="352" y="256" width="288" height="288">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_2"/>
    </properties>
   </object>
-  <object name="mwolf_3" type="spawn" x="192" y="544" width="224" height="32">
+  <object name="mwolf_3_2" type="spawn" x="192" y="544" width="224" height="32">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="mwolf_3"/>
    </properties>
   </object>
-  <object name="mwolf_2" type="spawn" x="448" y="320" width="192" height="448">
+  <object name="mwolf_2_2" type="spawn" x="448" y="320" width="192" height="448">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_2"/>
    </properties>
   </object>
-  <object name="mwolf_2" type="spawn" x="384" y="576" width="416" height="192">
+  <object name="mwolf_2_3" type="spawn" x="384" y="576" width="416" height="192">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_2"/>
    </properties>
   </object>
   <object name="mwolf_1" type="spawn" x="64" y="384" width="128" height="224">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake12.tmx b/AndorsTrail/res/xml/mountainlake12.tmx
index eca6f2d47..e71f4ba86 100644
--- a/AndorsTrail/res/xml/mountainlake12.tmx
+++ b/AndorsTrail/res/xml/mountainlake12.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="21" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -160,12 +161,12 @@
  <objectgroup name="Spawn">
   <object name="mwolf_2" type="spawn" x="288" y="480" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_2"/>
    </properties>
   </object>
-  <object name="mwolf_2" type="spawn" x="608" y="352" width="32" height="32">
+  <object name="mwolf_2_1" type="spawn" x="608" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_2"/>
    </properties>
   </object>
  </objectgroup>
@@ -173,6 +174,7 @@
   <object name="mwolf_1" type="spawn" x="64" y="160" width="800" height="416">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="mwolf_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake13.tmx b/AndorsTrail/res/xml/mountainlake13.tmx
index 9c4dafc11..de411039d 100644
--- a/AndorsTrail/res/xml/mountainlake13.tmx
+++ b/AndorsTrail/res/xml/mountainlake13.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="29">
   <data encoding="base64" compression="zlib">
@@ -161,34 +161,35 @@
  <objectgroup name="Spawn">
   <object name="mwolf_1" type="spawn" x="320" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_1"/>
    </properties>
   </object>
-  <object name="mwolf_1" type="spawn" x="352" y="448" width="32" height="32">
+  <object name="mwolf_1_1" type="spawn" x="352" y="448" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_1"/>
    </properties>
   </object>
-  <object name="mwolf_1" type="spawn" x="800" y="352" width="32" height="32">
+  <object name="mwolf_1_2" type="spawn" x="800" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_1"/>
    </properties>
   </object>
-  <object name="mwolf_1" type="spawn" x="96" y="416" width="32" height="32">
+  <object name="mwolf_1_3" type="spawn" x="96" y="416" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_1"/>
    </properties>
   </object>
-  <object name="mwolf_1" type="spawn" x="96" y="352" width="32" height="32">
+  <object name="mwolf_1_4" type="spawn" x="96" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mwolf_1"/>
    </properties>
   </object>
  </objectgroup>
  <objectgroup name="Spawn2">
-  <object name="mwolf_1" type="spawn" x="32" y="96" width="864" height="608">
+  <object name="mwolf_1_5" type="spawn" x="32" y="96" width="864" height="608">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="mwolf_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake2.tmx b/AndorsTrail/res/xml/mountainlake2.tmx
index f1a3b19c7..9838a977c 100644
--- a/AndorsTrail/res/xml/mountainlake2.tmx
+++ b/AndorsTrail/res/xml/mountainlake2.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="17">
   <data encoding="base64" compression="zlib">
@@ -162,36 +162,37 @@
   <object name="maonit_1" type="spawn" x="64" y="64" width="352" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
-  <object name="maonit_1" type="spawn" x="64" y="192" width="160" height="288">
+  <object name="maonit_1_1" type="spawn" x="64" y="192" width="160" height="288">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
   <object name="maonit_2" type="spawn" x="224" y="320" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="320" y="320" width="96" height="32">
+  <object name="maonit_2_1" type="spawn" x="320" y="320" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="416" y="320" width="96" height="32">
+  <object name="maonit_2_2" type="spawn" x="416" y="320" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_1" type="spawn" x="544" y="288" width="32" height="32">
+  <object name="maonit_1_2" type="spawn" x="544" y="288" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
-  <object name="maonit_1" type="spawn" x="544" y="224" width="32" height="32">
+  <object name="maonit_1_3" type="spawn" x="544" y="224" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake3.tmx b/AndorsTrail/res/xml/mountainlake3.tmx
index 5a72b3bcc..b6ccaa0a5 100644
--- a/AndorsTrail/res/xml/mountainlake3.tmx
+++ b/AndorsTrail/res/xml/mountainlake3.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="25" height="28">
   <data encoding="base64" compression="zlib">
@@ -162,51 +162,54 @@
   <object name="maonit_2" type="spawn" x="224" y="640" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="64" y="544" width="160" height="160">
+  <object name="maonit_2_1" type="spawn" x="64" y="544" width="160" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
   <object name="maonit_3" type="spawn" x="576" y="576" width="32" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_3"/>
    </properties>
   </object>
-  <object name="maonit_3" type="spawn" x="576" y="512" width="32" height="64">
+  <object name="maonit_3_1" type="spawn" x="576" y="512" width="32" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_3"/>
    </properties>
   </object>
-  <object name="maonit_3" type="spawn" x="576" y="448" width="32" height="64">
+  <object name="maonit_3_2" type="spawn" x="576" y="448" width="32" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_3"/>
    </properties>
   </object>
-  <object name="maonit_3" type="spawn" x="576" y="384" width="32" height="64">
+  <object name="maonit_3_3" type="spawn" x="576" y="384" width="32" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_3"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="256" y="640" width="448" height="160">
+  <object name="maonit_2_2" type="spawn" x="256" y="640" width="448" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="480" y="288" width="32" height="32">
+  <object name="maonit_2_3" type="spawn" x="480" y="288" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="448" y="320" width="224" height="64">
+  <object name="maonit_2_4" type="spawn" x="448" y="320" width="224" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="64" y="64" width="384" height="320">
+  <object name="maonit_2_5" type="spawn" x="64" y="64" width="384" height="320">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake4.tmx b/AndorsTrail/res/xml/mountainlake4.tmx
index 7065d4d5f..ee2316b38 100644
--- a/AndorsTrail/res/xml/mountainlake4.tmx
+++ b/AndorsTrail/res/xml/mountainlake4.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="25" height="16">
   <data encoding="base64" compression="zlib">
@@ -161,37 +161,39 @@
  <objectgroup name="Spawn">
   <object name="maonit_3" type="spawn" x="608" y="160" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_3"/>
    </properties>
   </object>
-  <object name="maonit_3" type="spawn" x="608" y="224" width="32" height="32">
+  <object name="maonit_3_1" type="spawn" x="608" y="224" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_3"/>
    </properties>
   </object>
   <object name="maonit_2" type="spawn" x="640" y="96" width="96" height="288">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="320" y="256" width="320" height="96">
+  <object name="maonit_2_1" type="spawn" x="320" y="256" width="320" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_3" type="spawn" x="64" y="416" width="32" height="32">
+  <object name="maonit_3_2" type="spawn" x="64" y="416" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_3"/>
    </properties>
   </object>
   <object name="maonit_1" type="spawn" x="160" y="64" width="448" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="maonit_1"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="64" y="64" width="224" height="352">
+  <object name="maonit_2_2" type="spawn" x="64" y="64" width="224" height="352">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake5.tmx b/AndorsTrail/res/xml/mountainlake5.tmx
index d9d610d67..ae50c28c6 100644
--- a/AndorsTrail/res/xml/mountainlake5.tmx
+++ b/AndorsTrail/res/xml/mountainlake5.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="29" height="20">
   <data encoding="base64" compression="zlib">
@@ -161,52 +161,53 @@
  <objectgroup name="Spawn">
   <object name="arulir_1" type="spawn" x="672" y="192" width="32" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1" type="spawn" x="672" y="256" width="32" height="64">
+  <object name="arulir_1_1" type="spawn" x="672" y="256" width="32" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1" type="spawn" x="448" y="448" width="64" height="32">
+  <object name="arulir_1_2" type="spawn" x="448" y="448" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1" type="spawn" x="512" y="448" width="64" height="32">
+  <object name="arulir_1_3" type="spawn" x="512" y="448" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1" type="spawn" x="608" y="352" width="128" height="160">
+  <object name="arulir_1_4" type="spawn" x="608" y="352" width="128" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
   <object name="maonit_3" type="spawn" x="576" y="96" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_3"/>
    </properties>
   </object>
-  <object name="arulir_1" type="spawn" x="512" y="96" width="32" height="32">
+  <object name="arulir_1_5" type="spawn" x="512" y="96" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="maonit_3" type="spawn" x="32" y="96" width="160" height="160">
+  <object name="maonit_3_1" type="spawn" x="32" y="96" width="160" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_3"/>
    </properties>
   </object>
   <object name="maonit_2" type="spawn" x="64" y="128" width="384" height="384">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="416" y="64" width="64" height="32">
+  <object name="maonit_2_1" type="spawn" x="416" y="64" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake6.tmx b/AndorsTrail/res/xml/mountainlake6.tmx
index 303f66dfd..e94d8cd16 100644
--- a/AndorsTrail/res/xml/mountainlake6.tmx
+++ b/AndorsTrail/res/xml/mountainlake6.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="19" height="29">
   <data encoding="base64" compression="zlib">
@@ -161,22 +161,22 @@
  <objectgroup name="Spawn">
   <object name="maonit_2" type="spawn" x="64" y="608" width="224" height="256">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="160" y="480" width="32" height="64">
+  <object name="maonit_2_1" type="spawn" x="160" y="480" width="32" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object name="maonit_2" type="spawn" x="160" y="416" width="32" height="32">
+  <object name="maonit_2_2" type="spawn" x="160" y="416" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
   <object name="mbrute_1" type="spawn" x="288" y="576" width="256" height="256">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_1"/>
    </properties>
   </object>
  </objectgroup>
@@ -184,6 +184,7 @@
   <object name="mbrute_2" type="spawn" x="32" y="64" width="512" height="800">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake7.tmx b/AndorsTrail/res/xml/mountainlake7.tmx
index e8fa8bd08..24065d249 100644
--- a/AndorsTrail/res/xml/mountainlake7.tmx
+++ b/AndorsTrail/res/xml/mountainlake7.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="16" height="20">
   <data encoding="base64" compression="zlib">
@@ -161,32 +161,33 @@
  <objectgroup name="Spawn">
   <object name="mbrute_2" type="spawn" x="128" y="416" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
-  <object name="mbrute_2" type="spawn" x="64" y="224" width="32" height="32">
+  <object name="mbrute_2_1" type="spawn" x="64" y="224" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
   <object name="mbrute_1" type="spawn" x="96" y="320" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_1"/>
    </properties>
   </object>
-  <object name="mbrute_2" type="spawn" x="384" y="256" width="32" height="32">
+  <object name="mbrute_2_2" type="spawn" x="384" y="256" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
-  <object name="mbrute_2" type="spawn" x="320" y="384" width="32" height="32">
+  <object name="mbrute_2_3" type="spawn" x="320" y="384" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
-  <object name="mbrute_1" type="spawn" x="64" y="96" width="384" height="480">
+  <object name="mbrute_1_1" type="spawn" x="64" y="96" width="384" height="480">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="mbrute_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake8.tmx b/AndorsTrail/res/xml/mountainlake8.tmx
index f089fd832..51f896205 100644
--- a/AndorsTrail/res/xml/mountainlake8.tmx
+++ b/AndorsTrail/res/xml/mountainlake8.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="30">
   <data encoding="base64" compression="zlib">
@@ -161,54 +161,56 @@
  <objectgroup name="Spawn">
   <object name="mbrute_4" type="spawn" x="96" y="128" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_4"/>
    </properties>
   </object>
   <object name="mbrute_3" type="spawn" x="128" y="224" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_3"/>
    </properties>
   </object>
-  <object name="mbrute_4" type="spawn" x="128" y="288" width="32" height="32">
+  <object name="mbrute_4_1" type="spawn" x="128" y="288" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_4"/>
    </properties>
   </object>
-  <object name="mbrute_4" type="spawn" x="288" y="640" width="32" height="32">
+  <object name="mbrute_4_2" type="spawn" x="288" y="640" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_4"/>
    </properties>
   </object>
-  <object name="mbrute_3" type="spawn" x="448" y="448" width="32" height="32">
+  <object name="mbrute_3_1" type="spawn" x="448" y="448" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_3"/>
    </properties>
   </object>
-  <object name="mbrute_3" type="spawn" x="448" y="384" width="32" height="32">
+  <object name="mbrute_3_2" type="spawn" x="448" y="384" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_3"/>
    </properties>
   </object>
-  <object name="mbrute_4" type="spawn" x="352" y="224" width="224" height="160">
+  <object name="mbrute_4_3" type="spawn" x="352" y="224" width="224" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_4"/>
    </properties>
   </object>
   <object name="mbrute_2" type="spawn" x="128" y="352" width="224" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
-  <object name="mbrute_2" type="spawn" x="320" y="640" width="256" height="224">
+  <object name="mbrute_2_1" type="spawn" x="320" y="640" width="256" height="224">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
  </objectgroup>
  <objectgroup name="Spawn2" visible="0">
-  <object name="mbrute_2" type="spawn" x="64" y="64" width="512" height="832">
+  <object name="mbrute_2_2" type="spawn" x="64" y="64" width="512" height="832">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/mountainlake9.tmx b/AndorsTrail/res/xml/mountainlake9.tmx
index bd1ba28ae..3dd0296f0 100644
--- a/AndorsTrail/res/xml/mountainlake9.tmx
+++ b/AndorsTrail/res/xml/mountainlake9.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -161,52 +161,56 @@
  <objectgroup name="Spawn">
   <object name="mbrute_3" type="spawn" x="416" y="160" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_3"/>
    </properties>
   </object>
-  <object name="mbrute_3" type="spawn" x="512" y="160" width="96" height="32">
+  <object name="mbrute_3_1" type="spawn" x="512" y="160" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_3"/>
    </properties>
   </object>
-  <object name="mbrute_3" type="spawn" x="480" y="800" width="32" height="64">
+  <object name="mbrute_3_2" type="spawn" x="480" y="800" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mbrute_3"/>
    </properties>
   </object>
-  <object name="mbrute_3" type="spawn" x="704" y="416" width="32" height="32">
+  <object name="mbrute_3_3" type="spawn" x="704" y="416" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_3"/>
    </properties>
   </object>
-  <object name="mbrute_3" type="spawn" x="96" y="192" width="32" height="64">
+  <object name="mbrute_3_4" type="spawn" x="96" y="192" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mbrute_3"/>
    </properties>
   </object>
   <object name="mbrute_1" type="spawn" x="128" y="96" width="288" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_1"/>
    </properties>
   </object>
   <object name="mbrute_2" type="spawn" x="608" y="96" width="320" height="320">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
-  <object name="mbrute_2" type="spawn" x="192" y="448" width="576" height="352">
+  <object name="mbrute_2_1" type="spawn" x="192" y="448" width="576" height="352">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
-  <object name="mbrute_2" type="spawn" x="512" y="832" width="64" height="32">
+  <object name="mbrute_2_2" type="spawn" x="512" y="832" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
-  <object name="mbrute_2" type="spawn" x="160" y="416" width="320" height="480">
+  <object name="mbrute_2_3" type="spawn" x="160" y="416" width="320" height="480">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/oldcave0.tmx b/AndorsTrail/res/xml/oldcave0.tmx
index fb2c4575e..f15c9e07b 100644
--- a/AndorsTrail/res/xml/oldcave0.tmx
+++ b/AndorsTrail/res/xml/oldcave0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -158,26 +159,50 @@
   <object name="zombie2" type="spawn" x="64" y="192" width="32" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="zombie2"/>
    </properties>
   </object>
-  <object name="zombie2" type="spawn" x="32" y="384" width="64" height="224">
+  <object name="zombie2_1" type="spawn" x="32" y="384" width="64" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie2"/>
    </properties>
   </object>
-  <object name="zombie3" type="spawn" x="128" y="576" width="64" height="32"/>
-  <object name="zombie2" type="spawn" x="224" y="576" width="64" height="32"/>
-  <object name="zombie3" type="spawn" x="288" y="384" width="224" height="192">
+  <object name="zombie3" type="spawn" x="128" y="576" width="64" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie3"/>
    </properties>
   </object>
-  <object name="zombie2" type="spawn" x="416" y="160" width="96" height="96"/>
-  <object name="zombie2" type="spawn" x="512" y="192" width="64" height="64"/>
-  <object name="zombie2" type="spawn" x="256" y="128" width="160" height="96"/>
-  <object name="zombie2" type="spawn" x="192" y="128" width="32" height="64">
+  <object name="zombie2_2" type="spawn" x="224" y="576" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="zombie2"/>
+   </properties>
+  </object>
+  <object name="zombie3_1" type="spawn" x="288" y="384" width="224" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie3"/>
+   </properties>
+  </object>
+  <object name="zombie2_3" type="spawn" x="416" y="160" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="zombie2"/>
+   </properties>
+  </object>
+  <object name="zombie2_4" type="spawn" x="512" y="192" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="zombie2"/>
+   </properties>
+  </object>
+  <object name="zombie2_5" type="spawn" x="256" y="128" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="zombie2"/>
+   </properties>
+  </object>
+  <object name="zombie2_6" type="spawn" x="192" y="128" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/oldcave1.tmx b/AndorsTrail/res/xml/oldcave1.tmx
index 0c081c133..5ae4228d7 100644
--- a/AndorsTrail/res/xml/oldcave1.tmx
+++ b/AndorsTrail/res/xml/oldcave1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="25" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -149,54 +150,83 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="zombie3" type="spawn" x="32" y="160" width="128" height="128"/>
-  <object name="zombie3" type="spawn" x="352" y="160" width="192" height="32">
+  <object name="zombie3" type="spawn" x="32" y="160" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="zombie3"/>
+   </properties>
+  </object>
+  <object name="zombie3_1" type="spawn" x="352" y="160" width="192" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie3"/>
    </properties>
   </object>
   <object name="zombie2" type="spawn" x="544" y="160" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie2"/>
    </properties>
   </object>
-  <object name="zombie3" type="spawn" x="576" y="256" width="32" height="128">
+  <object name="zombie3_2" type="spawn" x="576" y="256" width="32" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie3"/>
    </properties>
   </object>
   <object name="zombie4" type="spawn" x="320" y="384" width="256" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie4"/>
    </properties>
   </object>
-  <object name="zombie3" type="spawn" x="256" y="480" width="32" height="32"/>
-  <object name="zombie4" type="spawn" x="96" y="448" width="32" height="64">
+  <object name="zombie3_3" type="spawn" x="256" y="480" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie3"/>
    </properties>
   </object>
-  <object name="zombie4" type="spawn" x="32" y="512" width="32" height="160">
+  <object name="zombie4_1" type="spawn" x="96" y="448" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie4"/>
    </properties>
   </object>
-  <object name="zombie3" type="spawn" x="64" y="672" width="128" height="96"/>
-  <object name="zombie2" type="spawn" x="192" y="672" width="128" height="64">
+  <object name="zombie4_2" type="spawn" x="32" y="512" width="32" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie4"/>
    </properties>
   </object>
-  <object name="oldcaveboss" type="spawn" x="512" y="576" width="96" height="128"/>
-  <object name="zombie4" type="spawn" x="320" y="608" width="192" height="128">
+  <object name="zombie3_4" type="spawn" x="64" y="672" width="128" height="96">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie3"/>
    </properties>
   </object>
-  <object name="zombie3" type="spawn" x="192" y="480" width="32" height="32"/>
-  <object name="zombie2" type="spawn" x="160" y="128" width="160" height="160">
+  <object name="zombie2_1" type="spawn" x="192" y="672" width="128" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie2"/>
+   </properties>
+  </object>
+  <object name="oldcaveboss" type="spawn" x="512" y="576" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="oldcaveboss"/>
+   </properties>
+  </object>
+  <object name="zombie4_3" type="spawn" x="320" y="608" width="192" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie4"/>
+   </properties>
+  </object>
+  <object name="zombie3_5" type="spawn" x="192" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="zombie3"/>
+   </properties>
+  </object>
+  <object name="zombie2_2" type="spawn" x="160" y="128" width="160" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/pwcave0.tmx b/AndorsTrail/res/xml/pwcave0.tmx
index 58b3ee86f..f8db32c75 100644
--- a/AndorsTrail/res/xml/pwcave0.tmx
+++ b/AndorsTrail/res/xml/pwcave0.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="11" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="11" height="30">
   <data encoding="base64" compression="zlib">
@@ -158,17 +158,24 @@
  <objectgroup name="Spawn">
   <object name="iqhan_greeter" type="spawn" x="128" y="704" width="128" height="192">
    <properties>
+    <property name="spawngroup" value="iqhan_greeter"/>
    </properties>
   </object>
-  <object name="iqhan_1" type="spawn" x="96" y="640" width="192" height="64"/>
-  <object name="iqhan_1" type="spawn" x="32" y="192" width="288" height="416">
+  <object name="iqhan_1" type="spawn" x="96" y="640" width="192" height="64">
+   <properties>
+    <property name="spawngroup" value="iqhan_1"/>
+   </properties>
+  </object>
+  <object name="iqhan_1_1" type="spawn" x="32" y="192" width="288" height="416">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="iqhan_1"/>
    </properties>
   </object>
   <object name="iqhan_2" type="spawn" x="128" y="128" width="128" height="512">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/pwcave1.tmx b/AndorsTrail/res/xml/pwcave1.tmx
index db56a6f11..a96651534 100644
--- a/AndorsTrail/res/xml/pwcave1.tmx
+++ b/AndorsTrail/res/xml/pwcave1.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -159,52 +159,60 @@
  <objectgroup name="Spawn" visible="0">
   <object name="iqhan_2" type="spawn" x="768" y="800" width="96" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
-  <object name="iqhan_2" type="spawn" x="672" y="800" width="32" height="64">
+  <object name="iqhan_2_1" type="spawn" x="672" y="800" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
   <object name="iqhan_3" type="spawn" x="416" y="864" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object name="iqhan_2" type="spawn" x="96" y="480" width="448" height="256">
+  <object name="iqhan_2_2" type="spawn" x="96" y="480" width="448" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
   <object name="iqhan_1" type="spawn" x="96" y="736" width="224" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_1"/>
    </properties>
   </object>
-  <object name="iqhan_2" type="spawn" x="224" y="448" width="64" height="32">
+  <object name="iqhan_2_3" type="spawn" x="224" y="448" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
-  <object name="iqhan_1" type="spawn" x="128" y="160" width="416" height="320">
+  <object name="iqhan_1_1" type="spawn" x="128" y="160" width="416" height="320">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="iqhan_1"/>
    </properties>
   </object>
-  <object name="iqhan_2" type="spawn" x="640" y="416" width="32" height="64">
+  <object name="iqhan_2_4" type="spawn" x="640" y="416" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
-  <object name="iqhan_2" type="spawn" x="768" y="448" width="32" height="64">
+  <object name="iqhan_2_5" type="spawn" x="768" y="448" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
-  <object name="iqhan_1" type="spawn" x="800" y="64" width="96" height="384">
+  <object name="iqhan_1_2" type="spawn" x="800" y="64" width="96" height="384">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="iqhan_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/pwcave2.tmx b/AndorsTrail/res/xml/pwcave2.tmx
index 2844cb479..d7936fbc6 100644
--- a/AndorsTrail/res/xml/pwcave2.tmx
+++ b/AndorsTrail/res/xml/pwcave2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -163,72 +164,80 @@
  <objectgroup name="Spawn" visible="0">
   <object name="iqhan_2" type="spawn" x="768" y="832" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
   <object name="iqhan_3" type="spawn" x="704" y="832" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object name="iqhan_3" type="spawn" x="480" y="864" width="64" height="32">
+  <object name="iqhan_3_1" type="spawn" x="480" y="864" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object name="iqhan_2" type="spawn" x="256" y="896" width="128" height="32">
+  <object name="iqhan_2_1" type="spawn" x="256" y="896" width="128" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
-  <object name="iqhan_3" type="spawn" x="192" y="864" width="32" height="64">
+  <object name="iqhan_3_2" type="spawn" x="192" y="864" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object name="iqhan_3" type="spawn" x="64" y="704" width="128" height="160">
+  <object name="iqhan_3_3" type="spawn" x="64" y="704" width="128" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object name="iqhan_3" type="spawn" x="96" y="640" width="96" height="32">
+  <object name="iqhan_3_4" type="spawn" x="96" y="640" width="96" height="32">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object name="iqhan_2" type="spawn" x="96" y="512" width="224" height="128">
+  <object name="iqhan_2_2" type="spawn" x="96" y="512" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
-  <object name="iqhan_3" type="spawn" x="96" y="192" width="224" height="288">
+  <object name="iqhan_3_5" type="spawn" x="96" y="192" width="224" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
   <object name="iqhan_4" type="spawn" x="384" y="96" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_4"/>
    </properties>
   </object>
-  <object name="iqhan_4" type="spawn" x="512" y="96" width="32" height="64">
+  <object name="iqhan_4_1" type="spawn" x="512" y="96" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_4"/>
    </properties>
   </object>
-  <object name="iqhan_3" type="spawn" x="608" y="128" width="288" height="224">
+  <object name="iqhan_3_6" type="spawn" x="608" y="128" width="288" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
   <object name="iqhan_ch_1" type="spawn" x="416" y="352" width="480" height="352">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_1"/>
    </properties>
   </object>
-  <object name="iqhan_4" type="spawn" x="448" y="320" width="416" height="320">
+  <object name="iqhan_4_2" type="spawn" x="448" y="320" width="416" height="320">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="iqhan_4"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/pwcave2a.tmx b/AndorsTrail/res/xml/pwcave2a.tmx
index 5fbbbcc7f..77543a637 100644
--- a/AndorsTrail/res/xml/pwcave2a.tmx
+++ b/AndorsTrail/res/xml/pwcave2a.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="25" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -153,27 +154,28 @@
  <objectgroup name="Spawn">
   <object name="iqhan_4" type="spawn" x="160" y="544" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_4"/>
    </properties>
   </object>
   <object name="iqhan_ch_1" type="spawn" x="160" y="576" width="256" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_1"/>
    </properties>
   </object>
-  <object name="iqhan_ch_1" type="spawn" x="64" y="96" width="512" height="416">
+  <object name="iqhan_ch_1_1" type="spawn" x="64" y="96" width="512" height="416">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="iqhan_ch_1"/>
    </properties>
   </object>
   <object name="iqhan_chb_1" type="spawn" x="128" y="64" width="416" height="448">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_chb_1"/>
    </properties>
   </object>
   <object name="iqhan_ch_3" type="spawn" x="160" y="64" width="320" height="448">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/pwcave3.tmx b/AndorsTrail/res/xml/pwcave3.tmx
index 1c15146ef..7a3514ee6 100644
--- a/AndorsTrail/res/xml/pwcave3.tmx
+++ b/AndorsTrail/res/xml/pwcave3.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -158,79 +158,86 @@
  <objectgroup name="Spawn">
   <object name="iqhan_4" type="spawn" x="64" y="512" width="128" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_4"/>
    </properties>
   </object>
   <object name="iqhan_3" type="spawn" x="64" y="320" width="160" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
   <object name="iqhan_ch_1" type="spawn" x="192" y="128" width="128" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_ch_1"/>
    </properties>
   </object>
   <object name="iqhan_ch_2" type="spawn" x="416" y="352" width="32" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_2"/>
    </properties>
   </object>
-  <object name="iqhan_ch_2" type="spawn" x="512" y="128" width="128" height="32">
+  <object name="iqhan_ch_2_1" type="spawn" x="512" y="128" width="128" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_2"/>
    </properties>
   </object>
-  <object name="iqhan_ch_2" type="spawn" x="704" y="192" width="32" height="128">
+  <object name="iqhan_ch_2_2" type="spawn" x="704" y="192" width="32" height="128">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_2"/>
    </properties>
   </object>
-  <object name="iqhan_ch_2" type="spawn" x="864" y="256" width="32" height="96">
+  <object name="iqhan_ch_2_3" type="spawn" x="864" y="256" width="32" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_2"/>
    </properties>
   </object>
   <object name="iqhan_ch_3" type="spawn" x="768" y="576" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_3"/>
    </properties>
   </object>
-  <object name="iqhan_ch_1" type="spawn" x="704" y="544" width="32" height="64">
+  <object name="iqhan_ch_1_1" type="spawn" x="704" y="544" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_ch_1"/>
    </properties>
   </object>
-  <object name="iqhan_3" type="spawn" x="384" y="416" width="160" height="288">
+  <object name="iqhan_3_1" type="spawn" x="384" y="416" width="160" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object name="iqhan_ch_1" type="spawn" x="96" y="736" width="320" height="192">
+  <object name="iqhan_ch_1_2" type="spawn" x="96" y="736" width="320" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_ch_1"/>
    </properties>
   </object>
-  <object name="iqhan_ch_2" type="spawn" x="448" y="864" width="96" height="32">
+  <object name="iqhan_ch_2_4" type="spawn" x="448" y="864" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_2"/>
    </properties>
   </object>
-  <object name="iqhan_ch_1" type="spawn" x="704" y="640" width="224" height="224">
+  <object name="iqhan_ch_1_3" type="spawn" x="704" y="640" width="224" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_ch_1"/>
    </properties>
   </object>
-  <object name="iqhan_ch_3" type="spawn" x="640" y="864" width="64" height="32">
+  <object name="iqhan_ch_3_1" type="spawn" x="640" y="864" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_3"/>
    </properties>
   </object>
  </objectgroup>
  <objectgroup name="Spawn2" visible="0">
-  <object name="iqhan_4" type="spawn" x="128" y="64" width="800" height="832">
+  <object name="iqhan_4_1" type="spawn" x="128" y="64" width="800" height="832">
    <properties>
     <property name="quantity" value="7"/>
+    <property name="spawngroup" value="iqhan_4"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/pwcave4.tmx b/AndorsTrail/res/xml/pwcave4.tmx
index 7cf4791e0..1c0516572 100644
--- a/AndorsTrail/res/xml/pwcave4.tmx
+++ b/AndorsTrail/res/xml/pwcave4.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -159,63 +159,72 @@
  <objectgroup name="Spawn boss" visible="0">
   <object name="iqhan_boss" type="spawn" x="64" y="128" width="384" height="160">
    <properties>
+    <property name="spawngroup" value="iqhan_boss"/>
    </properties>
   </object>
   <object name="iqhan_chb_1" type="spawn" x="96" y="384" width="800" height="256">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="iqhan_chb_1"/>
    </properties>
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="iqhan_chb_1" type="spawn" x="64" y="128" width="384" height="160">
+  <object name="iqhan_chb_1_1" type="spawn" x="64" y="128" width="384" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="iqhan_chb_1"/>
    </properties>
   </object>
   <object name="iqhan_ch_3" type="spawn" x="160" y="288" width="32" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_3"/>
    </properties>
   </object>
-  <object name="iqhan_ch_3" type="spawn" x="256" y="672" width="96" height="32">
+  <object name="iqhan_ch_3_1" type="spawn" x="256" y="672" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_ch_3"/>
    </properties>
   </object>
-  <object name="iqhan_ch_3" type="spawn" x="768" y="672" width="128" height="256">
+  <object name="iqhan_ch_3_2" type="spawn" x="768" y="672" width="128" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_ch_3"/>
    </properties>
   </object>
-  <object name="iqhan_ch_3" type="spawn" x="352" y="672" width="416" height="256">
+  <object name="iqhan_ch_3_3" type="spawn" x="352" y="672" width="416" height="256">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="iqhan_ch_3"/>
    </properties>
   </object>
   <object name="iqhan_ch_2" type="spawn" x="64" y="704" width="288" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_ch_2"/>
    </properties>
   </object>
-  <object name="iqhan_ch_3" type="spawn" x="128" y="416" width="704" height="224">
+  <object name="iqhan_ch_3_4" type="spawn" x="128" y="416" width="704" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_ch_3"/>
    </properties>
   </object>
   <object name="iqhan_ch_1" type="spawn" x="512" y="64" width="416" height="352">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_ch_1"/>
    </properties>
   </object>
   <object name="iqhan_4" type="spawn" x="448" y="192" width="448" height="352">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="iqhan_4"/>
    </properties>
   </object>
   <object name="iqhan_1" type="spawn" x="416" y="576" width="160" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/remgard_prison.tmx b/AndorsTrail/res/xml/remgard_prison.tmx
index dd821867e..1608ad705 100644
--- a/AndorsTrail/res/xml/remgard_prison.tmx
+++ b/AndorsTrail/res/xml/remgard_prison.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="19" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="19" height="10">
   <data encoding="base64" compression="zlib">
@@ -150,10 +150,26 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="janach" type="spawn" x="288" y="96" width="160" height="160"/>
-  <object name="remgard_prison_guard" type="spawn" x="32" y="256" width="32" height="32"/>
-  <object name="remgard_prison_guard" type="spawn" x="512" y="256" width="32" height="32"/>
-  <object name="remgard_prison_guard" type="spawn" x="448" y="96" width="32" height="32"/>
+  <object name="janach" type="spawn" x="288" y="96" width="160" height="160">
+   <properties>
+    <property name="spawngroup" value="janach"/>
+   </properties>
+  </object>
+  <object name="remgard_prison_guard" type="spawn" x="32" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="remgard_prison_guard"/>
+   </properties>
+  </object>
+  <object name="remgard_prison_guard_1" type="spawn" x="512" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="remgard_prison_guard"/>
+   </properties>
+  </object>
+  <object name="remgard_prison_guard_2" type="spawn" x="448" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="remgard_prison_guard"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/remgard_tavern0.tmx b/AndorsTrail/res/xml/remgard_tavern0.tmx
index 6f2595477..6542dee22 100644
--- a/AndorsTrail/res/xml/remgard_tavern0.tmx
+++ b/AndorsTrail/res/xml/remgard_tavern0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,19 +156,41 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="kendelow" type="spawn" x="32" y="416" width="192" height="192"/>
+  <object name="kendelow" type="spawn" x="32" y="416" width="192" height="192">
+   <properties>
+    <property name="spawngroup" value="kendelow"/>
+   </properties>
+  </object>
   <object name="remgard_drunk" type="spawn" x="320" y="448" width="384" height="96">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="remgard_drunk"/>
    </properties>
   </object>
-  <object name="arghes" type="spawn" x="288" y="288" width="32" height="32"/>
-  <object name="krell" type="spawn" x="640" y="256" width="32" height="32"/>
-  <object name="elythom_knight1" type="spawn" x="608" y="288" width="32" height="32"/>
-  <object name="elythom_knight2" type="spawn" x="672" y="256" width="32" height="32"/>
-  <object name="remgard_drunk" type="spawn" x="288" y="96" width="480" height="128">
+  <object name="arghes" type="spawn" x="288" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="arghes"/>
+   </properties>
+  </object>
+  <object name="krell" type="spawn" x="640" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="krell"/>
+   </properties>
+  </object>
+  <object name="elythom_knight1" type="spawn" x="608" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="elythom_knight1"/>
+   </properties>
+  </object>
+  <object name="elythom_knight2" type="spawn" x="672" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="elythom_knight2"/>
+   </properties>
+  </object>
+  <object name="remgard_drunk_1" type="spawn" x="288" y="96" width="480" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="remgard_drunk"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/remgard_tavern1.tmx b/AndorsTrail/res/xml/remgard_tavern1.tmx
index 8b9f5f290..d51b36cad 100644
--- a/AndorsTrail/res/xml/remgard_tavern1.tmx
+++ b/AndorsTrail/res/xml/remgard_tavern1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -151,20 +152,48 @@
   <object name="rest1" type="rest" x="256" y="544" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="jhaeld" type="spawn" x="480" y="128" width="256" height="96"/>
-  <object name="remgard_guard" type="spawn" x="608" y="96" width="32" height="32"/>
-  <object name="maelf" type="spawn" x="64" y="448" width="32" height="32"/>
-  <object name="remgard_guard2" type="spawn" x="64" y="544" width="32" height="32"/>
-  <object name="morgisia" type="spawn" x="544" y="512" width="96" height="64"/>
-  <object name="remgard_guard2" type="spawn" x="128" y="544" width="32" height="32"/>
-  <object name="kaverin" type="spawn" x="320" y="96" width="64" height="96"/>
+  <object name="jhaeld" type="spawn" x="480" y="128" width="256" height="96">
+   <properties>
+    <property name="spawngroup" value="jhaeld"/>
+   </properties>
+  </object>
+  <object name="remgard_guard" type="spawn" x="608" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="remgard_guard"/>
+   </properties>
+  </object>
+  <object name="maelf" type="spawn" x="64" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="maelf"/>
+   </properties>
+  </object>
+  <object name="remgard_guard2" type="spawn" x="64" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="remgard_guard2"/>
+   </properties>
+  </object>
+  <object name="morgisia" type="spawn" x="544" y="512" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="morgisia"/>
+   </properties>
+  </object>
+  <object name="remgard_guard2_1" type="spawn" x="128" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="remgard_guard2"/>
+   </properties>
+  </object>
+  <object name="kaverin" type="spawn" x="320" y="96" width="64" height="96">
+   <properties>
+    <property name="spawngroup" value="kaverin"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys">
   <object name="nondisplay:21" type="key" x="448" y="480" width="32" height="32">
    <properties>
     <property name="phrase" value="remgard_tavern_room"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="nondisplay"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="21"/>
    </properties>
   </object>
diff --git a/AndorsTrail/res/xml/road1.tmx b/AndorsTrail/res/xml/road1.tmx
index 00268a219..40ccd9955 100644
--- a/AndorsTrail/res/xml/road1.tmx
+++ b/AndorsTrail/res/xml/road1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="25" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -179,12 +180,25 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="ff_outsideguard" type="spawn" x="640" y="224" width="32" height="32"/>
-  <object name="forestserpent2" type="spawn" x="128" y="544" width="224" height="224"/>
-  <object name="beetle2" type="spawn" x="544" y="608" width="192" height="128"/>
-  <object name="beetle2" type="spawn" x="64" y="352" width="224" height="352">
+  <object name="ff_outsideguard" type="spawn" x="640" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ff_outsideguard"/>
+   </properties>
+  </object>
+  <object name="forestserpent2" type="spawn" x="128" y="544" width="224" height="224">
+   <properties>
+    <property name="spawngroup" value="forestserpent2"/>
+   </properties>
+  </object>
+  <object name="beetle2" type="spawn" x="544" y="608" width="192" height="128">
+   <properties>
+    <property name="spawngroup" value="beetle2"/>
+   </properties>
+  </object>
+  <object name="beetle2_1" type="spawn" x="64" y="352" width="224" height="352">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="beetle2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/road4.tmx b/AndorsTrail/res/xml/road4.tmx
index e715a4709..b0ad79f9c 100644
--- a/AndorsTrail/res/xml/road4.tmx
+++ b/AndorsTrail/res/xml/road4.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -164,12 +165,36 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="forestboar3" type="spawn" x="640" y="352" width="64" height="64"/>
-  <object name="forestserpent2" type="spawn" x="160" y="320" width="320" height="64"/>
-  <object name="cavesnake2_boss" type="spawn" x="352" y="128" width="32" height="32"/>
-  <object name="shadowgarg1" type="spawn" x="256" y="128" width="32" height="32"/>
-  <object name="beetle2" type="spawn" x="544" y="64" width="192" height="128"/>
-  <object name="shadowgarg1" type="spawn" x="128" y="64" width="32" height="32"/>
+  <object name="forestboar3" type="spawn" x="640" y="352" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="forestboar3"/>
+   </properties>
+  </object>
+  <object name="forestserpent2" type="spawn" x="160" y="320" width="320" height="64">
+   <properties>
+    <property name="spawngroup" value="forestserpent2"/>
+   </properties>
+  </object>
+  <object name="cavesnake2_boss" type="spawn" x="352" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="cavesnake2_boss"/>
+   </properties>
+  </object>
+  <object name="shadowgarg1" type="spawn" x="256" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="shadowgarg1"/>
+   </properties>
+  </object>
+  <object name="beetle2" type="spawn" x="544" y="64" width="192" height="128">
+   <properties>
+    <property name="spawngroup" value="beetle2"/>
+   </properties>
+  </object>
+  <object name="shadowgarg1_1" type="spawn" x="128" y="64" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="shadowgarg1"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/road4_gargoylecave.tmx b/AndorsTrail/res/xml/road4_gargoylecave.tmx
index 1a7d794ce..892b2b505 100644
--- a/AndorsTrail/res/xml/road4_gargoylecave.tmx
+++ b/AndorsTrail/res/xml/road4_gargoylecave.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -158,11 +159,31 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="shadowgarg1" type="spawn" x="256" y="384" width="64" height="32"/>
-  <object name="cavesnake2_boss" type="spawn" x="352" y="320" width="32" height="64"/>
-  <object name="shadowgarg1" type="spawn" x="384" y="192" width="64" height="64"/>
-  <object name="shadowgarg1" type="spawn" x="160" y="256" width="32" height="32"/>
-  <object name="shadowgarg1" type="spawn" x="224" y="192" width="64" height="64"/>
+  <object name="shadowgarg1" type="spawn" x="256" y="384" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="shadowgarg1"/>
+   </properties>
+  </object>
+  <object name="cavesnake2_boss" type="spawn" x="352" y="320" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="cavesnake2_boss"/>
+   </properties>
+  </object>
+  <object name="shadowgarg1_1" type="spawn" x="384" y="192" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="shadowgarg1"/>
+   </properties>
+  </object>
+  <object name="shadowgarg1_2" type="spawn" x="160" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="shadowgarg1"/>
+   </properties>
+  </object>
+  <object name="shadowgarg1_3" type="spawn" x="224" y="192" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="shadowgarg1"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/roadbeforecrossroads.tmx b/AndorsTrail/res/xml/roadbeforecrossroads.tmx
index e880a329c..a4bead1e9 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="21" height="21" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -143,7 +144,7 @@
    eJxzFWBgcB3FwwLjAoPFPHq5k9rhSat4orb9xKjHF07I4qSEJ6H4JCd+SAGUpjtizccmPlQAvvilxExqhwE14hFdLQDtXFtQ
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="0" y="352" width="32" height="224">
    <properties>
     <property name="map" value="crossroads"/>
@@ -168,18 +169,35 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
-  <object name="fox2" type="spawn" x="224" y="384" width="192" height="64"/>
-  <object name="forestserpent1" type="spawn" x="512" y="480" width="96" height="32"/>
-  <object name="forestserpent1" type="spawn" x="64" y="576" width="192" height="64"/>
+ <objectgroup name="Spawn">
+  <object name="fox2" type="spawn" x="224" y="384" width="192" height="64">
+   <properties>
+    <property name="spawngroup" value="fox2"/>
+   </properties>
+  </object>
+  <object name="forestserpent1" type="spawn" x="512" y="480" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="forestserpent1"/>
+   </properties>
+  </object>
+  <object name="forestserpent1_1" type="spawn" x="64" y="576" width="192" height="64">
+   <properties>
+    <property name="spawngroup" value="forestserpent1"/>
+   </properties>
+  </object>
   <object name="forestwolf1" type="spawn" x="288" y="160" width="224" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestwolf1"/>
+   </properties>
+  </object>
+  <object name="wolf_leader" type="spawn" x="320" y="160" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="wolf_leader"/>
    </properties>
   </object>
-  <object name="wolf_leader" type="spawn" x="320" y="160" width="128" height="96"/>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0">
+ <objectgroup name="Keys">
   <object name="pathway_fallhaven:30" type="key" x="352" y="320" width="64" height="32">
    <properties>
     <property name="phrase" value="key_wolf_pack_jakrar"/>
diff --git a/AndorsTrail/res/xml/roadbeforecrossroads2.tmx b/AndorsTrail/res/xml/roadbeforecrossroads2.tmx
index 6a5408185..57bd82ac8 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads2.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -174,40 +175,63 @@
   <object name="forestwolf1" type="spawn" x="288" y="64" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestwolf1"/>
+   </properties>
+  </object>
+  <object name="forestfox2" type="spawn" x="96" y="128" width="192" height="128">
+   <properties>
+    <property name="spawngroup" value="forestfox2"/>
    </properties>
   </object>
-  <object name="forestfox2" type="spawn" x="96" y="128" width="192" height="128"/>
   <object name="fox2" type="spawn" x="384" y="256" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fox2"/>
    </properties>
   </object>
-  <object name="forestwolf1" type="spawn" x="288" y="352" width="128" height="96"/>
-  <object name="fox2" type="spawn" x="256" y="448" width="192" height="288">
+  <object name="forestwolf1_1" type="spawn" x="288" y="352" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="forestwolf1"/>
+   </properties>
+  </object>
+  <object name="fox2_1" type="spawn" x="256" y="448" width="192" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fox2"/>
    </properties>
   </object>
-  <object name="forestserpent1" type="spawn" x="256" y="832" width="64" height="32"/>
-  <object name="forestwolf1" type="spawn" x="64" y="800" width="192" height="128">
+  <object name="forestserpent1" type="spawn" x="256" y="832" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="forestserpent1"/>
+   </properties>
+  </object>
+  <object name="forestwolf1_2" type="spawn" x="64" y="800" width="192" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestwolf1"/>
    </properties>
   </object>
-  <object name="fox2" type="spawn" x="480" y="352" width="160" height="192">
+  <object name="fox2_2" type="spawn" x="480" y="352" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fox2"/>
    </properties>
   </object>
   <object name="forestboar3" type="spawn" x="544" y="704" width="192" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestboar3"/>
    </properties>
   </object>
-  <object name="fox2" type="spawn" x="544" y="160" width="160" height="64"/>
-  <object name="forestfox2" type="spawn" x="32" y="384" width="224" height="160">
+  <object name="fox2_3" type="spawn" x="544" y="160" width="160" height="64">
+   <properties>
+    <property name="spawngroup" value="fox2"/>
+   </properties>
+  </object>
+  <object name="forestfox2_1" type="spawn" x="32" y="384" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfox2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/roadbeforecrossroads4.tmx b/AndorsTrail/res/xml/roadbeforecrossroads4.tmx
index cf169e56c..d7416b4fb 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads4.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads4.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,16 +162,19 @@
   <object name="forestserpent2" type="spawn" x="96" y="192" width="160" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestserpent2"/>
    </properties>
   </object>
   <object name="forestboar3" type="spawn" x="96" y="352" width="192" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestboar3"/>
    </properties>
   </object>
-  <object name="forestserpent2" type="spawn" x="416" y="224" width="160" height="224">
+  <object name="forestserpent2_1" type="spawn" x="416" y="224" width="160" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestserpent2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/roadbeforecrossroads5.tmx b/AndorsTrail/res/xml/roadbeforecrossroads5.tmx
index c3378e52b..eea12b697 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads5.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads5.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="22" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -156,7 +157,7 @@
    eJxjYBgFo2AUjIJRMAqGHwAABuAAAQ==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="288" y="0" width="224" height="32">
    <properties>
     <property name="map" value="roadbeforecrossroads4"/>
@@ -177,22 +178,32 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
+ <objectgroup name="Spawn">
   <object name="forestboar3" type="spawn" x="128" y="288" width="192" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestboar3"/>
    </properties>
   </object>
   <object name="forestserpent2" type="spawn" x="128" y="416" width="192" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestserpent2"/>
+   </properties>
+  </object>
+  <object name="forestserpent2_1" type="spawn" x="512" y="352" width="64" height="96">
+   <properties>
+    <property name="spawngroup" value="forestserpent2"/>
+   </properties>
+  </object>
+  <object name="forestboar2" type="spawn" x="352" y="544" width="64" height="96">
+   <properties>
+    <property name="spawngroup" value="forestboar2"/>
    </properties>
   </object>
-  <object name="forestserpent2" type="spawn" x="512" y="352" width="64" height="96"/>
-  <object name="forestboar2" type="spawn" x="352" y="544" width="64" height="96"/>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
- <objectgroup name="Replace" width="20" height="22">
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace">
   <object name="pathway_fallhaven:50" type="replace" x="0" y="160" width="192" height="160">
    <properties>
     <property name="Above" value="layer_replace"/>
diff --git a/AndorsTrail/res/xml/roadbeforecrossroads6.tmx b/AndorsTrail/res/xml/roadbeforecrossroads6.tmx
index bfd381536..3e131d64e 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads6.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads6.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -169,22 +170,41 @@
   <object name="forestserpent2" type="spawn" x="352" y="256" width="128" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestserpent2"/>
    </properties>
   </object>
   <object name="forestfox2" type="spawn" x="384" y="480" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfox2"/>
    </properties>
   </object>
-  <object name="forestboar3" type="spawn" x="64" y="352" width="160" height="96"/>
-  <object name="fox2" type="spawn" x="96" y="736" width="192" height="128"/>
-  <object name="agthor" type="spawn" x="128" y="128" width="32" height="32"/>
-  <object name="forestfox2" type="spawn" x="416" y="256" width="160" height="128">
+  <object name="forestboar3" type="spawn" x="64" y="352" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="forestboar3"/>
+   </properties>
+  </object>
+  <object name="fox2" type="spawn" x="96" y="736" width="192" height="128">
+   <properties>
+    <property name="spawngroup" value="fox2"/>
+   </properties>
+  </object>
+  <object name="agthor" type="spawn" x="128" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="agthor"/>
+   </properties>
+  </object>
+  <object name="forestfox2_1" type="spawn" x="416" y="256" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfox2"/>
+   </properties>
+  </object>
+  <object name="agthor_guard" type="spawn" x="224" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="agthor_guard"/>
    </properties>
   </object>
-  <object name="agthor_guard" type="spawn" x="224" y="128" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/roadbeforecrossroads7.tmx b/AndorsTrail/res/xml/roadbeforecrossroads7.tmx
index 43cadfad5..5b73a7cc2 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads7.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads7.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,15 +162,25 @@
   <object name="beetle2" type="spawn" x="128" y="96" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="beetle2"/>
    </properties>
   </object>
-  <object name="forestboar3" type="spawn" x="352" y="64" width="128" height="64"/>
-  <object name="beetle2" type="spawn" x="448" y="128" width="160" height="192">
+  <object name="forestboar3" type="spawn" x="352" y="64" width="128" height="64">
+   <properties>
+    <property name="spawngroup" value="forestboar3"/>
+   </properties>
+  </object>
+  <object name="beetle2_1" type="spawn" x="448" y="128" width="160" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="beetle2"/>
+   </properties>
+  </object>
+  <object name="forestboar3_1" type="spawn" x="256" y="416" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="forestboar3"/>
    </properties>
   </object>
-  <object name="forestboar3" type="spawn" x="256" y="416" width="128" height="96"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/roadbeforecrossroads8.tmx b/AndorsTrail/res/xml/roadbeforecrossroads8.tmx
index ce6a422b9..6ee3f0653 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads8.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads8.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="27" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -171,28 +172,40 @@
   <object name="sign_rbfcr8" type="sign" x="448" y="544" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="forestfox2" type="spawn" x="352" y="384" width="64" height="32"/>
-  <object name="forestfox2" type="spawn" x="352" y="448" width="64" height="32">
+  <object name="forestfox2" type="spawn" x="352" y="384" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="forestfox2"/>
+   </properties>
+  </object>
+  <object name="forestfox2_1" type="spawn" x="352" y="448" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfox2"/>
    </properties>
   </object>
   <object name="forestserpent2" type="spawn" x="96" y="640" width="128" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestserpent2"/>
    </properties>
   </object>
   <object name="beetle2" type="spawn" x="320" y="704" width="160" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="beetle2"/>
    </properties>
   </object>
-  <object name="forestserpent2" type="spawn" x="480" y="704" width="96" height="160">
+  <object name="forestserpent2_1" type="spawn" x="480" y="704" width="96" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestserpent2"/>
+   </properties>
+  </object>
+  <object name="redft1" type="spawn" x="352" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="redft1"/>
    </properties>
   </object>
-  <object name="redft1" type="spawn" x="352" y="96" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/roadbeforecrossroads9.tmx b/AndorsTrail/res/xml/roadbeforecrossroads9.tmx
index 295d9df52..aeb4f2242 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads9.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads9.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="24" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -170,26 +171,57 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="forestserpent2" type="spawn" x="256" y="640" width="96" height="64"/>
-  <object name="ccentip" type="spawn" x="288" y="352" width="32" height="32"/>
+  <object name="forestserpent2" type="spawn" x="256" y="640" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="forestserpent2"/>
+   </properties>
+  </object>
+  <object name="ccentip" type="spawn" x="288" y="352" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
   <object name="zombie2" type="spawn" x="416" y="416" width="320" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="zombie2"/>
    </properties>
   </object>
-  <object name="zombie2" type="spawn" x="416" y="352" width="32" height="32"/>
-  <object name="zombie2" type="spawn" x="352" y="160" width="160" height="96"/>
-  <object name="zombie2" type="spawn" x="512" y="96" width="256" height="256">
+  <object name="zombie2_1" type="spawn" x="416" y="352" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="zombie2"/>
+   </properties>
+  </object>
+  <object name="zombie2_2" type="spawn" x="352" y="160" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="zombie2"/>
+   </properties>
+  </object>
+  <object name="zombie2_3" type="spawn" x="512" y="96" width="256" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="zombie2"/>
    </properties>
   </object>
-  <object name="forestserpent2" type="spawn" x="128" y="544" width="128" height="64"/>
-  <object name="redft2" type="spawn" x="160" y="96" width="32" height="32"/>
-  <object name="ccentip" type="spawn" x="160" y="224" width="32" height="32"/>
-  <object name="ccentip" type="spawn" x="128" y="256" width="160" height="160">
+  <object name="forestserpent2_1" type="spawn" x="128" y="544" width="128" height="64">
+   <properties>
+    <property name="spawngroup" value="forestserpent2"/>
+   </properties>
+  </object>
+  <object name="redft2" type="spawn" x="160" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="redft2"/>
+   </properties>
+  </object>
+  <object name="ccentip_1" type="spawn" x="160" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
+  <object name="ccentip_2" type="spawn" x="128" y="256" width="160" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/roadcave0.tmx b/AndorsTrail/res/xml/roadcave0.tmx
index 917db99ca..6766d62ca 100644
--- a/AndorsTrail/res/xml/roadcave0.tmx
+++ b/AndorsTrail/res/xml/roadcave0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,32 +156,49 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="jelly1" type="spawn" x="224" y="512" width="32" height="32"/>
-  <object name="jelly1" type="spawn" x="64" y="224" width="96" height="32">
+  <object name="jelly1" type="spawn" x="224" y="512" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="jelly1"/>
+   </properties>
+  </object>
+  <object name="jelly1_1" type="spawn" x="64" y="224" width="96" height="32">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="jelly1"/>
    </properties>
   </object>
   <object name="jelly2" type="spawn" x="32" y="288" width="128" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="jelly2"/>
    </properties>
   </object>
-  <object name="jelly1" type="spawn" x="288" y="480" width="192" height="128">
+  <object name="jelly1_2" type="spawn" x="288" y="480" width="192" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="jelly1"/>
    </properties>
   </object>
-  <object name="jelly2" type="spawn" x="96" y="480" width="96" height="96"/>
-  <object name="jelly1" type="spawn" x="192" y="128" width="32" height="32"/>
-  <object name="jelly1" type="spawn" x="256" y="96" width="288" height="128">
+  <object name="jelly2_1" type="spawn" x="96" y="480" width="96" height="96">
    <properties>
-    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="jelly2"/>
    </properties>
   </object>
-  <object name="jelly2" type="spawn" x="288" y="192" width="192" height="128">
+  <object name="jelly1_3" type="spawn" x="192" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="jelly1"/>
+   </properties>
+  </object>
+  <object name="jelly1_4" type="spawn" x="256" y="96" width="288" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="jelly1"/>
+   </properties>
+  </object>
+  <object name="jelly2_2" type="spawn" x="288" y="192" width="192" height="128">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="jelly2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/roadcave1.tmx b/AndorsTrail/res/xml/roadcave1.tmx
index 8d56e743a..5a21e17f4 100644
--- a/AndorsTrail/res/xml/roadcave1.tmx
+++ b/AndorsTrail/res/xml/roadcave1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="25" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -149,42 +150,80 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="jelly_b" type="spawn" x="608" y="128" width="160" height="96"/>
+  <object name="jelly_b" type="spawn" x="608" y="128" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="jelly_b"/>
+   </properties>
+  </object>
   <object name="jelly3" type="spawn" x="608" y="288" width="160" height="320">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="jelly3"/>
    </properties>
   </object>
-  <object name="jelly3" type="spawn" x="608" y="640" width="160" height="96"/>
-  <object name="jelly1" type="spawn" x="512" y="672" width="32" height="64"/>
-  <object name="jelly3" type="spawn" x="480" y="544" width="32" height="32"/>
-  <object name="jelly3" type="spawn" x="480" y="224" width="32" height="256">
+  <object name="jelly3_1" type="spawn" x="608" y="640" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="jelly3"/>
+   </properties>
+  </object>
+  <object name="jelly1" type="spawn" x="512" y="672" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="jelly1"/>
+   </properties>
+  </object>
+  <object name="jelly3_2" type="spawn" x="480" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="jelly3"/>
+   </properties>
+  </object>
+  <object name="jelly3_3" type="spawn" x="480" y="224" width="32" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="jelly3"/>
    </properties>
   </object>
   <object name="jelly2" type="spawn" x="256" y="384" width="32" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="jelly2"/>
    </properties>
   </object>
-  <object name="jelly3" type="spawn" x="320" y="96" width="224" height="96">
+  <object name="jelly3_4" type="spawn" x="320" y="96" width="224" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="jelly3"/>
    </properties>
   </object>
-  <object name="jelly3" type="spawn" x="288" y="288" width="32" height="32"/>
-  <object name="jelly2" type="spawn" x="224" y="640" width="32" height="96"/>
-  <object name="jelly3" type="spawn" x="160" y="736" width="32" height="32"/>
-  <object name="jelly2" type="spawn" x="64" y="608" width="64" height="128">
+  <object name="jelly3_5" type="spawn" x="288" y="288" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="jelly3"/>
    </properties>
   </object>
-  <object name="jelly2" type="spawn" x="96" y="448" width="32" height="96"/>
-  <object name="jelly2" type="spawn" x="64" y="224" width="32" height="160">
+  <object name="jelly2_1" type="spawn" x="224" y="640" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="jelly2"/>
+   </properties>
+  </object>
+  <object name="jelly3_6" type="spawn" x="160" y="736" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="jelly3"/>
+   </properties>
+  </object>
+  <object name="jelly2_2" type="spawn" x="64" y="608" width="64" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="jelly2"/>
+   </properties>
+  </object>
+  <object name="jelly2_3" type="spawn" x="96" y="448" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="jelly2"/>
+   </properties>
+  </object>
+  <object name="jelly2_4" type="spawn" x="64" y="224" width="32" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="jelly2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/roadtocarntower2.tmx b/AndorsTrail/res/xml/roadtocarntower2.tmx
index 85ac2f922..58ea1d08f 100644
--- a/AndorsTrail/res/xml/roadtocarntower2.tmx
+++ b/AndorsTrail/res/xml/roadtocarntower2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="26" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -176,16 +177,37 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn uniques" visible="0">
-  <object name="fieldwasp_unique" type="spawn" x="544" y="64" width="352" height="384"/>
-  <object name="rogorn" type="spawn" x="160" y="608" width="32" height="32"/>
-  <object name="rogorn_henchman" type="spawn" x="160" y="640" width="32" height="32"/>
-  <object name="rogorn_henchman" type="spawn" x="128" y="640" width="32" height="32"/>
-  <object name="rivertroll" type="spawn" x="384" y="480" width="32" height="32"/>
+  <object name="fieldwasp_unique" type="spawn" x="544" y="64" width="352" height="384">
+   <properties>
+    <property name="spawngroup" value="fieldwasp_unique"/>
+   </properties>
+  </object>
+  <object name="rogorn" type="spawn" x="160" y="608" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="rogorn"/>
+   </properties>
+  </object>
+  <object name="rogorn_henchman" type="spawn" x="160" y="640" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="rogorn_henchman"/>
+   </properties>
+  </object>
+  <object name="rogorn_henchman_1" type="spawn" x="128" y="640" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="rogorn_henchman"/>
+   </properties>
+  </object>
+  <object name="rivertroll" type="spawn" x="384" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="rivertroll"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn monsters" visible="0">
   <object name="fieldwasp_2" type="spawn" x="544" y="64" width="352" height="384">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fieldwasp_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/shortcut_lodar0.tmx b/AndorsTrail/res/xml/shortcut_lodar0.tmx
index dd2f56047..b7dc1f117 100644
--- a/AndorsTrail/res/xml/shortcut_lodar0.tmx
+++ b/AndorsTrail/res/xml/shortcut_lodar0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -233,26 +234,49 @@
   <object name="sign_lodar_shortcut_2" type="sign" x="352" y="256" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="mudfiend" type="spawn" x="64" y="480" width="64" height="64"/>
-  <object name="hirathil2" type="spawn" x="672" y="256" width="224" height="288"/>
+  <object name="mudfiend" type="spawn" x="64" y="480" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="mudfiend"/>
+   </properties>
+  </object>
+  <object name="hirathil2" type="spawn" x="672" y="256" width="224" height="288">
+   <properties>
+    <property name="spawngroup" value="hirathil2"/>
+   </properties>
+  </object>
   <object name="hirathil1" type="spawn" x="672" y="256" width="224" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil0" type="spawn" x="672" y="256" width="224" height="288">
+   <properties>
+    <property name="spawngroup" value="hirathil0"/>
    </properties>
   </object>
-  <object name="hirathil0" type="spawn" x="672" y="256" width="224" height="288"/>
   <object name="cavebat2" type="spawn" x="320" y="416" width="224" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavebat2"/>
    </properties>
   </object>
-  <object name="hirathil1" type="spawn" x="416" y="256" width="160" height="320"/>
-  <object name="hirathil0" type="spawn" x="416" y="256" width="160" height="320">
+  <object name="hirathil1_1" type="spawn" x="416" y="256" width="160" height="320">
+   <properties>
+    <property name="spawngroup" value="hirathil1"/>
+   </properties>
+  </object>
+  <object name="hirathil0_1" type="spawn" x="416" y="256" width="160" height="320">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="hirathil0"/>
+   </properties>
+  </object>
+  <object name="cavebat2_1" type="spawn" x="544" y="320" width="256" height="192">
+   <properties>
+    <property name="spawngroup" value="cavebat2"/>
    </properties>
   </object>
-  <object name="cavebat2" type="spawn" x="544" y="320" width="256" height="192"/>
  </objectgroup>
  <objectgroup name="Keys">
   <object name="lodar2:50" type="key" x="576" y="192" width="64" height="64">
diff --git a/AndorsTrail/res/xml/shortcut_lodar1.tmx b/AndorsTrail/res/xml/shortcut_lodar1.tmx
index e9c921ff5..b3087e538 100644
--- a/AndorsTrail/res/xml/shortcut_lodar1.tmx
+++ b/AndorsTrail/res/xml/shortcut_lodar1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="23" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -232,36 +233,43 @@
   <object name="cavebat2" type="spawn" x="64" y="320" width="160" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavebat2"/>
    </properties>
   </object>
   <object name="cavebat1" type="spawn" x="192" y="256" width="320" height="128">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
   <object name="caveburr2" type="spawn" x="448" y="384" width="224" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr2"/>
    </properties>
   </object>
   <object name="caveburr1" type="spawn" x="448" y="384" width="224" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
   <object name="mudfiend" type="spawn" x="608" y="256" width="32" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
-  <object name="cavebat2" type="spawn" x="544" y="128" width="256" height="288">
+  <object name="cavebat2_1" type="spawn" x="544" y="128" width="256" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat2"/>
    </properties>
   </object>
-  <object name="caveburr2" type="spawn" x="544" y="128" width="320" height="128">
+  <object name="caveburr2_1" type="spawn" x="544" y="128" width="320" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/shortcut_lodar2.tmx b/AndorsTrail/res/xml/shortcut_lodar2.tmx
index d4cd5d623..d7e8a67fc 100644
--- a/AndorsTrail/res/xml/shortcut_lodar2.tmx
+++ b/AndorsTrail/res/xml/shortcut_lodar2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -236,30 +237,62 @@
   <object name="cavebat1" type="spawn" x="128" y="192" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
   <object name="caveburr1" type="spawn" x="64" y="224" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr1"/>
    </properties>
   </object>
   <object name="caveburr2" type="spawn" x="384" y="128" width="256" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr2"/>
    </properties>
   </object>
-  <object name="caveburr1" type="spawn" x="384" y="128" width="256" height="224"/>
-  <object name="cavebat2" type="spawn" x="384" y="128" width="256" height="224"/>
-  <object name="mudfiend" type="spawn" x="640" y="192" width="96" height="64"/>
-  <object name="cavebat1" type="spawn" x="640" y="192" width="96" height="64"/>
-  <object name="caveburr1" type="spawn" x="768" y="256" width="32" height="32"/>
-  <object name="cavebat2" type="spawn" x="736" y="128" width="160" height="288"/>
-  <object name="caveburr2" type="spawn" x="736" y="128" width="160" height="288">
+  <object name="caveburr1_1" type="spawn" x="384" y="128" width="256" height="224">
+   <properties>
+    <property name="spawngroup" value="caveburr1"/>
+   </properties>
+  </object>
+  <object name="cavebat2" type="spawn" x="384" y="128" width="256" height="224">
+   <properties>
+    <property name="spawngroup" value="cavebat2"/>
+   </properties>
+  </object>
+  <object name="mudfiend" type="spawn" x="640" y="192" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="mudfiend"/>
+   </properties>
+  </object>
+  <object name="cavebat1_1" type="spawn" x="640" y="192" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="cavebat1"/>
+   </properties>
+  </object>
+  <object name="caveburr1_2" type="spawn" x="768" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="caveburr1"/>
+   </properties>
+  </object>
+  <object name="cavebat2_1" type="spawn" x="736" y="128" width="160" height="288">
+   <properties>
+    <property name="spawngroup" value="cavebat2"/>
+   </properties>
+  </object>
+  <object name="caveburr2_1" type="spawn" x="736" y="128" width="160" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="caveburr2"/>
+   </properties>
+  </object>
+  <object name="cavebat1_2" type="spawn" x="576" y="352" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
-  <object name="cavebat1" type="spawn" x="576" y="352" width="64" height="64"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
  <objectgroup name="Replace" visible="0">
diff --git a/AndorsTrail/res/xml/shortcut_lodar3.tmx b/AndorsTrail/res/xml/shortcut_lodar3.tmx
index 5e4d0f10f..766578301 100644
--- a/AndorsTrail/res/xml/shortcut_lodar3.tmx
+++ b/AndorsTrail/res/xml/shortcut_lodar3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="18" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -220,28 +221,59 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="cavebat2" type="spawn" x="384" y="192" width="224" height="160"/>
+  <object name="cavebat2" type="spawn" x="384" y="192" width="224" height="160">
+   <properties>
+    <property name="spawngroup" value="cavebat2"/>
+   </properties>
+  </object>
   <object name="cavebat1" type="spawn" x="352" y="192" width="256" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
-  <object name="caveburr2" type="spawn" x="416" y="352" width="32" height="96"/>
-  <object name="cavebat2" type="spawn" x="288" y="256" width="32" height="32"/>
-  <object name="caveburr2" type="spawn" x="320" y="416" width="192" height="128"/>
-  <object name="cavebat1" type="spawn" x="288" y="416" width="224" height="128">
+  <object name="caveburr2" type="spawn" x="416" y="352" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="caveburr2"/>
+   </properties>
+  </object>
+  <object name="cavebat2_1" type="spawn" x="288" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="cavebat2"/>
+   </properties>
+  </object>
+  <object name="caveburr2_1" type="spawn" x="320" y="416" width="192" height="128">
+   <properties>
+    <property name="spawngroup" value="caveburr2"/>
+   </properties>
+  </object>
+  <object name="cavebat1_1" type="spawn" x="288" y="416" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
    </properties>
   </object>
   <object name="caveburr1" type="spawn" x="544" y="416" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="caveburr1"/>
+   </properties>
+  </object>
+  <object name="mudfiend" type="spawn" x="672" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="mudfiend"/>
+   </properties>
+  </object>
+  <object name="cavebat2_2" type="spawn" x="704" y="320" width="160" height="160">
+   <properties>
+    <property name="spawngroup" value="cavebat2"/>
+   </properties>
+  </object>
+  <object name="caveburr2_2" type="spawn" x="800" y="192" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="caveburr2"/>
    </properties>
   </object>
-  <object name="mudfiend" type="spawn" x="672" y="384" width="32" height="32"/>
-  <object name="cavebat2" type="spawn" x="704" y="320" width="160" height="160"/>
-  <object name="caveburr2" type="spawn" x="800" y="192" width="96" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
  <objectgroup name="Replace">
diff --git a/AndorsTrail/res/xml/shortcut_lodar4.tmx b/AndorsTrail/res/xml/shortcut_lodar4.tmx
index 3cd62ea72..f0601b202 100644
--- a/AndorsTrail/res/xml/shortcut_lodar4.tmx
+++ b/AndorsTrail/res/xml/shortcut_lodar4.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="24" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -240,20 +241,31 @@
   <object name="mudfiend" type="spawn" x="128" y="384" width="64" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
-  <object name="cavebat1" type="spawn" x="96" y="576" width="128" height="96"/>
-  <object name="mudfiend" type="spawn" x="448" y="544" width="128" height="160">
+  <object name="cavebat1" type="spawn" x="96" y="576" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="cavebat1"/>
+   </properties>
+  </object>
+  <object name="mudfiend_1" type="spawn" x="448" y="544" width="128" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
-  <object name="cavebat1" type="spawn" x="416" y="320" width="128" height="192">
+  <object name="cavebat1_1" type="spawn" x="416" y="320" width="128" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavebat1"/>
+   </properties>
+  </object>
+  <object name="mudfiend_2" type="spawn" x="192" y="64" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="mudfiend"/>
    </properties>
   </object>
-  <object name="mudfiend" type="spawn" x="192" y="64" width="96" height="64"/>
  </objectgroup>
  <objectgroup name="Keys">
   <object name="lodar2:50" type="key" x="64" y="224" width="160" height="160">
diff --git a/AndorsTrail/res/xml/snakecave1.tmx b/AndorsTrail/res/xml/snakecave1.tmx
index 0dad6db1f..b0ce40fc6 100644
--- a/AndorsTrail/res/xml/snakecave1.tmx
+++ b/AndorsTrail/res/xml/snakecave1.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -159,26 +159,29 @@
   <object name="cavesnake1" type="spawn" x="288" y="384" width="288" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavesnake1"/>
    </properties>
   </object>
-  <object name="cavesnake1" type="spawn" x="32" y="128" width="160" height="160">
+  <object name="cavesnake1_1" type="spawn" x="32" y="128" width="160" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavesnake1"/>
    </properties>
   </object>
-  <object name="cavesnake1" type="spawn" x="416" y="192" width="32" height="128">
+  <object name="cavesnake1_2" type="spawn" x="416" y="192" width="32" height="128">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="cavesnake1"/>
    </properties>
   </object>
-  <object name="cavesnake1" type="spawn" x="224" y="256" width="32" height="96">
+  <object name="cavesnake1_3" type="spawn" x="224" y="256" width="32" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="cavesnake1"/>
    </properties>
   </object>
-  <object name="cavesnake1" type="spawn" x="64" y="384" width="160" height="128">
+  <object name="cavesnake1_4" type="spawn" x="64" y="384" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavesnake1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/snakecave2.tmx b/AndorsTrail/res/xml/snakecave2.tmx
index 17eae6a91..5df3e4b8e 100644
--- a/AndorsTrail/res/xml/snakecave2.tmx
+++ b/AndorsTrail/res/xml/snakecave2.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -159,29 +159,37 @@
   <object name="cavesnake2" type="spawn" x="32" y="96" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavesnake2"/>
    </properties>
   </object>
-  <object name="cavesnake2" type="spawn" x="224" y="96" width="160" height="32">
+  <object name="cavesnake2_1" type="spawn" x="224" y="96" width="160" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="cavesnake2"/>
    </properties>
   </object>
-  <object name="cavesnake2" type="spawn" x="384" y="96" width="224" height="128">
+  <object name="cavesnake2_2" type="spawn" x="384" y="96" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavesnake2"/>
    </properties>
   </object>
   <object name="cavesnake1" type="spawn" x="416" y="352" width="160" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavesnake1"/>
    </properties>
   </object>
-  <object name="cavesnake2" type="spawn" x="192" y="288" width="192" height="192">
+  <object name="cavesnake2_3" type="spawn" x="192" y="288" width="192" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavesnake2"/>
+   </properties>
+  </object>
+  <object name="cavesnake2_boss" type="spawn" x="320" y="192" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="cavesnake2_boss"/>
    </properties>
   </object>
-  <object name="cavesnake2_boss" type="spawn" x="320" y="192" width="128" height="128"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/snakecave3.tmx b/AndorsTrail/res/xml/snakecave3.tmx
index 9ef64f755..0dc02a92a 100644
--- a/AndorsTrail/res/xml/snakecave3.tmx
+++ b/AndorsTrail/res/xml/snakecave3.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="15" height="30">
   <data encoding="base64" compression="zlib">
@@ -154,35 +154,40 @@
   <object name="cavesnake2" type="spawn" x="288" y="640" width="160" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavesnake2"/>
    </properties>
   </object>
   <object name="cavesnake2_boss" type="spawn" x="352" y="416" width="96" height="224">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="cavesnake2_boss"/>
    </properties>
   </object>
   <object name="cavesnake3" type="spawn" x="288" y="256" width="160" height="128">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="cavesnake3"/>
    </properties>
   </object>
-  <object name="cavesnake3" type="spawn" x="160" y="416" width="160" height="320">
+  <object name="cavesnake3_1" type="spawn" x="160" y="416" width="160" height="320">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavesnake3"/>
    </properties>
   </object>
-  <object name="cavesnake3" type="spawn" x="32" y="384" width="128" height="448">
+  <object name="cavesnake3_2" type="spawn" x="32" y="384" width="128" height="448">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="cavesnake3"/>
    </properties>
   </object>
   <object name="cavesnake3_boss" type="spawn" x="32" y="64" width="416" height="128">
    <properties>
+    <property name="spawngroup" value="cavesnake3_boss"/>
    </properties>
   </object>
-  <object name="cavesnake3" type="spawn" x="96" y="96" width="192" height="192">
+  <object name="cavesnake3_3" type="spawn" x="96" y="96" width="192" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="cavesnake3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/stoutford_church.tmx b/AndorsTrail/res/xml/stoutford_church.tmx
index 31b37638d..fad24ee2d 100644
--- a/AndorsTrail/res/xml/stoutford_church.tmx
+++ b/AndorsTrail/res/xml/stoutford_church.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="19" height="14" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -140,7 +141,7 @@
    eJxzFWBgcB3hGARIlYMBdHWEADYzqW0WIT66GeToxWUWKWaTAgjpJRQ/5PqJXHfhSjukuosa4UVsHsCnDwAyfzYg
   </data>
  </layer>
- <objectgroup name="Mapevents" width="19" height="14">
+ <objectgroup name="Mapevents">
   <object name="entrance" type="mapchange" x="352" y="416" width="64" height="32">
    <properties>
     <property name="map" value="stoutford_gate"/>
@@ -148,11 +149,27 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="19" height="14">
-  <object name="stoutford_priest" type="spawn" x="352" y="128" width="64" height="64"/>
-  <object name="stoutford_worshipper" type="spawn" x="224" y="224" width="160" height="192"/>
-  <object name="stoutford_worshiper" type="spawn" x="384" y="224" width="160" height="192"/>
-  <object name="stoutford_acolyte" type="spawn" x="64" y="320" width="64" height="64"/>
+ <objectgroup name="Spawn">
+  <object name="tahalendor" type="spawn" x="352" y="128" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="tahalendor"/>
+   </properties>
+  </object>
+  <object name="stoutford_worshiper" type="spawn" x="224" y="224" width="160" height="192">
+   <properties>
+    <property name="spawngroup" value="stoutford_worshiper"/>
+   </properties>
+  </object>
+  <object name="stoutford_worshiper_1" type="spawn" x="384" y="224" width="160" height="192">
+   <properties>
+    <property name="spawngroup" value="stoutford_worshiper"/>
+   </properties>
+  </object>
+  <object name="yolgen" type="spawn" x="64" y="320" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="yolgen"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="19" height="14"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/stoutford_sw.tmx b/AndorsTrail/res/xml/stoutford_sw.tmx
index 28ac28415..197b552e0 100644
--- a/AndorsTrail/res/xml/stoutford_sw.tmx
+++ b/AndorsTrail/res/xml/stoutford_sw.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="24" height="18" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -158,7 +159,7 @@
    eJy1k8ENwCAMAxmhS7H/SlV/eTT2OS2ReICSi2NgX2ttuJ6guZN1kl9jUkfZaQ9V4+LrHKQvvSvF+pNfzxXD+fPGoszOS6rfeVJz1F4FfaeE02lRnjvNTlOqP/2bpJa+Mzdr0kv1dnMojYk/HXMyF81VXMW/Ab0wVas=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="24" height="18">
+ <objectgroup name="Mapevents">
   <object name="east" type="mapchange" x="736" y="320" width="32" height="32">
    <properties>
     <property name="map" value="stoutford_se"/>
@@ -184,14 +185,23 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="24" height="18">
+ <objectgroup name="Spawn">
   <object name="venomfang_1" type="spawn" x="0" y="320" width="320" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="venomfang_1"/>
+   </properties>
+  </object>
+  <object name="goat_1" type="spawn" x="0" y="96" width="192" height="320">
+   <properties>
+    <property name="spawngroup" value="goat_1"/>
+   </properties>
+  </object>
+  <object name="goat_1_1" type="spawn" x="320" y="448" width="256" height="128">
+   <properties>
+    <property name="spawngroup" value="goat_1"/>
    </properties>
   </object>
-  <object name="goat_1" type="spawn" x="0" y="96" width="192" height="320"/>
-  <object name="goat_1" type="spawn" x="320" y="448" width="256" height="128"/>
  </objectgroup>
- <objectgroup name="Keys" width="24" height="18"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/vilegard_chapel.tmx b/AndorsTrail/res/xml/vilegard_chapel.tmx
index a503eb6db..f670e861b 100644
--- a/AndorsTrail/res/xml/vilegard_chapel.tmx
+++ b/AndorsTrail/res/xml/vilegard_chapel.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="18" height="14" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="18" height="14">
   <data encoding="base64" compression="zlib">
@@ -150,9 +150,21 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="jolnor" type="spawn" x="192" y="128" width="32" height="32"/>
-  <object name="chapelgoer" type="spawn" x="32" y="224" width="160" height="192"/>
-  <object name="chapelgoer" type="spawn" x="224" y="224" width="160" height="192"/>
+  <object name="jolnor" type="spawn" x="192" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="jolnor"/>
+   </properties>
+  </object>
+  <object name="chapelgoer" type="spawn" x="32" y="224" width="160" height="192">
+   <properties>
+    <property name="spawngroup" value="chapelgoer"/>
+   </properties>
+  </object>
+  <object name="chapelgoer_1" type="spawn" x="224" y="224" width="160" height="192">
+   <properties>
+    <property name="spawngroup" value="chapelgoer"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/waterway0.tmx b/AndorsTrail/res/xml/waterway0.tmx
index 8cff13ab4..fcdb8952c 100644
--- a/AndorsTrail/res/xml/waterway0.tmx
+++ b/AndorsTrail/res/xml/waterway0.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -162,31 +162,32 @@
   <object name="frog_3" type="spawn" x="64" y="608" width="288" height="320">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="frog_3"/>
    </properties>
   </object>
   <object name="izthiel_1" type="spawn" x="288" y="576" width="160" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_1"/>
    </properties>
   </object>
-  <object name="izthiel_1" type="spawn" x="448" y="640" width="32" height="32">
+  <object name="izthiel_1_1" type="spawn" x="448" y="640" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_1"/>
    </properties>
   </object>
-  <object name="izthiel_1" type="spawn" x="736" y="544" width="32" height="32">
+  <object name="izthiel_1_2" type="spawn" x="736" y="544" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_1"/>
    </properties>
   </object>
   <object name="izthiel_2" type="spawn" x="736" y="416" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object name="izthiel_1" type="spawn" x="736" y="160" width="160" height="224">
+  <object name="izthiel_1_3" type="spawn" x="736" y="160" width="160" height="224">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway1.tmx b/AndorsTrail/res/xml/waterway1.tmx
index 87f1ef954..6ec71be30 100644
--- a/AndorsTrail/res/xml/waterway1.tmx
+++ b/AndorsTrail/res/xml/waterway1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -168,46 +169,50 @@
   <object name="frog_3" type="spawn" x="64" y="768" width="352" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="frog_3"/>
    </properties>
   </object>
   <object name="izthiel_1" type="spawn" x="352" y="768" width="384" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_1"/>
    </properties>
   </object>
   <object name="izthiel_2" type="spawn" x="480" y="736" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object name="izthiel_2" type="spawn" x="352" y="576" width="320" height="128">
+  <object name="izthiel_2_1" type="spawn" x="352" y="576" width="320" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object name="izthiel_2" type="spawn" x="576" y="448" width="32" height="64">
+  <object name="izthiel_2_2" type="spawn" x="576" y="448" width="32" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
   <object name="izthiel_3" type="spawn" x="576" y="288" width="32" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="736" y="192" width="32" height="32">
+  <object name="izthiel_3_1" type="spawn" x="736" y="192" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
   <object name="izthiel_4" type="spawn" x="384" y="256" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_4"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="96" y="96" width="224" height="320">
+  <object name="izthiel_3_2" type="spawn" x="96" y="96" width="224" height="320">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway10.tmx b/AndorsTrail/res/xml/waterway10.tmx
index 8441d5e27..9bbc73d79 100644
--- a/AndorsTrail/res/xml/waterway10.tmx
+++ b/AndorsTrail/res/xml/waterway10.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="18" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -160,25 +161,30 @@
  <objectgroup name="Spawn" visible="0">
   <object name="izthiel_2" type="spawn" x="544" y="96" width="160" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object name="izthiel_2" type="spawn" x="736" y="160" width="32" height="32">
+  <object name="izthiel_2_1" type="spawn" x="736" y="160" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
   <object name="izthiel_1" type="spawn" x="384" y="192" width="320" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_1"/>
    </properties>
   </object>
   <object name="erumen_3" type="spawn" x="128" y="288" width="704" height="288">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="erumen_3"/>
+   </properties>
+  </object>
+  <object name="izthiel_cr" type="spawn" x="320" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="izthiel_cr"/>
    </properties>
   </object>
-  <object name="izthiel_cr" type="spawn" x="320" y="192" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/waterway11.tmx b/AndorsTrail/res/xml/waterway11.tmx
index 419617010..1f7e785a9 100644
--- a/AndorsTrail/res/xml/waterway11.tmx
+++ b/AndorsTrail/res/xml/waterway11.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -167,37 +168,39 @@
  <objectgroup name="Spawn">
   <object name="erumen_4" type="spawn" x="96" y="320" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_4"/>
    </properties>
   </object>
-  <object name="erumen_4" type="spawn" x="96" y="672" width="64" height="32">
+  <object name="erumen_4_1" type="spawn" x="96" y="672" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_4"/>
    </properties>
   </object>
   <object name="erumen_1" type="spawn" x="384" y="352" width="416" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
   <object name="izthiel_2" type="spawn" x="224" y="256" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object name="izthiel_2" type="spawn" x="224" y="384" width="32" height="32">
+  <object name="izthiel_2_1" type="spawn" x="224" y="384" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
   <object name="izthiel_1" type="spawn" x="288" y="448" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_1"/>
    </properties>
   </object>
   <object name="erumen_2" type="spawn" x="256" y="672" width="192" height="32">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway11_east.tmx b/AndorsTrail/res/xml/waterway11_east.tmx
index 3e4352b6e..94335ac2e 100644
--- a/AndorsTrail/res/xml/waterway11_east.tmx
+++ b/AndorsTrail/res/xml/waterway11_east.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="25" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,32 +162,34 @@
  <objectgroup name="Spawn" visible="0">
   <object name="erumen_4" type="spawn" x="128" y="320" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_4"/>
    </properties>
   </object>
-  <object name="erumen_4" type="spawn" x="768" y="64" width="32" height="32">
+  <object name="erumen_4_1" type="spawn" x="768" y="64" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_4"/>
    </properties>
   </object>
   <object name="erumen_1" type="spawn" x="128" y="64" width="608" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
   <object name="irdegh_1" type="spawn" x="448" y="416" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_1"/>
    </properties>
   </object>
   <object name="irdegh_spawn" type="spawn" x="96" y="512" width="800" height="224">
    <properties>
     <property name="quantity" value="7"/>
+    <property name="spawngroup" value="irdegh_spawn"/>
    </properties>
   </object>
-  <object name="irdegh_1" type="spawn" x="640" y="448" width="224" height="160">
+  <object name="irdegh_1_1" type="spawn" x="640" y="448" width="224" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway12.tmx b/AndorsTrail/res/xml/waterway12.tmx
index 97a94747f..9c2ea5ddb 100644
--- a/AndorsTrail/res/xml/waterway12.tmx
+++ b/AndorsTrail/res/xml/waterway12.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -160,32 +161,36 @@
  <objectgroup name="Spawn" visible="0">
   <object name="izthiel_2" type="spawn" x="64" y="320" width="256" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
   <object name="izthiel_3" type="spawn" x="512" y="288" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object name="izthiel_2" type="spawn" x="576" y="256" width="320" height="160">
+  <object name="izthiel_2_1" type="spawn" x="576" y="256" width="320" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
   <object name="erumen_2" type="spawn" x="64" y="448" width="352" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
   <object name="erumen_1" type="spawn" x="64" y="608" width="288" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
-  <object name="erumen_1" type="spawn" x="672" y="416" width="224" height="256">
+  <object name="erumen_1_1" type="spawn" x="672" y="416" width="224" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway14.tmx b/AndorsTrail/res/xml/waterway14.tmx
index 13c284109..7de36ad72 100644
--- a/AndorsTrail/res/xml/waterway14.tmx
+++ b/AndorsTrail/res/xml/waterway14.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -168,21 +169,25 @@
   <object name="burrower_1" type="spawn" x="352" y="640" width="576" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="burrower_1"/>
    </properties>
   </object>
   <object name="burrower_2" type="spawn" x="544" y="160" width="352" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="burrower_2"/>
    </properties>
   </object>
-  <object name="burrower_1" type="spawn" x="288" y="192" width="288" height="448">
+  <object name="burrower_1_1" type="spawn" x="288" y="192" width="288" height="448">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="burrower_1"/>
    </properties>
   </object>
   <object name="frog_3" type="spawn" x="64" y="224" width="352" height="672">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="frog_3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway15.tmx b/AndorsTrail/res/xml/waterway15.tmx
index 06c439877..afb17f7c4 100644
--- a/AndorsTrail/res/xml/waterway15.tmx
+++ b/AndorsTrail/res/xml/waterway15.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="22" height="30">
   <data encoding="base64" compression="zlib">
@@ -174,21 +174,25 @@
   <object name="burrower_1" type="spawn" x="64" y="64" width="320" height="832">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="burrower_1"/>
    </properties>
   </object>
-  <object name="burrower_1" type="spawn" x="384" y="64" width="288" height="608">
+  <object name="burrower_1_1" type="spawn" x="384" y="64" width="288" height="608">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="burrower_1"/>
    </properties>
   </object>
   <object name="frog_3" type="spawn" x="64" y="64" width="640" height="576">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="frog_3"/>
    </properties>
   </object>
   <object name="burrower_2" type="spawn" x="384" y="672" width="256" height="224">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="burrower_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway3.tmx b/AndorsTrail/res/xml/waterway3.tmx
index a7f714039..092cd0b6c 100644
--- a/AndorsTrail/res/xml/waterway3.tmx
+++ b/AndorsTrail/res/xml/waterway3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -168,26 +169,28 @@
   <object name="izthiel_3" type="spawn" x="32" y="416" width="160" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="256" y="576" width="64" height="32">
+  <object name="izthiel_3_1" type="spawn" x="256" y="576" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="544" y="576" width="64" height="32">
+  <object name="izthiel_3_2" type="spawn" x="544" y="576" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
   <object name="iqhan_1" type="spawn" x="128" y="160" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="iqhan_1"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="672" y="448" width="256" height="192">
+  <object name="izthiel_3_3" type="spawn" x="672" y="448" width="256" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
  </objectgroup>
@@ -195,6 +198,7 @@
   <object name="frog_3" type="spawn" x="256" y="96" width="640" height="544">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="frog_3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway4.tmx b/AndorsTrail/res/xml/waterway4.tmx
index 66a7a776c..5348d3400 100644
--- a/AndorsTrail/res/xml/waterway4.tmx
+++ b/AndorsTrail/res/xml/waterway4.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -167,26 +168,31 @@
   <object name="frog_3" type="spawn" x="64" y="64" width="832" height="320">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="frog_3"/>
    </properties>
   </object>
   <object name="izthiel_3" type="spawn" x="96" y="96" width="640" height="320">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
   <object name="izthiel_4" type="spawn" x="256" y="320" width="256" height="416">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_4"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="416" y="544" width="192" height="352">
+  <object name="izthiel_3_1" type="spawn" x="416" y="544" width="192" height="352">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object name="frog_3" type="spawn" x="512" y="128" width="384" height="768">
+  <object name="frog_3_1" type="spawn" x="512" y="128" width="384" height="768">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="frog_3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway5.tmx b/AndorsTrail/res/xml/waterway5.tmx
index 697a861c5..fbe5c0a0f 100644
--- a/AndorsTrail/res/xml/waterway5.tmx
+++ b/AndorsTrail/res/xml/waterway5.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -173,25 +174,37 @@
   <object name="izthiel_3" type="spawn" x="320" y="64" width="192" height="352">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
   <object name="frog_3" type="spawn" x="480" y="64" width="416" height="608">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="frog_3"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="640" y="480" width="256" height="416">
+  <object name="izthiel_3_1" type="spawn" x="640" y="480" width="256" height="416">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
   <object name="izthiel_4" type="spawn" x="288" y="672" width="288" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_4"/>
+   </properties>
+  </object>
+  <object name="gylew" type="spawn" x="96" y="704" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="gylew"/>
+   </properties>
+  </object>
+  <object name="gylew_henchman" type="spawn" x="64" y="800" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="gylew_henchman"/>
    </properties>
   </object>
-  <object name="gylew" type="spawn" x="96" y="704" width="32" height="32"/>
-  <object name="gylew_henchman" type="spawn" x="64" y="800" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/waterway6.tmx b/AndorsTrail/res/xml/waterway6.tmx
index f107d9e45..99ee6589a 100644
--- a/AndorsTrail/res/xml/waterway6.tmx
+++ b/AndorsTrail/res/xml/waterway6.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -174,36 +175,43 @@
   <object name="izthiel_4" type="spawn" x="544" y="224" width="32" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_4"/>
    </properties>
   </object>
   <object name="izthiel_3" type="spawn" x="352" y="64" width="352" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
   <object name="burrower_2" type="spawn" x="640" y="64" width="288" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="burrower_2"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="32" y="288" width="320" height="224">
+  <object name="izthiel_3_1" type="spawn" x="32" y="288" width="320" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
   <object name="izthiel_2" type="spawn" x="224" y="448" width="320" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object name="izthiel_2" type="spawn" x="576" y="448" width="320" height="160">
+  <object name="izthiel_2_1" type="spawn" x="576" y="448" width="320" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
   <object name="erumen_1" type="spawn" x="160" y="640" width="736" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway7.tmx b/AndorsTrail/res/xml/waterway7.tmx
index 759fa2a59..2c7cc0f62 100644
--- a/AndorsTrail/res/xml/waterway7.tmx
+++ b/AndorsTrail/res/xml/waterway7.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -162,26 +162,28 @@
   <object name="erumen_1" type="spawn" x="64" y="480" width="384" height="448">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
-  <object name="erumen_1" type="spawn" x="608" y="416" width="288" height="512">
+  <object name="erumen_1_1" type="spawn" x="608" y="416" width="288" height="512">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
   <object name="izthiel_3" type="spawn" x="480" y="480" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="160" y="416" width="256" height="160">
+  <object name="izthiel_3_1" type="spawn" x="160" y="416" width="256" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
   <object name="izthiel_2" type="spawn" x="640" y="384" width="256" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway8.tmx b/AndorsTrail/res/xml/waterway8.tmx
index 899e131b2..9cdcfafe2 100644
--- a/AndorsTrail/res/xml/waterway8.tmx
+++ b/AndorsTrail/res/xml/waterway8.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -167,41 +168,43 @@
   <object name="erumen_2" type="spawn" x="64" y="416" width="288" height="512">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
   <object name="erumen_3" type="spawn" x="256" y="544" width="672" height="384">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="erumen_3"/>
    </properties>
   </object>
   <object name="izthiel_3" type="spawn" x="544" y="384" width="32" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
   <object name="izthiel_4" type="spawn" x="608" y="320" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_4"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="128" y="384" width="384" height="128">
+  <object name="izthiel_3_1" type="spawn" x="128" y="384" width="384" height="128">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="608" y="480" width="320" height="160">
+  <object name="izthiel_3_2" type="spawn" x="608" y="480" width="320" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="736" y="320" width="64" height="32">
+  <object name="izthiel_3_3" type="spawn" x="736" y="320" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object name="izthiel_4" type="spawn" x="704" y="192" width="32" height="96">
+  <object name="izthiel_4_1" type="spawn" x="704" y="192" width="32" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_4"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterway9.tmx b/AndorsTrail/res/xml/waterway9.tmx
index 620383a97..e53c531b5 100644
--- a/AndorsTrail/res/xml/waterway9.tmx
+++ b/AndorsTrail/res/xml/waterway9.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -187,61 +187,63 @@
   <object name="erumen_3" type="spawn" x="96" y="224" width="288" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_3"/>
    </properties>
   </object>
   <object name="izthiel_4" type="spawn" x="416" y="320" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_4"/>
    </properties>
   </object>
-  <object name="izthiel_4" type="spawn" x="288" y="480" width="32" height="128">
+  <object name="izthiel_4_1" type="spawn" x="288" y="480" width="32" height="128">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_4"/>
    </properties>
   </object>
   <object name="izthiel_3" type="spawn" x="320" y="640" width="128" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
   <object name="erumen_4" type="spawn" x="544" y="640" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_4"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="736" y="416" width="32" height="96">
+  <object name="izthiel_3_1" type="spawn" x="736" y="416" width="32" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
   <object name="izthiel_2" type="spawn" x="736" y="768" width="32" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object name="izthiel_2" type="spawn" x="480" y="736" width="32" height="96">
+  <object name="izthiel_2_1" type="spawn" x="480" y="736" width="32" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object name="erumen_4" type="spawn" x="128" y="96" width="160" height="32">
+  <object name="erumen_4_1" type="spawn" x="128" y="96" width="160" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_4"/>
    </properties>
   </object>
   <object name="erumen_2" type="spawn" x="672" y="576" width="224" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
-  <object name="erumen_4" type="spawn" x="800" y="320" width="64" height="32">
+  <object name="erumen_4_2" type="spawn" x="800" y="320" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_4"/>
    </properties>
   </object>
-  <object name="izthiel_4" type="spawn" x="288" y="96" width="160" height="32">
+  <object name="izthiel_4_2" type="spawn" x="288" y="96" width="160" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="izthiel_4"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waterwaycave.tmx b/AndorsTrail/res/xml/waterwaycave.tmx
index 1aabcf469..c521ab7af 100644
--- a/AndorsTrail/res/xml/waterwaycave.tmx
+++ b/AndorsTrail/res/xml/waterwaycave.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="15" height="15">
   <data encoding="base64" compression="zlib">
@@ -153,35 +153,43 @@
  <objectgroup name="Spawn">
   <object name="burrower_2" type="spawn" x="160" y="128" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="burrower_2"/>
    </properties>
   </object>
-  <object name="burrower_2" type="spawn" x="288" y="96" width="32" height="32">
+  <object name="burrower_2_1" type="spawn" x="288" y="96" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="burrower_2"/>
    </properties>
   </object>
   <object name="burrower_3" type="spawn" x="352" y="160" width="32" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="burrower_3"/>
    </properties>
   </object>
-  <object name="burrower_3" type="spawn" x="320" y="288" width="64" height="32">
+  <object name="burrower_3_1" type="spawn" x="320" y="288" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="burrower_3"/>
    </properties>
   </object>
-  <object name="burrower_3" type="spawn" x="96" y="320" width="352" height="128">
+  <object name="burrower_3_2" type="spawn" x="96" y="320" width="352" height="128">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="burrower_3"/>
    </properties>
   </object>
-  <object name="burrower_2" type="spawn" x="224" y="96" width="32" height="64">
+  <object name="burrower_2_2" type="spawn" x="224" y="96" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="burrower_2"/>
+   </properties>
+  </object>
+  <object name="burrower_cr" type="spawn" x="192" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="burrower_cr"/>
    </properties>
   </object>
-  <object name="burrower_cr" type="spawn" x="192" y="288" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/waytobrimhaven2.tmx b/AndorsTrail/res/xml/waytobrimhaven2.tmx
index d1ad02d2e..cc3403134 100644
--- a/AndorsTrail/res/xml/waytobrimhaven2.tmx
+++ b/AndorsTrail/res/xml/waytobrimhaven2.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -168,26 +168,30 @@
   <object name="erumen_1" type="spawn" x="192" y="448" width="320" height="416">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
   <object name="erumen_2" type="spawn" x="160" y="96" width="352" height="352">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
-  <object name="erumen_2" type="spawn" x="512" y="96" width="352" height="352">
+  <object name="erumen_2_1" type="spawn" x="512" y="96" width="352" height="352">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
   <object name="erumen_3" type="spawn" x="512" y="448" width="320" height="416">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_3"/>
    </properties>
   </object>
   <object name="skeleton3" type="spawn" x="736" y="864" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytobrimhaven3.tmx b/AndorsTrail/res/xml/waytobrimhaven3.tmx
index 3dd2b9a5e..229e3e6c0 100644
--- a/AndorsTrail/res/xml/waytobrimhaven3.tmx
+++ b/AndorsTrail/res/xml/waytobrimhaven3.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -165,31 +165,36 @@
   <object name="erumen_2" type="spawn" x="64" y="256" width="288" height="352">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
   <object name="erumen_1" type="spawn" x="512" y="768" width="384" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
-  <object name="erumen_2" type="spawn" x="64" y="576" width="544" height="320">
+  <object name="erumen_2_1" type="spawn" x="64" y="576" width="544" height="320">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
-  <object name="erumen_1" type="spawn" x="800" y="224" width="96" height="96">
+  <object name="erumen_1_1" type="spawn" x="800" y="224" width="96" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
   <object name="forestwolf2" type="spawn" x="448" y="96" width="384" height="480">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestwolf2"/>
    </properties>
   </object>
   <object name="forestdog" type="spawn" x="576" y="320" width="320" height="288">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="forestdog"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytobrimhavencave0.tmx b/AndorsTrail/res/xml/waytobrimhavencave0.tmx
index 2e64e8f6b..1384f8e47 100644
--- a/AndorsTrail/res/xml/waytobrimhavencave0.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave0.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="24" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="24">
   <data encoding="base64" compression="zlib">
@@ -159,31 +159,34 @@
   <object name="erumen_2" type="spawn" x="256" y="128" width="320" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
   <object name="undeadrat1" type="spawn" x="256" y="288" width="320" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="undeadrat1"/>
    </properties>
   </object>
   <object name="erumen_3" type="spawn" x="448" y="480" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_3"/>
    </properties>
   </object>
-  <object name="erumen_3" type="spawn" x="480" y="640" width="32" height="32">
+  <object name="erumen_3_1" type="spawn" x="480" y="640" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="erumen_3"/>
    </properties>
   </object>
   <object name="skeleton3" type="spawn" x="32" y="608" width="256" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
-  <object name="skeleton3" type="spawn" x="704" y="704" width="32" height="32">
+  <object name="skeleton3_1" type="spawn" x="704" y="704" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytobrimhavencave1.tmx b/AndorsTrail/res/xml/waytobrimhavencave1.tmx
index c0fe4e3ee..eedb27367 100644
--- a/AndorsTrail/res/xml/waytobrimhavencave1.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave1.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -165,61 +165,67 @@
   <object name="allaceph_1" type="spawn" x="864" y="768" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="allaceph_1"/>
    </properties>
   </object>
-  <object name="allaceph_1" type="spawn" x="416" y="448" width="32" height="32">
+  <object name="allaceph_1_1" type="spawn" x="416" y="448" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_1"/>
    </properties>
   </object>
-  <object name="allaceph_1" type="spawn" x="608" y="96" width="32" height="32">
+  <object name="allaceph_1_2" type="spawn" x="608" y="96" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_1"/>
    </properties>
   </object>
   <object name="erumen_3" type="spawn" x="64" y="416" width="352" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_3"/>
    </properties>
   </object>
-  <object name="erumen_3" type="spawn" x="64" y="96" width="448" height="256">
+  <object name="erumen_3_1" type="spawn" x="64" y="96" width="448" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_3"/>
    </properties>
   </object>
   <object name="skeleton3" type="spawn" x="512" y="256" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
-  <object name="skeleton3" type="spawn" x="704" y="128" width="32" height="32">
+  <object name="skeleton3_1" type="spawn" x="704" y="128" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
-  <object name="skeleton3" type="spawn" x="480" y="704" width="32" height="32">
+  <object name="skeleton3_2" type="spawn" x="480" y="704" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
   <object name="undeadrat1" type="spawn" x="576" y="704" width="256" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="undeadrat1"/>
    </properties>
   </object>
-  <object name="allaceph_1" type="spawn" x="704" y="224" width="192" height="384">
+  <object name="allaceph_1_3" type="spawn" x="704" y="224" width="192" height="384">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="allaceph_1"/>
    </properties>
   </object>
-  <object name="allaceph_1" type="spawn" x="64" y="800" width="32" height="32">
+  <object name="allaceph_1_4" type="spawn" x="64" y="800" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_1"/>
    </properties>
   </object>
-  <object name="allaceph_1" type="spawn" x="288" y="768" width="32" height="64">
+  <object name="allaceph_1_5" type="spawn" x="288" y="768" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="allaceph_1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytobrimhavencave2.tmx b/AndorsTrail/res/xml/waytobrimhavencave2.tmx
index 2e16b432a..4f7fb249b 100644
--- a/AndorsTrail/res/xml/waytobrimhavencave2.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -157,52 +158,58 @@
  <objectgroup name="Spawn">
   <object name="allaceph_2" type="spawn" x="352" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_2"/>
    </properties>
   </object>
-  <object name="allaceph_2" type="spawn" x="32" y="256" width="64" height="32">
+  <object name="allaceph_2_1" type="spawn" x="32" y="256" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="allaceph_2"/>
    </properties>
   </object>
   <object name="skeleton3" type="spawn" x="96" y="64" width="800" height="224">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
   <object name="undeadrat1" type="spawn" x="128" y="64" width="608" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="undeadrat1"/>
    </properties>
   </object>
-  <object name="undeadrat1" type="spawn" x="96" y="352" width="160" height="96">
+  <object name="undeadrat1_1" type="spawn" x="96" y="352" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="undeadrat1"/>
    </properties>
   </object>
   <object name="allaceph_1" type="spawn" x="576" y="448" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_1"/>
    </properties>
   </object>
-  <object name="allaceph_1" type="spawn" x="864" y="672" width="32" height="32">
+  <object name="allaceph_1_1" type="spawn" x="864" y="672" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_1"/>
    </properties>
   </object>
-  <object name="allaceph_1" type="spawn" x="544" y="736" width="192" height="96">
+  <object name="allaceph_1_2" type="spawn" x="544" y="736" width="192" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_1"/>
    </properties>
   </object>
-  <object name="allaceph_1" type="spawn" x="64" y="576" width="480" height="320">
+  <object name="allaceph_1_3" type="spawn" x="64" y="576" width="480" height="320">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="allaceph_1"/>
    </properties>
   </object>
   <object name="skeleton2" type="spawn" x="768" y="736" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="skeleton2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytobrimhavencave3.tmx b/AndorsTrail/res/xml/waytobrimhavencave3.tmx
index fee4ccfbc..3f1d40b76 100644
--- a/AndorsTrail/res/xml/waytobrimhavencave3.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -157,87 +158,96 @@
  <objectgroup name="Spawn">
   <object name="allaceph_2" type="spawn" x="608" y="192" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_2"/>
    </properties>
   </object>
-  <object name="allaceph_2" type="spawn" x="32" y="224" width="32" height="32">
+  <object name="allaceph_2_1" type="spawn" x="32" y="224" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_2"/>
    </properties>
   </object>
  </objectgroup>
  <objectgroup name="Spawn2" visible="0">
   <object name="allaceph_3" type="spawn" x="416" y="544" width="192" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_3"/>
    </properties>
   </object>
-  <object name="allaceph_3" type="spawn" x="480" y="640" width="64" height="32">
+  <object name="allaceph_3_1" type="spawn" x="480" y="640" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="allaceph_3"/>
    </properties>
   </object>
-  <object name="allaceph_3" type="spawn" x="416" y="736" width="32" height="32">
+  <object name="allaceph_3_2" type="spawn" x="416" y="736" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_3"/>
    </properties>
   </object>
-  <object name="allaceph_3" type="spawn" x="320" y="736" width="32" height="32">
+  <object name="allaceph_3_3" type="spawn" x="320" y="736" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_3"/>
    </properties>
   </object>
-  <object name="allaceph_3" type="spawn" x="96" y="608" width="192" height="160">
+  <object name="allaceph_3_4" type="spawn" x="96" y="608" width="192" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_3"/>
    </properties>
   </object>
-  <object name="allaceph_2" type="spawn" x="224" y="864" width="128" height="32">
+  <object name="allaceph_2_2" type="spawn" x="224" y="864" width="128" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_2"/>
    </properties>
   </object>
-  <object name="allaceph_2" type="spawn" x="416" y="896" width="128" height="32">
+  <object name="allaceph_2_3" type="spawn" x="416" y="896" width="128" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_2"/>
    </properties>
   </object>
-  <object name="allaceph_2" type="spawn" x="576" y="608" width="320" height="320">
+  <object name="allaceph_2_4" type="spawn" x="576" y="608" width="320" height="320">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="allaceph_2"/>
    </properties>
   </object>
   <object name="skeleton3" type="spawn" x="704" y="320" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
-  <object name="skeleton3" type="spawn" x="512" y="96" width="416" height="224">
+  <object name="skeleton3_1" type="spawn" x="512" y="96" width="416" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
-  <object name="allaceph_2" type="spawn" x="384" y="160" width="128" height="32">
+  <object name="allaceph_2_5" type="spawn" x="384" y="160" width="128" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_2"/>
    </properties>
   </object>
-  <object name="allaceph_2" type="spawn" x="384" y="224" width="128" height="32">
+  <object name="allaceph_2_6" type="spawn" x="384" y="224" width="128" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_2"/>
    </properties>
   </object>
-  <object name="skeleton3" type="spawn" x="64" y="224" width="320" height="288">
+  <object name="skeleton3_2" type="spawn" x="64" y="224" width="320" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
-  <object name="allaceph_2" type="spawn" x="832" y="544" width="32" height="32">
+  <object name="allaceph_2_7" type="spawn" x="832" y="544" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_2"/>
+   </properties>
+  </object>
+  <object name="allaceph_cr" type="spawn" x="96" y="576" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="allaceph_cr"/>
    </properties>
   </object>
-  <object name="allaceph_cr" type="spawn" x="96" y="576" width="96" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/waytobrimhavencave3a.tmx b/AndorsTrail/res/xml/waytobrimhavencave3a.tmx
index c1d6c6447..bbb10c37d 100644
--- a/AndorsTrail/res/xml/waytobrimhavencave3a.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave3a.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="22" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="22">
   <data encoding="base64" compression="zlib">
@@ -153,46 +153,54 @@
  <objectgroup name="Spawn">
   <object name="toszylae" type="spawn" x="320" y="96" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="toszylae"/>
+   </properties>
+  </object>
+  <object name="allaceph_4" type="spawn" x="224" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="allaceph_4"/>
    </properties>
   </object>
-  <object name="allaceph_4" type="spawn" x="224" y="96" width="32" height="32"/>
   <object name="toszylae_guard" type="spawn" x="288" y="96" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="toszylae_guard"/>
    </properties>
   </object>
-  <object name="allaceph_4" type="spawn" x="96" y="224" width="64" height="32">
+  <object name="allaceph_4_1" type="spawn" x="96" y="224" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="allaceph_4"/>
    </properties>
   </object>
-  <object name="allaceph_4" type="spawn" x="320" y="512" width="32" height="32">
+  <object name="allaceph_4_2" type="spawn" x="320" y="512" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_4"/>
    </properties>
   </object>
   <object name="allaceph_3" type="spawn" x="160" y="320" width="448" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="allaceph_3"/>
    </properties>
   </object>
-  <object name="allaceph_4" type="spawn" x="288" y="640" width="32" height="32">
+  <object name="allaceph_4_3" type="spawn" x="288" y="640" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_4"/>
    </properties>
   </object>
-  <object name="allaceph_3" type="spawn" x="224" y="640" width="64" height="32">
+  <object name="allaceph_3_1" type="spawn" x="224" y="640" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_3"/>
    </properties>
   </object>
-  <object name="allaceph_3" type="spawn" x="416" y="608" width="64" height="32">
+  <object name="allaceph_3_2" type="spawn" x="416" y="608" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_3"/>
    </properties>
   </object>
-  <object name="allaceph_3" type="spawn" x="448" y="192" width="160" height="160">
+  <object name="allaceph_3_3" type="spawn" x="448" y="192" width="160" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytobrimhavencave3b.tmx b/AndorsTrail/res/xml/waytobrimhavencave3b.tmx
index 19b1c6129..013706b1c 100644
--- a/AndorsTrail/res/xml/waytobrimhavencave3b.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave3b.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="14" height="7" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="14" height="7">
   <data encoding="base64" compression="zlib">
@@ -159,16 +159,17 @@
   <object name="allaceph_4" type="spawn" x="224" y="96" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="allaceph_4"/>
    </properties>
   </object>
   <object name="allaceph_3" type="spawn" x="96" y="128" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_3"/>
    </properties>
   </object>
-  <object name="allaceph_3" type="spawn" x="160" y="96" width="32" height="32">
+  <object name="allaceph_3_1" type="spawn" x="160" y="96" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="allaceph_3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytobrimhavencave4.tmx b/AndorsTrail/res/xml/waytobrimhavencave4.tmx
index 5735e6948..0b21618a0 100644
--- a/AndorsTrail/res/xml/waytobrimhavencave4.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave4.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -154,40 +154,48 @@
   <object name="erumen_3" type="spawn" x="192" y="672" width="640" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_3"/>
    </properties>
   </object>
   <object name="skeleton2" type="spawn" x="128" y="384" width="128" height="288">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="skeleton2"/>
    </properties>
   </object>
-  <object name="erumen_3" type="spawn" x="64" y="96" width="288" height="288">
+  <object name="erumen_3_1" type="spawn" x="64" y="96" width="288" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_3"/>
    </properties>
   </object>
-  <object name="skeleton2" type="spawn" x="384" y="544" width="384" height="128">
+  <object name="skeleton2_1" type="spawn" x="384" y="544" width="384" height="128">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="skeleton2"/>
    </properties>
   </object>
-  <object name="erumen_3" type="spawn" x="800" y="288" width="32" height="128">
+  <object name="erumen_3_2" type="spawn" x="800" y="288" width="32" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_3"/>
    </properties>
   </object>
   <object name="erumen_2" type="spawn" x="640" y="96" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
   <object name="undeadrat1" type="spawn" x="736" y="416" width="192" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="undeadrat1"/>
    </properties>
   </object>
   <object name="ulirfendor" type="spawn" x="480" y="352" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="ulirfendor"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytolake0.tmx b/AndorsTrail/res/xml/waytolake0.tmx
index 05c263660..5fa7ef743 100644
--- a/AndorsTrail/res/xml/waytolake0.tmx
+++ b/AndorsTrail/res/xml/waytolake0.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="30">
   <data encoding="base64" compression="zlib">
@@ -161,42 +161,44 @@
  <objectgroup name="Spawn">
   <object name="scaradon_2" type="spawn" x="320" y="736" width="128" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="scaradon_2"/>
    </properties>
   </object>
   <object name="plaguespider_1" type="spawn" x="480" y="672" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_1"/>
    </properties>
   </object>
   <object name="plaguespider_2" type="spawn" x="320" y="448" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_1" type="spawn" x="256" y="448" width="32" height="32">
+  <object name="plaguespider_1_1" type="spawn" x="256" y="448" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_1"/>
    </properties>
   </object>
-  <object name="plaguespider_1" type="spawn" x="96" y="160" width="128" height="352">
+  <object name="plaguespider_1_2" type="spawn" x="96" y="160" width="128" height="352">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_1"/>
    </properties>
   </object>
-  <object name="plaguespider_1" type="spawn" x="384" y="512" width="64" height="32">
+  <object name="plaguespider_1_3" type="spawn" x="384" y="512" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_1"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="352" y="192" width="32" height="32">
+  <object name="plaguespider_2_1" type="spawn" x="352" y="192" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="480" y="160" width="32" height="32">
+  <object name="plaguespider_2_2" type="spawn" x="480" y="160" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytolake1.tmx b/AndorsTrail/res/xml/waytolake1.tmx
index ed3e2cbf9..8b1668d5c 100644
--- a/AndorsTrail/res/xml/waytolake1.tmx
+++ b/AndorsTrail/res/xml/waytolake1.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -162,46 +162,50 @@
   <object name="plaguespider_2" type="spawn" x="96" y="544" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="128" y="448" width="384" height="160">
+  <object name="plaguespider_2_1" type="spawn" x="128" y="448" width="384" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="224" y="320" width="32" height="32">
+  <object name="plaguespider_2_2" type="spawn" x="224" y="320" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="224" y="384" width="32" height="32">
+  <object name="plaguespider_2_3" type="spawn" x="224" y="384" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="256" y="288" width="288" height="96">
+  <object name="plaguespider_2_4" type="spawn" x="256" y="288" width="288" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
   <object name="plaguespider_1" type="spawn" x="32" y="320" width="192" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_1"/>
    </properties>
   </object>
-  <object name="plaguespider_1" type="spawn" x="32" y="128" width="224" height="128">
+  <object name="plaguespider_1_1" type="spawn" x="32" y="128" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_1"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="256" y="192" width="160" height="32">
+  <object name="plaguespider_2_5" type="spawn" x="256" y="192" width="160" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="416" y="64" width="160" height="192">
+  <object name="plaguespider_2_6" type="spawn" x="416" y="64" width="160" height="192">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytolake2.tmx b/AndorsTrail/res/xml/waytolake2.tmx
index 8333b06c5..263b05ae4 100644
--- a/AndorsTrail/res/xml/waytolake2.tmx
+++ b/AndorsTrail/res/xml/waytolake2.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="25">
   <data encoding="base64" compression="zlib">
@@ -163,46 +163,50 @@
   <object name="plaguespider_2" type="spawn" x="160" y="576" width="448" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="224" y="544" width="64" height="32">
+  <object name="plaguespider_2_1" type="spawn" x="224" y="544" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="32" y="256" width="384" height="192">
+  <object name="plaguespider_2_2" type="spawn" x="32" y="256" width="384" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
   <object name="plaguespider_1" type="spawn" x="192" y="320" width="192" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_1"/>
    </properties>
   </object>
   <object name="plaguespider_3" type="spawn" x="224" y="128" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_3"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="320" y="160" width="32" height="32">
+  <object name="plaguespider_2_3" type="spawn" x="320" y="160" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="320" y="224" width="32" height="32">
+  <object name="plaguespider_2_4" type="spawn" x="320" y="224" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="384" y="160" width="192" height="192">
+  <object name="plaguespider_2_5" type="spawn" x="384" y="160" width="192" height="192">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="96" y="128" width="128" height="64">
+  <object name="plaguespider_2_6" type="spawn" x="96" y="128" width="128" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytolake3.tmx b/AndorsTrail/res/xml/waytolake3.tmx
index a7566e93c..729425725 100644
--- a/AndorsTrail/res/xml/waytolake3.tmx
+++ b/AndorsTrail/res/xml/waytolake3.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -161,37 +161,40 @@
  <objectgroup name="Spawn">
   <object name="plaguespider_3" type="spawn" x="160" y="512" width="96" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_3"/>
    </properties>
   </object>
-  <object name="plaguespider_3" type="spawn" x="320" y="384" width="32" height="32">
+  <object name="plaguespider_3_1" type="spawn" x="320" y="384" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_3"/>
    </properties>
   </object>
-  <object name="plaguespider_3" type="spawn" x="256" y="416" width="256" height="160">
+  <object name="plaguespider_3_2" type="spawn" x="256" y="416" width="256" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_3"/>
    </properties>
   </object>
-  <object name="plaguespider_3" type="spawn" x="288" y="288" width="32" height="32">
+  <object name="plaguespider_3_3" type="spawn" x="288" y="288" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_3"/>
    </properties>
   </object>
   <object name="plaguespider_2" type="spawn" x="288" y="96" width="288" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_2" type="spawn" x="256" y="128" width="32" height="32">
+  <object name="plaguespider_2_1" type="spawn" x="256" y="128" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_2"/>
    </properties>
   </object>
-  <object name="plaguespider_3" type="spawn" x="32" y="256" width="256" height="224">
+  <object name="plaguespider_3_4" type="spawn" x="32" y="256" width="256" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="plaguespider_3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytolake4.tmx b/AndorsTrail/res/xml/waytolake4.tmx
index 2205fe27a..d29625559 100644
--- a/AndorsTrail/res/xml/waytolake4.tmx
+++ b/AndorsTrail/res/xml/waytolake4.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="25" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="20" height="25">
   <data encoding="base64" compression="zlib">
@@ -158,82 +158,84 @@
  <objectgroup name="Spawn">
   <object name="plaguespider_3" type="spawn" x="128" y="704" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_3"/>
    </properties>
   </object>
   <object name="plaguespider_4" type="spawn" x="32" y="416" width="544" height="256">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="plaguespider_4"/>
    </properties>
   </object>
   <object name="plaguespider_5" type="spawn" x="288" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_5"/>
    </properties>
   </object>
-  <object name="plaguespider_5" type="spawn" x="192" y="352" width="32" height="32">
+  <object name="plaguespider_5_1" type="spawn" x="192" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_5"/>
    </properties>
   </object>
-  <object name="plaguespider_3" type="spawn" x="192" y="320" width="32" height="32">
+  <object name="plaguespider_3_1" type="spawn" x="192" y="320" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_3"/>
    </properties>
   </object>
-  <object name="plaguespider_4" type="spawn" x="224" y="352" width="32" height="32">
+  <object name="plaguespider_4_1" type="spawn" x="224" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_4"/>
    </properties>
   </object>
-  <object name="plaguespider_4" type="spawn" x="64" y="288" width="128" height="64">
+  <object name="plaguespider_4_2" type="spawn" x="64" y="288" width="128" height="64">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_4"/>
    </properties>
   </object>
-  <object name="plaguespider_5" type="spawn" x="32" y="256" width="32" height="32">
+  <object name="plaguespider_5_2" type="spawn" x="32" y="256" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_5"/>
    </properties>
   </object>
-  <object name="plaguespider_4" type="spawn" x="32" y="224" width="32" height="32">
+  <object name="plaguespider_4_3" type="spawn" x="32" y="224" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_4"/>
    </properties>
   </object>
-  <object name="plaguespider_5" type="spawn" x="96" y="416" width="480" height="256">
+  <object name="plaguespider_5_3" type="spawn" x="96" y="416" width="480" height="256">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_5"/>
    </properties>
   </object>
-  <object name="plaguespider_4" type="spawn" x="128" y="96" width="32" height="32">
+  <object name="plaguespider_4_4" type="spawn" x="128" y="96" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_4"/>
    </properties>
   </object>
-  <object name="plaguespider_5" type="spawn" x="96" y="128" width="64" height="32">
+  <object name="plaguespider_5_4" type="spawn" x="96" y="128" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_5"/>
    </properties>
   </object>
   <object name="plaguespider_1" type="spawn" x="192" y="96" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_1"/>
    </properties>
   </object>
-  <object name="plaguespider_4" type="spawn" x="192" y="128" width="32" height="32">
+  <object name="plaguespider_4_5" type="spawn" x="192" y="128" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_4"/>
    </properties>
   </object>
-  <object name="plaguespider_4" type="spawn" x="224" y="160" width="352" height="96">
+  <object name="plaguespider_4_6" type="spawn" x="224" y="160" width="352" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_4"/>
    </properties>
   </object>
-  <object name="plaguespider_3" type="spawn" x="224" y="96" width="224" height="192">
+  <object name="plaguespider_3_2" type="spawn" x="224" y="96" width="224" height="192">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytolake5.tmx b/AndorsTrail/res/xml/waytolake5.tmx
index 7de2684d1..323a97b3e 100644
--- a/AndorsTrail/res/xml/waytolake5.tmx
+++ b/AndorsTrail/res/xml/waytolake5.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="23" height="18" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="23" height="18">
   <data encoding="base64" compression="zlib">
@@ -158,45 +158,52 @@
  <objectgroup name="Spawn">
   <object name="plaguespider_6" type="spawn" x="160" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_6"/>
    </properties>
   </object>
-  <object name="plaguespider_6" type="spawn" x="480" y="192" width="32" height="32">
+  <object name="plaguespider_6_1" type="spawn" x="480" y="192" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_6"/>
    </properties>
   </object>
   <object name="plaguespider_4" type="spawn" x="96" y="384" width="160" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_4"/>
    </properties>
   </object>
-  <object name="plaguespider_4" type="spawn" x="96" y="96" width="384" height="256">
+  <object name="plaguespider_4_1" type="spawn" x="96" y="96" width="384" height="256">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="plaguespider_4"/>
    </properties>
   </object>
   <object name="plaguespider_5" type="spawn" x="64" y="64" width="384" height="256">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_5"/>
    </properties>
   </object>
-  <object name="plaguespider_5" type="spawn" x="512" y="160" width="96" height="128">
+  <object name="plaguespider_5_1" type="spawn" x="512" y="160" width="96" height="128">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_5"/>
    </properties>
   </object>
-  <object name="plaguespider_6" type="spawn" x="544" y="320" width="32" height="32">
+  <object name="plaguespider_6_2" type="spawn" x="544" y="320" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="plaguespider_6"/>
    </properties>
   </object>
-  <object name="plaguespider_4" type="spawn" x="384" y="352" width="192" height="128">
+  <object name="plaguespider_4_2" type="spawn" x="384" y="352" width="192" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="plaguespider_4"/>
+   </properties>
+  </object>
+  <object name="plaguespider_cr" type="spawn" x="352" y="416" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="plaguespider_cr"/>
    </properties>
   </object>
-  <object name="plaguespider_cr" type="spawn" x="352" y="416" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/waytolostmine0.tmx b/AndorsTrail/res/xml/waytolostmine0.tmx
index 5d57ab2ef..3e3810d2f 100644
--- a/AndorsTrail/res/xml/waytolostmine0.tmx
+++ b/AndorsTrail/res/xml/waytolostmine0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -158,51 +159,87 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="ccentip" type="spawn" x="448" y="800" width="128" height="96"/>
-  <object name="ccentip" type="spawn" x="544" y="704" width="128" height="96"/>
-  <object name="ccentip" type="spawn" x="576" y="640" width="32" height="32"/>
-  <object name="ccentip" type="spawn" x="416" y="608" width="160" height="32">
+  <object name="ccentip" type="spawn" x="448" y="800" width="128" height="96">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
-  <object name="ccentip" type="spawn" x="96" y="640" width="224" height="192">
+  <object name="ccentip_1" type="spawn" x="544" y="704" width="128" height="96">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
-  <object name="ccentip" type="spawn" x="160" y="512" width="64" height="32">
+  <object name="ccentip_2" type="spawn" x="576" y="640" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
-  <object name="ccentip" type="spawn" x="224" y="448" width="32" height="32"/>
-  <object name="ccentip" type="spawn" x="256" y="384" width="64" height="32"/>
-  <object name="ccentip" type="spawn" x="256" y="160" width="160" height="96"/>
-  <object name="ccentip" type="spawn" x="416" y="160" width="160" height="256">
+  <object name="ccentip_3" type="spawn" x="416" y="608" width="160" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
+  <object name="ccentip_4" type="spawn" x="96" y="640" width="224" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
+  <object name="ccentip_5" type="spawn" x="160" y="512" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
+  <object name="ccentip_6" type="spawn" x="224" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
+  <object name="ccentip_7" type="spawn" x="256" y="384" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
+  <object name="ccentip_8" type="spawn" x="256" y="160" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
+  <object name="ccentip_9" type="spawn" x="416" y="160" width="160" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
-  <object name="ccentip" type="spawn" x="512" y="416" width="64" height="32">
+  <object name="ccentip_10" type="spawn" x="512" y="416" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
-  <object name="charwdgg" type="spawn" x="544" y="480" width="32" height="32"/>
-  <object name="ccentip" type="spawn" x="608" y="416" width="288" height="192">
+  <object name="charwdgg" type="spawn" x="544" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdgg"/>
+   </properties>
+  </object>
+  <object name="ccentip_11" type="spawn" x="608" y="416" width="288" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
   <object name="charwdg1" type="spawn" x="640" y="64" width="128" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
-  <object name="ccentip" type="spawn" x="736" y="256" width="96" height="96">
+  <object name="ccentip_12" type="spawn" x="736" y="256" width="96" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytolostmine1.tmx b/AndorsTrail/res/xml/waytolostmine1.tmx
index f0bb8c345..f50fee029 100644
--- a/AndorsTrail/res/xml/waytolostmine1.tmx
+++ b/AndorsTrail/res/xml/waytolostmine1.tmx
@@ -183,47 +183,105 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="charwdg1" type="spawn" x="672" y="640" width="128" height="160"/>
-  <object name="charwdg1" type="spawn" x="672" y="576" width="64" height="32">
+  <object name="charwdg1" type="spawn" x="672" y="640" width="128" height="160">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
-  <object name="charwdg1" type="spawn" x="640" y="416" width="96" height="160">
+  <object name="charwdg1_1" type="spawn" x="672" y="576" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
-  <object name="charwdg1" type="spawn" x="704" y="352" width="32" height="32"/>
-  <object name="charwdg1" type="spawn" x="512" y="352" width="128" height="96"/>
-  <object name="charwdg2" type="spawn" x="416" y="352" width="64" height="32"/>
-  <object name="charwdg1" type="spawn" x="192" y="384" width="128" height="32"/>
-  <object name="charwdg1" type="spawn" x="128" y="416" width="32" height="96"/>
-  <object name="charwdg2" type="spawn" x="544" y="256" width="32" height="32"/>
-  <object name="charwdg2" type="spawn" x="96" y="640" width="64" height="32">
+  <object name="charwdg1_2" type="spawn" x="640" y="416" width="96" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
-  <object name="charwdg1" type="spawn" x="64" y="512" width="96" height="128"/>
-  <object name="charwdg1" type="spawn" x="160" y="736" width="32" height="64"/>
-  <object name="charwdg2" type="spawn" x="224" y="704" width="32" height="32"/>
-  <object name="charwdg1" type="spawn" x="224" y="608" width="160" height="96"/>
-  <object name="charwdg1" type="spawn" x="384" y="640" width="32" height="32"/>
-  <object name="charwdg2" type="spawn" x="768" y="256" width="32" height="32"/>
-  <object name="charwdg1" type="spawn" x="832" y="192" width="64" height="96">
+  <object name="charwdg1_3" type="spawn" x="704" y="352" width="32" height="32">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="352" y="192" width="160" height="32">
+  <object name="charwdg1_4" type="spawn" x="512" y="352" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="416" y="352" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg1_5" type="spawn" x="192" y="384" width="128" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg1_6" type="spawn" x="128" y="416" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg2_1" type="spawn" x="544" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg2_2" type="spawn" x="96" y="640" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg1_7" type="spawn" x="64" y="512" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg1_8" type="spawn" x="160" y="736" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg2_3" type="spawn" x="224" y="704" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg1_9" type="spawn" x="224" y="608" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg1_10" type="spawn" x="384" y="640" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg2_4" type="spawn" x="768" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg1_11" type="spawn" x="832" y="192" width="64" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg2_5" type="spawn" x="352" y="192" width="160" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
   <object name="halvor" type="spawn" x="448" y="672" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
+    <property name="spawngroup" value="halvor"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytolostmine2.tmx b/AndorsTrail/res/xml/waytolostmine2.tmx
index 751fe50be..fb82b2acd 100644
--- a/AndorsTrail/res/xml/waytolostmine2.tmx
+++ b/AndorsTrail/res/xml/waytolostmine2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="28" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -174,52 +175,77 @@
   <object name="charwdg1" type="spawn" x="64" y="672" width="224" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
-  <object name="charwdg1" type="spawn" x="224" y="448" width="96" height="192">
+  <object name="charwdg1_1" type="spawn" x="224" y="448" width="96" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="288" y="416" width="32" height="32"/>
-  <object name="charwdg2" type="spawn" x="96" y="256" width="128" height="160">
+  <object name="charwdg2" type="spawn" x="288" y="416" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg2_1" type="spawn" x="96" y="256" width="128" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="224" y="320" width="352" height="96">
+  <object name="charwdg2_2" type="spawn" x="224" y="320" width="352" height="96">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg3" type="spawn" x="480" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object name="charwdg3" type="spawn" x="480" y="448" width="32" height="32"/>
   <object name="mazarth1" type="spawn" x="480" y="480" width="128" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="mazarth1"/>
    </properties>
   </object>
-  <object name="charwdg3" type="spawn" x="544" y="672" width="64" height="32">
+  <object name="charwdg3_1" type="spawn" x="544" y="672" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object name="ccentip" type="spawn" x="704" y="672" width="192" height="96"/>
-  <object name="charwdg2" type="spawn" x="224" y="640" width="64" height="32">
+  <object name="ccentip" type="spawn" x="704" y="672" width="192" height="96">
+   <properties>
+    <property name="spawngroup" value="ccentip"/>
+   </properties>
+  </object>
+  <object name="charwdg2_3" type="spawn" x="224" y="640" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="576" y="320" width="160" height="96">
+  <object name="charwdg2_4" type="spawn" x="576" y="320" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="544" y="704" width="160" height="128">
+  <object name="charwdg2_5" type="spawn" x="544" y="704" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="ccentip_1" type="spawn" x="384" y="256" width="128" height="64">
+   <properties>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
-  <object name="ccentip" type="spawn" x="384" y="256" width="128" height="64"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/waytolostmine3.tmx b/AndorsTrail/res/xml/waytolostmine3.tmx
index 0dffc7ec3..dc62151d6 100644
--- a/AndorsTrail/res/xml/waytolostmine3.tmx
+++ b/AndorsTrail/res/xml/waytolostmine3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -185,61 +186,91 @@
   <object name="charwdg3" type="spawn" x="576" y="64" width="96" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
   <object name="charwdg2" type="spawn" x="384" y="192" width="160" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="320" y="352" width="32" height="32"/>
-  <object name="charwdg2" type="spawn" x="608" y="352" width="32" height="64">
+  <object name="charwdg2_1" type="spawn" x="320" y="352" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="charwdg2_2" type="spawn" x="608" y="352" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg1" type="spawn" x="512" y="512" width="64" height="64"/>
-  <object name="charwdg3" type="spawn" x="288" y="544" width="160" height="32">
+  <object name="charwdg1" type="spawn" x="512" y="512" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="charwdg1"/>
+   </properties>
+  </object>
+  <object name="charwdg3_1" type="spawn" x="288" y="544" width="160" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="512" y="608" width="256" height="256">
+  <object name="charwdg2_3" type="spawn" x="512" y="608" width="256" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="96" y="544" width="192" height="224">
+  <object name="charwdg2_4" type="spawn" x="96" y="544" width="192" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg3" type="spawn" x="160" y="800" width="64" height="32">
+  <object name="charwdg3_2" type="spawn" x="160" y="800" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="160" y="864" width="64" height="32">
+  <object name="charwdg2_5" type="spawn" x="160" y="864" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg2" type="spawn" x="736" y="256" width="128" height="192">
+  <object name="charwdg2_6" type="spawn" x="736" y="256" width="128" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="charwdg3" type="spawn" x="576" y="448" width="32" height="32"/>
-  <object name="charwdg2" type="spawn" x="448" y="448" width="64" height="32">
+  <object name="charwdg3_3" type="spawn" x="576" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg3"/>
+   </properties>
+  </object>
+  <object name="charwdg2_7" type="spawn" x="448" y="448" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="charwdg2"/>
+   </properties>
+  </object>
+  <object name="mazarth2" type="spawn" x="448" y="512" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="mazarth2"/>
+   </properties>
+  </object>
+  <object name="charwdg2_8" type="spawn" x="160" y="352" width="128" height="32">
+   <properties>
+    <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object name="mazarth2" type="spawn" x="448" y="512" width="32" height="32"/>
-  <object name="charwdg2" type="spawn" x="160" y="352" width="128" height="32"/>
   <object name="mazarth1" type="spawn" x="128" y="576" width="160" height="192">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="mazarth1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytominingtown0.tmx b/AndorsTrail/res/xml/waytominingtown0.tmx
index 237184064..3d33d6791 100644
--- a/AndorsTrail/res/xml/waytominingtown0.tmx
+++ b/AndorsTrail/res/xml/waytominingtown0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,31 +162,36 @@
   <object name="redft1" type="spawn" x="640" y="320" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="redft1"/>
    </properties>
   </object>
-  <object name="redft1" type="spawn" x="704" y="96" width="192" height="128">
+  <object name="redft1_1" type="spawn" x="704" y="96" width="192" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="redft1"/>
    </properties>
   </object>
   <object name="redft2" type="spawn" x="672" y="256" width="192" height="160">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="redft2"/>
    </properties>
   </object>
   <object name="forestfox2" type="spawn" x="416" y="224" width="192" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfox2"/>
    </properties>
   </object>
-  <object name="redft1" type="spawn" x="192" y="128" width="192" height="128">
+  <object name="redft1_2" type="spawn" x="192" y="128" width="192" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="redft1"/>
    </properties>
   </object>
-  <object name="forestfox2" type="spawn" x="64" y="256" width="224" height="160">
+  <object name="forestfox2_1" type="spawn" x="64" y="256" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestfox2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytominingtown1.tmx b/AndorsTrail/res/xml/waytominingtown1.tmx
index 1037e5bf1..2069c19c3 100644
--- a/AndorsTrail/res/xml/waytominingtown1.tmx
+++ b/AndorsTrail/res/xml/waytominingtown1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -180,36 +181,43 @@
   <object name="redft2" type="spawn" x="576" y="128" width="320" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="redft2"/>
    </properties>
   </object>
-  <object name="redft2" type="spawn" x="288" y="384" width="160" height="96">
+  <object name="redft2_1" type="spawn" x="288" y="384" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="redft2"/>
    </properties>
   </object>
   <object name="redft1" type="spawn" x="96" y="160" width="448" height="192">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="redft1"/>
    </properties>
   </object>
-  <object name="redft1" type="spawn" x="448" y="384" width="480" height="256">
+  <object name="redft1_1" type="spawn" x="448" y="384" width="480" height="256">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="redft1"/>
    </properties>
   </object>
-  <object name="redft2" type="spawn" x="736" y="768" width="32" height="64">
+  <object name="redft2_2" type="spawn" x="736" y="768" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="redft2"/>
    </properties>
   </object>
-  <object name="redft1" type="spawn" x="352" y="736" width="192" height="128">
+  <object name="redft1_2" type="spawn" x="352" y="736" width="192" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="redft1"/>
    </properties>
   </object>
-  <object name="redft1" type="spawn" x="128" y="512" width="288" height="224">
+  <object name="redft1_3" type="spawn" x="128" y="512" width="288" height="224">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="redft1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytominingtown3.tmx b/AndorsTrail/res/xml/waytominingtown3.tmx
index 9d81be31b..70a068d82 100644
--- a/AndorsTrail/res/xml/waytominingtown3.tmx
+++ b/AndorsTrail/res/xml/waytominingtown3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -158,41 +159,67 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="redft_cr" type="spawn" x="480" y="864" width="96" height="64"/>
+  <object name="redft_cr" type="spawn" x="480" y="864" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="redft_cr"/>
+   </properties>
+  </object>
   <object name="redft2" type="spawn" x="64" y="352" width="256" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="redft2"/>
    </properties>
   </object>
-  <object name="redft2" type="spawn" x="128" y="192" width="192" height="160">
+  <object name="redft2_1" type="spawn" x="128" y="192" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="redft2"/>
    </properties>
   </object>
   <object name="ccentip" type="spawn" x="352" y="96" width="288" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="ccentip"/>
    </properties>
   </object>
-  <object name="redft2" type="spawn" x="640" y="192" width="192" height="160"/>
-  <object name="redft2" type="spawn" x="416" y="448" width="32" height="32"/>
-  <object name="redft2" type="spawn" x="160" y="576" width="320" height="320">
+  <object name="redft2_2" type="spawn" x="640" y="192" width="192" height="160">
+   <properties>
+    <property name="spawngroup" value="redft2"/>
+   </properties>
+  </object>
+  <object name="redft2_3" type="spawn" x="416" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="redft2"/>
+   </properties>
+  </object>
+  <object name="redft2_4" type="spawn" x="160" y="576" width="320" height="320">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="redft2"/>
    </properties>
   </object>
   <object name="redft1" type="spawn" x="480" y="608" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="redft1"/>
    </properties>
   </object>
-  <object name="redft2" type="spawn" x="704" y="544" width="224" height="224">
+  <object name="redft2_5" type="spawn" x="704" y="544" width="224" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="redft2"/>
+   </properties>
+  </object>
+  <object name="redft1_1" type="spawn" x="800" y="800" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="redft1"/>
+   </properties>
+  </object>
+  <object name="redft1_2" type="spawn" x="640" y="800" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="redft1"/>
    </properties>
   </object>
-  <object name="redft1" type="spawn" x="800" y="800" width="128" height="96"/>
-  <object name="redft1" type="spawn" x="640" y="800" width="128" height="128"/>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/waytomountaincave0.tmx b/AndorsTrail/res/xml/waytomountaincave0.tmx
index 8fcd2db48..1dc57266e 100644
--- a/AndorsTrail/res/xml/waytomountaincave0.tmx
+++ b/AndorsTrail/res/xml/waytomountaincave0.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="15" height="29">
   <data encoding="base64" compression="zlib">
@@ -161,17 +161,18 @@
  <objectgroup name="Spawn">
   <object name="irdegh_2" type="spawn" x="192" y="320" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_2"/>
    </properties>
   </object>
   <object name="irdegh_1" type="spawn" x="64" y="64" width="352" height="256">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_1"/>
    </properties>
   </object>
-  <object name="irdegh_2" type="spawn" x="64" y="384" width="352" height="480">
+  <object name="irdegh_2_1" type="spawn" x="64" y="384" width="352" height="480">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="irdegh_2"/>
    </properties>
   </object>
  </objectgroup>
@@ -179,6 +180,7 @@
   <object name="irdegh_spawn" type="spawn" x="32" y="64" width="384" height="800">
    <properties>
     <property name="quantity" value="8"/>
+    <property name="spawngroup" value="irdegh_spawn"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytomountaincave1.tmx b/AndorsTrail/res/xml/waytomountaincave1.tmx
index 0240e4270..47be43ccf 100644
--- a/AndorsTrail/res/xml/waytomountaincave1.tmx
+++ b/AndorsTrail/res/xml/waytomountaincave1.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="15" height="19">
   <data encoding="base64" compression="zlib">
@@ -161,17 +161,17 @@
  <objectgroup name="Spawn">
   <object name="irdegh_2" type="spawn" x="96" y="320" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_2"/>
    </properties>
   </object>
-  <object name="irdegh_2" type="spawn" x="160" y="96" width="224" height="128">
+  <object name="irdegh_2_1" type="spawn" x="160" y="96" width="224" height="128">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_2"/>
    </properties>
   </object>
   <object name="irdegh_3" type="spawn" x="288" y="416" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_3"/>
    </properties>
   </object>
  </objectgroup>
@@ -179,6 +179,7 @@
   <object name="irdegh_spawn" type="spawn" x="32" y="64" width="384" height="480">
    <properties>
     <property name="quantity" value="8"/>
+    <property name="spawngroup" value="irdegh_spawn"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytomountaincave2.tmx b/AndorsTrail/res/xml/waytomountaincave2.tmx
index 5f037a222..f6635b872 100644
--- a/AndorsTrail/res/xml/waytomountaincave2.tmx
+++ b/AndorsTrail/res/xml/waytomountaincave2.tmx
@@ -5,124 +5,124 @@
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="30" height="20">
   <data encoding="base64" compression="zlib">
@@ -161,32 +161,33 @@
  <objectgroup name="Spawn">
   <object name="irdegh_4" type="spawn" x="608" y="544" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_4"/>
    </properties>
   </object>
   <object name="irdegh_3" type="spawn" x="640" y="416" width="288" height="192">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_3"/>
    </properties>
   </object>
-  <object name="irdegh_3" type="spawn" x="320" y="320" width="32" height="32">
+  <object name="irdegh_3_1" type="spawn" x="320" y="320" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_3"/>
    </properties>
   </object>
-  <object name="irdegh_3" type="spawn" x="384" y="320" width="32" height="32">
+  <object name="irdegh_3_2" type="spawn" x="384" y="320" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_3"/>
    </properties>
   </object>
   <object name="irdegh_2" type="spawn" x="224" y="352" width="384" height="256">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="irdegh_2"/>
    </properties>
   </object>
-  <object name="irdegh_3" type="spawn" x="64" y="64" width="384" height="256">
+  <object name="irdegh_3_3" type="spawn" x="64" y="64" width="384" height="256">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="irdegh_3"/>
    </properties>
   </object>
  </objectgroup>
@@ -194,6 +195,7 @@
   <object name="irdegh_spawn" type="spawn" x="64" y="64" width="800" height="544">
    <properties>
     <property name="quantity" value="8"/>
+    <property name="spawngroup" value="irdegh_spawn"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/wild0.tmx b/AndorsTrail/res/xml/wild0.tmx
index f3f1ad96a..3a9184abd 100644
--- a/AndorsTrail/res/xml/wild0.tmx
+++ b/AndorsTrail/res/xml/wild0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="21" height="21" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -173,37 +174,58 @@
   <object name="forestdog" type="spawn" x="192" y="512" width="256" height="96">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestdog"/>
    </properties>
   </object>
   <object name="forestboar" type="spawn" x="160" y="384" width="160" height="96">
    <properties>
-    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="forestboar"/>
    </properties>
   </object>
   <object name="fox1" type="spawn" x="64" y="128" width="160" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fox1"/>
    </properties>
   </object>
-  <object name="forestboar" type="spawn" x="256" y="96" width="192" height="160">
+  <object name="forestboar_1" type="spawn" x="256" y="96" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestboar"/>
    </properties>
   </object>
   <object name="forestwasp" type="spawn" x="352" y="384" width="192" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestwasp"/>
+   </properties>
+  </object>
+  <object name="erinith" type="spawn" x="544" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="erinith"/>
    </properties>
   </object>
-  <object name="erinith" type="spawn" x="544" y="544" width="32" height="32"/>
   <object name="larva_1" type="spawn" x="512" y="192" width="96" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="larva_1"/>
+   </properties>
+  </object>
+  <object name="larva_1_1" type="spawn" x="320" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_1"/>
+   </properties>
+  </object>
+  <object name="fox1_1" type="spawn" x="224" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fox1"/>
+   </properties>
+  </object>
+  <object name="larva_1_2" type="spawn" x="352" y="64" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_1"/>
    </properties>
   </object>
-  <object name="larva_1" type="spawn" x="320" y="192" width="32" height="32"/>
-  <object name="fox1" type="spawn" x="224" y="480" width="32" height="32"/>
-  <object name="larva_1" type="spawn" x="352" y="64" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild1.tmx b/AndorsTrail/res/xml/wild1.tmx
index 329fdf828..57493f6a6 100644
--- a/AndorsTrail/res/xml/wild1.tmx
+++ b/AndorsTrail/res/xml/wild1.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="21" height="21" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -174,15 +175,33 @@
   <object name="forestdog" type="spawn" x="96" y="64" width="224" height="224">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="forestdog"/>
+   </properties>
+  </object>
+  <object name="forestboar" type="spawn" x="64" y="64" width="128" height="160">
+   <properties>
+    <property name="spawngroup" value="forestboar"/>
+   </properties>
+  </object>
+  <object name="fox1" type="spawn" x="320" y="608" width="128" height="32">
+   <properties>
+    <property name="spawngroup" value="fox1"/>
+   </properties>
+  </object>
+  <object name="fox1_1" type="spawn" x="576" y="224" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="fox1"/>
+   </properties>
+  </object>
+  <object name="fox1_2" type="spawn" x="544" y="96" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="fox1"/>
    </properties>
   </object>
-  <object name="forestboar" type="spawn" x="64" y="64" width="128" height="160"/>
-  <object name="fox1" type="spawn" x="320" y="608" width="128" height="32"/>
-  <object name="fox1" type="spawn" x="576" y="224" width="32" height="64"/>
-  <object name="fox1" type="spawn" x="544" y="96" width="32" height="64"/>
   <object name="forestwasp" type="spawn" x="288" y="352" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestwasp"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/wild11_clearing.tmx b/AndorsTrail/res/xml/wild11_clearing.tmx
index 785d84973..632ff3b60 100644
--- a/AndorsTrail/res/xml/wild11_clearing.tmx
+++ b/AndorsTrail/res/xml/wild11_clearing.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,17 +162,24 @@
   <object name="pack1" type="spawn" x="288" y="352" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pack1"/>
    </properties>
   </object>
-  <object name="pack2" type="spawn" x="160" y="384" width="32" height="32"/>
-  <object name="pack1" type="spawn" x="64" y="256" width="192" height="96">
+  <object name="pack2" type="spawn" x="160" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="pack2"/>
+   </properties>
+  </object>
+  <object name="pack1_1" type="spawn" x="64" y="256" width="192" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pack1"/>
    </properties>
   </object>
-  <object name="pack1" type="spawn" x="32" y="96" width="384" height="160">
+  <object name="pack1_2" type="spawn" x="32" y="96" width="384" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="pack1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/wild13.tmx b/AndorsTrail/res/xml/wild13.tmx
index d8b8a1017..1b7359ed9 100644
--- a/AndorsTrail/res/xml/wild13.tmx
+++ b/AndorsTrail/res/xml/wild13.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,11 +162,24 @@
   <object name="forestboar2" type="spawn" x="32" y="256" width="256" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestboar2"/>
+   </properties>
+  </object>
+  <object name="forestboar2_1" type="spawn" x="256" y="64" width="224" height="128">
+   <properties>
+    <property name="spawngroup" value="forestboar2"/>
+   </properties>
+  </object>
+  <object name="forestserpent1" type="spawn" x="320" y="352" width="256" height="96">
+   <properties>
+    <property name="spawngroup" value="forestserpent1"/>
+   </properties>
+  </object>
+  <object name="beetle2" type="spawn" x="288" y="224" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="beetle2"/>
    </properties>
   </object>
-  <object name="forestboar2" type="spawn" x="256" y="64" width="224" height="128"/>
-  <object name="forestserpent1" type="spawn" x="320" y="352" width="256" height="96"/>
-  <object name="beetle2" type="spawn" x="288" y="224" width="96" height="64"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild14_cave.tmx b/AndorsTrail/res/xml/wild14_cave.tmx
index d58b175e7..4233507ed 100644
--- a/AndorsTrail/res/xml/wild14_cave.tmx
+++ b/AndorsTrail/res/xml/wild14_cave.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="23" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -155,13 +156,41 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="beetle2" type="spawn" x="160" y="96" width="160" height="96"/>
-  <object name="forestboar3" type="spawn" x="384" y="224" width="32" height="32"/>
-  <object name="caveboar1" type="spawn" x="352" y="544" width="32" height="32"/>
-  <object name="beetle2" type="spawn" x="288" y="608" width="160" height="64"/>
-  <object name="beetle2" type="spawn" x="160" y="640" width="64" height="32"/>
-  <object name="beetle2" type="spawn" x="64" y="352" width="256" height="128"/>
-  <object name="beetle2" type="spawn" x="352" y="288" width="32" height="128"/>
+  <object name="beetle2" type="spawn" x="160" y="96" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="beetle2"/>
+   </properties>
+  </object>
+  <object name="forestboar3" type="spawn" x="384" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="forestboar3"/>
+   </properties>
+  </object>
+  <object name="caveboar1" type="spawn" x="352" y="544" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="caveboar1"/>
+   </properties>
+  </object>
+  <object name="beetle2_1" type="spawn" x="288" y="608" width="160" height="64">
+   <properties>
+    <property name="spawngroup" value="beetle2"/>
+   </properties>
+  </object>
+  <object name="beetle2_2" type="spawn" x="160" y="640" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="beetle2"/>
+   </properties>
+  </object>
+  <object name="beetle2_3" type="spawn" x="64" y="352" width="256" height="128">
+   <properties>
+    <property name="spawngroup" value="beetle2"/>
+   </properties>
+  </object>
+  <object name="beetle2_4" type="spawn" x="352" y="288" width="32" height="128">
+   <properties>
+    <property name="spawngroup" value="beetle2"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild2.tmx b/AndorsTrail/res/xml/wild2.tmx
index db40f1f3e..0bd4148c1 100644
--- a/AndorsTrail/res/xml/wild2.tmx
+++ b/AndorsTrail/res/xml/wild2.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -179,11 +180,24 @@
   <object name="forestant" type="spawn" x="32" y="352" width="320" height="96">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestant"/>
+   </properties>
+  </object>
+  <object name="forestant_1" type="spawn" x="512" y="288" width="64" height="128">
+   <properties>
+    <property name="spawngroup" value="forestant"/>
+   </properties>
+  </object>
+  <object name="forestsnake" type="spawn" x="416" y="64" width="192" height="64">
+   <properties>
+    <property name="spawngroup" value="forestsnake"/>
+   </properties>
+  </object>
+  <object name="forestsnake_1" type="spawn" x="384" y="224" width="160" height="160">
+   <properties>
+    <property name="spawngroup" value="forestsnake"/>
    </properties>
   </object>
-  <object name="forestant" type="spawn" x="512" y="288" width="64" height="128"/>
-  <object name="forestsnake" type="spawn" x="416" y="64" width="192" height="64"/>
-  <object name="forestsnake" type="spawn" x="384" y="224" width="160" height="160"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild3.tmx b/AndorsTrail/res/xml/wild3.tmx
index 7a9bcbd11..53fc500b2 100644
--- a/AndorsTrail/res/xml/wild3.tmx
+++ b/AndorsTrail/res/xml/wild3.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -196,23 +197,34 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="Jan" type="spawn" x="192" y="416" width="32" height="32"/>
+  <object name="Jan" type="spawn" x="192" y="416" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="Jan"/>
+   </properties>
+  </object>
   <object name="forestwasp" type="spawn" x="352" y="512" width="224" height="64">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="forestwasp"/>
    </properties>
   </object>
   <object name="forestdog" type="spawn" x="288" y="288" width="288" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestdog"/>
    </properties>
   </object>
   <object name="forestant" type="spawn" x="448" y="64" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestant"/>
+   </properties>
+  </object>
+  <object name="forestant_1" type="spawn" x="64" y="224" width="224" height="128">
+   <properties>
+    <property name="spawngroup" value="forestant"/>
    </properties>
   </object>
-  <object name="forestant" type="spawn" x="64" y="224" width="224" height="128"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild4.tmx b/AndorsTrail/res/xml/wild4.tmx
index b0b26c95a..153f194b1 100644
--- a/AndorsTrail/res/xml/wild4.tmx
+++ b/AndorsTrail/res/xml/wild4.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -161,22 +162,30 @@
   <object name="fox1" type="spawn" x="64" y="96" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fox1"/>
+   </properties>
+  </object>
+  <object name="minorhaunt1" type="spawn" x="192" y="192" width="256" height="160">
+   <properties>
+    <property name="spawngroup" value="minorhaunt1"/>
    </properties>
   </object>
-  <object name="minorhaunt1" type="spawn" x="192" y="192" width="256" height="160"/>
   <object name="forestwasp" type="spawn" x="192" y="64" width="416" height="160">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="forestwasp"/>
    </properties>
   </object>
-  <object name="forestwasp" type="spawn" x="128" y="320" width="480" height="128">
+  <object name="forestwasp_1" type="spawn" x="128" y="320" width="480" height="128">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="forestwasp"/>
    </properties>
   </object>
-  <object name="forestwasp" type="spawn" x="704" y="96" width="224" height="224">
+  <object name="forestwasp_2" type="spawn" x="704" y="96" width="224" height="224">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="forestwasp"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/wild5.tmx b/AndorsTrail/res/xml/wild5.tmx
index 7d1b53276..f2a2cf964 100644
--- a/AndorsTrail/res/xml/wild5.tmx
+++ b/AndorsTrail/res/xml/wild5.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="26" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -185,26 +186,31 @@
   <object name="forestsnake" type="spawn" x="192" y="96" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestsnake"/>
    </properties>
   </object>
   <object name="fox2" type="spawn" x="352" y="64" width="352" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fox2"/>
    </properties>
   </object>
   <object name="forestwasp2" type="spawn" x="128" y="192" width="160" height="288">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestwasp2"/>
    </properties>
   </object>
   <object name="forestboar2" type="spawn" x="288" y="320" width="480" height="256">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestboar2"/>
    </properties>
   </object>
-  <object name="forestwasp2" type="spawn" x="736" y="64" width="32" height="192">
+  <object name="forestwasp2_1" type="spawn" x="736" y="64" width="32" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestwasp2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/wild9.tmx b/AndorsTrail/res/xml/wild9.tmx
index 2be914a7d..5fac1425a 100644
--- a/AndorsTrail/res/xml/wild9.tmx
+++ b/AndorsTrail/res/xml/wild9.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="24" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -200,27 +201,43 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="bandit1" type="spawn" x="64" y="512" width="832" height="96"/>
-  <object name="fallhaven_bandit" type="spawn" x="416" y="288" width="32" height="32"/>
+  <object name="bandit1" type="spawn" x="64" y="512" width="832" height="96">
+   <properties>
+    <property name="spawngroup" value="bandit1"/>
+   </properties>
+  </object>
+  <object name="fallhaven_bandit" type="spawn" x="416" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="fallhaven_bandit"/>
+   </properties>
+  </object>
   <object name="forestwasp2" type="spawn" x="160" y="352" width="736" height="352">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestwasp2"/>
    </properties>
   </object>
   <object name="forestwolf1" type="spawn" x="128" y="320" width="736" height="352">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestwolf1"/>
    </properties>
   </object>
-  <object name="forestwolf1" type="spawn" x="416" y="64" width="352" height="224">
+  <object name="forestwolf1_1" type="spawn" x="416" y="64" width="352" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestwolf1"/>
    </properties>
   </object>
-  <object name="forestant" type="spawn" x="800" y="64" width="96" height="224"/>
-  <object name="forestwasp2" type="spawn" x="64" y="64" width="256" height="224">
+  <object name="forestant" type="spawn" x="800" y="64" width="96" height="224">
+   <properties>
+    <property name="spawngroup" value="forestant"/>
+   </properties>
+  </object>
+  <object name="forestwasp2_1" type="spawn" x="64" y="64" width="256" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestwasp2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/woodcave0.tmx b/AndorsTrail/res/xml/woodcave0.tmx
index 40338f3c9..e909977f1 100644
--- a/AndorsTrail/res/xml/woodcave0.tmx
+++ b/AndorsTrail/res/xml/woodcave0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="19" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -158,28 +159,78 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="larva_2" type="spawn" x="64" y="192" width="64" height="32"/>
-  <object name="larva_2" type="spawn" x="128" y="160" width="32" height="32"/>
-  <object name="larva_2" type="spawn" x="160" y="160" width="32" height="32"/>
-  <object name="larva_2" type="spawn" x="128" y="128" width="32" height="32"/>
-  <object name="larva_2" type="spawn" x="128" y="288" width="96" height="256">
+  <object name="larva_2" type="spawn" x="64" y="192" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_2"/>
+   </properties>
+  </object>
+  <object name="larva_2_1" type="spawn" x="128" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_2"/>
+   </properties>
+  </object>
+  <object name="larva_2_2" type="spawn" x="160" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_2"/>
+   </properties>
+  </object>
+  <object name="larva_2_3" type="spawn" x="128" y="128" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_2"/>
+   </properties>
+  </object>
+  <object name="larva_2_4" type="spawn" x="128" y="288" width="96" height="256">
    <properties>
     <property name="quantity" value="4"/>
+    <property name="spawngroup" value="larva_2"/>
    </properties>
   </object>
   <object name="fox1" type="spawn" x="416" y="320" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fox1"/>
+   </properties>
+  </object>
+  <object name="larva_1" type="spawn" x="512" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_1"/>
+   </properties>
+  </object>
+  <object name="larva_2_5" type="spawn" x="448" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_2"/>
+   </properties>
+  </object>
+  <object name="larva_2_6" type="spawn" x="288" y="160" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="larva_2"/>
+   </properties>
+  </object>
+  <object name="fox1_1" type="spawn" x="608" y="128" width="256" height="128">
+   <properties>
+    <property name="spawngroup" value="fox1"/>
+   </properties>
+  </object>
+  <object name="larva_2_7" type="spawn" x="256" y="512" width="128" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_2"/>
+   </properties>
+  </object>
+  <object name="larva_2_8" type="spawn" x="416" y="512" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_2"/>
+   </properties>
+  </object>
+  <object name="larva_2_9" type="spawn" x="544" y="512" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_2"/>
+   </properties>
+  </object>
+  <object name="larva_2_10" type="spawn" x="768" y="512" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="larva_2"/>
    </properties>
   </object>
-  <object name="larva_1" type="spawn" x="512" y="96" width="32" height="32"/>
-  <object name="larva_2" type="spawn" x="448" y="160" width="32" height="32"/>
-  <object name="larva_2" type="spawn" x="288" y="160" width="96" height="96"/>
-  <object name="fox1" type="spawn" x="608" y="128" width="256" height="128"/>
-  <object name="larva_2" type="spawn" x="256" y="512" width="128" height="32"/>
-  <object name="larva_2" type="spawn" x="416" y="512" width="96" height="32"/>
-  <object name="larva_2" type="spawn" x="544" y="512" width="96" height="32"/>
-  <object name="larva_2" type="spawn" x="768" y="512" width="64" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/woodcave1.tmx b/AndorsTrail/res/xml/woodcave1.tmx
index d5fa2b196..ca9511701 100644
--- a/AndorsTrail/res/xml/woodcave1.tmx
+++ b/AndorsTrail/res/xml/woodcave1.tmx
@@ -2,124 +2,124 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="10" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="0" height="0"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="0" height="0"/>
  </tileset>
  <layer name="Ground" width="10" height="10">
   <data encoding="base64" compression="zlib">
@@ -153,15 +153,18 @@
   <object name="larva_2" type="spawn" x="64" y="128" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="larva_2"/>
    </properties>
   </object>
-  <object name="larva_2" type="spawn" x="64" y="128" width="160" height="128">
+  <object name="larva_2_1" type="spawn" x="64" y="128" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="larva_2"/>
    </properties>
   </object>
   <object name="larva_boss" type="spawn" x="64" y="256" width="32" height="32">
    <properties>
+    <property name="spawngroup" value="larva_boss"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/woodsettlement0.tmx b/AndorsTrail/res/xml/woodsettlement0.tmx
index 30787b42a..167442777 100644
--- a/AndorsTrail/res/xml/woodsettlement0.tmx
+++ b/AndorsTrail/res/xml/woodsettlement0.tmx
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="14" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
@@ -176,13 +177,34 @@
   <object name="pig" type="spawn" x="672" y="160" width="128" height="224">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="pig"/>
+   </properties>
+  </object>
+  <object name="smuggler6" type="spawn" x="512" y="320" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="smuggler6"/>
+   </properties>
+  </object>
+  <object name="vermin" type="spawn" x="256" y="288" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="vermin"/>
+   </properties>
+  </object>
+  <object name="vermin_1" type="spawn" x="128" y="160" width="64" height="160">
+   <properties>
+    <property name="spawngroup" value="vermin"/>
+   </properties>
+  </object>
+  <object name="vermin_2" type="spawn" x="416" y="160" width="64" height="160">
+   <properties>
+    <property name="spawngroup" value="vermin"/>
+   </properties>
+  </object>
+  <object name="vermin_3" type="spawn" x="480" y="160" width="128" height="32">
+   <properties>
+    <property name="spawngroup" value="vermin"/>
    </properties>
   </object>
-  <object name="smuggler6" type="spawn" x="512" y="320" width="32" height="32"/>
-  <object name="vermin" type="spawn" x="256" y="288" width="160" height="96"/>
-  <object name="vermin" type="spawn" x="128" y="160" width="64" height="160"/>
-  <object name="vermin" type="spawn" x="416" y="160" width="64" height="160"/>
-  <object name="vermin" type="spawn" x="480" y="160" width="128" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index f0e7f3973..e15015a79 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -17,12 +17,12 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
 	public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
 	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
-	public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
+	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
 	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
 	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED;
-	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 42;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 43;
 	public static final String CURRENT_VERSION_DISPLAY = "0.7.2dev";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
index b7acc4de6..e242ad5d9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
@@ -143,7 +143,7 @@ public final class ConversationController {
 			tileMap = world.model.currentTileMap;
 		}
 		for (MonsterSpawnArea area : map.spawnAreas) {
-			if (!area.monsterTypeSpawnGroup.equals(monsterTypeSpawnGroup)) continue;
+			if (!area.areaID.equals(monsterTypeSpawnGroup)) continue;
 			controllers.monsterSpawnController.activateSpawnArea(map, tileMap, area, true);
 		}
 	}
@@ -151,7 +151,7 @@ public final class ConversationController {
 	private void deactivateSpawnArea(String mapName, String monsterTypeSpawnGroup, boolean removeAllMonsters) {
 		PredefinedMap map = findMapForScriptEffect(mapName);
 		for (MonsterSpawnArea area : map.spawnAreas) {
-			if (!area.monsterTypeSpawnGroup.equals(monsterTypeSpawnGroup)) continue;
+			if (!area.areaID.equals(monsterTypeSpawnGroup)) continue;
 			controllers.monsterSpawnController.deactivateSpawnArea(area, removeAllMonsters);
 		}
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
index e0a8ddab5..61d3aa8e5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
@@ -60,6 +60,7 @@ public final class MonsterMovementController implements EvaluateWalkable {
 
 		for (MapObject m : map.eventObjects) {
 			if (m == null) continue;
+			if (!m.isActive) continue;
 			if (!m.position.intersects(p)) continue;
 			switch (m.type) {
 				case newmap:
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
index fa158e0b4..cbde9931b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
@@ -17,7 +17,7 @@ public final class MonsterSpawnArea {
 	public final CoordRect area;
 	public final Range quantity;
 	private final Range spawnChance;
-	public final String monsterTypeSpawnGroup;
+	public final String areaID;
 	public final String[] monsterTypeIDs;
 	public final ArrayList<Monster> monsters = new ArrayList<Monster>();
 	public final boolean isUnique; // unique == non-respawnable
@@ -29,7 +29,7 @@ public final class MonsterSpawnArea {
 			CoordRect area
 			, Range quantity
 			, Range spawnChance
-			, String monsterTypeSpawnGroup
+			, String areaID
 			, String[] monsterTypeIDs
 			, boolean isUnique
 			, String group
@@ -38,7 +38,7 @@ public final class MonsterSpawnArea {
 		this.area = area;
 		this.quantity = quantity;
 		this.spawnChance = spawnChance;
-		this.monsterTypeSpawnGroup = monsterTypeSpawnGroup;
+		this.areaID = areaID;
 		this.monsterTypeIDs = monsterTypeIDs;
 		this.isUnique = isUnique;
 		this.group = group;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
index c3e5cf1ec..83e0bd0ae 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
@@ -213,7 +213,30 @@ public final class PredefinedMap {
 						L.log("WARNING: Trying to load monsters from savegame in map " + this.name + " for spawn #" + i + ". This will totally fail.");
 					}
 				}
-				this.spawnAreas[i].readFromParcel(src, world, fileversion);
+				if(fileversion >= 43) {
+					//Spawn areas now have unique IDs. Need to check as maps can change.
+					int idLength = src.readInt();
+					byte[] idBytes = new byte[idLength];
+					src.read(idBytes);
+					String id = new String(idBytes);
+					int j = i;
+					boolean found = false;
+					do {
+						if (this.spawnAreas[j].areaID.equals(id)) {
+							this.spawnAreas[j].readFromParcel(src, world, fileversion);
+							found = true;
+							break;
+						} 
+						j = (j+1)%spawnAreas.length;
+					} while (j != i);
+					if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+						if (!found) {
+							L.log("WARNING: Trying to load monsters from savegame in map " + this.name + " for spawn #" + id + " but this area cannot be found. This will totally fail.");
+						}
+					}
+				} else {
+					this.spawnAreas[i].readFromParcel(src, world, fileversion);
+				}
 			}
 
 			groundBags.clear();
@@ -277,6 +300,9 @@ public final class PredefinedMap {
 			dest.writeBoolean(true);
 			dest.writeInt(spawnAreas.length);
 			for(MonsterSpawnArea a : spawnAreas) {
+				byte[] idBytes = a.areaID.getBytes();
+				dest.writeInt(idBytes.length);
+				dest.write(idBytes);
 				a.writeToParcel(dest);
 			}
 			dest.writeInt(groundBags.size());
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
index 1c3005c16..8820ac392 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
@@ -81,9 +81,9 @@ public final class TMXMapTranslator {
 						}
 						mapObjects.add(MapObject.createMapChangeArea(position, object.name, map, place, group.name, isActiveForNewGame));
 					} else if (object.type.equalsIgnoreCase("spawn")) {
-						ArrayList<MonsterType> types = monsterTypes.getMonsterTypesFromSpawnGroup(object.name);
 						int maxQuantity = 1;
 						int spawnChance = 10;
+						String spawnGroup = object.name;
 						for (TMXProperty p : object.properties) {
 							if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
 								if (p.value.equals("")) {
@@ -97,11 +97,14 @@ public final class TMXMapTranslator {
 								spawnChance = Integer.parseInt(p.value);
 							} else if (p.name.equalsIgnoreCase("active")) {
 								isActiveForNewGame = Boolean.parseBoolean(p.value);
+							} else if (p.name.equalsIgnoreCase("spawngroup")) {
+								spawnGroup = p.value;
 							} else if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
 								L.log("OPTIMIZE: Map " + m.name + ", spawn " + object.name + "@" + topLeft.toString() + " has unrecognized property \"" + p.name + "\".");
 							}
 						}
 
+						ArrayList<MonsterType> types = monsterTypes.getMonsterTypesFromSpawnGroup(spawnGroup);
 						if (types.isEmpty()) {
 							if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
 								L.log("OPTIMIZE: Map " + m.name + " contains spawn \"" + object.name + "\"@" + topLeft.toString() + " that does not correspond to any monsters. The spawn will be removed.");
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
index 1520e341f..f475c3056 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
@@ -116,7 +116,7 @@ public final class LegacySavegameFormatReaderForPlayer {
 	private static void deactivateSpawnArea(WorldContext world, ControllerContext controllers, String mapName, String monsterTypeSpawnGroup) {
 		PredefinedMap map = world.maps.findPredefinedMap(mapName);
 		for (MonsterSpawnArea area : map.spawnAreas) {
-			if (!area.monsterTypeSpawnGroup.equals(monsterTypeSpawnGroup)) continue;
+			if (!area.areaID.equals(monsterTypeSpawnGroup)) continue;
 			controllers.monsterSpawnController.deactivateSpawnArea(area, true);
 		}
 	}