diff options
-rw-r--r-- | graphics/particles/campfire.particle.xml | 87 | ||||
-rw-r--r-- | graphics/particles/hellblaze.particle.xml | 87 | ||||
-rw-r--r-- | maps/000-0-0.tmx | 23 |
3 files changed, 184 insertions, 13 deletions
diff --git a/graphics/particles/campfire.particle.xml b/graphics/particles/campfire.particle.xml new file mode 100644 index 00000000..875ddcf4 --- /dev/null +++ b/graphics/particles/campfire.particle.xml @@ -0,0 +1,87 @@ +<?xml version="1.0"?> +<!-- +A red and yellow blaze. Does not really look like fire but looks awesome +nevertheless. Maybe we could modify this effect and use it for some persistent +AoE fire magic spell. + +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 = "15" + position-z = "150" + > + <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"/> + <property name="image" value="graphics/particles/glow-small.png|W:#dd3311"/> + <property name="lifetime" min="40" max="140"/> + <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" /> + </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"/> + <property name="image" value="graphics/particles/glow-small.png|W:#ffff00"/> + <property name="lifetime" min="40" max="140"/> + <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" /> + </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"/> + <property name="image" value="graphics/particles/orb-medium.png|W:#dd3311"/> + <property name="lifetime" min="40" max="140"/> + <property name="fade-in" value="10"/> + <property name="fade-out" value="50"/> + <property name="output" min="-1" max="1"/> + <property name="randomnes" value="150"/> + <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"/> + <property name="image" value="graphics/particles/orb-medium.png|W:#ddff00"/> + <property name="lifetime" min="40" max="140"/> + <property name="fade-in" value="10"/> + <property name="fade-out" value="50"/> + <property name="output" min="-1" max="1"/> + <property name="randomnes" value="150"/> + <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="40" max="140"/> + <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/hellblaze.particle.xml b/graphics/particles/hellblaze.particle.xml new file mode 100644 index 00000000..55b45c20 --- /dev/null +++ b/graphics/particles/hellblaze.particle.xml @@ -0,0 +1,87 @@ +<?xml version="1.0"?> +<!-- +A red and yellow blaze. Does not really look like fire but looks awesome +nevertheless. Maybe we could modify this effect and use it for some persistent +AoE fire magic spell. + +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" + > + <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"/> + <property name="image" value="graphics/particles/glow-medium.png|W:#dd3311"/> + <property name="lifetime" min="60" max="160"/> + <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" /> + </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"/> + <property name="image" value="graphics/particles/glow-medium.png|W:#ffff00"/> + <property name="lifetime" min="40" max="140"/> + <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" /> + </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"/> + <property name="image" value="graphics/particles/orb-medium.png|W:#dd3311"/> + <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="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"/> + <property name="image" value="graphics/particles/orb-medium.png|W:#ddff00"/> + <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="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/maps/000-0-0.tmx b/maps/000-0-0.tmx index 3ac02b8e..f7d48369 100644 --- a/maps/000-0-0.tmx +++ b/maps/000-0-0.tmx @@ -155,10 +155,10 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,0,0,0,0,0,0,70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,298,298,300,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,70,0,0,283,228,229,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,283,244,245,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,285,266,266,284,0,0,0,0,0,73,0,0,0,0,0,0,70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -236,7 +236,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -471,10 +471,10 @@ 42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,43,42,42,0,0,0,0,0,42,0,0,0,0,0,0,0,0,0,0,42,42,43,43,43,43,43,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, 42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,43,42,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,42,42,42,42,42,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, 42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,42,42,0,0,0,0,0,0,0,0,0,0,0,42,0,0,0,0,0,0,0,0,0,0,0,0,42,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, -42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,42,0,0,0,0,0,301,298,298,300,0,0,0,0,0,0,0,0,0,42,0,0,0,0,0,0,42,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, -42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,42,0,0,42,0,0,283,228,229,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, -42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,42,0,0,0,0,0,283,244,245,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, -42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,42,42,0,0,0,0,285,266,266,284,0,0,0,0,0,42,0,0,0,0,0,0,42,0,0,0,42,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, +42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,0,0,0,0,0,0,42,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, +42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,42,0,0,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, +42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,42,0,0,0,0,0,0,38,38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, +42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,42,42,0,0,0,0,0,0,0,0,0,0,0,0,0,42,0,0,0,0,0,0,42,0,0,0,42,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, 42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,43,42,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,42,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, 42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,43,42,42,0,0,0,0,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,42,43,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, 42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,43,42,42,0,0,0,0,0,0,0,0,0,0,42,42,42,42,42,42,42,42,42,42,43,43,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, @@ -588,9 +588,6 @@ <objectgroup name="Object"> <object id="3" name="Margin" type="fixme" x="1760" y="1760" width="640" height="640"/> <object id="4" name="Margin" type="fixme" x="0" y="0" width="640" height="640"/> - <object id="5" name="graphics/particles/bonfire.particle.xml" type="particle_effect" x="960" y="1408" width="32" height="32"/> - <object id="6" name="graphics/particles/bonfire.particle.xml" type="particle_effect" x="928" y="1376" width="32" height="32"/> - <object id="7" name="graphics/particles/bonfire.particle.xml" type="particle_effect" x="960" y="1376" width="32" height="32"/> - <object id="8" name="graphics/particles/bonfire.particle.xml" type="particle_effect" x="928" y="1408" width="32" height="32"/> + <object id="7" name="graphics/particles/campfire.particle.xml" type="particle_effect" x="960" y="1408" width="32" height="32"/> </objectgroup> </map> |