Merge branch 'equipment_overhaul' into 'master'

To resolve some of the pipeline errors

See merge request themanaworld/evolved/clientdata!5

29 files changed, 170 insertions, 96 deletions

diff --git a/graphics/particles/aniblaze-medium.png b/graphics/particles/aniblaze-medium.png
index f49dea36..edc2c72b 100644
--- a/graphics/particles/aniblaze-medium.png
+++ b/graphics/particles/aniblaze-medium.png
diff --git a/graphics/particles/aniblaze.png b/graphics/particles/aniblaze.png
index 7249001c..e6750d1f 100644
--- a/graphics/particles/aniblaze.png
+++ b/graphics/particles/aniblaze.png
diff --git a/graphics/particles/bonfire.particle.xml b/graphics/particles/bonfire.particle.xml
index c02afb60..f3a90fc2 100644
--- a/graphics/particles/bonfire.particle.xml
+++ b/graphics/particles/bonfire.particle.xml
@@ -11,7 +11,7 @@ Special fire animation for bonfire tile. Can be used only on the open air.
       <property name="vertical-angle" min="0" max="90"/>
       <property name="power" min="0" max="0.05"/>
       <property name="gravity" value="-0.03"/>
-      <animation imageset="graphics/particles/aniblaze.png|W:#BF0019,FF6715,FFE659" width="8" height="8">
+      <animation imageset="graphics/particles/aniblaze.png" width="8" height="8">
         <sequence start="0" end="14" delay="30"/>
         <frame index="14" delay="1000"/>
       </animation>
@@ -27,7 +27,7 @@ Special fire animation for bonfire tile. Can be used only on the open air.
       <property name="vertical-angle" min="0" max="90"/>
       <property name="power" min="0" max="0.05"/>
       <property name="gravity" value="-0.03"/>
-      <animation imageset="graphics/particles/aniblaze.png|W:#BF0019,FF6715,FFE659" width="8" height="8">
+      <animation imageset="graphics/particles/aniblaze.png" width="8" height="8">
         <sequence start="0" end="14" delay="30"/>
         <frame index="14" delay="1000"/>
       </animation>
@@ -42,7 +42,7 @@ Special fire animation for bonfire tile. Can be used only on the open air.
       <property name="vertical-angle" min="0" max="90"/>
       <property name="power" min="0.0" max="0.05"/>
       <property name="gravity" value="-0.03"/>
-      <animation imageset="graphics/particles/aniblaze.png|W:#BF0019,FF6715,FFE659" width="8" height="8">
+      <animation imageset="graphics/particles/aniblaze.png" width="8" height="8">
         <sequence start="0" end="14" delay="30"/>
         <frame index="14" delay="1000"/>
       </animation>
diff --git a/graphics/particles/circle-magic.xml b/graphics/particles/circle-magic.xml
index ce597fba..64be7747 100644
--- a/graphics/particles/circle-magic.xml
+++ b/graphics/particles/circle-magic.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0"?>
+
 <effect>
-  <particle position-x="16" position-y="24" position-z="0">
+  <particle
+    position-x = "16"
+    position-y = "24"
+    position-z = "0"
+    >
+
     <animation imageset="graphics/particles/circle-magic.png" width="78" height="55">
       <sequence start="0" end="9" delay="80"/>
     </animation>
+
     <emitter>
       <property name="horizontal-angle" min="0" max="360"/>
       <property name="vertical-angle" value="0"/>
@@ -20,5 +27,6 @@
         </animation>
       </emitter>
     </emitter>
+
   </particle>
 </effect>
diff --git a/graphics/particles/fog-medium-a.png b/graphics/particles/fog-medium-a.png
index f2b29eb6..a488a86c 100644
--- a/graphics/particles/fog-medium-a.png
+++ b/graphics/particles/fog-medium-a.png
diff --git a/graphics/particles/fog-medium-b.png b/graphics/particles/fog-medium-b.png
index f2a344a1..6698ef0d 100644
--- a/graphics/particles/fog-medium-b.png
+++ b/graphics/particles/fog-medium-b.png
diff --git a/graphics/particles/fog-medium-c.png b/graphics/particles/fog-medium-c.png
index db3413e9..bb20be3f 100644
--- a/graphics/particles/fog-medium-c.png
+++ b/graphics/particles/fog-medium-c.png
diff --git a/graphics/particles/glow-medium.png b/graphics/particles/glow-medium.png
index 580e6c6b..b7ef24e3 100644
--- a/graphics/particles/glow-medium.png
+++ b/graphics/particles/glow-medium.png
diff --git a/graphics/particles/glow-small.png b/graphics/particles/glow-small.png
index c625f06d..f2d180d1 100644
--- a/graphics/particles/glow-small.png
+++ b/graphics/particles/glow-small.png
diff --git a/graphics/particles/gloworb-medium.png b/graphics/particles/gloworb-medium.png
index d437ca58..0d45d78f 100644
--- a/graphics/particles/gloworb-medium.png
+++ b/graphics/particles/gloworb-medium.png
diff --git a/graphics/particles/gloworb-small.png b/graphics/particles/gloworb-small.png
index fc7158d2..ab62402c 100644
--- a/graphics/particles/gloworb-small.png
+++ b/graphics/particles/gloworb-small.png
diff --git a/graphics/particles/heartnecklace.particle.xml b/graphics/particles/heartnecklace.particle.xml
index fd63fdbc..aba3ef38 100644
--- a/graphics/particles/heartnecklace.particle.xml
+++ b/graphics/particles/heartnecklace.particle.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-Green stars which are supposed to engulf a character
+Hearts which are supposed to engulf a character
 -->
 <effect>
   <particle position-x="0" position-y="0" position-z="0">
     <emitter>
-      <property name="image" value="graphics/particles/single-heart.png"/>
+      <property name="image" value="graphics/particles/pinkheart.png"/>
       <property name="vertical-angle" value="90"/>
       <property name="gravity" min="-0.5" max="-0.6"/>
       <property name="momentum" value="0.0001"/>
diff --git a/graphics/particles/hellblaze.particle.xml b/graphics/particles/hellblaze.particle.xml
index b9ab089c..55b45c20 100644
--- a/graphics/particles/hellblaze.particle.xml
+++ b/graphics/particles/hellblaze.particle.xml
@@ -8,10 +8,14 @@ It is about 100 pixels wide and 200 pixels high, takes about 280 particles and
 lowers my FPS by about 30%.
 -->
 <effect>
-  <particle position-x="0" position-y="0" position-z="150">
+  <particle
+    position-x = "0"
+    position-y = "0"
+    position-z = "150"
+    >
     <emitter>
-      <property name="position-z" value="-150"/>
-      <property name="position-y" value="32"/>
+      <property name="position-z" value="-150" />
+      <property name="position-y" value="32" />
       <property name="acceleration" value="0.05"/>
       <property name="momentum" value="0.95"/>
       <property name="image" value="graphics/particles/glow-medium.png|W:#dd3311"/>
@@ -19,12 +23,12 @@ lowers my FPS by about 30%.
       <property name="fade-in" value="30"/>
       <property name="fade-out" value="30"/>
       <property name="output" min="1" max="2"/>
-      <property name="horizontal-angle" min="0" max="360"/>
-      <property name="power" min="1" max="3"/>
+      <property name="horizontal-angle" min="0" max="360" />
+      <property name="power" min="1" max="3" />
     </emitter>
     <emitter>
-      <property name="position-z" value="-150"/>
-      <property name="position-y" value="32"/>
+      <property name="position-z" value="-150" />
+      <property name="position-y" value="32" />
       <property name="acceleration" value="0.05"/>
       <property name="momentum" value="0.95"/>
       <property name="image" value="graphics/particles/glow-medium.png|W:#ffff00"/>
@@ -32,12 +36,12 @@ lowers my FPS by about 30%.
       <property name="fade-in" value="10"/>
       <property name="fade-out" value="30"/>
       <property name="output" min="0" max="1"/>
-      <property name="horizontal-angle" min="0" max="360"/>
-      <property name="power" min="0" max="2"/>
+      <property name="horizontal-angle" min="0" max="360" />
+      <property name="power" min="0" max="2" />
     </emitter>
     <emitter>
-      <property name="position-z" value="-150"/>
-      <property name="position-y" value="32"/>
+      <property name="position-z" value="-150" />
+      <property name="position-y" value="32" />
       <property name="acceleration" value="0.05"/>
       <property name="momentum" value="0.95"/>
       <property name="image" value="graphics/particles/orb-medium.png|W:#dd3311"/>
@@ -45,13 +49,13 @@ lowers my FPS by about 30%.
       <property name="fade-in" value="10"/>
       <property name="fade-out" value="50"/>
       <property name="output" min="-1" max="1"/>
-      <property name="randomness" value="200"/>
-      <property name="horizontal-angle" min="0" max="360"/>
-      <property name="power" min="0" max="2"/>
+      <property name="randomnes" value="200"/>
+      <property name="horizontal-angle" min="0" max="360" />
+      <property name="power" min="0" max="2" />
     </emitter>
     <emitter>
-      <property name="position-z" value="-150"/>
-      <property name="position-y" value="32"/>
+      <property name="position-z" value="-150" />
+      <property name="position-y" value="32" />
       <property name="acceleration" value="0.05"/>
       <property name="momentum" value="0.95"/>
       <property name="image" value="graphics/particles/orb-medium.png|W:#ddff00"/>
@@ -59,9 +63,25 @@ lowers my FPS by about 30%.
       <property name="fade-in" value="10"/>
       <property name="fade-out" value="50"/>
       <property name="output" min="-1" max="1"/>
-      <property name="randomness" value="200"/>
-      <property name="horizontal-angle" min="0" max="360"/>
-      <property name="power" min="0" max="2"/>
+      <property name="randomnes" value="200"/>
+      <property name="horizontal-angle" min="0" max="360" />
+      <property name="power" min="0" max="2" />
+    </emitter>
+    <emitter>
+      <property name="position-z" value="-150" />
+      <property name="position-y" value="32" />
+      <property name="acceleration" value="0.05"/>
+      <property name="momentum" value="0.95"/>
+      <animation imageset="graphics/particles/aniblaze.png|W:#BF0019,FF6715,FFE659" width="8" height="8">
+        <sequence start="0" end="14" delay="20"/>
+        <frame index="14" delay="1000"/>
+      </animation>
+      <property name="lifetime" min="60" max="160"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="50"/>
+      <property name="output" min="-1" max="1"/>
+      <property name="horizontal-angle" min="0" max="360" />
+      <property name="power" min="0" max="2" />
     </emitter>
   </particle>
 </effect>
diff --git a/graphics/particles/light-large.png b/graphics/particles/light-large.png
index 9159ebf0..9ff0bfb7 100644
--- a/graphics/particles/light-large.png
+++ b/graphics/particles/light-large.png
diff --git a/graphics/particles/lightning2-263.png b/graphics/particles/lightning2-263.png
index 2a4900da..3ce165cf 100644
--- a/graphics/particles/lightning2-263.png
+++ b/graphics/particles/lightning2-263.png
diff --git a/graphics/particles/lightning3-275.png b/graphics/particles/lightning3-275.png
index c0f7ecec..4cd933c7 100644
--- a/graphics/particles/lightning3-275.png
+++ b/graphics/particles/lightning3-275.png
diff --git a/graphics/particles/magic.golden.xml b/graphics/particles/magic.golden.xml
index 18fb52ca..2da3e32e 100644
--- a/graphics/particles/magic.golden.xml
+++ b/graphics/particles/magic.golden.xml
@@ -1,18 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Alige, Unknown
+Copyright (C) 2016 Evol Online
+Copyright (C) 2004~2019 The Mana World -->
+
 <effect>
-  <particle position-x="0" position-y="0" position-z="0" lifetime="128">
-    <emitter>
-      <animation imageset="graphics/particles/sparkle.png|W:#a0a000,ffdf10" width="15" height="15">
-        <sequence start="0" end="3" delay="50"/>
-        <frame index="0" delay="100"/>
-      </animation>
-      <property name="vertical-angle" value="90"/>
-      <property name="power" min="1" max="1"/>
-      <property name="lifetime" min="15" max="25"/>
-      <property name="output" min="1" max="1"/>
-      <property name="position-x" min="-16" max="16"/>
-      <property name="position-y" min="-16" max="16"/>
-      <property name="position-z" min="29" max="40"/>
-    </emitter>
-  </particle>
+    <particle position-x="0"
+              position-y="0"
+              position-z="27"
+              lifetime="150">
+        <emitter>
+            <animation imageset="graphics/particles/sparkles.png|W:#a0a000,ffdf10" width="15" height="15">
+                <sequence start="0" end="3" delay="50"/>
+                <frame index="0" delay="100"/>
+            </animation>
+            <property name="vertical-angle" value="90"/>
+            <property name="power" value="1.1"/>
+            <property name="lifetime" min="50" max="60"/>
+            <property name="output" value="1"/>
+            <property name="output-pause" value="4"/>
+            <property name="fade-in" min="5" max="10"/>
+            <property name="fade-out" value="15"/>
+            <property name="position-x" min="-12" max="12"/>
+            <property name="position-y" value="32"/>
+        </emitter>
+    </particle>
 </effect>
diff --git a/graphics/particles/magic.green.xml b/graphics/particles/magic.green.xml
index 6641c6e8..5ca502a0 100644
--- a/graphics/particles/magic.green.xml
+++ b/graphics/particles/magic.green.xml
@@ -1,18 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Alige, Unknown
+Copyright (C) 2016 Evol Online
+Copyright (C) 2004~2019 The Mana World -->
+
 <effect>
-  <particle position-x="0" position-y="0" position-z="0" lifetime="128">
-    <emitter>
-      <animation imageset="graphics/particles/sparkle.png|W:#00a000,30ff30" width="15" height="15">
-        <sequence start="0" end="3" delay="50"/>
-        <frame index="0" delay="100"/>
-      </animation>
-      <property name="vertical-angle" value="90"/>
-      <property name="power" min="1" max="1"/>
-      <property name="lifetime" min="15" max="25"/>
-      <property name="output" min="1" max="1"/>
-      <property name="position-x" min="-16" max="16"/>
-      <property name="position-y" min="-16" max="16"/>
-      <property name="position-z" min="29" max="40"/>
-    </emitter>
-  </particle>
+    <particle position-x="0"
+              position-y="0"
+              position-z="27"
+              lifetime="150">
+        <emitter>
+            <animation imageset="graphics/particles/sparkles.png|W:#00a000,30ff30" width="15" height="15">
+                <sequence start="0" end="3" delay="50"/>
+                <frame index="0" delay="100"/>
+            </animation>
+            <property name="vertical-angle" value="90"/>
+            <property name="power" value="1.1"/>
+            <property name="lifetime" min="50" max="60"/>
+            <property name="output" value="1"/>
+            <property name="output-pause" value="4"/>
+            <property name="fade-in" min="5" max="10"/>
+            <property name="fade-out" value="15"/>
+            <property name="position-x" min="-12" max="12"/>
+            <property name="position-y" value="32"/>
+        </emitter>
+    </particle>
 </effect>
diff --git a/graphics/particles/magic.red.xml b/graphics/particles/magic.red.xml
index 59a494ae..e918928a 100644
--- a/graphics/particles/magic.red.xml
+++ b/graphics/particles/magic.red.xml
@@ -1,18 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Alige, Unknown
+Copyright (C) 2016 Evol Online
+Copyright (C) 2004~2019 The Mana World -->
+
 <effect>
-  <particle position-x="0" position-y="0" position-z="0" lifetime="128">
-    <emitter>
-      <animation imageset="graphics/particles/sparkle.png|W:#b00000,ff8020" width="15" height="15">
-        <sequence start="0" end="3" delay="50"/>
-        <frame index="0" delay="100"/>
-      </animation>
-      <property name="vertical-angle" value="90"/>
-      <property name="power" min="1" max="1"/>
-      <property name="lifetime" min="15" max="25"/>
-      <property name="output" min="1" max="1"/>
-      <property name="position-x" min="-16" max="16"/>
-      <property name="position-y" min="-16" max="16"/>
-      <property name="position-z" min="29" max="40"/>
-    </emitter>
-  </particle>
+    <particle position-x="0"
+              position-y="0"
+              position-z="27"
+              lifetime="150">
+        <emitter>
+            <animation imageset="graphics/particles/sparkles.png|W:#b00000,ff8020" width="15" height="15">
+                <sequence start="0" end="3" delay="50"/>
+                <frame index="0" delay="100"/>
+            </animation>
+            <property name="vertical-angle" value="90"/>
+            <property name="power" value="1.1"/>
+            <property name="lifetime" min="50" max="60"/>
+            <property name="output" value="1"/>
+            <property name="output-pause" value="4"/>
+            <property name="fade-in" min="5" max="10"/>
+            <property name="fade-out" value="15"/>
+            <property name="position-x" min="-12" max="12"/>
+            <property name="position-y" value="32"/>
+        </emitter>
+    </particle>
 </effect>
diff --git a/graphics/particles/magic.white.xml b/graphics/particles/magic.white.xml
index ef3d387f..344b8bd8 100644
--- a/graphics/particles/magic.white.xml
+++ b/graphics/particles/magic.white.xml
@@ -1,18 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Alige, Unknown
+Copyright (C) 2016 Evol Online
+Copyright (C) 2004~2019 The Mana World -->
+
 <effect>
-  <particle position-x="0" position-y="0" position-z="0" lifetime="128">
-    <emitter>
-      <animation imageset="graphics/particles/sparkle.png|W:#e0e0e0,ffffff" width="15" height="15">
-        <sequence start="0" end="3" delay="50"/>
-        <frame index="0" delay="100"/>
-      </animation>
-      <property name="vertical-angle" value="90"/>
-      <property name="power" min="1" max="1"/>
-      <property name="lifetime" min="15" max="25"/>
-      <property name="output" min="1" max="1"/>
-      <property name="position-x" min="-16" max="16"/>
-      <property name="position-y" min="-16" max="16"/>
-      <property name="position-z" min="29" max="40"/>
-    </emitter>
-  </particle>
+    <particle position-x="0"
+              position-y="0"
+              position-z="27"
+              lifetime="150">
+        <emitter>
+            <animation imageset="graphics/particles/sparkles.png|W:#e0e0e0,ffffff" width="15" height="15">
+                <sequence start="0" end="3" delay="50"/>
+                <frame index="0" delay="100"/>
+            </animation>
+            <property name="vertical-angle" value="90"/>
+            <property name="power" value="1.1"/>
+            <property name="lifetime" min="50" max="60"/>
+            <property name="output" value="1"/>
+            <property name="output-pause" value="4"/>
+            <property name="fade-in" min="5" max="10"/>
+            <property name="fade-out" value="15"/>
+            <property name="position-x" min="-12" max="12"/>
+            <property name="position-y" value="32"/>
+        </emitter>
+    </particle>
 </effect>
diff --git a/graphics/particles/monster-troll-foefire.particle.png b/graphics/particles/monster-troll-foefire.particle.png
index 8928db3c..371f93b7 100644
--- a/graphics/particles/monster-troll-foefire.particle.png
+++ b/graphics/particles/monster-troll-foefire.particle.png
diff --git a/graphics/particles/orb-large.png b/graphics/particles/orb-large.png
index 8886997f..dca87fdf 100644
--- a/graphics/particles/orb-large.png
+++ b/graphics/particles/orb-large.png
diff --git a/graphics/particles/orb-medium.png b/graphics/particles/orb-medium.png
index 4c1edc35..602357b1 100644
--- a/graphics/particles/orb-medium.png
+++ b/graphics/particles/orb-medium.png
diff --git a/graphics/particles/orb-small.png b/graphics/particles/orb-small.png
index 179be0d5..1d87f1d0 100644
--- a/graphics/particles/orb-small.png
+++ b/graphics/particles/orb-small.png
diff --git a/graphics/particles/python.png b/graphics/particles/python.png
index a66b2e8b..26df79fd 100644
--- a/graphics/particles/python.png
+++ b/graphics/particles/python.png
diff --git a/graphics/particles/python.xml b/graphics/particles/python.xml
index 459d50df..35c28b1e 100644
--- a/graphics/particles/python.xml
+++ b/graphics/particles/python.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0"?>
+<!-- Author: Gumi
+Copyright (C) 2004-2020 The Mana World -->
+
 <effect>
-  <particle position-x="0" position-y="0" position-z="270" lifetime="300">
-    <animation imageset="graphics/particles/python.png" width="512" height="512">
-      <sequence start="0" end="8" delay="40"/>
-      <frame index="8"/>
-    </animation>
-  </particle>
+    <particle
+            position-x="0"
+            position-y="0"
+            position-z="270"
+            lifetime="300">
+        <animation
+                imageset="graphics/particles/python.png"
+                width="512"
+                height="512">
+            <sequence start="0" end="8" delay="40"/>
+            <frame index="8"/>
+        </animation>
+    </particle>
 </effect>
diff --git a/graphics/particles/star-medium.png b/graphics/particles/star-medium.png
index 01d8c156..c3020604 100644
--- a/graphics/particles/star-medium.png
+++ b/graphics/particles/star-medium.png
diff --git a/graphics/particles/star-small.png b/graphics/particles/star-small.png
index da4b93cd..3af8bd02 100644
--- a/graphics/particles/star-small.png
+++ b/graphics/particles/star-small.png
diff --git a/graphics/particles/whirlpool.particle.xml b/graphics/particles/whirlpool.particle.xml
index 5b18dfe5..f9356d76 100644
--- a/graphics/particles/whirlpool.particle.xml
+++ b/graphics/particles/whirlpool.particle.xml
@@ -7,7 +7,7 @@ White bubbles which come out of the ground and fill exactly one tile.
     <emitter>
       <property name="position-x" min="0" max="32"/>
       <property name="position-y" min="0" max="48"/>
-      <animation imageset="graphics/particles/bubble_8px.png" width="8" height="8">
+      <animation imageset="graphics/particles/bubble.png" width="8" height="8">
         <frame index="0" delay="50"/>
         <frame index="1" delay="50"/>
         <frame index="2" delay="50"/>