Includes a couple of new testing items: 586 and 3518

3 files changed, 46 insertions, 0 deletions

diff --git a/effects.xml b/effects.xml
index 0696d5f5..ffba7a28 100644
--- a/effects.xml
+++ b/effects.xml
@@ -41,6 +41,7 @@ Copyright (C) 2010-2014 Evol Online -->
     <!-- Reserved for TMW2: id 50~250 -->
     <effect id="50" particle="graphics/particles/smoke.xml"/> <!-- Smoke particle effect. -->
     <effect id="51" particle="graphics/particles/medium-blindinglight.xml"/> <!-- Bug bomb -->
+    <effect id="52" particle="graphics/particles/medium-blindinglight2.xml"/> <!-- Smoke Grenade -->
 
 
     <effect id="310" particle="graphics/particles/circle-magic.xml"/> <!-- A magical circle, which GMs can use -->
diff --git a/graphics/particles/medium-blindinglight2.xml b/graphics/particles/medium-blindinglight2.xml
new file mode 100644
index 00000000..45cc9981
--- /dev/null
+++ b/graphics/particles/medium-blindinglight2.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+Smoke Grenade: When you need to take players by surprise and RUN.
+-->
+<effect>
+  <particle position-x="-16" position-y="0" position-z="40" lifetime="200">
+    <emitter>
+      <property name="position-x" min="-2" max="2"/>
+      <property name="position-y" min="-2" max="2"/>
+      <property name="vertical-angle" min="-60" max="60"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="3"/>
+      <property name="gravity" value="0.1"/>
+      <property name="image" value="graphics/particles/light-large.png"/>
+      <property name="lifetime" min="200" max="200"/>
+      <property name="output" min="10" max="800"/>
+      <property name="fade-out" value="10"/>
+      <property name="bounce" value="0.1"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/items.xml b/items.xml
index 880746d6..ca6d014e 100644
--- a/items.xml
+++ b/items.xml
@@ -875,6 +875,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
         effect="Heal 1000-5000 HP"
         type="usable"
         weight="5"/>
+    <item id="586"
+        image="usable/cactuspotion.png"
+        name="Smoke Grenade"
+        description="Explodes and could cause splash damage... If it didn't missed every single time."
+        useButton="Explode"
+        effect="Splash damage"
+        type="usable"
+        weight="40"/>
 
 
     <!-- Generic Items -->
@@ -3892,6 +3900,22 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
         <sound event="hit">weapons/piouslayer/hit1.ogg</sound>
         <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
     </item>
+    <item id="3518"
+        image="equipment/weapons/staffoflife.png"
+        name="Jesusalva's Judgement ★★★"
+        description="The program is buggy? No worries, maybe it is time to destroy everything."
+        attack="100"
+        effect="Splash damage: cast Magnum Break on attack."
+        level="40"
+        critical-hit-effect-id="312"        
+        hit-effect-id="312"        
+        miss-effect-id="50"
+        type="equip-2hand"
+        weight="1000">
+        <sprite>equipment/weapons/piouslayer.xml</sprite>
+        <sound event="hit">weapons/piouslayer/hit1.ogg</sound>
+        <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+    </item>
     <!-- Pets -->
     <item id="4000"
         image="usable/piouegg.png"