Prepare a few surprises at 026-1. Update items

2 files changed, 28 insertions, 17 deletions

diff --git a/items.xml b/items.xml
index 02c5e85c..5068e9af 100644
--- a/items.xml
+++ b/items.xml
@@ -725,14 +725,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		effect="Heal 8%-12% HP"
 		type="usable"
 		weight="7"/>
-	<item id="563"
-		image="usable/food/plum.png"
-		name="Plum"
-		description="A Fresh healthy plum."
-		useButton="Eat"
-		effect="Doesn't work. Heal HP, please report."
-		type="usable"
-		weight="10"/>
+	<!-- 563 free -->
 	<item id="564"
 		image="usable/food/pumpkinjuice.png"
 		name="Pumpkin Juice"
@@ -767,10 +760,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="40"/>
 	<item id="568"
 		image="usable/potion/skullpotion.png"
-		name="Skull Potion"
-		description="A bottle in the shape of a skull."
+		name="Death Potion"
+		description="A bottle containing a very strong poison."
 		useButton="Drink"
-		effect="Heal 2%-3% HP"
+		effect="Kills user"
 		type="usable"
 		weight="25"/>
 	<item id="569"
diff --git a/maps/026-1.tmx b/maps/026-1.tmx
index d4d6febf..6da874dd 100644
--- a/maps/026-1.tmx
+++ b/maps/026-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="3">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="11">
  <properties>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/026-1.png"/>
@@ -827,11 +827,11 @@
 2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
 2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
 2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
-2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,2904,2904,0,0,0,2904,2904,0,0,0,2904,0,2904,2904,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
-2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,2904,2904,0,0,0,2904,2904,0,0,0,2904,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
-2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,2904,2904,0,0,0,2904,2904,0,0,0,2904,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,0,0,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
-2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,2904,2904,0,0,0,2904,2904,0,0,0,2904,0,0,0,2904,2904,2904,0,0,0,2904,2904,2904,0,0,0,2904,2904,2904,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,0,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
-2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,2904,2904,0,0,0,2904,2904,0,0,0,2904,0,0,0,2904,2904,2904,0,0,0,2904,2904,2904,0,0,0,2904,2904,2904,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,0,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
+2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,2904,2904,0,0,0,2904,2904,2904,2904,2904,2904,0,2904,2904,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
+2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,2904,2904,0,0,0,2904,2904,2904,2904,2904,2904,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
+2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,2904,2904,0,0,0,2904,2904,2904,2904,2904,2904,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,0,0,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
+2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,2904,2904,0,0,0,2904,2904,2904,2904,2904,2904,0,0,0,2904,2904,2904,0,0,0,2904,2904,2904,0,0,0,2904,2904,2904,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,0,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
+2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,2904,2904,0,0,0,2904,2904,2904,2904,2904,2904,0,0,0,2904,2904,2904,0,0,0,2904,2904,2904,0,0,0,2904,2904,2904,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,0,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
 2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,2904,2904,2904,2904,0,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,0,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
 2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,2904,0,0,0,0,0,2904,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,0,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
 2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,2904,2904,2904,2904,0,0,0,0,0,0,0,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,2904,
@@ -1062,5 +1062,23 @@
     <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
+  <object id="3" name="026-1_GateA" type="dyncollision" x="1856" y="2432" width="160" height="32"/>
+  <object id="4" name="026-1_GateB" type="dyncollision" x="800" y="1024" width="32" height="32"/>
+  <object id="5" name="026-1_GateC" type="dyncollision" x="960" y="1024" width="32" height="32"/>
+  <object id="8" name="026-1_SwitchA" type="switch" x="768" y="896" width="32" height="32">
+   <properties>
+    <property name="doevent" value="#026-1_30_32::OnDisable"/>
+   </properties>
+  </object>
+  <object id="9" name="026-1_SwitchB" type="switch" x="960" y="896" width="32" height="32">
+   <properties>
+    <property name="doevent" value="#026-1_25_32::OnDisable"/>
+   </properties>
+  </object>
+  <object id="10" name="026-1_SwitchC" type="switch" x="1984" y="896" width="32" height="32">
+   <properties>
+    <property name="doevent" value="#026-1_58_76::OnDisable"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>