diff options
135 files changed, 754 insertions, 142 deletions
diff --git a/.gitmodules b/.gitmodules index ef870bd6..6da1e30c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "music"] path = music - url = https://github.com/themanaworld/tmw-music.git + url = https://git.themanaworld.org/legacy/music.git diff --git a/effects.xml b/effects.xml index 01e00cf0..3c3a5233 100644 --- a/effects.xml +++ b/effects.xml @@ -23,8 +23,8 @@ <being-effects> <!-- Core effect - used by the TMW magic system - do not change the ids without testing the corresponding magic spells. --> - <effect id="0" audio="system/levelup.ogg" particle="graphics/particles/levelup.particle.xml"/> - <effect id="1" audio="system/levelup.ogg" particle="graphics/particles/skillup.particle.xml"/> + <effect id="0" audio="system/levelup-long.ogg" particle="graphics/particles/levelup.particle.xml"/> + <effect id="1" audio="system/skillup02.ogg" particle="graphics/particles/skillup.particle.xml"/> <effect id="2" particle="graphics/particles/magic.generic.xml"/> <!-- life --> <effect id="3" particle="graphics/particles/magic.white.xml"/> @@ -39,50 +39,48 @@ <!-- dark --> <effect id="8" particle="graphics/particles/magic.darkred.xml"/> <effect id="10" particle="graphics/particles/magic.default.xml"/> - <!-- #betsanc (protect) hit --> - <effect id="11" particle="graphics/particles/magic.shield.xml"/> + <!-- #betsanc (protect) hit | XML animation looks reversed, so end animation has on SFX --> + <effect id="11" audio="magic/betsanc-on.ogg" particle="graphics/particles/magic.shield-ends.xml"/> <!-- <effect id="12" particle="graphics/particles/magic.haste.xml"/>--> <effect id="13" particle="graphics/particles/magic.hit.xml"/> <effect id="14" particle="graphics/particles/magic.hit.evil.xml"/> <effect id="15" audio="env/flame.ogg" particle="graphics/particles/fire-burst.xml"/> <effect id="16" audio="env/flame.ogg" particle="graphics/particles/fire-explosion.xml"/> <!-- #ingrav (lightning strike) hit --> - <effect id="17" particle="graphics/particles/lightning1.xml"/> - <!-- #ingrav (lightning strike) hit --> - <effect id="18" particle="graphics/particles/lightning2.xml"/> - <!-- #ingrav (lightning strike) hit --> - <effect id="19" particle="graphics/particles/lightning3.xml"/> - <effect id="20" particle="graphics/particles/magic.teleport.xml"/> + <effect id="17" audio="magic/ingrav1.ogg" particle="graphics/particles/lightning1.xml"/> + <effect id="18" audio="magic/ingrav2.ogg" particle="graphics/particles/lightning2.xml"/> + <effect id="19" audio="magic/ingrav3.ogg" particle="graphics/particles/lightning3.xml"/> + <effect id="20" audio="system/warp.ogg" particle="graphics/particles/magic.teleport.xml"/> <!-- <effect id="20" particle="graphics/particles/magic.barrier.xml"/> --> <effect id="21" particle="graphics/particles/pentagram-buildup-short.xml"/> <effect id="22" particle="graphics/particles/pentagram-burst.xml"/> - <effect id="24" particle="graphics/particles/magic.teleport.xml"/> + <effect id="24" audio="system/warp.ogg" particle="graphics/particles/magic.teleport.xml"/> <!-- #kaflosh (rain) hit --> <effect id="25" particle="graphics/particles/rain.xml" audio="magic/kaflosh.ogg"/> <effect id="26" particle="graphics/particles/hit.particle.xml"/> <!-- #frillyar (arrow hail) hit --> - <effect id="27" particle="graphics/particles/arrow-hail.xml"/> + <effect id="27" audio="magic/frillyar.ogg" particle="graphics/particles/arrow-hail.xml"/> <effect id="28" audio="system/crit.ogg" particle="graphics/particles/crit.particle.xml"/> <effect id="30" audio="system/boom.ogg" particle="graphics/particles/large-explosion.xml"/> <effect id="31" audio="system/crit.ogg" particle="graphics/particles/medium-explosion.xml"/> <effect id="32" particle="graphics/particles/medium-smoke.xml"/> <!-- Illia quest effects --> - <effect id="33" particle="graphics/particles/medium-blindinglight.xml"/> + <effect id="33" audio="magic/spawn_burst.ogg" particle="graphics/particles/medium-blindinglight.xml"/> <effect id="34" particle="graphics/particles/channelling-raise.particle.xml"/> <effect id="35" particle="graphics/particles/channelling-cast.particle.xml"/> <effect id="36" particle="graphics/particles/enchanted-door-broken.particle.xml"/> <effect id="37" particle="graphics/particles/dark-teleport.particle.xml"/> - <effect id="38" particle="graphics/particles/evil-summon.particle.xml"/> - <effect id="39" particle="graphics/particles/ground-spawn.particle.xml"/> + <effect id="38" audio="magic/astral.ogg" particle="graphics/particles/evil-summon.particle.xml"/> + <effect id="39" audio="magic/spawn_burst.ogg" particle="graphics/particles/ground-spawn.particle.xml"/> <effect id="40" particle="graphics/particles/blue-magic-cast.particle.xml"/> <effect id="41" particle="graphics/particles/magic-blue-teleport.particle.xml"/> <effect id="42" particle="graphics/particles/magic-dark-explosion.particle.xml"/> <effect id="43" audio="monsters/pumpkin/pumpkin-explosion.ogg" particle="graphics/particles/monster-pumpkin-explosion.particle.xml"/> <effect id="44" particle="graphics/particles/object-getitem.particle.xml"/> - <effect id="45" sprite="icons/quest-start.xml"/> - <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="45" audio="system/quest-start.ogg" sprite="icons/quest-start.xml"/> + <effect id="46" audio="system/quest-continue.ogg" sprite="icons/quest-continue.xml"/> + <effect id="47" audio="system/quest-up.ogg" particle="graphics/particles/questup.particle.xml"/> + <effect id="48" audio="system/quest-done.ogg" particle="graphics/particles/questdone.particle.xml"/> <effect id="49" particle="graphics/particles/hug.particle.xml"/> <effect id="50" particle="graphics/particles/hellblaze.particle.xml"/> <effect id="51" audio="system/warning.ogg"/> @@ -92,7 +90,7 @@ <effect id="55" particle="graphics/particles/snowball-crit.particle.xml"/> <effect id="69" particle="graphics/particles/python.xml" audio="env/fart.ogg"/> <!-- #betsanc (protect) end --> - <effect id="111" particle="graphics/particles/magic.shield-ends.xml"/> + <effect id="111" audio="magic/betsanc-off.ogg" particle="graphics/particles/magic.shield.xml"/> <!-- <effect id="112" particle="graphics/particles/magic.haste-ends.xml"/>--> <!-- <effect id="113" particle="graphics/particles/magic.barrier-ends.xml"/> --> <effect id="114" particle="graphics/particles/electricity.red.xml"/> @@ -110,111 +108,111 @@ <effect id="403" audio="monsters/bat/bat-hit1.ogg"/> <!-- magic v3 spells --> <!-- #discharge --> - <effect id="500" particle="graphics/particles/fire-burst.xml"/> + <effect id="500" audio="magic/discharge.ogg" particle="graphics/particles/fire-burst.xml"/> <!-- #confringo (wand) cast --> - <effect id="501" particle="graphics/particles/magic.generic.xml"/> + <effect id="501" audio="magic/generic.ogg" particle="graphics/particles/magic.generic.xml"/> <!-- #itenplz (aggravate) cast --> - <effect id="503" particle="graphics/particles/magic.green.xml"/> + <effect id="503" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/> <!-- #itenplz (aggravate) hit --> - <effect id="504" particle="graphics/particles/magic.default.xml"/> + <effect id="504" audio="magic/itenplz-hit.ogg" particle="graphics/particles/magic.default.xml"/> <!-- #miteyo (detect magic) cast --> - <effect id="505" particle="graphics/particles/magic.generic.xml"/> + <effect id="505" audio="magic/generic.ogg" particle="graphics/particles/magic.generic.xml"/> <!-- #miteyo (detect magic) hit --> - <effect id="506" particle="graphics/particles/magic.default.xml"/> + <effect id="506" audio="magic/detect_magic.ogg" particle="graphics/particles/magic.default.xml"/> <!-- #abizit (magic experience) cast --> - <effect id="507" particle="graphics/particles/magic.default.xml"/> + <effect id="507" audio="magic/default_magic.ogg" particle="graphics/particles/magic.default.xml"/> <!-- #flar (flare dart) cast --> - <effect id="508" particle="graphics/particles/magic.default.xml"/> + <effect id="508" audio="magic/war.ogg" particle="graphics/particles/magic.default.xml"/> <!-- (grow plant) cast --> - <effect id="510" particle="graphics/particles/magic.grow-plant.xml"/> + <effect id="510" audio="magic/nature.ogg" particle="graphics/particles/magic.grow-plant.xml"/> <!-- (grow plant) spawn --> - <effect id="511" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="511" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #lum (lesser heal) cast --> <effect id="512" particle="graphics/particles/magic.white.xml"/> <!-- #lum (lesser heal) hit --> - <effect id="513" particle="graphics/particles/magic.white.xml"/> + <effect id="513" audio="magic/inma.ogg" particle="graphics/particles/magic.white.xml"/> <!-- #chiza (magic blade) cast --> - <effect id="514" particle="graphics/particles/magic.black.xml"/> + <effect id="514" audio="magic/war.ogg" particle="graphics/particles/magic.black.xml"/> <!-- #gole (make sulphur) cast --> - <effect id="516" particle="graphics/particles/magic.red.xml"/> + <effect id="516" audio="magic/transmute.ogg" particle="graphics/particles/magic.red.xml"/> <!-- #kalmurk (summon maggot) cast --> - <effect id="517" particle="graphics/particles/magic.astral-summon.xml"/> + <effect id="517" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalmurk (summon maggot) spawn --> - <effect id="518" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="518" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #parum (transmute wood) cast --> - <effect id="519" particle="graphics/particles/magic.red.xml"/> + <effect id="519" audio="magic/transmute.ogg" particle="graphics/particles/magic.red.xml"/> <!-- #frillyar (arrow hail) cast --> - <effect id="520" particle="graphics/particles/magic.black.xml"/> + <effect id="520" audio="magic/war.ogg" particle="graphics/particles/magic.black.xml"/> <!-- #asorm (astral barrier) cast --> - <effect id="521" particle="graphics/particles/magic.blue.xml"/> + <effect id="521" audio="magic/astral.ogg" particle="graphics/particles/magic.blue.xml"/> <!-- #asorm (astral barrier) hit --> - <effect id="522" particle="graphics/particles/magic.default.xml"/> + <effect id="522" audio="magic/default_magic.ogg" particle="graphics/particles/magic.default.xml"/> <!-- #asorm (astral barrier) end --> - <effect id="523" particle="graphics/particles/magic.default.xml"/> + <effect id="523" audio="magic/default_magic.ogg" particle="graphics/particles/magic.default.xml"/> <!-- #inwilt (detect player) cast --> - <effect id="524" particle="graphics/particles/magic.generic.xml"/> + <effect id="524" audio="magic/generic.ogg" particle="graphics/particles/magic.generic.xml"/> <!-- #manpahil (enchant lifestone) cast --> - <effect id="525" particle="graphics/particles/magic.generic.xml"/> + <effect id="525" audio="magic/generic.ogg" particle="graphics/particles/magic.generic.xml"/> <!-- #plugh (flying backpack) cast --> - <effect id="526" particle="graphics/particles/magic.green.xml"/> + <effect id="526" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/> <!-- #plugh (flying backpack) hit --> - <effect id="527" particle="graphics/particles/magic.generic.xml"/> + <effect id="527" audio="magic/nature.ogg" particle="graphics/particles/magic.generic.xml"/> <!-- #plugh (flying backpack) end --> - <effect id="528" particle="graphics/particles/magic.generic.xml"/> + <effect id="528" audio="magic/nature.ogg" particle="graphics/particles/magic.generic.xml"/> <!-- #joyplim (happy curse) cast --> - <effect id="529" particle="graphics/particles/magic.green.xml"/> + <effect id="529" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/> <!-- #anwiltyp (hide) cast --> - <effect id="530" particle="graphics/particles/magic.blue.xml"/> + <effect id="530" audio="magic/astral.ogg" particle="graphics/particles/magic.blue.xml"/> <!-- #anwiltyp (hide) hit --> - <effect id="531" particle="graphics/particles/magic.default.xml"/> + <effect id="531" audio="magic/default_magic.ogg" particle="graphics/particles/magic.default.xml"/> <!-- #anwiltyp (hide) end --> - <effect id="532" particle="graphics/particles/magic.generic.xml"/> + <effect id="532" audio="magic/default_magic.ogg" particle="graphics/particles/magic.generic.xml"/> <!-- #inma (lay on hands) cast --> <effect id="533" particle="graphics/particles/magic.white.xml"/> <!-- #inma (lay on hands) hit --> - <effect id="534" particle="graphics/particles/magic.white.xml"/> + <effect id="534" audio="magic/inma.ogg" particle="graphics/particles/magic.white.xml"/> <!-- #ingrav (lightning strike) cast --> - <effect id="535" particle="graphics/particles/magic.black.xml"/> + <effect id="535" audio="magic/war.ogg" particle="graphics/particles/magic.black.xml"/> <!-- #upmarmu (magic knuckles) cast --> - <effect id="536" particle="graphics/particles/magic.black.xml"/> + <effect id="536" audio="magic/war.ogg" particle="graphics/particles/magic.black.xml"/> <!-- #kularzufrill (make arrows) cast --> - <effect id="537" particle="graphics/particles/magic.red.xml"/> + <effect id="537" audio="magic/transmute.ogg" particle="graphics/particles/magic.red.xml"/> <!-- #zukminbirf (make iron powder) cast --> - <effect id="538" particle="graphics/particles/magic.red.xml"/> + <effect id="538" audio="magic/transmute.ogg" particle="graphics/particles/magic.red.xml"/> <!-- (make shirt/short tanktop/tanktop) cast --> - <effect id="539" particle="graphics/particles/magic.red.xml"/> + <effect id="539" audio="magic/transmute.ogg" particle="graphics/particles/magic.red.xml"/> <!-- #betsanc (protect) cast --> - <effect id="540" particle="graphics/particles/magic.green.xml"/> + <effect id="540" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/> <!-- #kaflosh (rain) cast --> - <effect id="541" particle="graphics/particles/magic.green.xml"/> + <effect id="541" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/> <!-- #chipchip (shear) cast --> - <effect id="542" particle="graphics/particles/magic.green.xml"/> + <effect id="542" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/> <!-- #kalakarenk (summon fluffy) cast --> - <effect id="543" particle="graphics/particles/magic.astral-summon.xml"/> + <effect id="543" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalakarenk (summon fluffy) spawn --> - <effect id="544" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="544" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #kalboo (summon mouboo) cast --> - <effect id="545" particle="graphics/particles/magic.astral-summon.xml"/> + <effect id="545" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalboo (summon mouboo) spawn --> - <effect id="546" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="546" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #kalgina (summon pinky) cast --> - <effect id="547" particle="graphics/particles/magic.astral-summon.xml"/> + <effect id="547" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalgina (summon pinky) spawn --> - <effect id="548" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="548" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #halhiss (summon snake) cast --> - <effect id="549" particle="graphics/particles/magic.dark-summon.xml"/> + <effect id="549" audio="magic/astral.ogg" particle="graphics/particles/magic.dark-summon.xml"/> <!-- #halhiss (summon snake) spawn --> - <effect id="550" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="550" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #kalrenk (summon spiky shroom) cast --> - <effect id="551" particle="graphics/particles/magic.astral-summon.xml"/> + <effect id="551" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalrenk (summon spiky shroom) spawn --> - <effect id="552" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="552" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #helorp (summon wicked shroom) cast --> - <effect id="553" particle="graphics/particles/magic.dark-summon.xml"/> + <effect id="553" audio="magic/astral.ogg" particle="graphics/particles/magic.dark-summon.xml"/> <!-- #helorp (summon wicked shroom) spawn --> - <effect id="554" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="554" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #phlex (toxic dart) cast --> - <effect id="555" particle="graphics/particles/magic.darkred.xml"/> + <effect id="555" audio="magic/astral.ogg" particle="graphics/particles/magic.darkred.xml"/> <!-- Temporary --> <effect id="907" particle="graphics/sprites/npcs/halifax.xml"/> </being-effects> diff --git a/graphics/particles/dart.particle.xml b/graphics/particles/dart.particle.xml new file mode 100644 index 00000000..8b74e69c --- /dev/null +++ b/graphics/particles/dart.particle.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<effect> + <particle position-x="0" position-y="0" position-z="32" lifetime="128"> + <rotation imageset="graphics/particles/dart.png" width="16" height="16"> + <sequence start="0" end="7"/> + </rotation> + </particle> +</effect> diff --git a/graphics/particles/dart.png b/graphics/particles/dart.png Binary files differnew file mode 100644 index 00000000..afa27ca7 --- /dev/null +++ b/graphics/particles/dart.png diff --git a/graphics/particles/electricity.yellow.persist.xml b/graphics/particles/electricity.yellow.persist.xml new file mode 100644 index 00000000..f5534f0b --- /dev/null +++ b/graphics/particles/electricity.yellow.persist.xml @@ -0,0 +1,17 @@ +<?xml version="1.0"?> +<effect> + <particle position-x="0" position-y="0" position-z="0" lifetime="250"> + <emitter> + <property name="lifetime" value="30"/> + <property name="output" value="1"/> + <property name="position-x" min="-16" max="16"/> + <property name="position-y" min="-16" max="16"/> + <property name="gravity" value="-1"/> + <property name="momentum" value="0.05"/> + <animation imageset="graphics/particles/electricity.particle.png|W:#FFFF8F" width="15" height="15"> + <sequence start="0" end="7" delay="20"/> + </animation> + <property name="fade-out" value="250"/> + </emitter> + </particle> +</effect> diff --git a/graphics/particles/electricity.yellow.xml b/graphics/particles/electricity.yellow.xml new file mode 100644 index 00000000..67df5739 --- /dev/null +++ b/graphics/particles/electricity.yellow.xml @@ -0,0 +1,17 @@ +<?xml version="1.0"?> +<effect> + <particle position-x="0" position-y="0" position-z="0" lifetime="300"> + <emitter> + <property name="lifetime" value="30"/> + <property name="output" value="1"/> + <property name="position-x" min="-16" max="16"/> + <property name="position-y" min="-16" max="16"/> + <property name="gravity" value="-2"/> + <property name="momentum" value="0.3"/> + <animation imageset="graphics/particles/electricity.particle.png|W:#FFFF8F" width="15" height="15"> + <sequence start="0" end="7" delay="20"/> + </animation> + <property name="fade-out" value="30"/> + </emitter> + </particle> +</effect> diff --git a/graphics/particles/hex-facet-outline-50.png b/graphics/particles/hex-facet-outline-50.png Binary files differnew file mode 100644 index 00000000..711f6828 --- /dev/null +++ b/graphics/particles/hex-facet-outline-50.png diff --git a/graphics/particles/hex-facet-outline.png b/graphics/particles/hex-facet-outline.png Binary files differnew file mode 100644 index 00000000..c68dd9e2 --- /dev/null +++ b/graphics/particles/hex-facet-outline.png diff --git a/graphics/particles/levelup.particle.xml b/graphics/particles/levelup.particle.xml index 17e10f82..ccdf9044 100644 --- a/graphics/particles/levelup.particle.xml +++ b/graphics/particles/levelup.particle.xml @@ -3,7 +3,7 @@ Red stars which are supposed to engulf a character --> <effect> - <particle position-x="0" position-y="0" position-z="0" lifetime="128"> + <particle position-x="0" position-y="0" position-z="0" lifetime="500"> <emitter> <property name="image" value="graphics/particles/star-medium.png|W:#ff0000,ffffff"/> <property name="vertical-angle" value="90"/> diff --git a/graphics/particles/lightning1.xml b/graphics/particles/lightning1.xml index 0fe869b0..39071735 100644 --- a/graphics/particles/lightning1.xml +++ b/graphics/particles/lightning1.xml @@ -8,9 +8,22 @@ An explosion of white particles. <property name="power" min="0" max="0"/> <property name="gravity" value="0"/> <property name="image" value="graphics/particles/lightning1-240.png"/> - <property name="lifetime" min="5" max="10"/> + <property name="lifetime" min="5" max="50"/> <property name="output" value="1"/> <property name="fade-out" value="8"/> </emitter> + <emitter> + <property name="lifetime" value="300"/> + <property name="output" min="5" max="30"/> + <property name="position-x" min="-32" max="32"/> + <property name="position-y" min="-16" max="-32"/> + <property name="position-z" value="-120"/> + <property name="gravity" value="1"/> + <property name="momentum" value="0.1"/> + <animation imageset="graphics/particles/electricity.particle.png|W:#FFFF8F" width="15" height="15"> + <sequence start="0" end="7" delay="20"/> + </animation> + <property name="fade-out" value="0"/> + </emitter> </particle> </effect> diff --git a/graphics/particles/lightning2.xml b/graphics/particles/lightning2.xml index 6f5d059d..09d20888 100644 --- a/graphics/particles/lightning2.xml +++ b/graphics/particles/lightning2.xml @@ -8,9 +8,22 @@ An explosion of white particles. <property name="power" min="0" max="0"/> <property name="gravity" value="0"/> <property name="image" value="graphics/particles/lightning2-263.png"/> - <property name="lifetime" min="5" max="10"/> + <property name="lifetime" min="5" max="50"/> <property name="output" value="1"/> <property name="fade-out" value="8"/> </emitter> + <emitter> + <property name="lifetime" value="300"/> + <property name="output" min="5" max="30"/> + <property name="position-x" min="-32" max="32"/> + <property name="position-y" min="-16" max="-32"/> + <property name="position-z" value="-120"/> + <property name="gravity" value="1"/> + <property name="momentum" value="0.1"/> + <animation imageset="graphics/particles/electricity.particle.png|W:#FFFF8F" width="15" height="15"> + <sequence start="0" end="7" delay="20"/> + </animation> + <property name="fade-out" value="0"/> + </emitter> </particle> </effect> diff --git a/graphics/particles/lightning3.xml b/graphics/particles/lightning3.xml index 3734f1f8..50c478a4 100644 --- a/graphics/particles/lightning3.xml +++ b/graphics/particles/lightning3.xml @@ -8,9 +8,22 @@ An explosion of white particles. <property name="power" min="0" max="0"/> <property name="gravity" value="0"/> <property name="image" value="graphics/particles/lightning3-275.png"/> - <property name="lifetime" min="5" max="10"/> + <property name="lifetime" min="5" max="50"/> <property name="output" value="1"/> <property name="fade-out" value="8"/> </emitter> + <emitter> + <property name="lifetime" value="300"/> + <property name="output" min="5" max="30"/> + <property name="position-x" min="-32" max="32"/> + <property name="position-y" min="-16" max="-32"/> + <property name="position-z" value="-120"/> + <property name="gravity" value="1"/> + <property name="momentum" value="0.1"/> + <animation imageset="graphics/particles/electricity.particle.png|W:#FFFF8F" width="15" height="15"> + <sequence start="0" end="7" delay="20"/> + </animation> + <property name="fade-out" value="0"/> + </emitter> </particle> </effect> diff --git a/graphics/particles/magic.black.persist.xml b/graphics/particles/magic.black.persist.xml new file mode 100644 index 00000000..842b33b6 --- /dev/null +++ b/graphics/particles/magic.black.persist.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<effect> + <particle position-x="0" position-y="0" position-z="0" lifetime="3000"> + <emitter> + <animation imageset="graphics/particles/sparkle.png|W:#000000" 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="0" 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.persist.xml b/graphics/particles/magic.green.persist.xml new file mode 100644 index 00000000..044911a2 --- /dev/null +++ b/graphics/particles/magic.green.persist.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<effect> + <particle position-x="0" position-y="0" position-z="0" lifetime="3000"> + <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/monster-virus-foefire.particle.xml b/graphics/particles/monster-virus-foefire.particle.xml index fdb76438..eede2af3 100644 --- a/graphics/particles/monster-virus-foefire.particle.xml +++ b/graphics/particles/monster-virus-foefire.particle.xml @@ -14,7 +14,7 @@ used for the foefire attack of the Virus. <property name="power" min="1" max="1.5"/> <property name="momentum" value="0.99"/> <property name="gravity" value="-0.02"/> - <animation imageset="graphics/particles/mist-face-b.particle.png|W:#00FF22" width="30" height="30"> + <animation imageset="graphics/particles/mist-face-b.png|W:#00FF22" width="30" height="30"> <frame index="0" delay="20"/> <frame index="1" delay="30"/> <frame index="2" delay="35"/> diff --git a/graphics/particles/snow-burst.xml b/graphics/particles/snow-burst.xml new file mode 100644 index 00000000..2932d6a9 --- /dev/null +++ b/graphics/particles/snow-burst.xml @@ -0,0 +1,86 @@ +<?xml version="1.0"?> +<!-- + Snow Burst + a ball of snow that leaves a tail on its way +--> +<effect> + <particle position-x="0" position-y="0" position-z="32" lifetime="128"> + <emitter> + <property name="image" value="graphics/particles/snowflake-7x7.png"/> + <property name="lifetime" value="111"/> + <property name="fade-in" value="10"/> + <property name="fade-out" value="40"/> + <property name="output" min="3" max="4"/> + <property name="power" min="1" max="2"/> + <property name="horizontal-angle" min="-180" max="180"/> + <property name="gravity" value="0.05"/> + <property name="bounce" value="1"/> + <property name="momentum" value="0.95"/> + <property name="randomness" value="100"/> + <property name="vertical-angle" min="-180" max="180"/> + </emitter> +<!-- + it looks good with the 9x9 snowflakes but its very unrealistic when a snowflake is 1/4 size of the head +--> +<!-- + <emitter> + <property name="image" value="graphics/particles/snowflake-9x9.png"/> + <property name="lifetime" value="111"/> + <property name="fade-in" value="10"/> + <property name="fade-out" value="40"/> + <property name="output" min="0" max="1"/> + <property name="power" min="2" max="3"/> + <property name="horizontal-angle" min="-180" max="180"/> + <property name="gravity" value="0.05"/> + <property name="bounce" value="1"/> + <property name="momentum" value="0.95"/> + <property name="randomness" value="200"/> + <property name="vertical-angle" min="-180" max="180"/> + </emitter> +--> + <emitter> + <property name="image" value="graphics/particles/star-small.png"/> + <property name="lifetime" value="111"/> + <property name="fade-in" value="10"/> + <property name="fade-out" value="40"/> + <property name="output" min="3" max="4"/> + <property name="power" min="1" max="2"/> + <property name="horizontal-angle" min="-180" max="180"/> + <property name="gravity" value="0.01"/> + <property name="bounce" value="1"/> + <property name="momentum" value="0.95"/> + <property name="randomness" value="200"/> + <property name="vertical-angle" min="-180" max="180"/> + </emitter> + <emitter> + <property name="image" value="graphics/particles/snowflake-7x7.png"/> + <property name="lifetime" value="111"/> + <property name="alpha" value="1"/> + <property name="fade-in" value="10"/> + <property name="fade-out" value="40"/> + <property name="output" min="8" max="10"/> + <property name="power" min="1" max="1"/> + <property name="horizontal-angle" min="-180" max="180"/> + <property name="gravity" value="0.1"/> + <property name="bounce" value="1"/> + <property name="momentum" value="0.95"/> + <property name="randomness" value="100"/> + <property name="vertical-angle" min="-180" max="180"/> + <property name="follow-parent" value="1"/> + </emitter> + <emitter> + <property name="image" value="graphics/particles/snowflake-7x7.png"/> + <property name="lifetime" value="12"/> + <property name="alpha" value="1"/> + <property name="fade-in" value="4"/> + <property name="fade-out" value="4"/> + <property name="output" min="66" max="66"/> + <property name="power" min="2" max="2"/> + <property name="horizontal-angle" min="-180" max="180"/> + <property name="gravity" value="0.1"/> + <property name="bounce" value="1"/> + <property name="vertical-angle" min="-180" max="180"/> + <property name="follow-parent" value="1"/> + </emitter> + </particle> +</effect> diff --git a/graphics/particles/snowflake-7x7.png b/graphics/particles/snowflake-7x7.png Binary files differnew file mode 100644 index 00000000..221b4d08 --- /dev/null +++ b/graphics/particles/snowflake-7x7.png diff --git a/graphics/particles/snowflake-9x9.png b/graphics/particles/snowflake-9x9.png Binary files differnew file mode 100644 index 00000000..2ac1c5e8 --- /dev/null +++ b/graphics/particles/snowflake-9x9.png diff --git a/graphics/sprites/equipment/weapons/null.png b/graphics/sprites/equipment/weapons/null.png Binary files differnew file mode 100644 index 00000000..0906ec03 --- /dev/null +++ b/graphics/sprites/equipment/weapons/null.png diff --git a/graphics/sprites/equipment/weapons/null.xml b/graphics/sprites/equipment/weapons/null.xml new file mode 100644 index 00000000..c706c02b --- /dev/null +++ b/graphics/sprites/equipment/weapons/null.xml @@ -0,0 +1,84 @@ +<?xml version="1.0"?> +<!-- For use with weapons that require no sprite. e.g. items/misc/ (magic) --> +<sprite variants="135" variant_offset="1"> + <imageset name="null" src="graphics/sprites/equipment/weapons/null.png|B;R" width="128" height="128"/> + <action name="default" imageset="null"/> + <action name="stand" imageset="null"> + <animation direction="down"> + <frame index="0" offsetY="32"/> + </animation> + <animation direction="left"> + <frame index="0" offsetY="32"/> + </animation> + <animation direction="up"> + <frame index="0" offsetY="32"/> + </animation> + <animation direction="right"> + <frame index="0" offsetY="32"/> + </animation> + </action> + <action name="sit" imageset="null"> + <animation direction="down"> + <frame index="0" offsetY="32"/> + </animation> + <animation direction="left"> + <frame index="0" offsetY="32"/> + </animation> + <animation direction="up"> + <frame index="0" offsetY="32"/> + </animation> + <animation direction="right"> + <frame index="0" offsetY="32"/> + </animation> + </action> + <action name="walk" imageset="null"> + <animation direction="down"> + <sequence offsetY="32" start="1" end="1" delay="75"/> + </animation> + <animation direction="left"> + <sequence offsetY="32" start="1" end="1" delay="75"/> + </animation> + <animation direction="up"> + <sequence offsetY="32" start="1" end="1" delay="75"/> + </animation> + <animation direction="right"> + <sequence offsetY="32" start="1" end="1" delay="75"/> + </animation> + </action> + <action name="attack" imageset="null"> + <animation direction="down"> + <sequence offsetY="32" start="1" end="1" delay="75"/> + <end/> + </animation> + <animation direction="left"> + <sequence offsetY="32" start="1" end="1" delay="75"/> + <end/> + </animation> + <animation direction="up"> + <sequence offsetY="32" start="1" end="1" delay="75"/> + <end/> + </animation> + <animation direction="right"> + <sequence offsetY="32" start="1" end="1" delay="75"/> + <end/> + </animation> + </action> + <action name="attack_chop" imageset="null"> + <animation direction="down"> + <sequence offsetY="32" start="1" end="1" delay="140"/> + <end/> + </animation> + <animation direction="left"> + <sequence offsetY="32" start="1" end="1" delay="140"/> + <end/> + </animation> + <animation direction="up"> + <sequence offsetY="32" start="1" end="1" delay="140"/> + <end/> + </animation> + <animation direction="right"> + <sequence offsetY="32" start="1" end="1" delay="140"/> + <end/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/icons/feather-outline.png b/graphics/sprites/icons/feather-outline.png Binary files differnew file mode 100644 index 00000000..47eeb709 --- /dev/null +++ b/graphics/sprites/icons/feather-outline.png diff --git a/graphics/sprites/icons/feather.xml b/graphics/sprites/icons/feather.xml index 010e25c4..6926a782 100644 --- a/graphics/sprites/icons/feather.xml +++ b/graphics/sprites/icons/feather.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <sprite> - <imageset name="base" src="graphics/sprites/icons/feather.png" width="13" height="20"/> + <imageset name="base" src="graphics/sprites/icons/feather-outline.png" width="15" height="20"/> <action name="default" imageset="base"> <animation direction="default"> - <frame index="0" offsetY="-12" delay="100"/> + <frame index="0" offsetY="-9" delay="100"/> </animation> </action> </sprite> diff --git a/graphics/sprites/icons/green-barrier.xml b/graphics/sprites/icons/green-barrier.xml index 0e74d763..68cbc8f9 100644 --- a/graphics/sprites/icons/green-barrier.xml +++ b/graphics/sprites/icons/green-barrier.xml @@ -3,7 +3,7 @@ <imageset name="base" src="graphics/sprites/icons/green-barrier.png" width="13" height="20"/> <action name="default" imageset="base"> <animation direction="default"> - <frame index="0" offsetY="-12" delay="0"/> + <frame index="0" offsetY="-9" delay="0"/> </animation> </action> </sprite> diff --git a/graphics/sprites/icons/haste-potion.xml b/graphics/sprites/icons/haste-potion.xml index 887d1b91..67c159dd 100644 --- a/graphics/sprites/icons/haste-potion.xml +++ b/graphics/sprites/icons/haste-potion.xml @@ -3,10 +3,10 @@ <imageset name="base" src="graphics/sprites/icons/potion-c.png|G" width="13" height="20"/> <action name="default" imageset="base"> <animation direction="default"> - <frame index="0" offsetY="-12" delay="100"/> - <frame index="1" offsetY="-12" delay="100"/> - <frame index="2" offsetY="-12" delay="100"/> - <frame index="3" offsetY="-12" delay="100"/> + <frame index="0" offsetY="-9" delay="100"/> + <frame index="1" offsetY="-9" delay="100"/> + <frame index="2" offsetY="-9" delay="100"/> + <frame index="3" offsetY="-9" delay="100"/> </animation> </action> </sprite> diff --git a/graphics/sprites/icons/healing.png b/graphics/sprites/icons/healing.png Binary files differnew file mode 100644 index 00000000..dfc6b804 --- /dev/null +++ b/graphics/sprites/icons/healing.png diff --git a/graphics/sprites/icons/healing.xml b/graphics/sprites/icons/healing.xml new file mode 100644 index 00000000..d05f95fb --- /dev/null +++ b/graphics/sprites/icons/healing.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Reid +Copyright (C) 2011-2012 Evol Online --> + +<sprite> + <imageset name="icon" + src="graphics/sprites/icons/healing.png" + width="14" + height="15" + offsetY="-11"/> + + <action name="default" imageset="icon"> + <animation direction="default"> + <sequence start="0" end="2" delay="100"/> + <frame index="1" delay="100"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/icons/hidden-outline.png b/graphics/sprites/icons/hidden-outline.png Binary files differnew file mode 100644 index 00000000..f1011b7c --- /dev/null +++ b/graphics/sprites/icons/hidden-outline.png diff --git a/graphics/sprites/icons/hidden.xml b/graphics/sprites/icons/hidden.xml index e2b8f1d9..a528c3d4 100644 --- a/graphics/sprites/icons/hidden.xml +++ b/graphics/sprites/icons/hidden.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <sprite> - <imageset name="base" src="graphics/sprites/icons/hidden.png" width="12" height="12"/> + <imageset name="base" src="graphics/sprites/icons/hidden-outline.png" width="12" height="11"/> <action name="default" imageset="base"> <animation direction="default"> - <frame index="0" offsetY="15" delay="0"/> + <frame index="0" offsetY="-12" delay="0"/> </animation> </action> </sprite> diff --git a/graphics/sprites/icons/invisible-outline.png b/graphics/sprites/icons/invisible-outline.png Binary files differnew file mode 100644 index 00000000..f40f4b2c --- /dev/null +++ b/graphics/sprites/icons/invisible-outline.png diff --git a/graphics/sprites/icons/invisible.xml b/graphics/sprites/icons/invisible.xml index cbb4d0cd..1367408a 100644 --- a/graphics/sprites/icons/invisible.xml +++ b/graphics/sprites/icons/invisible.xml @@ -1,35 +1,35 @@ <?xml version="1.0"?> <sprite> - <imageset name="base" src="graphics/sprites/icons/invisible.png" width="16" height="24"/> + <imageset name="base" src="graphics/sprites/icons/invisible-outline.png" width="16" height="24"/> <action name="default" imageset="base"> <animation direction="default"> - <frame index="0" offsetY="-10" delay="2000"/> - <frame index="1" offsetY="-10" delay="100"/> - <frame index="2" offsetY="-10" delay="100"/> - <frame index="3" offsetY="-10" delay="100"/> - <frame index="4" offsetY="-10" delay="100"/> - <frame index="0" offsetY="-10" delay="5000"/> - <frame index="1" offsetY="-10" delay="100"/> - <frame index="2" offsetY="-10" delay="100"/> - <frame index="3" offsetY="-10" delay="100"/> - <frame index="4" offsetY="-10" delay="100"/> - <frame index="0" offsetY="-10" delay="3000"/> - <frame index="7" offsetY="-10" delay="500"/> - <frame index="0" offsetY="-10" delay="3000"/> - <frame index="5" offsetY="-10" delay="50"/> - <frame index="6" offsetY="-10" delay="50"/> - <frame index="5" offsetY="-10" delay="50"/> - <frame index="6" offsetY="-10" delay="50"/> - <frame index="5" offsetY="-10" delay="50"/> - <frame index="6" offsetY="-10" delay="50"/> - <frame index="5" offsetY="-10" delay="50"/> - <frame index="6" offsetY="-10" delay="50"/> - <frame index="5" offsetY="-10" delay="50"/> - <frame index="6" offsetY="-10" delay="50"/> - <frame index="0" offsetY="-10" delay="3000"/> - <frame index="7" offsetY="-10" delay="300"/> - <frame index="0" offsetY="-10" delay="5000"/> - <frame index="7" offsetY="-10" delay="200"/> + <frame index="0" offsetY="-6" delay="2000"/> + <frame index="1" offsetY="-6" delay="100"/> + <frame index="2" offsetY="-6" delay="100"/> + <frame index="3" offsetY="-6" delay="100"/> + <frame index="4" offsetY="-6" delay="100"/> + <frame index="0" offsetY="-6" delay="5000"/> + <frame index="1" offsetY="-6" delay="100"/> + <frame index="2" offsetY="-6" delay="100"/> + <frame index="3" offsetY="-6" delay="100"/> + <frame index="4" offsetY="-6" delay="100"/> + <frame index="0" offsetY="-6" delay="3000"/> + <frame index="7" offsetY="-6" delay="500"/> + <frame index="0" offsetY="-6" delay="3000"/> + <frame index="5" offsetY="-6" delay="50"/> + <frame index="6" offsetY="-6" delay="50"/> + <frame index="5" offsetY="-6" delay="50"/> + <frame index="6" offsetY="-6" delay="50"/> + <frame index="5" offsetY="-6" delay="50"/> + <frame index="6" offsetY="-6" delay="50"/> + <frame index="5" offsetY="-6" delay="50"/> + <frame index="6" offsetY="-6" delay="50"/> + <frame index="5" offsetY="-6" delay="50"/> + <frame index="6" offsetY="-6" delay="50"/> + <frame index="0" offsetY="-6" delay="3000"/> + <frame index="7" offsetY="-6" delay="300"/> + <frame index="0" offsetY="-6" delay="5000"/> + <frame index="7" offsetY="-6" delay="200"/> </animation> </action> </sprite> diff --git a/graphics/sprites/icons/iron-potion.xml b/graphics/sprites/icons/iron-potion.xml index 2d34a4d0..7fcfc80d 100644 --- a/graphics/sprites/icons/iron-potion.xml +++ b/graphics/sprites/icons/iron-potion.xml @@ -3,7 +3,7 @@ <imageset name="base" src="graphics/sprites/icons/potion-b.png|G" width="13" height="20"/> <action name="default" imageset="base"> <animation direction="default"> - <frame index="0" offsetY="-12"/> + <frame index="0" offsetY="-9"/> </animation> </action> </sprite> diff --git a/graphics/sprites/icons/red-rotating-hex.xml b/graphics/sprites/icons/red-rotating-hex.xml index 107b16be..bb23b77b 100644 --- a/graphics/sprites/icons/red-rotating-hex.xml +++ b/graphics/sprites/icons/red-rotating-hex.xml @@ -1,16 +1,16 @@ <?xml version="1.0"?> <sprite> - <imageset name="base" src="graphics/particles/hex-facet-50.png|W" width="9" height="11"/> + <imageset name="base" src="graphics/particles/hex-facet-outline.png|W" width="11" height="13"/> <action name="default" imageset="base"> <animation direction="default"> - <frame index="0" offsetX="-2" offsetY="-16" delay="120"/> - <frame index="1" offsetX="-2" offsetY="-16" delay="120"/> - <frame index="2" offsetX="-2" offsetY="-16" delay="120"/> - <frame index="3" offsetX="-2" offsetY="-16" delay="120"/> - <frame index="4" offsetX="-2" offsetY="-16" delay="120"/> - <frame index="5" offsetX="-3" offsetY="-16" delay="120"/> - <frame index="6" offsetX="-2" offsetY="-16" delay="120"/> - <frame index="7" offsetX="-2" offsetY="-16" delay="120"/> + <frame index="0" offsetX="-2" offsetY="-12" delay="120"/> + <frame index="1" offsetX="-2" offsetY="-12" delay="120"/> + <frame index="2" offsetX="-2" offsetY="-12" delay="120"/> + <frame index="3" offsetX="-2" offsetY="-12" delay="120"/> + <frame index="4" offsetX="-2" offsetY="-12" delay="120"/> + <frame index="5" offsetX="-2" offsetY="-12" delay="120"/> + <frame index="6" offsetX="-2" offsetY="-12" delay="120"/> + <frame index="7" offsetX="-2" offsetY="-12" delay="120"/> </animation> </action> </sprite> diff --git a/graphics/sprites/icons/spell-attack-generic-outline.png b/graphics/sprites/icons/spell-attack-generic-outline.png Binary files differnew file mode 100644 index 00000000..a6232f87 --- /dev/null +++ b/graphics/sprites/icons/spell-attack-generic-outline.png diff --git a/graphics/sprites/icons/spell-attack-generic.xml b/graphics/sprites/icons/spell-attack-generic.xml index c4185bc5..3ce09dc7 100644 --- a/graphics/sprites/icons/spell-attack-generic.xml +++ b/graphics/sprites/icons/spell-attack-generic.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <sprite> - <imageset name="base" src="graphics/sprites/icons/spell-attack-generic.png" width="13" height="20"/> + <imageset name="base" src="graphics/sprites/icons/spell-attack-generic-outline.png" width="13" height="21"/> <action name="default" imageset="base"> <animation direction="default"> - <frame index="0" offsetY="-12" delay="100"/> + <frame index="0" offsetY="-8" delay="100"/> </animation> </action> </sprite> diff --git a/graphics/sprites/icons/spell-cooldown-ar-outline.png b/graphics/sprites/icons/spell-cooldown-ar-outline.png Binary files differnew file mode 100644 index 00000000..5441acd9 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-ar-outline.png diff --git a/graphics/sprites/icons/spell-cooldown-ar.png b/graphics/sprites/icons/spell-cooldown-ar.png Binary files differnew file mode 100644 index 00000000..04058e16 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-ar.png diff --git a/graphics/sprites/icons/spell-cooldown-ar.xml b/graphics/sprites/icons/spell-cooldown-ar.xml new file mode 100644 index 00000000..58c16b4d --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-ar.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/icons/spell-cooldown-ar-outline.png" width="13" height="21"/> + <action name="default" imageset="base"> + <animation direction="default"> + <frame index="0" offsetY="-8" delay="100"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/icons/spell-cooldown-mg.png b/graphics/sprites/icons/spell-cooldown-mg.png Binary files differnew file mode 100644 index 00000000..31e46a53 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-mg.png diff --git a/graphics/sprites/icons/spell-cooldown-mg.xml b/graphics/sprites/icons/spell-cooldown-mg.xml new file mode 100644 index 00000000..f4282793 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-mg.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/icons/spell-cooldown-mg.png" width="13" height="21"/> + <action name="default" imageset="base"> + <animation direction="default"> + <frame index="0" offsetY="-8" delay="100"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/icons/spell-cooldown-mt.png b/graphics/sprites/icons/spell-cooldown-mt.png Binary files differnew file mode 100644 index 00000000..84fe8322 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-mt.png diff --git a/graphics/sprites/icons/spell-cooldown-mt.xml b/graphics/sprites/icons/spell-cooldown-mt.xml new file mode 100644 index 00000000..87b8ef2e --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-mt.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/icons/spell-cooldown-mt.png" width="13" height="21"/> + <action name="default" imageset="base"> + <animation direction="default"> + <frame index="0" offsetY="-8" delay="100"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/icons/spell-cooldown-outline.png b/graphics/sprites/icons/spell-cooldown-outline.png Binary files differnew file mode 100644 index 00000000..bc16cb7b --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-outline.png diff --git a/graphics/sprites/icons/spell-cooldown-r-outline.png b/graphics/sprites/icons/spell-cooldown-r-outline.png Binary files differnew file mode 100644 index 00000000..af56eda5 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-r-outline.png diff --git a/graphics/sprites/icons/spell-cooldown-r.png b/graphics/sprites/icons/spell-cooldown-r.png Binary files differnew file mode 100644 index 00000000..67555ebf --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-r.png diff --git a/graphics/sprites/icons/spell-cooldown-r.xml b/graphics/sprites/icons/spell-cooldown-r.xml new file mode 100644 index 00000000..f0a7f6e7 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-r.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/icons/spell-cooldown-r-outline.png" width="13" height="21"/> + <action name="default" imageset="base"> + <animation direction="default"> + <frame index="0" offsetY="-8" delay="100"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/icons/spell-cooldown.png b/graphics/sprites/icons/spell-cooldown.png Binary files differnew file mode 100644 index 00000000..c34d1669 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown.png diff --git a/graphics/sprites/icons/spell-cooldown.xml b/graphics/sprites/icons/spell-cooldown.xml new file mode 100644 index 00000000..c9f5ff26 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/icons/spell-cooldown-outline.png" width="13" height="21"/> + <action name="default" imageset="base"> + <animation direction="default"> + <frame index="0" offsetY="-8" delay="100"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/icons/spell-shearing.xml b/graphics/sprites/icons/spell-shearing.xml index f2e73c75..fb0bc452 100644 --- a/graphics/sprites/icons/spell-shearing.xml +++ b/graphics/sprites/icons/spell-shearing.xml @@ -3,7 +3,7 @@ <imageset name="base" src="graphics/sprites/icons/spell-shearing.png" width="13" height="20"/> <action name="default" imageset="base"> <animation direction="default"> - <frame index="0" offsetY="-12" delay="100"/> + <frame index="0" offsetY="-9" delay="100"/> </animation> </action> </sprite> diff --git a/graphics/sprites/icons/weight-big.png b/graphics/sprites/icons/weight-big.png Binary files differnew file mode 100644 index 00000000..632c9d1f --- /dev/null +++ b/graphics/sprites/icons/weight-big.png diff --git a/graphics/sprites/icons/weight-big.xml b/graphics/sprites/icons/weight-big.xml new file mode 100644 index 00000000..c64f89fe --- /dev/null +++ b/graphics/sprites/icons/weight-big.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/icons/weight-big.png" width="16" height="16"/> + <action name="default" imageset="base"> + <animation direction="default"> + <frame index="0" offsetY="-10" delay="500"/> + <frame index="0" offsetY="-11" delay="500"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/icons/weight-small.png b/graphics/sprites/icons/weight-small.png Binary files differnew file mode 100644 index 00000000..c4a14281 --- /dev/null +++ b/graphics/sprites/icons/weight-small.png diff --git a/graphics/sprites/icons/weight-small.xml b/graphics/sprites/icons/weight-small.xml new file mode 100644 index 00000000..acc9e77a --- /dev/null +++ b/graphics/sprites/icons/weight-small.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/icons/weight-small.png" width="12" height="16"/> + <action name="default" imageset="base"> + <animation direction="default"> + <frame index="0" offsetY="-10" delay="500"/> + <frame index="0" offsetY="-11" delay="500"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/monsters/golem-blackcrystal.png b/graphics/sprites/monsters/golem-blackcrystal.png Binary files differnew file mode 100644 index 00000000..be28544e --- /dev/null +++ b/graphics/sprites/monsters/golem-blackcrystal.png diff --git a/graphics/sprites/monsters/golem-blackcrystal.xml b/graphics/sprites/monsters/golem-blackcrystal.xml new file mode 100644 index 00000000..941229a1 --- /dev/null +++ b/graphics/sprites/monsters/golem-blackcrystal.xml @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="mob" src="graphics/sprites/monsters/golem-blackcrystal.png" width="128" height="128" offsetY="3"/> + <include file="monsters/golem.xml"/> +</sprite> diff --git a/graphics/sprites/monsters/golem-crystal.png b/graphics/sprites/monsters/golem-crystal.png Binary files differnew file mode 100644 index 00000000..c564f850 --- /dev/null +++ b/graphics/sprites/monsters/golem-crystal.png diff --git a/graphics/sprites/monsters/golem-crystal.xml b/graphics/sprites/monsters/golem-crystal.xml new file mode 100644 index 00000000..91eace79 --- /dev/null +++ b/graphics/sprites/monsters/golem-crystal.xml @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="mob" src="graphics/sprites/monsters/golem-crystal.png" width="128" height="128" offsetY="3"/> + <include file="monsters/golem.xml"/> +</sprite> diff --git a/graphics/sprites/monsters/presente-surpresa.png b/graphics/sprites/monsters/presente-surpresa.png Binary files differnew file mode 100644 index 00000000..2c6e6376 --- /dev/null +++ b/graphics/sprites/monsters/presente-surpresa.png diff --git a/graphics/sprites/monsters/presente-surpresa.xml b/graphics/sprites/monsters/presente-surpresa.xml new file mode 100644 index 00000000..04dbbff0 --- /dev/null +++ b/graphics/sprites/monsters/presente-surpresa.xml @@ -0,0 +1,40 @@ +<?xml version="1.0"?> +<sprite> + + <imageset name="base" src="graphics/sprites/monsters/presente-surpresa.png" width="60" height="61"/> + + <action name="stand" imageset="base"> + <animation> + <frame index="0" offsetX="-3" offsetY="10"/> + </animation> + </action> + + <action name="dead" imageset="base"> + <animation> + <frame index="1" delay="50" offsetX="-3" offsetY="10"/> + <frame index="2" delay="50" offsetX="-3" offsetY="10"/> + <frame index="3" delay="50" offsetX="-3" offsetY="10"/> + <frame index="4" delay="100" offsetX="-3" offsetY="10"/> + <frame index="5" delay="50" offsetX="-3" offsetY="10"/> + <frame index="6" delay="50" offsetX="-3" offsetY="10"/> + <frame index="7" delay="50" offsetX="-3" offsetY="10"/> + <frame index="8" delay="75" offsetX="-3" offsetY="10"/> + <frame index="9" delay="75" offsetX="-3" offsetY="10"/> + <frame index="10" delay="75" offsetX="-3" offsetY="10"/> + <frame index="11" delay="100" offsetX="-3" offsetY="10"/> + <frame index="12" delay="75" offsetX="-3" offsetY="10"/> + <frame index="13" delay="75" offsetX="-3" offsetY="10"/> + <frame index="14" delay="75" offsetX="-3" offsetY="10"/> + <frame index="15" delay="75" offsetX="-3" offsetY="10"/> + <frame index="16" delay="75" offsetX="-3" offsetY="10"/> + <frame index="17" delay="75" offsetX="-3" offsetY="10"/> + <frame index="18" delay="75" offsetX="-3" offsetY="10"/> + <frame index="19" delay="75" offsetX="-3" offsetY="10"/> + <frame index="15" delay="75" offsetX="-3" offsetY="10"/> + <frame index="14" delay="75" offsetX="-3" offsetY="10"/> + <frame index="13" delay="75" offsetX="-3" offsetY="10"/> + <frame index="12" offsetX="-3" offsetY="10"/> + </animation> + </action> + +</sprite> diff --git a/graphics/sprites/monsters/snowman-boss.png b/graphics/sprites/monsters/snowman-boss.png Binary files differnew file mode 100644 index 00000000..d521ab61 --- /dev/null +++ b/graphics/sprites/monsters/snowman-boss.png diff --git a/graphics/sprites/monsters/snowman-boss.xml b/graphics/sprites/monsters/snowman-boss.xml new file mode 100644 index 00000000..9857638f --- /dev/null +++ b/graphics/sprites/monsters/snowman-boss.xml @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="mob" src="graphics/sprites/monsters/snowman-boss.png" width="128" height="128" offsetY="0"/> + <include file="monsters/golem.xml"/> +</sprite> diff --git a/graphics/sprites/monsters/snowman.png b/graphics/sprites/monsters/snowman.png Binary files differnew file mode 100644 index 00000000..272eb49d --- /dev/null +++ b/graphics/sprites/monsters/snowman.png diff --git a/graphics/sprites/monsters/snowman.xml b/graphics/sprites/monsters/snowman.xml new file mode 100644 index 00000000..32de5e49 --- /dev/null +++ b/graphics/sprites/monsters/snowman.xml @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="mob" src="graphics/sprites/monsters/snowman.png" width="64" height="64" offsetY="0"/> + <include file="monsters/golem.xml"/> +</sprite> diff --git a/graphics/sprites/monsters/spider-crystal.png b/graphics/sprites/monsters/spider-crystal.png Binary files differnew file mode 100644 index 00000000..650f0538 --- /dev/null +++ b/graphics/sprites/monsters/spider-crystal.png diff --git a/graphics/sprites/monsters/spider-crystal.xml b/graphics/sprites/monsters/spider-crystal.xml new file mode 100644 index 00000000..f9979732 --- /dev/null +++ b/graphics/sprites/monsters/spider-crystal.xml @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/monsters/spider-crystal.png" width="35" height="35"/> + <include file="monsters/spider.xml"/> +</sprite> diff --git a/items/misc/item1700_magicblade.xml b/items/misc/item1700_magicblade.xml index 6c55157a..7d557464 100644 --- a/items/misc/item1700_magicblade.xml +++ b/items/misc/item1700_magicblade.xml @@ -8,5 +8,8 @@ </its:rules> <item id="1700" name="Magic Blade" attack-action="attack" attack-range="1" missile-particle="graphics/particles/magic.darkred.xml"> <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="hit">magic/chiza1.ogg</sound> + <sound event="hit">magic/chiza2.ogg</sound> + <sound event="hit">magic/chiza3.ogg</sound> </item> </items> diff --git a/items/misc/item1701_toxicdart.xml b/items/misc/item1701_toxicdart.xml index 1ba18381..ae581db4 100644 --- a/items/misc/item1701_toxicdart.xml +++ b/items/misc/item1701_toxicdart.xml @@ -6,5 +6,9 @@ <its:translateRule selector="//item/@effect" translate="yes"/> <its:translateRule selector="//*" translate="no"/> </its:rules> - <item id="1701" name="Toxic Dart" attack-action="attack_bow" attack-range="1" missile-particle="graphics/particles/arrow.particle.xml"/> + <item id="1701" name="Toxic Dart" attack-action="attack_bow" attack-range="1" missile-particle="graphics/particles/dart.particle.xml"/> + <sprite>equipment/weapons/null.xml</sprite> + <sound event="hit">magic/flar1.ogg</sound> + <sound event="hit">magic/flar2.ogg</sound> + <sound event="hit">magic/flar3.ogg</sound> </items> diff --git a/items/misc/item1703_wand.xml b/items/misc/item1703_wand.xml index 72009700..4d9eb9dc 100644 --- a/items/misc/item1703_wand.xml +++ b/items/misc/item1703_wand.xml @@ -6,8 +6,11 @@ <its:translateRule selector="//item/@effect" translate="yes"/> <its:translateRule selector="//*" translate="no"/> </its:rules> - <item id="1703" name="Wand" attack-action="attack" attack-range="3" missile-particle="graphics/particles/magic.red.xml"> + <item id="1703" name="Wand" attack-action="attack" attack-range="3" missile-particle="graphics/particles/magic.hit.xml"> <sprite gender="unisex">equipment/weapons/wand.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> <sprite gender="female">equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> </item> </items> diff --git a/items/misc/item1704_flaredart.xml b/items/misc/item1704_flaredart.xml index e60fb9a6..2aa9fd17 100644 --- a/items/misc/item1704_flaredart.xml +++ b/items/misc/item1704_flaredart.xml @@ -6,5 +6,10 @@ <its:translateRule selector="//item/@effect" translate="yes"/> <its:translateRule selector="//*" translate="no"/> </its:rules> - <item id="1704" name="Flare Dart" attack-action="attack_bow" attack-range="1" missile-particle="graphics/particles/arrow.particle.xml"/> + <item id="1704" name="Flare Dart" attack-action="attack_bow" attack-range="1" missile-particle="graphics/particles/dart.particle.xml"> + <sprite>equipment/weapons/null.xml</sprite> + <sound event="hit">magic/flar1.ogg</sound> + <sound event="hit">magic/flar2.ogg</sound> + <sound event="hit">magic/flar3.ogg</sound> + </item> </items> diff --git a/items/misc/item1705_wand_staff.xml b/items/misc/item1705_wand_staff.xml index 3c85661a..33e0c94b 100644 --- a/items/misc/item1705_wand_staff.xml +++ b/items/misc/item1705_wand_staff.xml @@ -6,8 +6,11 @@ <its:translateRule selector="//item/@effect" translate="yes"/> <its:translateRule selector="//*" translate="no"/> </its:rules> - <item id="1705" name="Wand" attack-action="attack" attack-range="3" missile-particle="graphics/particles/magic.red.xml"> + <item id="1705" name="Wand" attack-action="attack" attack-range="3" missile-particle="graphics/particles/magic.hit.xml"> <sprite gender="unisex">equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> <sprite gender="female">equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> </item> </items> diff --git a/items/misc/item1706_magicknuckles.xml b/items/misc/item1706_magicknuckles.xml index df019e4e..1cf8db99 100644 --- a/items/misc/item1706_magicknuckles.xml +++ b/items/misc/item1706_magicknuckles.xml @@ -6,8 +6,10 @@ <its:translateRule selector="//item/@effect" translate="yes"/> <its:translateRule selector="//*" translate="no"/> </its:rules> - <item id="1706" name="Magic Knuckles" attack-action="attack" attack-range="1" missile-particle="graphics/particles/crit.particle.xml"> - <sprite gender="unisex">equipment/hands/bromenalgloves.xml</sprite> - <sprite gender="female">equipment/hands/bromenalgloves-female.xml</sprite> + <item id="1706" name="Magic Knuckles" attack-action="attack" attack-range="1"> + <!-- <sprite gender="unisex">equipment/hands/bromenalgloves.xml</sprite> --> + <!-- <sprite gender="female">equipment/hands/bromenalgloves-female.xml</sprite> --> + <sprite>equipment/weapons/null.xml</sprite> + <sound event="hit">punch.ogg</sound> </item> </items> diff --git a/items/misc/item1707_shear.xml b/items/misc/item1707_shear.xml index bb48b004..f797369b 100644 --- a/items/misc/item1707_shear.xml +++ b/items/misc/item1707_shear.xml @@ -8,5 +8,6 @@ </its:rules> <item id="1707" name="Shears" attack-action="attack" attack-range="1" missile-particle="graphics/particles/magic.blue.xml"> <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> </item> </items> diff --git a/items/racesprite/item-100_Deprecated.xml b/items/racesprite/item-100_Deprecated.xml index cf47ca8a..288e8105 100644 --- a/items/racesprite/item-100_Deprecated.xml +++ b/items/racesprite/item-100_Deprecated.xml @@ -10,9 +10,13 @@ <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="other">model/neutral.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sound event="hit">punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> <item id="-99100" type="racesprite" name="Placeholder"> <sprite gender="unisex">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sound event="hit">weapons/punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> </items> diff --git a/items/racesprite/item-101_Talpan.xml b/items/racesprite/item-101_Talpan.xml index 5a6dab6c..94e476f8 100644 --- a/items/racesprite/item-101_Talpan.xml +++ b/items/racesprite/item-101_Talpan.xml @@ -10,9 +10,13 @@ <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="other">model/neutral.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sound event="hit">punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> <item id="-99101" type="racesprite" name="Talpan"> <sprite gender="unisex">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sound event="hit">weapons/punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> </items> diff --git a/items/racesprite/item-102_Tritan.xml b/items/racesprite/item-102_Tritan.xml index 20563c31..ca87d302 100644 --- a/items/racesprite/item-102_Tritan.xml +++ b/items/racesprite/item-102_Tritan.xml @@ -10,9 +10,13 @@ <sprite gender="female">model/female.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite> <sprite gender="male">model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite> <sprite gender="other">model/neutral.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite> + <sound event="hit">punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> <item id="-99102" type="racesprite" name="Tritan"> <sprite gender="unisex">model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite> <sprite gender="female">model/female.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite> + <sound event="hit">weapons/punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> </items> diff --git a/items/racesprite/item-103_Ifriton.xml b/items/racesprite/item-103_Ifriton.xml index 5b4a2e90..ad844dc4 100644 --- a/items/racesprite/item-103_Ifriton.xml +++ b/items/racesprite/item-103_Ifriton.xml @@ -10,9 +10,13 @@ <sprite gender="female">model/female.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="male">model/male.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="other">model/neutral.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sound event="hit">punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> <item id="-99103" type="racesprite" name="Ifriton"> <sprite gender="unisex">model/male.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="female">model/female.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sound event="hit">weapons/punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> </items> diff --git a/items/racesprite/item-104_Gispaan.xml b/items/racesprite/item-104_Gispaan.xml index db848e7c..85e8d7a5 100644 --- a/items/racesprite/item-104_Gispaan.xml +++ b/items/racesprite/item-104_Gispaan.xml @@ -10,9 +10,13 @@ <sprite gender="female">model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="male">model/male.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="other">model/neutral.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sound event="hit">punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> <item id="-99104" type="racesprite" name="Gispaan"> <sprite gender="unisex">model/male.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="female">model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sound event="hit">weapons/punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> </items> diff --git a/items/racesprite/item-105_Sparron.xml b/items/racesprite/item-105_Sparron.xml index 6773d171..c91680ee 100644 --- a/items/racesprite/item-105_Sparron.xml +++ b/items/racesprite/item-105_Sparron.xml @@ -10,9 +10,13 @@ <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="other">model/neutral.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sound event="hit">punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> <item id="-99105" type="racesprite" name="Sparron"> <sprite gender="unisex">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sound event="hit">weapons/punch.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> </item> </items> @@ -594,6 +594,7 @@ File | Artists | Licenses `graphics/particles/bubble_12px.png` | Crush | GPLv2, CC BY-SA 3.0 `graphics/particles/bubble_32px.png` | Crush | GPLv2, CC BY-SA 3.0 `graphics/particles/casket-trap_96x96.png` | Skipy | GPLv2 +`graphics/particles/dart.png` | Ledmitz | GPLv2, CC BY-SA 3.0 `graphics/particles/fog-medium-a.png` | Crush | GPLv2, CC BY-SA 3.0 `graphics/particles/fog-medium-b.png` | Crush | GPLv2, CC BY-SA 3.0 `graphics/particles/fog-medium-c.png` | Crush | GPLv2, CC BY-SA 3.0 @@ -676,6 +677,7 @@ File | Artists | Licenses `graphics/sprites/equipment/weapons/axe-stab.png` | :grey_question:, Wombat, Wushin, Varuna | GPLv2 `graphics/sprites/equipment/weapons/bow-banshee.png` | V0id | GPLv2 `graphics/sprites/equipment/weapons/bow-slingshot.png` | Chef Chelios, wushin | GPLv2 +`graphics/sprites/equipment/weapons/null.png` | Ledmitz | CC0 `graphics/sprites/equipment/weapons/polearm-blunt.png` | :grey_question:, Wombat, Wushin | GPLv2 `graphics/sprites/equipment/weapons/polearm-chop.png` | :grey_question:, Wombat, Wushin | GPLv2 `graphics/sprites/equipment/weapons/polearm-spear.png` | :grey_question:, Wombat, Wushin | GPLv2 @@ -1155,7 +1157,34 @@ File | Artists | Licenses `sfx/env/env-waterfall1.ogg` | Dariuna | GPLv2 `sfx/env/fart.ogg` | unknown | CC0 `sfx/env/flame.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/astral.ogg' | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/betsanc-on.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/betsanc-off.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/chiza1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/chiza2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/chiza3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/confringo1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/confringo2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/confringo3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/default_magic.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/detect_magic.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/discharge.ogg` | Ledmitz (Plunger pop -12.wav / Quistard / CC BY 3.0) | GPLv2, CC BY-SA 3.0 +`sfx/magic/flar1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/flar2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/flar3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/frillyar.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0 +`sfx/magic/generic.ogg` | Ledmitz (firework_explosion_fizz.wav / soundscalpel.co / CC BY 3.0) | GPLv2, CC BY-SA 3.0 +`sfx/magic/ingrav1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/ingrav2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/ingrav3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/inma.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/itenplz-hit.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/magic/kaflosh.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/nature.ogg` | Ledmitz (nord_analog_howling_wind_storm.wav / medialint / Sampling Plus 1.0) | GPLv2, CC BY-SA 3.0 +`sfx/magic/spawn_burst.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/transmute.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/war.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/warp.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/bat/bat-dying1.ogg` | Cosmostrator | GPLv2 `sfx/monsters/bat/bat-hit1.ogg` | Cosmostrator | GPLv2 `sfx/monsters/bee/bee-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 @@ -1247,6 +1276,15 @@ File | Artists | Licenses `sfx/monsters/squirrel/squirrel-die2.ogg` | Krazyjakee | GPLv2 `sfx/monsters/squirrel/squirrel-hurt1.ogg` | Krazyjakee | GPLv2 `sfx/monsters/squirrel/squirrel-hurt2.ogg` | Krazyjakee | GPLv2 +`sfx/monsters/terranite/terra-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/terranite/terra-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/terranite/terra-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/terranite/terra-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/terranite/terra-hurt1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/terranite/terra-hurt2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/terranite/terra-hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/terranite/terra-miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/terranite/terra-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/tengu/tengu-crit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/tengu/tengu-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/tengu/tengu-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 @@ -1287,7 +1325,13 @@ File | Artists | Licenses `sfx/system/boom.ogg` | Ledmitz (firework_explosion_fizz.wav / soundscalpel.co / (CC BY 3.0)) | GPLv2, CC BY-SA 3.0 `sfx/system/crit.ogg` | Ledmitz (firework_explosion_fizz.wav / soundscalpel.co / (CC BY 3.0)) | GPLv2, CC BY-SA 3.0 `sfx/system/levelup.ogg` | Cosmostrator | GPLv2 +`sfx/system/levelup-long.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/system/quest-continue.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/system/quest-done.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/system/quest-start.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/system/quest-up.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/system/ship-bell2.ogg` | unknown | (public domain) +`sfx/system/skillup02.ogg` | Ledmitz ([SFX] Angelic_ Choir_ Ahhhh_ Dm Chord (90bpm) (320kb).mp3 / TuneHntr_2Day / Sampling+ 1.0) | GPLv2, CC BY-SA 3.0 `sfx/system/warning.ogg` | Jesusalva | (public domain) `sfx/weapons/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/weapons/miss2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 diff --git a/monsters/_include.xml b/monsters/_include.xml index bcca4647..c64a6ce0 100644 --- a/monsters/_include.xml +++ b/monsters/_include.xml @@ -157,5 +157,13 @@ <include name="monsters/monster1160_VoidShroom.xml"/> <include name="monsters/monster1161_Xakelbael.xml"/> <include name="monsters/monster1162_Grinchboo.xml"/> + <include name="monsters/monster1163_FridayCat.xml"/> + <include name="monsters/monster1164_CristmasTree.xml"/> + <include name="monsters/monster1165_CristmasGift.xml"/> + <include name="monsters/monster1166_Snowman.xml"/> + <include name="monsters/monster1167_SnowmanBoss.xml"/> <include name="monsters/monster1168_Floyd.xml"/> + <include name="monsters/monster1169_CrystalSpider.xml"/> + <include name="monsters/monster1170_CrystalGolem.xml"/> + <include name="monsters/monster1171_BlackCrystalGolem.xml"/> </monsters> diff --git a/monsters/monster1062_Terranite.xml b/monsters/monster1062_Terranite.xml index 69e376c0..25ab0551 100644 --- a/monsters/monster1062_Terranite.xml +++ b/monsters/monster1062_Terranite.xml @@ -2,5 +2,14 @@ <monsters offset="0"> <monster id="1062" name="Terranite"> <sprite>monsters/terranite.xml</sprite> + <sound event="die">monsters/terranite/terra-die1.ogg</sound> + <sound event="hit">monsters/terranite/terra-hit1.ogg</sound> + <sound event="hit">monsters/terranite/terra-hit2.ogg</sound> + <sound event="hit">monsters/terranite/terra-hit3.ogg</sound> + <sound event="hurt">monsters/terranite/terra-hurt1.ogg</sound> + <sound event="hurt">monsters/terranite/terra-hurt2.ogg</sound> + <sound event="hurt">monsters/terranite/terra-hurt3.ogg</sound> + <sound event="miss">monsters/terranite/terra-miss1.ogg</sound> + <sound event="move">monsters/terranite/terra-move1.ogg</sound> </monster> </monsters> diff --git a/monsters/monster1162_Grinchboo.xml b/monsters/monster1162_Grinchboo.xml index bdfe40df..d638888e 100644 --- a/monsters/monster1162_Grinchboo.xml +++ b/monsters/monster1162_Grinchboo.xml @@ -3,7 +3,4 @@ <monster id="1162" name="Grinchboo"> <sprite>monsters/grinchboo.xml</sprite> </monster> - <monster id="1163" name="Friday"> - <sprite>monsters/pet-black-cat.xml</sprite> - </monster> </monsters> diff --git a/monsters/monster1163_FridayCat.xml b/monsters/monster1163_FridayCat.xml new file mode 100644 index 00000000..dadc08b1 --- /dev/null +++ b/monsters/monster1163_FridayCat.xml @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<monsters offset="0"> + <monster id="1163" name="Friday"> + <sprite>monsters/pet-black-cat.xml</sprite> + </monster> +</monsters> diff --git a/monsters/monster1164_CristmasTree.xml b/monsters/monster1164_CristmasTree.xml new file mode 100644 index 00000000..a54a4994 --- /dev/null +++ b/monsters/monster1164_CristmasTree.xml @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<monsters offset="0"> + <monster id="1164" name="Christmas Tree"> + <sprite>npcs/christmastree.xml</sprite> + </monster> +</monsters> diff --git a/monsters/monster1165_CristmasGift.xml b/monsters/monster1165_CristmasGift.xml new file mode 100644 index 00000000..40d2aadd --- /dev/null +++ b/monsters/monster1165_CristmasGift.xml @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<monsters offset="0"> + <monster id="1165" name="Christmas Gift"> + <sprite>monsters/presente-surpresa.xml</sprite> + </monster> +</monsters> diff --git a/monsters/monster1166_Snowman.xml b/monsters/monster1166_Snowman.xml new file mode 100644 index 00000000..de7607cf --- /dev/null +++ b/monsters/monster1166_Snowman.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<monsters offset="0"> + <monster id="1166" name="Snowman"> + <sprite>monsters/snowman.xml</sprite> + <sound event="hit">weapons/projectiles/snowball/hit1.ogg</sound> + <sound event="miss">weapons/projectiles/snowball/miss1.ogg</sound> + </monster> +</monsters> diff --git a/monsters/monster1167_SnowmanBoss.xml b/monsters/monster1167_SnowmanBoss.xml new file mode 100644 index 00000000..449999a5 --- /dev/null +++ b/monsters/monster1167_SnowmanBoss.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<monsters offset="0"> + <monster id="1167" name="Der Schneemann"> + <sprite>monsters/snowman-boss.xml</sprite> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/snow-burst.xml" action="attack"/> + <sound event="hit">monsters/snowman_boss/hit1.ogg</sound> + <sound event="miss">monsters/snowman_boss/miss1.ogg</sound> + </monster> +</monsters> diff --git a/monsters/monster1169_CrystalSpider.xml b/monsters/monster1169_CrystalSpider.xml new file mode 100644 index 00000000..29a12a00 --- /dev/null +++ b/monsters/monster1169_CrystalSpider.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<monsters offset="0"> + <monster id="1169" name="Crystal Spider"> + <sprite>monsters/spider-crystal.xml</sprite> + <sound event="hit">monsters/spider/spider-hit1.ogg</sound> + <sound event="hit">monsters/spider/spider-hit2.ogg</sound> + <sound event="hit">monsters/spider/spider-hit3.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + <sound event="move">monsters/spider/spider-move1.ogg</sound> + <sound event="move">monsters/spider/spider-move2.ogg</sound> + <sound event="move">monsters/spider/spider-move3.ogg</sound> + <sound event="move">monsters/spider/spider-move4.ogg</sound> + <sound event="move">monsters/spider/spider-move5.ogg</sound> + <sound event="die">monsters/spider/spider-die1.ogg</sound> + </monster> +</monsters> diff --git a/monsters/monster1170_CrystalGolem.xml b/monsters/monster1170_CrystalGolem.xml new file mode 100644 index 00000000..7b8f5791 --- /dev/null +++ b/monsters/monster1170_CrystalGolem.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<monsters offset="0"> + <monster id="1170" name="Crystal Golem"> + <sprite>monsters/golem-crystal.xml</sprite> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> + <sound event="die">monsters/golem/die.ogg</sound> + <sound event="hit">monsters/golem/hit1.ogg</sound> + <sound event="miss">monsters/golem/miss1.ogg</sound> + </monster> +</monsters> diff --git a/monsters/monster1171_BlackCrystalGolem.xml b/monsters/monster1171_BlackCrystalGolem.xml new file mode 100644 index 00000000..51598021 --- /dev/null +++ b/monsters/monster1171_BlackCrystalGolem.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<monsters offset="0"> + <monster id="1171" name="Black Crystal Golem"> + <sprite>monsters/golem-blackcrystal.xml</sprite> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> + <sound event="die">monsters/golem/die.ogg</sound> + <sound event="hit">monsters/golem/hit1.ogg</sound> + <sound event="miss">monsters/golem/miss1.ogg</sound> + </monster> +</monsters> @@ -44,8 +44,8 @@ Also, don't forget to add the '/' path separator at the end of folder values. <option name="sfx" value="sfx/"/> <!-- option name="newQuestSfx" value="system/levelup.ogg"/ --> <!-- option name="completeQuestSfx" value="system/levelup.ogg"/ --> - <option name="attackSfxFile" value="weapons/knives/knife-hit1.ogg"/> - <option name="missSfxFile" value="fist-swish.ogg"/> + <!-- option name="attackSfxFile" value=""/ --> + <!-- option name="missSfxFile" value=""/ --> <option name="music" value="music/"/> <option name="wallpapers" value="graphics/images/"/> <option name="wallpaperFile" value="login_wallpaper.png"/> diff --git a/sfx/magic/astral.ogg b/sfx/magic/astral.ogg Binary files differnew file mode 100644 index 00000000..2f9c8a00 --- /dev/null +++ b/sfx/magic/astral.ogg diff --git a/sfx/magic/betsanc-off.ogg b/sfx/magic/betsanc-off.ogg Binary files differnew file mode 100644 index 00000000..d8511d05 --- /dev/null +++ b/sfx/magic/betsanc-off.ogg diff --git a/sfx/magic/betsanc-on.ogg b/sfx/magic/betsanc-on.ogg Binary files differnew file mode 100644 index 00000000..63c12b33 --- /dev/null +++ b/sfx/magic/betsanc-on.ogg diff --git a/sfx/magic/chiza1.ogg b/sfx/magic/chiza1.ogg Binary files differnew file mode 100644 index 00000000..e8a7a254 --- /dev/null +++ b/sfx/magic/chiza1.ogg diff --git a/sfx/magic/chiza2.ogg b/sfx/magic/chiza2.ogg Binary files differnew file mode 100644 index 00000000..6cef4b67 --- /dev/null +++ b/sfx/magic/chiza2.ogg diff --git a/sfx/magic/chiza3.ogg b/sfx/magic/chiza3.ogg Binary files differnew file mode 100644 index 00000000..0db8a02d --- /dev/null +++ b/sfx/magic/chiza3.ogg diff --git a/sfx/magic/confringo1.ogg b/sfx/magic/confringo1.ogg Binary files differnew file mode 100644 index 00000000..ec918dff --- /dev/null +++ b/sfx/magic/confringo1.ogg diff --git a/sfx/magic/confringo2.ogg b/sfx/magic/confringo2.ogg Binary files differnew file mode 100644 index 00000000..4053fb19 --- /dev/null +++ b/sfx/magic/confringo2.ogg diff --git a/sfx/magic/confringo3.ogg b/sfx/magic/confringo3.ogg Binary files differnew file mode 100644 index 00000000..270e649d --- /dev/null +++ b/sfx/magic/confringo3.ogg diff --git a/sfx/magic/default_magic.ogg b/sfx/magic/default_magic.ogg Binary files differnew file mode 100644 index 00000000..96e0d01a --- /dev/null +++ b/sfx/magic/default_magic.ogg diff --git a/sfx/magic/detect_magic.ogg b/sfx/magic/detect_magic.ogg Binary files differnew file mode 100644 index 00000000..2fbbb7ca --- /dev/null +++ b/sfx/magic/detect_magic.ogg diff --git a/sfx/magic/discharge.ogg b/sfx/magic/discharge.ogg Binary files differnew file mode 100644 index 00000000..266008de --- /dev/null +++ b/sfx/magic/discharge.ogg diff --git a/sfx/magic/flar1.ogg b/sfx/magic/flar1.ogg Binary files differnew file mode 100644 index 00000000..1d01ff02 --- /dev/null +++ b/sfx/magic/flar1.ogg diff --git a/sfx/magic/flar2.ogg b/sfx/magic/flar2.ogg Binary files differnew file mode 100644 index 00000000..341ed30d --- /dev/null +++ b/sfx/magic/flar2.ogg diff --git a/sfx/magic/flar3.ogg b/sfx/magic/flar3.ogg Binary files differnew file mode 100644 index 00000000..f936681a --- /dev/null +++ b/sfx/magic/flar3.ogg diff --git a/sfx/magic/frillyar.ogg b/sfx/magic/frillyar.ogg Binary files differnew file mode 100644 index 00000000..353e5e39 --- /dev/null +++ b/sfx/magic/frillyar.ogg diff --git a/sfx/magic/generic.ogg b/sfx/magic/generic.ogg Binary files differnew file mode 100644 index 00000000..c2eb6b09 --- /dev/null +++ b/sfx/magic/generic.ogg diff --git a/sfx/magic/ingrav1.ogg b/sfx/magic/ingrav1.ogg Binary files differnew file mode 100644 index 00000000..7c4d31a0 --- /dev/null +++ b/sfx/magic/ingrav1.ogg diff --git a/sfx/magic/ingrav2.ogg b/sfx/magic/ingrav2.ogg Binary files differnew file mode 100644 index 00000000..3b2da47f --- /dev/null +++ b/sfx/magic/ingrav2.ogg diff --git a/sfx/magic/ingrav3.ogg b/sfx/magic/ingrav3.ogg Binary files differnew file mode 100644 index 00000000..9b1d317b --- /dev/null +++ b/sfx/magic/ingrav3.ogg diff --git a/sfx/magic/inma.ogg b/sfx/magic/inma.ogg Binary files differnew file mode 100644 index 00000000..41e5772f --- /dev/null +++ b/sfx/magic/inma.ogg diff --git a/sfx/magic/itenplz-hit.ogg b/sfx/magic/itenplz-hit.ogg Binary files differnew file mode 100644 index 00000000..dac1bfd8 --- /dev/null +++ b/sfx/magic/itenplz-hit.ogg diff --git a/sfx/magic/nature.ogg b/sfx/magic/nature.ogg Binary files differnew file mode 100644 index 00000000..5b48ab73 --- /dev/null +++ b/sfx/magic/nature.ogg diff --git a/sfx/magic/spawn_burst.ogg b/sfx/magic/spawn_burst.ogg Binary files differnew file mode 100644 index 00000000..74390fe1 --- /dev/null +++ b/sfx/magic/spawn_burst.ogg diff --git a/sfx/magic/transmute.ogg b/sfx/magic/transmute.ogg Binary files differnew file mode 100644 index 00000000..27234be2 --- /dev/null +++ b/sfx/magic/transmute.ogg diff --git a/sfx/magic/war.ogg b/sfx/magic/war.ogg Binary files differnew file mode 100644 index 00000000..43f4c683 --- /dev/null +++ b/sfx/magic/war.ogg diff --git a/sfx/magic/warp.ogg b/sfx/magic/warp.ogg Binary files differnew file mode 100644 index 00000000..e94e9371 --- /dev/null +++ b/sfx/magic/warp.ogg diff --git a/sfx/monsters/snowman_boss/hit1.ogg b/sfx/monsters/snowman_boss/hit1.ogg Binary files differnew file mode 100644 index 00000000..af55daf1 --- /dev/null +++ b/sfx/monsters/snowman_boss/hit1.ogg diff --git a/sfx/monsters/snowman_boss/miss1.ogg b/sfx/monsters/snowman_boss/miss1.ogg Binary files differnew file mode 100644 index 00000000..bcc1ec1c --- /dev/null +++ b/sfx/monsters/snowman_boss/miss1.ogg diff --git a/sfx/monsters/terranite/terra-die1.ogg b/sfx/monsters/terranite/terra-die1.ogg Binary files differnew file mode 100644 index 00000000..ec7ea551 --- /dev/null +++ b/sfx/monsters/terranite/terra-die1.ogg diff --git a/sfx/monsters/terranite/terra-hit1.ogg b/sfx/monsters/terranite/terra-hit1.ogg Binary files differnew file mode 100644 index 00000000..95e9cf16 --- /dev/null +++ b/sfx/monsters/terranite/terra-hit1.ogg diff --git a/sfx/monsters/terranite/terra-hit2.ogg b/sfx/monsters/terranite/terra-hit2.ogg Binary files differnew file mode 100644 index 00000000..55450275 --- /dev/null +++ b/sfx/monsters/terranite/terra-hit2.ogg diff --git a/sfx/monsters/terranite/terra-hit3.ogg b/sfx/monsters/terranite/terra-hit3.ogg Binary files differnew file mode 100644 index 00000000..888f3763 --- /dev/null +++ b/sfx/monsters/terranite/terra-hit3.ogg diff --git a/sfx/monsters/terranite/terra-hurt1.ogg b/sfx/monsters/terranite/terra-hurt1.ogg Binary files differnew file mode 100644 index 00000000..046f6d53 --- /dev/null +++ b/sfx/monsters/terranite/terra-hurt1.ogg diff --git a/sfx/monsters/terranite/terra-hurt2.ogg b/sfx/monsters/terranite/terra-hurt2.ogg Binary files differnew file mode 100644 index 00000000..69e3f440 --- /dev/null +++ b/sfx/monsters/terranite/terra-hurt2.ogg diff --git a/sfx/monsters/terranite/terra-hurt3.ogg b/sfx/monsters/terranite/terra-hurt3.ogg Binary files differnew file mode 100644 index 00000000..7d59ffd5 --- /dev/null +++ b/sfx/monsters/terranite/terra-hurt3.ogg diff --git a/sfx/monsters/terranite/terra-miss1.ogg b/sfx/monsters/terranite/terra-miss1.ogg Binary files differnew file mode 100644 index 00000000..015ae3f2 --- /dev/null +++ b/sfx/monsters/terranite/terra-miss1.ogg diff --git a/sfx/monsters/terranite/terra-move1.ogg b/sfx/monsters/terranite/terra-move1.ogg Binary files differnew file mode 100644 index 00000000..c77e730e --- /dev/null +++ b/sfx/monsters/terranite/terra-move1.ogg diff --git a/sfx/system/levelup-long.ogg b/sfx/system/levelup-long.ogg Binary files differnew file mode 100644 index 00000000..bae5ab8d --- /dev/null +++ b/sfx/system/levelup-long.ogg diff --git a/sfx/system/quest-continue.ogg b/sfx/system/quest-continue.ogg Binary files differnew file mode 100644 index 00000000..2bde9f5d --- /dev/null +++ b/sfx/system/quest-continue.ogg diff --git a/sfx/system/quest-done.ogg b/sfx/system/quest-done.ogg Binary files differnew file mode 100644 index 00000000..57c7e1cf --- /dev/null +++ b/sfx/system/quest-done.ogg diff --git a/sfx/system/quest-start.ogg b/sfx/system/quest-start.ogg Binary files differnew file mode 100644 index 00000000..4f50f402 --- /dev/null +++ b/sfx/system/quest-start.ogg diff --git a/sfx/system/quest-up.ogg b/sfx/system/quest-up.ogg Binary files differnew file mode 100644 index 00000000..722ba4f5 --- /dev/null +++ b/sfx/system/quest-up.ogg diff --git a/sfx/system/skillup02.ogg b/sfx/system/skillup02.ogg Binary files differnew file mode 100644 index 00000000..68812056 --- /dev/null +++ b/sfx/system/skillup02.ogg diff --git a/status-effects.xml b/status-effects.xml index 92562369..a928a4ad 100644 --- a/status-effects.xml +++ b/status-effects.xml @@ -1,13 +1,13 @@ <?xml version="1.0"?> <status-effects> - <status-effect name="item-healing" id="70" opt2="256" persistent-particle-effect="yes" particle="graphics/particles/circle.particle.xml"/> + <status-effect name="item-healing" id="70" opt2="256" icon="icons/healing.xml" persistent-particle-effect="yes" particle="graphics/particles/circle.particle.xml"/> <status-effect name="speed" id="37" opt2="32" icon="icons/haste-potion.xml|#da69e5,ffdaff" persistent-particle-effect="yes" particle="graphics/particles/pink-violent-glow.particle.xml"/> <status-effect name="strength" id="185" opt2="128" icon="icons/iron-potion.xml|#c05000,f0a000,f0f09f" persistent-particle-effect="yes" particle="graphics/particles/orange-violent-glow.particle.xml"/> <status-effect name="invisibility" id="4096" option="4096" icon="icons/invisible.xml" start-message="You are now invisible." end-message="You are no longer invisible." persistent-particle-effect="yes" particle="graphics/particles/sphere-white.particle.xml"/> <status-effect name="poison" id="132" opt2="1" icon="icons/poison.xml" persistent-particle-effect="yes" particle="graphics/particles/green-bubbles.particle.xml"/> <status-effect name="slow-poison" id="14" opt2="512" icon="icons/slow-poison.xml" persistent-particle-effect="yes" particle="graphics/particles/small-green-bubbles.particle.xml"/> - <status-effect name="weight 50%" id="35"/> - <status-effect name="weight 90%" id="36"/> + <status-effect name="weight 50%" id="35" icon="icons/weight-small.xml"/> + <status-effect name="weight 90%" id="36" icon="icons/weight-big.xml"/> <status-effect name="hide" id="194" option="64" icon="icons/hidden.xml"/> <status-effect name="halt-regenerate" id="195"/> <status-effect name="flying-backpack" id="196" icon="icons/feather.xml"/> @@ -18,4 +18,9 @@ <status-effect name="spell-shearing" id="2001" icon="icons/spell-shearing.xml"/> <status-effect name="spell-protection-generic" id="2002" icon="icons/spell-protection-generic.xml"/> <status-effect name="spell-haste" id="2003" icon="icons/spell-haste.xml"/> + <status-effect name="spell-cooldown" id="71" icon="icons/spell-cooldown.xml"/> + <status-effect name="spell-cooldown-mg" id="72" icon="icons/spell-cooldown-mg.xml"/> + <status-effect name="spell-cooldown-mt" id="73" icon="icons/spell-cooldown-mt.xml"/> + <status-effect name="spell-cooldown-r" id="74" icon="icons/spell-cooldown-r.xml"/> + <status-effect name="spell-cooldown-ar" id="75" icon="icons/spell-cooldown-ar.xml"/> </status-effects> |
