From 58f286b90d3a95ba9a43c36b41112d49e86fd39f Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Fri, 27 Jan 2012 18:50:17 +0100
Subject: Fixed custom attack with particle effects on the 0.6.0 client.

Note that a client fix was also needed after all.

Thanks to Ali-G for spotting that one.
---
 effects.xml  | 6 +++++-
 monsters.xml | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/effects.xml b/effects.xml
index cfcdb64f..2cf75438 100644
--- a/effects.xml
+++ b/effects.xml
@@ -52,6 +52,10 @@
     <effect id="301" particle="graphics/particles/casket-lid.xml"/>
     <effect id="302" particle="graphics/particles/casket-monster.xml"/>
 
+    <!-- Monster attack particle effects -->
+    <effect id="400" particle="graphics/particles/monster-goblin-firebreath.particle.xml"/>
+    <effect id="401" particle="graphics/particles/monster-lizard-firebreath.particle.xml"/>
+
     <!-- Emotion Effects -->
     <effect id="10000" particle="graphics/particles/emotes/emote-disgust.particle.xml"/>
     <effect id="10001" particle="graphics/particles/emotes/emote-surprise.particle.xml"/>
@@ -71,7 +75,7 @@
 // Add the data need for the electricity boss battle
 </being-effects>
 
-<!-- 
+<!--
      Note: Effects definition for client version superior or equal to 0.6.x will prefer
      the 'effects' root tag when possible.
 -->
diff --git a/monsters.xml b/monsters.xml
index 46dfe1c7..08b8d720 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -71,7 +71,8 @@
         <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound>
         <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound>
         <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound>
-        <attack id="1"
+        <!-- The particle-effect parameter is kept for 0.5.x compatibility -->
+        <attack id="1" effect-id="400"
                 particle-effect="graphics/particles/monster-goblin-firebreath.particle.xml"
                 />
     </monster>
@@ -233,7 +234,8 @@
         <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound>
         <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound>
         <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound>
-        <attack id="1"
+        <!-- The particle-effect parameter is kept for 0.5.x compatibility -->
+        <attack id="1" effect-id="401"
                 particle-effect="graphics/particles/monster-lizard-firebreath.particle.xml"
                 />
     </monster>
-- 
cgit v1.2.3-70-g09d2