Merge branch 'map-renaming' of git@gitorious.org:tmwdata/mainline into map-renaming

5 files changed, 17 insertions, 99 deletions

diff --git a/graphics/items/armor-head-mouboohead.png b/graphics/items/armor-head-mouboohead.png
index 1ad4909c..cb665a11 100644
--- a/graphics/items/armor-head-mouboohead.png
+++ b/graphics/items/armor-head-mouboohead.png
diff --git a/items.xml b/items.xml
index 42f38f1f..99ff657d 100644
--- a/items.xml
+++ b/items.xml
@@ -11,9 +11,7 @@
 -->
 <items>
     
-    <!-- Version of this items.xml file to ensure that account-server and
-         game-server are in-sync -->
-    <version revision="1" />
+    <version revision="$Revision$" />
     
     <!-- Pseudo-item hairstyles. Using negative IDs is just a temporary
          solution. I would like to use the lower ID numbers when they aren't
@@ -55,9 +53,13 @@
         <sprite gender="female">player_female_base.xml</sprite>
     </item>
 
+    <item id="16">
+<!--        <sprite>weapon-dagger.xml</sprite>-->
+    </item>
 
     <!-- TEMPORARY LOW WEAPON ID:S (< 256) -->
 
+
     <item id="30"
         weapon_type="1">
         <sprite>weapon-dagger.xml</sprite>
@@ -479,7 +481,7 @@
         weight="365"
         max-per-slot="10"/>
     <item id="543"
-        image="armor-head-standardheadband.png|W:#e8ca19"
+        image="armor-head-standardheadband.png|W:#291e16,99784c,d8bd86,ffffff"
         name="Standard Headband"
         description="Just a standard headband."
         effect="+3% Defense"
@@ -487,7 +489,7 @@
         weight="45"
         max-per-slot="1"
         defense="3">
-        <sprite>item007.xml|#e8ca19</sprite>
+        <sprite>item007.xml|#563f25,99784c,d8bd86,ffffff</sprite>
     </item>
     <item id="544"
         image="armor-head-silkheadband.png"
@@ -2143,6 +2145,13 @@
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
         
+    <item id="1198"
+        image="generic-spectral-orb.png|R:#FF6600,FF9933,FFFF33"
+        name="Jack O Soul"
+        description="The soul of a Jack O."
+        effect=""
+        type="generic"
+        weight="1"/>
     <item id="1199"
         image="weapon-arrow-arrow.png"
         name="Arrow"
diff --git a/maps/002-2.tmx b/maps/002-2.tmx
deleted file mode 100644
index 566a1739..00000000
--- a/maps/002-2.tmx
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="128" height="128" tilewidth="32" tileheight="32">
- <properties>
-  <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
-  <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
-  <property name="minimap" value="graphics/images/minimap_new_2-1.png"/>
- </properties>
- <tileset name="cave" firstgid="1" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/cave.png" trans="ff00ff"/>
- </tileset>
- <tileset name="collision" firstgid="129" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/collision.png" trans="000000"/>
- </tileset>
- <layer name="Ground" width="128" height="128">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAO2dzVLkNhRGtSA8QAjzAEMIle1AT5hNkkriwGySef+nGauqb5Va6O/Kki3jszhV0EC78fkky9Jt9a0x5hYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAODMzcx9B37c6LX+OsA53QsPM3czp5nnM6czv8/8MfOn89jJ+53nxGMfTbsMiPe7wHH8rz8a8lHKbzOPM9PM65npzH8z/898cx6bvN95TTz2ybTJwI3j/TFwHP/rT+YyF35OQvk4aiZeZv6e+aEDf5nlGRD34r3ktf5jLnPh50Ty4WbjywAutuBDJ/ehDNSMIcR9y4xKPtxsfDXH7Ad6+3cz4Le50Pf+Y63dx3gyl2OHo+RgDf+SAb/Nhb73H1vDvdsn2JzKGOEIGVjL/16wOZAxwhEygP94DmwG3vu4EP/pDHwdwBH+t+OnARzhP86V879cRx73uVY8P/7HJeW41f+N//Ztc0vv+F/P/8jnDv9j+Lfrj/dKWqwp4n8M/3b98WTSc8EnE17fXZID/I/h364/TiY9FzyZ8PpuTQ6kjuAX/G/u/0HhwcWdq5cclGTArSP4jP/N/Ms1/07hIZeDVAbc2iGpI/i34Plb3GeMzhb+5Zr/WOihJAexuXq/dkhzvPfe9rfyL9f81jUdP5vLPsCvHaLN9yE2txPyX3vNL8HWcHxxjiPu8d6XWB/i+xcnuWt+zEVuDlH6ALtmL3WtuB/Hf4mTkmtuKgfSB7wUurdIZrY+j3ul1H+JE82YK5QDWbPXjGvc6wb0859zou2HU8fV+D9CncfW/nPjvpp7rVb+a48P5f7ttT817sP/finxn7v243+/lPhP+ag99y39cw+wL/+p8USNf+4B9uU/NZ6o8c89QD//ubZac8zUeKLGP2OAfv5zbbXlMfE/nv9cW215zKvMz/GfJ7fHjl9nkfO/9tgf/8u8u/sBnczb2ky/7g7/+ye0x07sffp+3d3a/u1rDY0n3fUD/Jfj1kpYv7k1Or/uLje2T7nwa3ZKiI0nS+838f/2fNbU4kndXW5sn3KhnXeRth96rfivQ1MrEcpAydg+VrOhnXcpvZfEfzm9akBbz/9J24/VjeL/fftPtX2/dgT/78t/6rofeg78t/Hvt6vavTOW+tfWj+B/uf8le6iEzqXmfQI+2voR/C/3nzsfMZ+x3NQeJzbfg/++/mvmZnrkLNf3t/B/5PeAxM6VnZtpuYd/jf/cuC/mTuP/yO6FUF/u7929NAc1/mvavtb/Ufv9kvPl7t29NAda/yVtH/99/UsGJlOfg9yeK6HzL+uRJftD4L8NuXu6WA5CWXBrSHJ7roTOf+malPZeA//LMuDnwK8J8Z0/m/y6sn/+S/v91LgN/30zIDnwa0Lcz+2Yzj9P7fPhO1za78veQpo9JvC/LAdun6D93A733Lv7tZSsR8euGzZ/mn2l8N8mAzXIude69/sNt91Phc+B/20zIA6XuHf3krPXnpr95PC/fg6uzNt9+UrbrPu+IvFu//5V8Rz43y4LV+ayzWprD133S7zjfxvc/R817qTf1+7thv9xkHv7Semul3v8r+u+Zs9fd7xXW6uO/zHca93593lLatXxv2/3lh61qvjvS0mfXVqD0do/tR/9yfXZGget/dP2+9Oi9v/e6Nd1aPtjkHv/r7iVGgJ//wmZJzqZZZ8XQtsfz/+Tefu5Xq5vi8wTTYb7vj2S8i97CVikhsD13do5/sfyH8pCL9/4H9v/2uB/PXrXEGiPwdh/3znI+dO+NxH2kQn8AQAAAAAAAAAAAAAAAAAAAAAAAAAAAADAlnwHbKCdQgAAAQA=
-  </data>
- </layer>
- <layer name="Fringe" width="128" height="128">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAO3BAQEAAACAkP6v7ggKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAauuOl9cAAAEA
-  </data>
- </layer>
- <layer name="Over" width="128" height="128">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAO3dTW6DMBAGULbNBdrc/6JNpFZByCB+bGN73pNYJEqy+YYxMQamCQAAAAAAAAAAAAAAAAAAAAAAANr2/dp+/rbnyvvL7TkxgnfGj9nrr+mT8SP5jc/n1EB5a/tmrt/dypi2zPfNq5vcAQAoYfn/EhjbfM4iwr6f43/5CHNp5pTasTZ3X6rOjPPt2Mriv1eN0G84Tx2MSR+OS/YA8ej9APHo/UAu+glAPHo/QFtcbwmU5NgP8luuxTWOx5HqqXvXXqbuzaF2xrGVp7E4hrVrh3rMXs3262p20bM3NgPE1esYEH3szqm3GpB9frVrQIbtcX01by2PB/pGHSVr4GyGsq+rxHggw/7M5/uv1MKV7NVNG67cN072HCX7uGQfl+zjkn0cqXu+1shejd1PBnHdmb26AwCA/EqvIThzTtKxf1251xCknte05/y05zzdK3Xe+Oh+uye/ka5NHN2RtQTyAwAAAAAAAAAAAAAA7vQLrvgsPAAAAQA=
-  </data>
- </layer>
- <layer name="Collision" width="128" height="128" opacity="0.42">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAO3SS24lMQxD0Vp7Vt7DAEHblmTJ9OcSOKPk2VVk/Xzf9wMAAAAAAAAAAAAAAAAAAAAAAAAAAADgeRVRPau6y9NUZsfnVPe9m+q88oynWpGbn+905DfqLdh/j6g3YX991Luwvz7qbdi/n9a7ZL2zehv2b2fFe6u3OXn/qntWvrd6m5v2380N78D+7M/+7M/+7H/q/lXnsv+d+3vPj96r3oX9c+/x3qfe5YX9V95luU+9xam8XVaE3e/YP/t3o6i7u4G311Zm7vvf7y1Rd3cDT6+9zN7r3T5yJ+L795J9rzXq7m5g7bWVins9Ufd3OmunrbD/2aydtsL+Z7N0WtF97zxP1P2dztJpRfe98zxR93c6S6cV3ffO80Td3+ksnVb03jvTG3WHJ7P0md15K+z/7v6W76MVdYcnG/VZ0Xn0zopned2oz4rOo3dWPMvrRn1WdD46yxt1hzvx9jT6P89Z7L/n7r2+In//+z/sf872fzvr/c3zPzPPyv5rtx/Fegf761Wkan/rGbPP+5KKsP85PJ1YU7F/xXNGnuM2kT4iXUbuYf8994/8LnpP5HvzRr3BifuvvKeX2f3V/aut6mTmnlYi30v1e55oRS/R/nthf+027H+HFf1Ezh+F/eu/gayeIudGn8kadee7qezLe97Mc1ij7ntH2b1Fzpi93xp11zub6TD6O/bfS2Wqtmf//b+Bqu2zngN138HM+ey/h2iqts9+Huz1LWXvPjoXe+z+Jfw+cjb0u39JZ0TOh37/6u17d+D+7Xv3YN32Fd+PJeo+XpK1QWbUnbwis/+sqDt5SeYGWVF38pLMDbKi7uQlsxtURN3JS7x7rIi6k5fsGHUnr6lI9A51Fy/LSPQe9btj7ptQPycAAAAAAAAAAAAAAAAAAAAAAHjbP723EooAAAEA
-  </data>
- </layer>
- <objectgroup name="Objects" width="0" height="0">
-  <object name="CaveExit" type="WARP" x="1152" y="960" width="128" height="32">
-   <properties>
-    <property name="DEST_MAP">
-     1
-    </property>
-    <property name="DEST_Y">
-     2880
-    </property>
-    <property name="DEST_X">
-     592
-    </property>
-   </properties>
-  </object>
-  <object name="Red Slime" type="SPAWN" x="1088" y="1088" width="320" height="320">
-   <properties>
-    <property name="MONSTER_ID">
-     6
-    </property>
-   </properties>
-  </object>
-  <object name="Black Scorpion" type="SPAWN" x="2496" y="2816" width="320" height="320">
-   <properties>
-    <property name="MONSTER_ID">
-     7
-    </property>
-   </properties>
-  </object>
-  <object name="Nathan the Miner" type="NPC" x="1136" y="1136" width="0" height="0">
-   <properties>
-    <property name="SCRIPT">
-     function npc_handler(npc, ch)
-       do_message(npc, ch, "It's very dangerous in here\nBe careful")
-     end
-    </property>
-    <property name="NPC_ID">
-     109
-    </property>
-   </properties>
-  </object>
-  <object name="Naem the Miner" type="NPC" x="2736" y="3120" width="0" height="0">
-   <properties>
-    <property name="SCRIPT">
-     function npc_handler(npc, ch)
-       do_message(npc, ch, "We discovered an underground palace\nDo you want me to let you in?")
-       local v = do_choice(npc, ch, "Sure", "Not yet!")
-       if v == 1 then
-         tmw.chr_warp(ch, 5, 34 * 32 + 16, 92 * 32 + 16)
-       end
-     end
-    </property>
-    <property name="NPC_ID">
-     109
-    </property>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/maps/013-3.tmx b/maps/013-3.tmx
index 5cd10229..e7f84df3 100644
--- a/maps/013-3.tmx
+++ b/maps/013-3.tmx
@@ -154,7 +154,7 @@
    <properties>
     <property name="dest_map" value="018-3"/>
     <property name="dest_x" value="4288"/>
-    <property name="dest_y" value="1984"/>
+    <property name="dest_y" value="1920"/>
    </properties>
   </object>
   <object name="toCave" type="warp" x="3936" y="3328" width="32" height="32">
@@ -216,7 +216,7 @@
   <object name="toCave" type="warp" x="2272" y="1344" width="32" height="32">
    <properties>
     <property name="dest_map" value="013-3"/>
-    <property name="dest_x" value="6336"/>
+    <property name="dest_x" value="3488"/>
     <property name="dest_y" value="672"/>
    </properties>
   </object>
diff --git a/maps/018-1.tmx b/maps/018-1.tmx
index fc45a657..5712adf0 100644
--- a/maps/018-1.tmx
+++ b/maps/018-1.tmx
@@ -144,7 +144,7 @@
   </object>
   <object name="toCave" type="warp" x="5664" y="640" width="32" height="32">
    <properties>
-    <property name="dest_map" value="013-1"/>
+    <property name="dest_map" value="013-3"/>
     <property name="dest_x" value="5664"/>
     <property name="dest_y" value="2880"/>
    </properties>