diff options
| author | meko <mekolat@users.noreply.github.com> | 2015-09-29 12:27:27 -0400 |
|---|---|---|
| committer | meko <mekolat@users.noreply.github.com> | 2015-09-29 12:27:27 -0400 |
| commit | a0b9e2463d741e0973a92f90f9879680ac7080df (patch) | |
| tree | cf07cd3fce1c3cff2f8e1d2d1a1042fbbe593578 | |
| parent | 34792d65cf678b423bf4af508b94fef9b8230908 (diff) | |
| parent | e68b0d7689e64e4b30ab127d609b4d7e271f3adf (diff) | |
| download | clientdata-a0b9e2463d741e0973a92f90f9879680ac7080df.tar.gz clientdata-a0b9e2463d741e0973a92f90f9879680ac7080df.tar.bz2 clientdata-a0b9e2463d741e0973a92f90f9879680ac7080df.tar.xz clientdata-a0b9e2463d741e0973a92f90f9879680ac7080df.zip | |
Merge pull request #285 from wushin/hug
Add effect for hug
| -rw-r--r-- | effects.xml | 1 | ||||
| -rw-r--r-- | graphics/particles/hug.particle.xml | 18 | ||||
| -rw-r--r-- | graphics/particles/single-heart.png | bin | 0 -> 553 bytes | |||
| -rw-r--r-- | graphics/sprites/npcs/npc-dicentra.png | bin | 4489 -> 0 bytes | |||
| -rw-r--r-- | license.txt | 3 |
5 files changed, 22 insertions, 0 deletions
diff --git a/effects.xml b/effects.xml index 047625e4..41b04f8c 100644 --- a/effects.xml +++ b/effects.xml @@ -77,6 +77,7 @@ <effect id="46" sprite="icons/quest-continue.xml"/> <effect id="47" particle="graphics/particles/questup.particle.xml"/> <effect id="48" particle="graphics/particles/questdone.particle.xml"/> + <effect id="49" particle="graphics/particles/hug.particle.xml"/> <effect id="111" particle="graphics/particles/magic.shield-ends.xml"/> <!-- <effect id="112" particle="graphics/particles/magic.haste-ends.xml"/>--> <!-- <effect id="113" particle="graphics/particles/magic.barrier-ends.xml"/> --> diff --git a/graphics/particles/hug.particle.xml b/graphics/particles/hug.particle.xml new file mode 100644 index 00000000..551d0a4c --- /dev/null +++ b/graphics/particles/hug.particle.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<!-- +Green stars which are supposed to engulf a character +--> +<effect> + <particle position-x="0" position-y="0" position-z="0" lifetime="128"> + <emitter> + <property name="image" value="graphics/particles/single-heart.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="32"/> + <property name="position-z" min="16" max="32"/> + </emitter> + </particle> +</effect> diff --git a/graphics/particles/single-heart.png b/graphics/particles/single-heart.png Binary files differnew file mode 100644 index 00000000..ee65ae93 --- /dev/null +++ b/graphics/particles/single-heart.png diff --git a/graphics/sprites/npcs/npc-dicentra.png b/graphics/sprites/npcs/npc-dicentra.png Binary files differdeleted file mode 100644 index 1b63c89e..00000000 --- a/graphics/sprites/npcs/npc-dicentra.png +++ /dev/null diff --git a/license.txt b/license.txt index a2502bc3..4ba1c0c4 100644 --- a/license.txt +++ b/license.txt @@ -532,6 +532,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/particles/pool-undyed.png (Alige, Skipy) (GPLv2) graphics/particles/puff-blue.png (????) (GPLv2) graphics/particles/raindrop.png (????) (GPLv2) + graphics/particles/single-heart.png (????) (GPLv2) graphics/particles/smoke-large-grey.png (????) (GPLv2) graphics/particles/snowflake.png (????) (GPLv2) graphics/particles/sparkle.png (????) (GPLv2) @@ -883,6 +884,8 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/npcs/hugenpcs.png (ChefChelios, Nami) (GPLv2), (CC BY-SA 3.0) graphics/sprites/npcs/npc-annualeaster.png (????) (GPLv2) graphics/sprites/npcs/npc-beerguyghost.png (Reid, Skipy) (GPLv2) + graphics/sprites/npcs/bleeding-heart-tree.png (????) (GPLv2) + graphics/sprites/npcs/bleeding-heart-tree-sm.png (????) (GPLv2) graphics/sprites/npcs/npc-chronos.png (Lien) (GPLv2) graphics/sprites/npcs/npc-cindycage.png (Skipy) (GPLv2) graphics/sprites/npcs/npc-creepysurgeon.png (Modanung) (GPLv2), (CC BY-SA 3.0) |
