Merged particle engine into main eAthena branch.

47 files changed, 258 insertions, 0 deletions

diff --git a/graphics/particles/blaze.png b/graphics/particles/blaze.png
new file mode 100644
index 00000000..bdfc6fab
--- /dev/null
+++ b/graphics/particles/blaze.png
diff --git a/graphics/particles/flame.particle.xml b/graphics/particles/flame.particle.xml
new file mode 100644
index 00000000..d53e61f9
--- /dev/null
+++ b/graphics/particles/flame.particle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>

+

+<effect>

+	<particle

+		position-x = "17"

+		position-y = "0"

+		position-z = "32"

+		>

+		<emitter>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="vertical-angle" min="0" max="90"/>

+			<property name="power" min="0.25" max="0.5"/>

+			<property name="gravity" value="-0.05"/>

+			<property name="image" value="graphics/particles/blaze.png"/>

+			<property name="lifetime" min="20" max="30"/>

+			<property name="output" min="0" max="4"/>

+			<property name="fade-in" value="0"/>

+			<property name="fade-out" value="30"/>

+		</emitter>

+	</particle>

+</effect>
\ No newline at end of file
diff --git a/graphics/particles/fog-medium-white-a.png b/graphics/particles/fog-medium-white-a.png
new file mode 100644
index 00000000..a488a86c
--- /dev/null
+++ b/graphics/particles/fog-medium-white-a.png
diff --git a/graphics/particles/fog-medium-white-b.png b/graphics/particles/fog-medium-white-b.png
new file mode 100644
index 00000000..6698ef0d
--- /dev/null
+++ b/graphics/particles/fog-medium-white-b.png
diff --git a/graphics/particles/fog-medium-white-c.png b/graphics/particles/fog-medium-white-c.png
new file mode 100644
index 00000000..bb20be3f
--- /dev/null
+++ b/graphics/particles/fog-medium-white-c.png
diff --git a/graphics/particles/fountain.particle.xml b/graphics/particles/fountain.particle.xml
new file mode 100644
index 00000000..5140e28b
--- /dev/null
+++ b/graphics/particles/fountain.particle.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "32"

+		>

+		<emitter>

+			<property name="position-x" min="0" max="32"/>

+			<property name="position-y" min="0" max="32"/>

+			<property name="position-z" min="0" max="32"/>

+			<property name="image" value="graphics/particles/star-medium-cyan.png"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="vertical-angle" min="45" max="90"/>

+			<property name="power" min="6" max="7"/>

+			<property name="gravity" value="0.1"/>

+			<property name="lifetime" value="300"/>

+			<property name="output" min="0" max="1"/>

+			<emitter>

+				<property name="position-x" value="0"/>

+                <property name="position-y" value="0"/>

+                <property name="position-z" value="0"/>

+                <property name="image" value="graphics/particles/star-small-cyan.png"/>

+                <property name="horizontal-angle" min="0" max="360"/>

+                <property name="vertical-angle" min="0" max="360"/>

+                <property name="power" value="1"/>

+                <property name="randomnes" value="100"/>

+                <property name="lifetime" min="20" max="30"/>

+                <property name="output" min="0" max="1"/>

+			</emitter>

+		</emitter>

+	</particle>

+</effect>
\ No newline at end of file
diff --git a/graphics/particles/glow-medium-blue.png b/graphics/particles/glow-medium-blue.png
new file mode 100644
index 00000000..71b6f956
--- /dev/null
+++ b/graphics/particles/glow-medium-blue.png
diff --git a/graphics/particles/hit.particle.xml b/graphics/particles/hit.particle.xml
new file mode 100644
index 00000000..4a7c009b
--- /dev/null
+++ b/graphics/particles/hit.particle.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "16"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="45" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="6"/>

+			<property name="gravity" value="100"/>

+			<property name="image" value="graphics/particles/orb-small-white.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="6" max="12"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="45" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="6"/>

+			<property name="gravity" value="0.1"/>

+			<property name="image" value="graphics/particles/star-small-white.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="6" max="12"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="45" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="6"/>

+			<property name="gravity" value="0.1"/>

+			<property name="image" value="graphics/particles/orb-medium-white.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="6" max="12"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="45" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="6"/>

+			<property name="gravity" value="0.1"/>

+			<property name="image" value="graphics/particles/star-medium-white.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="3" max="6"/>

+		</emitter>

+	</particle>

+</effect>
\ No newline at end of file
diff --git a/graphics/particles/levelup.particle.xml b/graphics/particles/levelup.particle.xml
new file mode 100644
index 00000000..5d22343b
--- /dev/null
+++ b/graphics/particles/levelup.particle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "0"

+		lifetime = "128"

+		>

+		<emitter>

+		<property name="image" value="graphics/particles/star-medium-red.png"/>

+		<property name="vertical-angle" value="90"/>

+		<property name="power" value="2"/>

+		<property name="lifetime" value="36"/>

+		<property name="output" min="-5" max="1"/>

+		<property name="position-x" min="-16" max="16"/>

+		<property name="position-y" min="-16" max="16"/>

+		<property name="position-z" min="0" max="32"/>

+		</emitter>

+	</particle>

+</effect>
\ No newline at end of file
diff --git a/graphics/particles/orb-medium-blue.png b/graphics/particles/orb-medium-blue.png
new file mode 100644
index 00000000..27a32a9a
--- /dev/null
+++ b/graphics/particles/orb-medium-blue.png
diff --git a/graphics/particles/orb-medium-cyan.png b/graphics/particles/orb-medium-cyan.png
new file mode 100644
index 00000000..cf406362
--- /dev/null
+++ b/graphics/particles/orb-medium-cyan.png
diff --git a/graphics/particles/orb-medium-green.png b/graphics/particles/orb-medium-green.png
new file mode 100644
index 00000000..f1e03f13
--- /dev/null
+++ b/graphics/particles/orb-medium-green.png
diff --git a/graphics/particles/orb-medium-magenta.png b/graphics/particles/orb-medium-magenta.png
new file mode 100644
index 00000000..682b4e2d
--- /dev/null
+++ b/graphics/particles/orb-medium-magenta.png
diff --git a/graphics/particles/orb-medium-red.png b/graphics/particles/orb-medium-red.png
new file mode 100644
index 00000000..5c0a6114
--- /dev/null
+++ b/graphics/particles/orb-medium-red.png
diff --git a/graphics/particles/orb-medium-white.png b/graphics/particles/orb-medium-white.png
new file mode 100644
index 00000000..eb896c85
--- /dev/null
+++ b/graphics/particles/orb-medium-white.png
diff --git a/graphics/particles/orb-medium-yellow.png b/graphics/particles/orb-medium-yellow.png
new file mode 100644
index 00000000..197d7e15
--- /dev/null
+++ b/graphics/particles/orb-medium-yellow.png
diff --git a/graphics/particles/orb-small-blue.png b/graphics/particles/orb-small-blue.png
new file mode 100644
index 00000000..2c0a05a6
--- /dev/null
+++ b/graphics/particles/orb-small-blue.png
diff --git a/graphics/particles/orb-small-cyan.png b/graphics/particles/orb-small-cyan.png
new file mode 100644
index 00000000..98a4d842
--- /dev/null
+++ b/graphics/particles/orb-small-cyan.png
diff --git a/graphics/particles/orb-small-green.png b/graphics/particles/orb-small-green.png
new file mode 100644
index 00000000..49d353d1
--- /dev/null
+++ b/graphics/particles/orb-small-green.png
diff --git a/graphics/particles/orb-small-magenta.png b/graphics/particles/orb-small-magenta.png
new file mode 100644
index 00000000..fcf7396f
--- /dev/null
+++ b/graphics/particles/orb-small-magenta.png
diff --git a/graphics/particles/orb-small-red.png b/graphics/particles/orb-small-red.png
new file mode 100644
index 00000000..077497c4
--- /dev/null
+++ b/graphics/particles/orb-small-red.png
diff --git a/graphics/particles/orb-small-white.png b/graphics/particles/orb-small-white.png
new file mode 100644
index 00000000..47cf957f
--- /dev/null
+++ b/graphics/particles/orb-small-white.png
diff --git a/graphics/particles/orb-small-yellow.png b/graphics/particles/orb-small-yellow.png
new file mode 100644
index 00000000..79c64de7
--- /dev/null
+++ b/graphics/particles/orb-small-yellow.png
diff --git a/graphics/particles/playerglow.particle.xml b/graphics/particles/playerglow.particle.xml
new file mode 100644
index 00000000..e0de0c4e
--- /dev/null
+++ b/graphics/particles/playerglow.particle.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "64"

+		lifetime = "-1"

+		>

+		<animation imageset="graphics/sprites/monster-bat.png" width="37" height="38">

+			<sequence start="1" end="4" delay="50" />

+		</animation>

+		<emitter>

+			<property name="position-x" min="-1" max="1"/>

+			<property name="position-y" min="-1" max="1"/>

+			<property name="position-z" min="0" max="0"/>

+			<property name="power" min="0" max="3"/>

+			<property name="vertical-angle" min="0" max="360"/>-->

+			<property name="output" value="1"/>

+			<property name="lifetime" value="60"/>

+			<property name="fade-out" value="30"/>

+			<property name="acceleration" value="0.1"/>

+			<property name="momentum" value="0.998"/>

+			<property name="image" value="graphics/particles/orb-medium-yellow.png"/>

+		</emitter>

+	</particle>

+</effect>
\ No newline at end of file
diff --git a/graphics/particles/skillup.particle.xml b/graphics/particles/skillup.particle.xml
new file mode 100644
index 00000000..09a512e2
--- /dev/null
+++ b/graphics/particles/skillup.particle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "0"

+		lifetime = "128"

+		>

+		<emitter>

+		<property name="image" value="graphics/particles/star-medium-green.png"/>

+		<property name="vertical-angle" value="90"/>

+		<property name="power" value="2"/>

+		<property name="lifetime" value="36"/>

+		<property name="output" min="-5" max="1"/>

+		<property name="position-x" min="-16" max="16"/>

+		<property name="position-y" min="-16" max="16"/>

+		<property name="position-z" min="0" max="32"/>

+		</emitter>

+	</particle>

+</effect>
\ No newline at end of file
diff --git a/graphics/particles/smoke-large-grey.png b/graphics/particles/smoke-large-grey.png
new file mode 100644
index 00000000..01fd98e7
--- /dev/null
+++ b/graphics/particles/smoke-large-grey.png
diff --git a/graphics/particles/snow.particle.xml b/graphics/particles/snow.particle.xml
new file mode 100644
index 00000000..e54f6f70
--- /dev/null
+++ b/graphics/particles/snow.particle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "512"

+		>

+		<emitter>

+			<property name="position-x" min="0.0" max="6400"/>

+			<property name="position-y" min="0.0" max="6400"/>

+			<property name="gravity" value="0.03"/>

+			<property name="momentum" value="0.97"/>

+			<!--<property name="randomnes" value="100"/>-->

+			<property name="image" value="graphics/particles/snowflake.png"/>

+			<property name="output" min="0" max="3"/>

+			<property name="fade-in" value="100"/>

+		</emitter>

+

+	</particle>

+</effect>
\ No newline at end of file
diff --git a/graphics/particles/snowflake.png b/graphics/particles/snowflake.png
new file mode 100644
index 00000000..3291885f
--- /dev/null
+++ b/graphics/particles/snowflake.png
diff --git a/graphics/particles/star-medium-blue.png b/graphics/particles/star-medium-blue.png
new file mode 100644
index 00000000..fa4e9154
--- /dev/null
+++ b/graphics/particles/star-medium-blue.png
diff --git a/graphics/particles/star-medium-cyan.png b/graphics/particles/star-medium-cyan.png
new file mode 100644
index 00000000..41c37b1c
--- /dev/null
+++ b/graphics/particles/star-medium-cyan.png
diff --git a/graphics/particles/star-medium-green.png b/graphics/particles/star-medium-green.png
new file mode 100644
index 00000000..88b3ac92
--- /dev/null
+++ b/graphics/particles/star-medium-green.png
diff --git a/graphics/particles/star-medium-magenta.png b/graphics/particles/star-medium-magenta.png
new file mode 100644
index 00000000..56d07b98
--- /dev/null
+++ b/graphics/particles/star-medium-magenta.png
diff --git a/graphics/particles/star-medium-red.png b/graphics/particles/star-medium-red.png
new file mode 100644
index 00000000..9bd25775
--- /dev/null
+++ b/graphics/particles/star-medium-red.png
diff --git a/graphics/particles/star-medium-white.png b/graphics/particles/star-medium-white.png
new file mode 100644
index 00000000..dc9409b3
--- /dev/null
+++ b/graphics/particles/star-medium-white.png
diff --git a/graphics/particles/star-medium-yellow.png b/graphics/particles/star-medium-yellow.png
new file mode 100644
index 00000000..7551d565
--- /dev/null
+++ b/graphics/particles/star-medium-yellow.png
diff --git a/graphics/particles/star-small-blue.png b/graphics/particles/star-small-blue.png
new file mode 100644
index 00000000..8c1e2d34
--- /dev/null
+++ b/graphics/particles/star-small-blue.png
diff --git a/graphics/particles/star-small-cyan.png b/graphics/particles/star-small-cyan.png
new file mode 100644
index 00000000..c0b269d9
--- /dev/null
+++ b/graphics/particles/star-small-cyan.png
diff --git a/graphics/particles/star-small-green.png b/graphics/particles/star-small-green.png
new file mode 100644
index 00000000..49158a13
--- /dev/null
+++ b/graphics/particles/star-small-green.png
diff --git a/graphics/particles/star-small-magenta.png b/graphics/particles/star-small-magenta.png
new file mode 100644
index 00000000..de3e0d60
--- /dev/null
+++ b/graphics/particles/star-small-magenta.png
diff --git a/graphics/particles/star-small-red.png b/graphics/particles/star-small-red.png
new file mode 100644
index 00000000..c1f572e0
--- /dev/null
+++ b/graphics/particles/star-small-red.png
diff --git a/graphics/particles/star-small-white.png b/graphics/particles/star-small-white.png
new file mode 100644
index 00000000..f3bcf1fc
--- /dev/null
+++ b/graphics/particles/star-small-white.png
diff --git a/graphics/particles/star-small-yellow.png b/graphics/particles/star-small-yellow.png
new file mode 100644
index 00000000..326976e2
--- /dev/null
+++ b/graphics/particles/star-small-yellow.png
diff --git a/graphics/particles/waterfall-a.png b/graphics/particles/waterfall-a.png
new file mode 100644
index 00000000..bfaa8ca4
--- /dev/null
+++ b/graphics/particles/waterfall-a.png
diff --git a/graphics/particles/waterfall.particle.xml b/graphics/particles/waterfall.particle.xml
new file mode 100644
index 00000000..42eb87a7
--- /dev/null
+++ b/graphics/particles/waterfall.particle.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "0"

+		>

+		<emitter>

+			<property name="position-x" min="0" max="32"/>

+			<property name="position-y" min="0" max="8"/>

+			<property name="position-z" min="80" max="88"/>

+			<property name="image" value="graphics/particles/waterfall-a.png"/>

+			<property name="output" min="1" max="1"/>

+			<property name="horizontal-angle" value="90"/>

+			<property name="vertical-angle" min="0" max="0"/>

+			<property name="power" min="0.8" max="1.0"/>

+			<property name="gravity" value="0.05"/>

+			<property name="fade-in" value="20"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-16" max="48"/>

+			<property name="position-y" min="48" max="58"/>

+			<property name="position-z" min="0" max="8"/>

+			<property name="image" value="graphics/particles/fog-medium-white-a.png"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="vertical-angle" min="0" max="90"/>

+			<property name="power" value="1.0"/>

+			<property name="output" min="1" max="2"/>

+            <property name="lifetime" min="20" max="40"/>

+            <property name="fade-out" value="20"/>

+        </emitter>

+		<emitter>

+			<property name="position-x" min="-16" max="48"/>

+			<property name="position-y" min="48" max="58"/>

+			<property name="position-z" min="0" max="8"/>

+			<property name="image" value="graphics/particles/fog-medium-white-b.png"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="vertical-angle" min="0" max="90"/>

+			<property name="power" value="1.0"/>

+			<property name="output" min="1" max="2"/>

+            <property name="lifetime" min="20" max="40"/>

+            <property name="fade-out" value="20"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-16" max="48"/>

+			<property name="position-y" min="48" max="58"/>

+			<property name="position-z" min="0" max="8"/>

+			<property name="image" value="graphics/particles/fog-medium-white-c.png"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="vertical-angle" min="0" max="90"/>

+			<property name="power" value="1.0"/>

+			<property name="output" min="1" max="2"/>

+			<property name="lifetime" min="20" max="40"/>

+            <property name="fade-out" value="20"/>

+		</emitter>

+	</particle>

+</effect>
\ No newline at end of file
diff --git a/maps/new_4-1.tmx.gz b/maps/new_4-1.tmx.gz
index dc9f63f3..727d77ba 100644
--- a/maps/new_4-1.tmx.gz
+++ b/maps/new_4-1.tmx.gz
diff --git a/maps/new_5-1.tmx.gz b/maps/new_5-1.tmx.gz
index 2b42f643..9af446d9 100644
--- a/maps/new_5-1.tmx.gz
+++ b/maps/new_5-1.tmx.gz
diff --git a/maps/new_9-1.tmx.gz b/maps/new_9-1.tmx.gz
index 380842e1..26097132 100644
--- a/maps/new_9-1.tmx.gz
+++ b/maps/new_9-1.tmx.gz