summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/particles/apple.pngbin190 -> 0 bytes
-rw-r--r--graphics/particles/falling-apple.pngbin0 -> 2931 bytes
-rw-r--r--graphics/particles/falling-apple.xml47
-rw-r--r--graphics/particles/falling-pear.pngbin0 -> 2965 bytes
-rw-r--r--graphics/particles/falling-pear.xml (renamed from graphics/particles/apple.particle.xml)10
-rw-r--r--graphics/particles/highlight.xml3
-rw-r--r--graphics/particles/monster-snail-trail.particle.xml3
-rw-r--r--graphics/particles/savepoint-32x32.xml2
-rw-r--r--graphics/particles/savepoint-32x64.xml2
-rw-r--r--graphics/particles/savepoint-64x32.xml2
-rw-r--r--graphics/particles/savepoint-64x64.xml2
-rw-r--r--graphics/particles/waterfall-2x1.particle.xml2
-rw-r--r--graphics/particles/waterfall-2x3.particle.xml3
13 files changed, 62 insertions, 14 deletions
diff --git a/graphics/particles/apple.png b/graphics/particles/apple.png
deleted file mode 100644
index 522e79cd..00000000
--- a/graphics/particles/apple.png
+++ /dev/null
Binary files differ
diff --git a/graphics/particles/falling-apple.png b/graphics/particles/falling-apple.png
new file mode 100644
index 00000000..794e9b8d
--- /dev/null
+++ b/graphics/particles/falling-apple.png
Binary files differ
diff --git a/graphics/particles/falling-apple.xml b/graphics/particles/falling-apple.xml
new file mode 100644
index 00000000..8387bd14
--- /dev/null
+++ b/graphics/particles/falling-apple.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!-- Authors: Alige, Dark_Mage
+Copyright (C) 2011-2012 Evol Online -->
+<effect>
+ <particle
+ position-x="0" position-y="0" position-z="0">
+ <emitter>
+ <property name="position-x" min="-13" max="30"/>
+ <property name="position-y" min="15" max="18"/>
+ <property name="position-z" min="35" max="88"/>
+ <property name="image" value="graphics/particles/falling-apple.png"/>
+ <property name="output" min="-2350" max="1"/>
+ <property name="horizontal-angle" value="90"/>
+ <property name="gravity" value="0.01"/>
+ <property name="fade-in" value="50"/>
+ <property name="lifetime" value="1070"/>
+ <property name="fade-out" value="20"/>
+ <property name="bounce" min="0.2" max="0.2"/>
+ </emitter>
+ <emitter>
+ <property name="position-x" min="-15" max="0"/>
+ <property name="position-y" min="0" max="3"/>
+ <property name="position-z" min="15" max="15"/>
+ <property name="image" value="graphics/particles/falling-apple.png"/>
+ <property name="output" min="-3000" max="1"/>
+ <property name="horizontal-angle" value="90"/>
+ <property name="gravity" value="0.01"/>
+ <property name="fade-in" value="30"/>
+ <property name="lifetime" value="870"/>
+ <property name="fade-out" value="20"/>
+ <property name="bounce" min="0.3" max="0.3"/>
+ </emitter>
+ <emitter>
+ <property name="position-x" min="13" max="30"/>
+ <property name="position-y" min="0" max="3"/>
+ <property name="position-z" min="15" max="15"/>
+ <property name="image" value="graphics/particles/falling-apple.png"/>
+ <property name="output" min="-3000" max="1"/>
+ <property name="horizontal-angle" value="90"/>
+ <property name="gravity" value="0.01"/>
+ <property name="fade-in" value="30"/>
+ <property name="lifetime" value="870"/>
+ <property name="fade-out" value="20"/>
+ <property name="bounce" min="0.3" max="0.3"/>
+ </emitter>
+ </particle>
+</effect>
diff --git a/graphics/particles/falling-pear.png b/graphics/particles/falling-pear.png
new file mode 100644
index 00000000..017d6573
--- /dev/null
+++ b/graphics/particles/falling-pear.png
Binary files differ
diff --git a/graphics/particles/apple.particle.xml b/graphics/particles/falling-pear.xml
index 6ec71686..0a9ac2e0 100644
--- a/graphics/particles/apple.particle.xml
+++ b/graphics/particles/falling-pear.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- Author from The Mana World
-Copyright (C) 2010-2012 Evol Online -->
+<!-- Authors: Alige, Dark_Mage
+Copyright (C) 2011-2012 Evol Online -->
<effect>
<particle
position-x="0" position-y="0" position-z="0">
@@ -8,7 +8,7 @@ Copyright (C) 2010-2012 Evol Online -->
<property name="position-x" min="-13" max="30"/>
<property name="position-y" min="15" max="18"/>
<property name="position-z" min="35" max="88"/>
- <property name="image" value="graphics/particles/apple.png"/>
+ <property name="image" value="graphics/particles/falling-pear.png"/>
<property name="output" min="-2350" max="1"/>
<property name="horizontal-angle" value="90"/>
<property name="gravity" value="0.01"/>
@@ -21,7 +21,7 @@ Copyright (C) 2010-2012 Evol Online -->
<property name="position-x" min="-15" max="0"/>
<property name="position-y" min="0" max="3"/>
<property name="position-z" min="15" max="15"/>
- <property name="image" value="graphics/particles/apple.png"/>
+ <property name="image" value="graphics/particles/falling-pear.png"/>
<property name="output" min="-3000" max="1"/>
<property name="horizontal-angle" value="90"/>
<property name="gravity" value="0.01"/>
@@ -34,7 +34,7 @@ Copyright (C) 2010-2012 Evol Online -->
<property name="position-x" min="13" max="30"/>
<property name="position-y" min="0" max="3"/>
<property name="position-z" min="15" max="15"/>
- <property name="image" value="graphics/particles/apple.png"/>
+ <property name="image" value="graphics/particles/falling-pear.png"/>
<property name="output" min="-3000" max="1"/>
<property name="horizontal-angle" value="90"/>
<property name="gravity" value="0.01"/>
diff --git a/graphics/particles/highlight.xml b/graphics/particles/highlight.xml
index fde1cfb0..fa107153 100644
--- a/graphics/particles/highlight.xml
+++ b/graphics/particles/highlight.xml
@@ -2,7 +2,8 @@
<!-- Author from The Mana World
Copyright (C) 2010-2012 Evol Online -->
<effect>
- <particle position-x="0" position-y="0" position-z="15" lifetime="128">
+ <particle
+ position-x="0" position-y="0" position-z="15" lifetime="128">
<emitter>
<property name="image" value="graphics/particles/star-small.png|W:#f3ffbe,f3ffe3"/>
<property name="vertical-angle" value="90"/>
diff --git a/graphics/particles/monster-snail-trail.particle.xml b/graphics/particles/monster-snail-trail.particle.xml
index 5bfed77f..6779841a 100644
--- a/graphics/particles/monster-snail-trail.particle.xml
+++ b/graphics/particles/monster-snail-trail.particle.xml
@@ -2,7 +2,8 @@
<!-- Author from The Mana World
Copyright (C) 2010-2012 Evol Online -->
<effect>
- <particle position-x="0" position-y="0" position-z="10">
+ <particle
+ position-x="0" position-y="0" position-z="10">
<emitter>
<property name="position-y" min="-1" max="5"/>
<property name="position-x" min="-3" max="3"/>
diff --git a/graphics/particles/savepoint-32x32.xml b/graphics/particles/savepoint-32x32.xml
index a5a7530c..65e8ece1 100644
--- a/graphics/particles/savepoint-32x32.xml
+++ b/graphics/particles/savepoint-32x32.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Authors: Alige & Reid
+<!-- Authors: Alige, Reid
Copyright (C) 2010-2012 Evol Online -->
<effect>
<particle position-x="0" position-y="0" position-z="5">
diff --git a/graphics/particles/savepoint-32x64.xml b/graphics/particles/savepoint-32x64.xml
index eab5f67d..ce3954ae 100644
--- a/graphics/particles/savepoint-32x64.xml
+++ b/graphics/particles/savepoint-32x64.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Authors: Alige & Reid
+<!-- Authors: Alige, Reid
Copyright (C) 2010-2012 Evol Online -->
<effect>
<particle position-x="0" position-y="0" position-z="56">
diff --git a/graphics/particles/savepoint-64x32.xml b/graphics/particles/savepoint-64x32.xml
index 76dc95cc..e79c7901 100644
--- a/graphics/particles/savepoint-64x32.xml
+++ b/graphics/particles/savepoint-64x32.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Authors: Alige & Reid
+<!-- Authors: Alige, Reid
Copyright (C) 2010-2012 Evol Online -->
<effect>
<particle position-x="0" position-y="0" position-z="24">
diff --git a/graphics/particles/savepoint-64x64.xml b/graphics/particles/savepoint-64x64.xml
index 1d720572..0561b1f7 100644
--- a/graphics/particles/savepoint-64x64.xml
+++ b/graphics/particles/savepoint-64x64.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Authors: Alige & Reid
+<!-- Authors: Alige, Reid
Copyright (C) 2010-2012 Evol Online -->
<effect>
<particle position-x="0" position-y="0" position-z="56">
diff --git a/graphics/particles/waterfall-2x1.particle.xml b/graphics/particles/waterfall-2x1.particle.xml
index 9e2e64a3..2afc5c15 100644
--- a/graphics/particles/waterfall-2x1.particle.xml
+++ b/graphics/particles/waterfall-2x1.particle.xml
@@ -5,7 +5,7 @@ Copyright (C) 2010-2012 Evol Online -->
<particle
position-x="0" position-y="0" position-z="0">
<emitter>
- <property name="position-x" min="-24" max="30"/>
+ <property name="position-x" min="-24" max="30"/>
<property name="position-y" min="-28" max="-24"/>
<property name="position-z" min="27" max="37"/>
<property name="image" value="graphics/particles/waterfall-a.png"/>
diff --git a/graphics/particles/waterfall-2x3.particle.xml b/graphics/particles/waterfall-2x3.particle.xml
index 25b85de1..02d9b2da 100644
--- a/graphics/particles/waterfall-2x3.particle.xml
+++ b/graphics/particles/waterfall-2x3.particle.xml
@@ -3,8 +3,7 @@
Copyright (C) 2010-2012 Evol Online -->
<effect>
<particle
- position-x="0" position-y="0" position-z="0"
- >
+ position-x="0" position-y="0" position-z="0">
<emitter>
<property name="position-x" min="-24" max="30"/>
<property name="position-y" min="-28" max="-24"/>