diff options
-rw-r--r-- | graphics/particles/savepoint-32x32.xml | 32 | ||||
-rw-r--r-- | graphics/particles/savepoint/savepoint-32x32.xml | 34 | ||||
-rw-r--r-- | graphics/particles/savepoint/savepoint-32x64.xml (renamed from graphics/particles/savepoint-32x64.xml) | 0 | ||||
-rw-r--r-- | graphics/particles/savepoint/savepoint-64x32.xml (renamed from graphics/particles/savepoint-64x32.xml) | 0 | ||||
-rw-r--r-- | graphics/particles/savepoint/savepoint-64x64.xml (renamed from graphics/particles/savepoint-64x64.xml) | 0 | ||||
-rw-r--r-- | maps/000-2-1.tmx | 2 | ||||
-rw-r--r-- | npcs.xml | 26 |
7 files changed, 48 insertions, 46 deletions
diff --git a/graphics/particles/savepoint-32x32.xml b/graphics/particles/savepoint-32x32.xml deleted file mode 100644 index 9c6880c5..00000000 --- a/graphics/particles/savepoint-32x32.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="24"> - <emitter> - <property name="position-x" min="0" max="32"/> - <property name="position-y" min="0" max="32"/> - <property name="image" value="graphics/particles/orb-medium.png|W:#ff0000"/> - <property name="gravity" value="-0.003"/> - <property name="lifetime" value="100"/> - <property name="output" min="0" max="1"/> - <property name="output-pause" min="0" max="10"/> - <property name="fade-in" value="15"/> - <property name="fade-out" value="20"/> - </emitter> - </particle> - <particle position-x="16" position-y="0" position-z="16"> - <emitter> - <property name="position-x" min="0" max="16"/> - <property name="position-y" min="0" max="16"/> - <property name="image" value="graphics/particles/orb-medium.png|W:#0000ff"/> - <property name="horizontal-angle" min="0" max="360"/> - <property name="vertical-angle" min="0" max="360"/> - <property name="power" min="0.4" max="0.8"/> - <property name="lifetime" value="100"/> - <property name="fade-in" value="15"/> - <property name="fade-out" value="20"/> - <property name="output" min="-20" max="1"/> - <property name="acceleration" value="0.03"/> - <property name="alpha" value="0.5"/> - </emitter> - </particle> -</effect>
\ No newline at end of file diff --git a/graphics/particles/savepoint/savepoint-32x32.xml b/graphics/particles/savepoint/savepoint-32x32.xml new file mode 100644 index 00000000..de08b4a5 --- /dev/null +++ b/graphics/particles/savepoint/savepoint-32x32.xml @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<effect> + <particle + position-x = "0" + position-y = "0" + position-z = "0" + > + <emitter> + <property name="position-z" value="16" /> + <property name="vertical-angle" min="0" max="90"/> + <property name="horizontal-angle" min="0" max="360"/> + <property name="power" min="20" max="24"/> + <property name="lifetime" value="1"/> + <property name="output" value="1"/> + <emitter> + <property name="image" value="graphics/particles/orb-small.png|W:#fffebe"/> + <property name="gravity" value="-0.003"/> + <property name="lifetime" value="100"/> + <property name="output" min="0" max="1"/> + <property name="output-pause" min="0" max="10"/> + <property name="fade-in" value="15"/> + <property name="fade-out" value="20"/> + </emitter> + <emitter> + <property name="image" value="graphics/particles/star-small.png|W:#f3ffbe,f3ffe3"/> + <property name="lifetime" value="160"/> + <property name="output" min="-20" max="1"/> + <property name="fade-in" value="40" /> + <property name="fade-out" value="40" /> + <property name="gravity" value="-0.003"/> + </emitter> + </emitter> + </particle> +</effect>
\ No newline at end of file diff --git a/graphics/particles/savepoint-32x64.xml b/graphics/particles/savepoint/savepoint-32x64.xml index 61b768b0..61b768b0 100644 --- a/graphics/particles/savepoint-32x64.xml +++ b/graphics/particles/savepoint/savepoint-32x64.xml diff --git a/graphics/particles/savepoint-64x32.xml b/graphics/particles/savepoint/savepoint-64x32.xml index 14443882..14443882 100644 --- a/graphics/particles/savepoint-64x32.xml +++ b/graphics/particles/savepoint/savepoint-64x32.xml diff --git a/graphics/particles/savepoint-64x64.xml b/graphics/particles/savepoint/savepoint-64x64.xml index 0140064b..0140064b 100644 --- a/graphics/particles/savepoint-64x64.xml +++ b/graphics/particles/savepoint/savepoint-64x64.xml diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx index f1fffe19..560f9c10 100644 --- a/maps/000-2-1.tmx +++ b/maps/000-2-1.tmx @@ -140,7 +140,7 @@ </layer> <layer name="Collision" width="83" height="59"> <data encoding="base64" compression="gzip"> - H4sIAAAAAAAAA+3SQQ6DIBBA0fb+V/GQTRfdGEVGoCP6SF5iTIvOl+X9ei0AAAAAAAAAEPBd2e9wF6WWT+r8W7X3R7ecuf3R+tce632yu7S0LF3P9D2yXaHDXVquZ4mey9KePb7nzC1bZjj7/71nz9ax5lzszTdyZTcZ2TEyf8+9ZtNj7t4ru0mPliO6nFnZTXqfx63ft+4RfY/sRtGWkev1vVLjUd/0impmqJlxa+Zoy9Kzsjv1PpeR1nt9ncvjGVs7aKllz95P6pDdWksAAAAAgJgPSi7FroRMAAA= + H4sIAAAAAAAAA+3SUa7CIBBAUd3/VrpI44c/jaVQBqfgITlJ0/h4zC3b8/HYAAAAAAAAAKDBe2WfYRWllv/U+bNq349uOXP7s/WrPfb7ZHfpaVl6nul7ZLtDh1Va7mdpvZelPSO+58wte2a4+vdH/3u2jjX34mi+kSu7yciOLfNH7jWbiLmjV3aTiJYjulxZ2U2i7+O33/fu0XqO7EatLVue9+9KjUd90zuqneFsvqN3LeconSe7U/S9PJqx5tm9rGtZ+xst+1pGnmMFPa1X6pDdWksAAAAAgDYvK2ATCoRMAAA= </data> </layer> <objectgroup name="Object" width="83" height="59" visible="0"> @@ -80,20 +80,20 @@ IDs 990-999 = Special <!-- Special NPCs --> <npc id="900"> <!-- Savepoint, 32x32. --> - <particlefx>graphics/particles/savepoint-32x32.xml</particlefx> - </npc> - <npc id="901"> - <!-- Savepoint, 32x64. --> - <particlefx>graphics/particles/savepoint-32x64.xml</particlefx> - </npc> - <npc id="902"> - <!-- Savepoint, 64x32. --> - <particlefx>graphics/particles/savepoint-64x32.xml</particlefx> - </npc> - <npc id="903"> - <!-- Savepoint, 64x64. --> - <particlefx>graphics/particles/savepoint-64x64.xml</particlefx> + <particlefx>graphics/particles/savepoint/savepoint-32x32.xml</particlefx> </npc> +<!-- WIP <npc id="901"> + Savepoint, 32x64. + <particlefx>graphics/particles/savepoint/savepoint-32x64.xml</particlefx> + </npc>--> +<!-- WIP <npc id="902"> + Savepoint, 64x32. + <particlefx>graphics/particles/savepoint/savepoint-64x32.xml</particlefx> + </npc>--> +<!-- WIP <npc id="903"> + Savepoint, 64x64. + <particlefx>graphics/particles/savepoint/savepoint-64x64.xml</particlefx> + </npc> --> <npc id="999"> <!-- blank NPC --> </npc> |