- Removed redundent input from mercenary vendor. (bugreport:2427)

- Corrected Wolfheiden and Mithril magic cape skill levels. (bugreport:2431)
- Corrected 12.1 monsters using penuma on target not self. (bugreport:2435)
- Fixed delitem causing the sign quest to fault. (bugreport:2444)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13376 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 10 insertions, 11 deletions

diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index bf1a8c392..f851eac93 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -4713,7 +4713,7 @@
 1904,Bomb Poring@NPC_SELFDESTRUCTION,chase,173,2,10000,3000,0,no,self,always,0,,,,,,
 
 // Satan Morroc (Based on information from Future Wiki)
-1916,Satan Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1916,Satan Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1916,Satan Morroc@AL_HEAL,idle,28,9,10000,0,2000,yes,self,myhpltmaxrate,99,,,,,,
 1916,Satan Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,700,10000,no,self,slavele,1,1918,1919,1920,1921,,
 1916,Satan Morroc@NPC_SUMMONSLAVE,idle,196,4,10000,700,10000,no,self,slavele,1,1918,1919,1920,1921,,
@@ -4744,7 +4744,7 @@
 1916,Satan Morroc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,
 1916,Satan Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,
 // MVP
-1917,Wounded Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1917,Wounded Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1917,Wounded Morroc@AL_HEAL,idle,28,9,10000,0,2000,yes,self,myhpltmaxrate,99,,,,,,
 1917,Wounded Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,700,10000,no,self,slavele,1,1918,1919,1920,1921,,
 1917,Wounded Morroc@NPC_SUMMONSLAVE,idle,196,4,10000,700,10000,no,self,slavele,1,1918,1919,1920,1921,,
@@ -4776,7 +4776,7 @@
 1917,Wounded Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,
 
 //Standard Mobs
-1918,Morroc Shadow (Angel)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1918,Morroc Shadow (Angel)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1918,Morroc Shadow (Angel)@AL_HEAL,any,28,11,10000,0,600,yes,self,myhpltmaxrate,99,,,,,,
 1918,Morroc Shadow (Angel)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
 1918,Morroc Shadow (Angel)@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,
@@ -4788,26 +4788,26 @@
 1918,Morroc Shadow (Angel)@NPC_GRANDDARKNESS,attack,339,10,1000,700,5000,no,self,always,,,,,,,
 1918,Morroc Shadow (Angel)@SA_DISPELL,chase,289,5,10000,0,30000,yes,target,always,0,,,,,,
 
-1919,Morroc Shadow (Golem)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1919,Morroc Shadow (Golem)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1919,Morroc Shadow (Golem)@NPC_BLOODDRAIN,chase,199,1,1000,0,5000,yes,target,always,0,,,,,,
 1919,Morroc Shadow (Golem)@NPC_WIDEBLEEDING,chase,665,4,5000,300,15000,yes,self,always,,,,,,,
 1919,Morroc Shadow (Golem)@NPC_EARTHQUAKE,chase,653,5,10000,500,50000,no,self,myhpltmaxrate,20,,,,,,6
 1919,Morroc Shadow (Golem)@SM_MAGNUM,attack,7,10,2000,0,5000,no,self,always,0,,,,,,
 
-1920,Morroc Shadow (Human)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1920,Morroc Shadow (Human)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1920,Morroc Shadow (Human)@NPC_CRITICALWOUND,attack,673,3,1000,0,10000,no,target,always,0,,,,,,
 1920,Morroc Shadow (Human)@AL_HEAL,any,28,5,5000,0,600,yes,self,myhpltmaxrate,60,,,,,,
 1920,Morroc Shadow (Human)@NPC_ENERGYDRAIN,attack,200,1,1000,0,5000,yes,target,always,0,,,,,,
 1920,Morroc Shadow (Human)@NPC_WIDESILENCE,attack,663,5,1000,0,20000,no,self,myhpltmaxrate,50,,,,,,
 
-1921,Morroc Shadow (Spirit)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1921,Morroc Shadow (Spirit)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1921,Morroc Shadow (Spirit)@AL_HEAL,any,28,11,10000,0,600,yes,friend,friendhpltmaxrate,99,,,,,,
 1921,Morroc Shadow (Spirit)@AL_HEAL,any,28,11,10000,0,600,yes,self,myhpltmaxrate,99,,,,,,
 1921,Morroc Shadow (Spirit)@HP_ASSUMPTIO,idle,361,5,5000,1000,10000,no,self,always,,,,,,,
 1921,Morroc Shadow (Spirit)@HP_ASSUMPTIO,idle,361,5,5000,1000,10000,no,friend,always,,,,,,,
 
 // No EXP/Drops
-1922,Morroc Shadow (Angel)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1922,Morroc Shadow (Angel)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1922,Morroc Shadow (Angel)@AL_HEAL,any,28,11,10000,0,600,yes,self,myhpltmaxrate,99,,,,,,
 1922,Morroc Shadow (Angel)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
 1922,Morroc Shadow (Angel)@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,
@@ -4822,20 +4822,20 @@
 1922,Morroc Shadow (Angel)@WZ_VERMILION,idle,85,20,10000,1000,10000,no,randomtarget,always,0,,,,,,
 1922,Morroc Shadow (Angel)@WZ_JUPITEL,attack,84,28,3000,1000,10000,no,target,always,0,,,,,,
 
-1923,MORROC_SHADOW_GOLE@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1923,MORROC_SHADOW_GOLE@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1923,Morroc Shadow (Golem)@NPC_SUMMONSLAVE,attack,196,6,10000,700,10000,no,self,always,0,1937,,,,,
 1923,Morroc Shadow (Golem)@NPC_BLOODDRAIN,chase,199,1,1000,0,5000,yes,target,always,0,,,,,,
 1923,Morroc Shadow (Golem)@NPC_WIDEBLEEDING,chase,665,4,5000,300,15000,yes,self,always,,,,,,,
 1923,Morroc Shadow (Golem)@NPC_EARTHQUAKE,chase,653,5,10000,200,10000,no,self,myhpltmaxrate,80,,,,,,6
 1923,Morroc Shadow (Golem)@SM_MAGNUM,attack,7,10,2000,0,5000,no,self,always,0,,,,,,
 
-1924,Morroc Shadow (Human)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1924,Morroc Shadow (Human)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1924,Morroc Shadow (Human)@NPC_CRITICALWOUND,attack,673,4,1000,0,10000,no,target,always,0,,,,,,
 1924,Morroc Shadow (Human)@AL_HEAL,any,28,5,5000,0,600,yes,self,myhpltmaxrate,60,,,,,,
 1924,Morroc Shadow (Human)@NPC_ENERGYDRAIN,attack,200,1,1000,0,5000,yes,target,always,0,,,,,,
 1924,Morroc Shadow (Human)@NPC_WIDESILENCE,attack,663,5,1000,0,20000,no,self,always,,,,,,,
 
-1925,Morroc Shadow (Spirit)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1925,Morroc Shadow (Spirit)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1925,Morroc Shadow (Spirit)@HP_ASSUMPTIO,idle,361,5,10000,1000,10000,no,friend,always,,,,,,,
 1925,Morroc Shadow (Spirit)@HP_ASSUMPTIO,idle,361,5,10000,1000,10000,no,self,always,,,,,,,
 1925,Morroc Shadow (Spirit)@AL_HEAL,any,28,11,10000,0,600,yes,friend,friendhpltmaxrate,99,,,,,,
@@ -4884,7 +4884,6 @@
 1957,Entweihen@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,50,,,,,,
 1957,Entweihen@NPC_MAGICALATTACK,attack,192,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,70,,,,,,
 1957,Entweihen@NPC_DARKBREATH,attack,202,10,2000,0,10000,no,randomtarget,myhpltmaxrate,50,,,,,,9
-1957,Entweihen@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1008,,,,,
 1957,Entweihen@NPC_EXPULSION,attack,674,1,1000,1000,10000,no,self,myhpltmaxrate,60,,,,,,
 1957,Entweihen@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,randomtarget,always,0,,,,,,6
 1957,Entweihen@NPC_DEFENDER,attack,205,1,500,0,30000,yes,self,longrangeattacked,,,,,,,29