summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--effects.xml11
-rw-r--r--graphics/particles/magic.blue.xml24
-rw-r--r--graphics/particles/magic.generic.xml104
-rw-r--r--graphics/particles/magic.golden.xml24
-rw-r--r--graphics/particles/magic.green.xml24
-rw-r--r--graphics/particles/magic.red.xml24
-rw-r--r--graphics/particles/magic.white.xml2
-rw-r--r--graphics/sprites/npcs.pngbin119157 -> 125768 bytes
-rw-r--r--npcs.xml4
9 files changed, 212 insertions, 5 deletions
diff --git a/effects.xml b/effects.xml
index d77b7cfb..e9314bf5 100644
--- a/effects.xml
+++ b/effects.xml
@@ -1,10 +1,13 @@
<being-effects>
<effect id="0" audio="sfx/levelup.ogg" particle="graphics/particles/levelup.particle.xml" />
<effect id="1" audio="sfx/levelup.ogg" particle="graphics/particles/skillup.particle.xml" />
- <effect id="2" particle="graphics/particles/magic.default.xml"/>
- <effect id="3" particle="graphics/particles/magic.enhance.xml"/>
- <effect id="4" particle="graphics/particles/magic.white.xml"/>
- <effect id="5" particle="graphics/particles/magic.black.xml"/>
+ <effect id="2" particle="graphics/particles/magic.generic.xml"/>
+ <effect id="3" particle="graphics/particles/magic.white.xml"/> <!-- life -->
+ <effect id="4" particle="graphics/particles/magic.black.xml"/> <!-- war -->
+ <effect id="5" particle="graphics/particles/magic.red.xml"/> <!-- transmute -->
+ <effect id="6" particle="graphics/particles/magic.green.xml"/> <!-- nature -->
+ <effect id="7" particle="graphics/particles/magic.blue.xml"/> <!-- astral -->
+ <effect id="10" particle="graphics/particles/magic.default.xml"/>
<effect id="11" particle="graphics/particles/magic.shield.xml"/>
<!-- <effect id="12" particle="graphics/particles/magic.haste.xml"/>-->
<effect id="13" particle="graphics/particles/magic.hit.xml"/>
diff --git a/graphics/particles/magic.blue.xml b/graphics/particles/magic.blue.xml
new file mode 100644
index 00000000..bf51895e
--- /dev/null
+++ b/graphics/particles/magic.blue.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<effect>
+ <particle
+ position-x = "0"
+ position-y = "0"
+ position-z = "0"
+ lifetime = "128"
+ >
+ <emitter>
+ <animation imageset="graphics/particles/sparkle.png|W:#0000e0,7080ff" 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>
+</effect>
diff --git a/graphics/particles/magic.generic.xml b/graphics/particles/magic.generic.xml
new file mode 100644
index 00000000..d5db5e89
--- /dev/null
+++ b/graphics/particles/magic.generic.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+
+<effect>
+ <particle
+ position-x = "0"
+ position-y = "0"
+ position-z = "0"
+ lifetime = "128"
+ >
+ <emitter>
+<!-- red --> <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="output-pause" min="0" max="12"/>
+ <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>
+
+
+ <emitter>
+<!-- green --> <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="output-pause" min="0" max="12"/>
+ <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>
+
+ <emitter>
+<!-- blue --> <animation imageset="graphics/particles/sparkle.png|W:#0000e0,7080ff" 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="output-pause" min="0" max="12"/>
+ <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>
+
+
+ <emitter>
+<!-- yellow --> <animation imageset="graphics/particles/sparkle.png|W:#9090000,ffff00" 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="output-pause" min="0" max="12"/>
+ <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>
+
+
+ <emitter>
+<!-- cyan --> <animation imageset="graphics/particles/sparkle.png|W:#008080,00ffff" 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="output-pause" min="0" max="12"/>
+ <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>
+
+
+ <emitter>
+<!-- magenta --> <animation imageset="graphics/particles/sparkle.png|W:#800080,ff00ff" 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="output-pause" min="0" max="12"/>
+ <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>
+</effect>
diff --git a/graphics/particles/magic.golden.xml b/graphics/particles/magic.golden.xml
new file mode 100644
index 00000000..328abb09
--- /dev/null
+++ b/graphics/particles/magic.golden.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<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>
+</effect>
diff --git a/graphics/particles/magic.green.xml b/graphics/particles/magic.green.xml
new file mode 100644
index 00000000..41851075
--- /dev/null
+++ b/graphics/particles/magic.green.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<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>
+</effect>
diff --git a/graphics/particles/magic.red.xml b/graphics/particles/magic.red.xml
new file mode 100644
index 00000000..31380bb2
--- /dev/null
+++ b/graphics/particles/magic.red.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<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>
+</effect>
diff --git a/graphics/particles/magic.white.xml b/graphics/particles/magic.white.xml
index 4a5aa827..4b7789df 100644
--- a/graphics/particles/magic.white.xml
+++ b/graphics/particles/magic.white.xml
@@ -8,7 +8,7 @@
lifetime = "128"
>
<emitter>
- <animation imageset="graphics/particles/sparkle.png|W:#ffdf10" width="15" height="15">
+ <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>
diff --git a/graphics/sprites/npcs.png b/graphics/sprites/npcs.png
index 0822f166..6cea34ca 100644
--- a/graphics/sprites/npcs.png
+++ b/graphics/sprites/npcs.png
Binary files differ
diff --git a/npcs.xml b/npcs.xml
index 285a858a..07f67cb8 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -73,6 +73,10 @@
<npc id="163"><sprite variant="63">npc.xml</sprite></npc><!-- Flower Girl -->
<npc id="164"><sprite variant="64">npc.xml</sprite></npc><!-- Wedding Officiator -->
<npc id="165"><sprite variant="65">npc.xml</sprite></npc><!-- Dimond/Magician -->
+<npc id="166"><sprite variant="66">npc.xml</sprite></npc><!-- Mana Seed -->
+<npc id="167"><sprite variant="67">npc.xml</sprite></npc><!-- Young Witch -->
+<npc id="168"><sprite variant="68">npc.xml</sprite></npc><!-- Middle-Aged Wizard -->
+<npc id="169"><sprite variant="69">npc.xml</sprite></npc><!-- Miner -->
<npc id="200">
<sprite>npc-test.xml</sprite>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-03 12:25:53 +0000