diff options
23 files changed, 109 insertions, 6 deletions
diff --git a/effects.xml b/effects.xml index 794b04d3..5d558a45 100644 --- a/effects.xml +++ b/effects.xml @@ -129,7 +129,7 @@ <!-- (grow plant) spawn --> <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"/> + <effect id="512" audio="magic/inma.ogg" particle="graphics/particles/magic.white.xml"/> <!-- #lum (lesser heal) hit --> <effect id="513" audio="magic/inma.ogg" particle="graphics/particles/magic.white.xml"/> <!-- #chiza (magic blade) cast --> @@ -169,7 +169,7 @@ <!-- #anwiltyp (hide) end --> <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"/> + <effect id="533" audio="magic/inma.ogg" particle="graphics/particles/magic.white.xml"/> <!-- #inma (lay on hands) hit --> <effect id="534" audio="magic/inma.ogg" particle="graphics/particles/magic.white.xml"/> <!-- #ingrav (lightning strike) cast --> diff --git a/graphics/sprites/npcs/mouboo-injured.xml b/graphics/sprites/npcs/mouboo-injured.xml new file mode 100644 index 00000000..af469330 --- /dev/null +++ b/graphics/sprites/npcs/mouboo-injured.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite variants="60" variant_offset="1"> + <imageset name="mob" src="graphics/sprites/monsters/mouboo.png" width="80" height="80"/> + <action name="stand" imageset="mob"> + <animation direction="default"> + <frame index="0"/> + </animation> + </action> +</sprite> diff --git a/graphics/tiles/woodland_graveyard_ground.png b/graphics/tiles/woodland_graveyard_ground.png Binary files differindex 961638dc..8fd88e4e 100644 --- a/graphics/tiles/woodland_graveyard_ground.png +++ b/graphics/tiles/woodland_graveyard_ground.png diff --git a/graphics/tiles/woodland_graveyard_x3.png b/graphics/tiles/woodland_graveyard_x3.png Binary files differindex 726525e7..857a9820 100644 --- a/graphics/tiles/woodland_graveyard_x3.png +++ b/graphics/tiles/woodland_graveyard_x3.png @@ -1125,8 +1125,8 @@ File | Artists | Licenses `graphics/tiles/wood_lab.png` | Fate, Varuna, Enchilado, Wushin | GPLv2 `graphics/tiles/wood_lab_small.png` | Fate, Varuna, Enchilado, Wushin | GPLv2 `graphics/tiles/woodland_graveyard_crypt.png` | :grey_question:, Spit23 | GPLv2 -`graphics/tiles/woodland_graveyard_ground.png` | :grey_question:, Crush | GPLv2 -`graphics/tiles/woodland_graveyard_x3.png` | :grey_question:, Black Don, Crush | GPLv2 +`graphics/tiles/woodland_graveyard_ground.png` | Micksha, :grey_question:, Crush | GPLv2 +`graphics/tiles/woodland_graveyard_x3.png` | Micksha, :grey_question:, Black Don, Crush | GPLv2 `graphics/tiles/woodland_graveyard_x4.png` | :grey_question:, Crush, Spit23 | GPLv2 `graphics/tiles/woodland_ground.png` | :grey_question:, Crush, Wombat, enchilado | GPLv2 `graphics/tiles/woodland_indoor_x2.png` | :grey_question:, Crush, tux9th | GPLv2 @@ -1230,6 +1230,10 @@ File | Artists | Licenses `sfx/monsters/maggot/maggot-hit1.ogg` | Cosmostrator | GPLv2 `sfx/monsters/maggot/maggot-hit2.ogg` | Cosmostrator | GPLv2 `sfx/monsters/maggot/maggot-miss1.ogg` | Cosmostrator | GPLv2 +`sfx/monsters/ghost/ghost-die1.ogg` | Ledmitz (ghostly-moans / Alivvie / CC by SA 3.0) | GPLv2, CC BY-SA 3.0 +`sfx/monsters/ghost/ghost-move1.ogg` | Ledmitz (ghostly-moans / Alivvie / CC by SA 3.0) | GPLv2, CC BY-SA 3.0 +`sfx/monsters/ghost/ghost-move2.ogg` | Ledmitz (ghostly-moans / Alivvie / CC by SA 3.0) | GPLv2, CC BY-SA 3.0 +`sfx/monsters/ghost/ghost-move3.ogg` | Ledmitz (ghostly-moans / Alivvie / CC by SA 3.0) | GPLv2, CC BY-SA 3.0 `sfx/monsters/pinkie/pinkie-hit1.ogg` | Cosmostrator | GPLv2 `sfx/monsters/pinkie/pinkie-miss1.ogg` | Cosmostrator | GPLv2 `sfx/monsters/pollett/pollett-hit1.ogg` | clort | GPLv2, CC BY-SA 3.0 diff --git a/monsters/monster1045_Fallen.xml b/monsters/monster1045_Fallen.xml index acb54a28..c612517e 100644 --- a/monsters/monster1045_Fallen.xml +++ b/monsters/monster1045_Fallen.xml @@ -5,6 +5,7 @@ <sprite>equipment/legs/chaps.xml</sprite> <sprite>equipment/chest/warlordplate.xml</sprite> <sprite>equipment/head/warlordhelm.xml</sprite> + <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sound event="die">monsters/fallen/fallen-die1.ogg</sound> <sound event="die">monsters/fallen/fallen-die2.ogg</sound> <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound> diff --git a/monsters/monster1073_TheLost.xml b/monsters/monster1073_TheLost.xml index fc1688f4..cda9d5f7 100644 --- a/monsters/monster1073_TheLost.xml +++ b/monsters/monster1073_TheLost.xml @@ -4,5 +4,13 @@ <sprite>monsters/skeleton.xml|#aca379</sprite> <sprite>equipment/chest/robe.xml|#333333</sprite> <sprite>equipment/head/phylactery.xml</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> + <attack id="1" missile-particle="graphics/particles/thelost-attack.particle.xml" action="attack"/> </monster> </monsters> diff --git a/monsters/monster1074_RedBone.xml b/monsters/monster1074_RedBone.xml index f4fc2084..6a147e1a 100644 --- a/monsters/monster1074_RedBone.xml +++ b/monsters/monster1074_RedBone.xml @@ -2,6 +2,13 @@ <monsters offset="0"> <monster id="1074" name="Red Bone"> <sprite>monsters/skeleton.xml|#994040,772020,440808,000000</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> <particlefx>graphics/particles/necroblast.particle.xml</particlefx> </monster> </monsters> diff --git a/monsters/monster1077_DrunkenSkeleton.xml b/monsters/monster1077_DrunkenSkeleton.xml index b9b70cac..2b0c8d99 100644 --- a/monsters/monster1077_DrunkenSkeleton.xml +++ b/monsters/monster1077_DrunkenSkeleton.xml @@ -5,5 +5,12 @@ <sprite>equipment/legs/chaps.xml</sprite> <sprite>equipment/chest/vnecksweater.xml|#580000,A40000,C02020,ff6060</sprite> <sprite>equipment/head/tophat.xml</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> </monster> </monsters> diff --git a/monsters/monster1078_TipsySkeleton.xml b/monsters/monster1078_TipsySkeleton.xml index fe74781a..58e27d7d 100644 --- a/monsters/monster1078_TipsySkeleton.xml +++ b/monsters/monster1078_TipsySkeleton.xml @@ -5,5 +5,12 @@ <sprite>equipment/legs/chaps.xml</sprite> <sprite>equipment/chest/vnecksweater.xml|#0d1430,21337c,4363e5</sprite> <sprite>equipment/head/bowler-hat.xml</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> </monster> </monsters> diff --git a/monsters/monster1079_DrunkenLadySkeleton.xml b/monsters/monster1079_DrunkenLadySkeleton.xml index dbf684c3..35825fcd 100644 --- a/monsters/monster1079_DrunkenLadySkeleton.xml +++ b/monsters/monster1079_DrunkenLadySkeleton.xml @@ -6,5 +6,12 @@ <sprite>equipment/legs/skirt.xml|#3f221d,754d23,f5cea4</sprite> <sprite>equipment/chest/shorttanktop.xml|#3f221d,754d23,f5cea4</sprite> <sprite>equipment/head/heart-glasses.xml</sprite> + <sound event="die">monsters/skeleton_lady/ladyskel-die1.ogg</sound> + <sound event="die">monsters/skeleton_lady/ladyskel-die2.ogg</sound> + <sound event="hit">monsters/skeleton_lady/ladyskel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton_lady/ladyskel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton_lady/ladyskel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton_lady/ladyskel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton_lady/ladyskel-miss1.ogg</sound> </monster> </monsters> diff --git a/monsters/monster1097_SoulEater.xml b/monsters/monster1097_SoulEater.xml index 2bf509fb..c3378425 100644 --- a/monsters/monster1097_SoulEater.xml +++ b/monsters/monster1097_SoulEater.xml @@ -5,6 +5,13 @@ <sprite>equipment/chest/tanktop.xml|#333333,555555,444444</sprite> <sprite>equipment/legs/shorts.xml|#333333,555555,444444</sprite> <sprite>monsters/accessories/hairstyle05.xml|#333333</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> <particlefx>graphics/particles/monster-souleater.particle.xml</particlefx> </monster> </monsters> diff --git a/monsters/monster1116_UndeadWitch.xml b/monsters/monster1116_UndeadWitch.xml index 898c2e2b..fdead204 100644 --- a/monsters/monster1116_UndeadWitch.xml +++ b/monsters/monster1116_UndeadWitch.xml @@ -6,6 +6,15 @@ <sprite>equipment/head/witch-hat.xml</sprite> <sprite>equipment/chest/sorcerer-robe.xml|#111111,222222,333333,444444,555555,aaaaaa;#EFEFEF</sprite> <sprite>equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> + <sound event="die">monsters/skeleton_lady/ladyskel-die1.ogg</sound> + <sound event="die">monsters/skeleton_lady/ladyskel-die2.ogg</sound> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> + <sound event="hurt">monsters/skeleton_lady/ladyskel-hurt1.ogg</sound> + <sound event="miss">weapons/other/staff/staff-miss1.ogg</sound> + <sound event="miss">weapons/other/staff/staff-miss2.ogg</sound> + <sound event="miss">weapons/other/staff/staff-miss3.ogg</sound> <attack id="1" missile-particle="graphics/particles/undead-witch-attack.particle.xml" action="attack"/> </monster> </monsters> diff --git a/monsters/monster1124_Wight.xml b/monsters/monster1124_Wight.xml index 1fa0134d..a015079c 100644 --- a/monsters/monster1124_Wight.xml +++ b/monsters/monster1124_Wight.xml @@ -3,6 +3,13 @@ <monster id="1124" name="Wight"> <sprite>monsters/skeleton_inv.xml|#497ac3,2053a0,164995,154387</sprite> <sprite>monsters/wight.xml|#164489,1f529f,619aea</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> <particlefx>graphics/particles/chillfog.particle.xml</particlefx> </monster> </monsters> diff --git a/monsters/monster1125_ManaGhost.xml b/monsters/monster1125_ManaGhost.xml index 2ca73bde..f711bfa7 100644 --- a/monsters/monster1125_ManaGhost.xml +++ b/monsters/monster1125_ManaGhost.xml @@ -2,5 +2,9 @@ <monsters offset="0"> <monster id="1125" name="Mana Ghost"> <sprite>monsters/mana-ghost.xml</sprite> + <sound event="die">monsters/ghost/ghost-die1.ogg</sound> + <sound event="move">monsters/ghost/ghost-move1.ogg</sound> + <sound event="move">monsters/ghost/ghost-move2.ogg</sound> + <sound event="move">monsters/ghost/ghost-move3.ogg</sound> </monster> </monsters> diff --git a/monsters/monster1127_GeneralKrukan.xml b/monsters/monster1127_GeneralKrukan.xml index e9a81a08..f9948562 100644 --- a/monsters/monster1127_GeneralKrukan.xml +++ b/monsters/monster1127_GeneralKrukan.xml @@ -5,5 +5,15 @@ <sprite>equipment/legs/chaps.xml</sprite> <sprite>equipment/chest/warlordplate.xml</sprite> <sprite>equipment/head/bull.xml</sprite> + <sound event="die">monsters/fallen/fallen-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skell-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skell-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skell-hit3.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt1.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt2.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> </monster> </monsters> diff --git a/monsters/monster1128_GeneralRazha.xml b/monsters/monster1128_GeneralRazha.xml index b40c590f..51d9eded 100644 --- a/monsters/monster1128_GeneralRazha.xml +++ b/monsters/monster1128_GeneralRazha.xml @@ -7,6 +7,16 @@ <sprite>equipment/chest/demonwarlordplate.xml|#ea0000,979797</sprite> <sprite>equipment/head/bull.xml</sprite> <sprite>equipment/weapons/dagger.xml|#181619,1c1b00,1b1a31,54438a,5b5660,827e85,9596e0</sprite> + <sound event="die">monsters/fallen/fallen-die2.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt1.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt2.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> <particlefx>graphics/particles/monster-witchguard.particle.xml</particlefx> </monster> </monsters> diff --git a/monsters/monster1129_GeneralTerogan.xml b/monsters/monster1129_GeneralTerogan.xml index f1d58217..f6cde526 100644 --- a/monsters/monster1129_GeneralTerogan.xml +++ b/monsters/monster1129_GeneralTerogan.xml @@ -4,8 +4,14 @@ <sprite>monsters/skeleton.xml|#aca379</sprite> <sprite>equipment/chest/robe.xml|#ea0000,333333</sprite> <sprite>equipment/head/phylactery.xml</sprite> - <sprite>equipment/head/evileyes.xml</sprite> + <!-- <sprite>equipment/head/evileyes.xml</sprite> Commented due to missing frame errors, which cause lag. evileyes.xml needs rework --> <sprite>equipment/hands/magefire.xml</sprite> + <sound event="die">monsters/fallen/fallen-die2.ogg</sound> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> + <sound event="hurt">monsters/fallen/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/thelost-attack.particle.xml" action="attack"/> </monster> </monsters> diff --git a/npcs/npc171.xml b/npcs/npc171.xml index e0e7f020..9ae592a5 100644 --- a/npcs/npc171.xml +++ b/npcs/npc171.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <npcs> <npc id="171"> - <sprite variant="59">monsters/mouboo.xml</sprite> + <sprite variant="59">npcs/mouboo-injured.xml</sprite> </npc> </npcs> diff --git a/sfx/monsters/ghost/ghost-die1.ogg b/sfx/monsters/ghost/ghost-die1.ogg Binary files differnew file mode 100644 index 00000000..cea2d1d9 --- /dev/null +++ b/sfx/monsters/ghost/ghost-die1.ogg diff --git a/sfx/monsters/ghost/ghost-move1.ogg b/sfx/monsters/ghost/ghost-move1.ogg Binary files differnew file mode 100644 index 00000000..2cf4cd34 --- /dev/null +++ b/sfx/monsters/ghost/ghost-move1.ogg diff --git a/sfx/monsters/ghost/ghost-move2.ogg b/sfx/monsters/ghost/ghost-move2.ogg Binary files differnew file mode 100644 index 00000000..f1948703 --- /dev/null +++ b/sfx/monsters/ghost/ghost-move2.ogg diff --git a/sfx/monsters/ghost/ghost-move3.ogg b/sfx/monsters/ghost/ghost-move3.ogg Binary files differnew file mode 100644 index 00000000..ab5c7e1d --- /dev/null +++ b/sfx/monsters/ghost/ghost-move3.ogg |