* Fixed Satan Morroc and Injured Satan Morroc stats (bugreport:1546)

* Fixed a few instances of pneuma being casted on target. (bugreport:1557)
* Fixed Desert Twilight increasing damage to demi (bugreport:1559)


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

4 files changed, 11 insertions, 7 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index e3f9b58da..2466fe5d7 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -43,6 +43,10 @@
 	2385 Recuvative_Armor		Should trigger HP/SP return with magical kills as well.
 
 =======================
+2008/05/24
+	* Rev. 12719 Fixed Satan Morroc and Injured Satan Morroc stats (bugreport:1546) [L0ne_W0lf]
+	* Fixed a few instances of pneuma being casted on target. (bugreport:1557)
+	* Fixed Desert Twilight increasing damage to demi (bugreport:1559)
 2008/05/19
 	* Fixed Thorny Shield and Survivor's Manteau [Playtester]
 2008/05/14
diff --git a/db/item_db.txt b/db/item_db.txt
index f3de68c91..921c3932a 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -3638,7 +3638,7 @@
 13031,Sword_Breaker_,Swordbreaker,4,,10,1000,70,,1,3,0x028F5EEE,7,2,2,4,36,1,1,{ bonus bBreakWeaponRate,500; },{},{}
 13032,Mail_Breaker_,Mailbreaker,4,,10,1000,70,,1,3,0x028F5EEE,7,2,2,4,36,1,1,{ bonus bBreakArmorRate,500; },{},{}
 13033,Assasin_Dagger_,Assassin Dagger,4,,10,600,140,,1,1,0x00001000,7,2,2,4,36,1,1,{ bonus bMaxHPrate,20; bonus bMaxSPrate,15; bonus bAspdRate,2; bonus bAtkEle,Ele_Dark; },{},{}
-13034,Twilight_Desert,Desert Twilight,4,,,600,130,,1,2,0x00001000,2,2,2,3,70,1,1,{ if (isequipped(13035)) { bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddRace,RC_DemiHuman,30; bonusautoscript "{ sc_start SC_INCASPDRATE,7000,100; }",10; } },{},{}
+13034,Twilight_Desert,Desert Twilight,4,,,600,130,,1,2,0x00001000,2,2,2,3,70,1,1,{ if (isequipped(13035)) { bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddSize,2,10; bonusautoscript "{ sc_start SC_INCASPDRATE,7000,100; }",10; } },{},{}
 13035,Sandstorm,Desert Winds,4,,,600,50,,1,4,0x00001000,2,2,2,2,70,1,1,{},{},{}
 13036,Assassin_Dagger,Assassin Dagger,4,,0,0,120,,1,0,0x029E7CEB,7,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; if (Class == Job_Ninja) bonus bMatkRate,15; },{},{}
 13037,Assassin_Dagger_,Assassin Dagger,4,,0,0,120,,1,0,0x029E7CEB,7,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; if (Class == Job_Ninja) bonus bMatkRate,15; },{},{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index bd251eb83..c0674e13c 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -954,8 +954,8 @@
 1914,OBJ_A2,Flag,Flag,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1915,OBJ_B2,Flag,Flag,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Satan Morroc
-1916,MOROCC,Satan Morroc,Satan Morroc,99,60000000,0,6700000,4500000,2,15000,18000,29,65,140,160,30,250,180,50,10,12,2,6,87,0x37B5,100,76,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1917,MOROCC_,Satan Morroc,Satan Morroc,99,40000000,0,3600000,3000000,2,9000,11000,29,65,140,160,30,250,180,40,10,12,2,6,87,0x37B5,100,76,540,432,3600000,5000,607,5500,617,5000,617,5000,5808,1000,2374,2000,2375,2000,2433,2500,7799,9000,7798,9000,0,0,0,0,0,0,0,0
+1916,MOROCC,Satan Morroc,Satan Morroc,99,20000000,0,6700000,4500000,2,32000,32001,29,65,140,160,30,250,180,50,10,12,2,6,87,0x37B5,100,76,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1917,MOROCC_,Satan Morroc,Satan Morroc,99,15000000,0,3600000,3000000,2,15000,18000,29,65,140,160,30,250,180,40,10,12,2,6,87,0x37B5,100,76,540,432,3600000,5000,607,5500,617,5000,617,5000,5808,1000,2374,2000,2375,2000,2433,2500,7799,9000,7798,9000,0,0,0,0,0,0,0,0
 1918,MOROCC_1,Morroc Shadow,Morroc Shadow,97,190000,0,61000,140000,2,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,26,0x37B5,110,576,540,432,0,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,0,0,0,0,0,0,0,0
 1919,MOROCC_2,Morroc Shadow,Morroc Shadow,97,190000,0,65000,120000,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x37B5,150,576,540,432,0,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,0,0,0,0,0,0,0,0,0,0
 1920,MOROCC_3,Morroc Shadow,Morroc Shadow,96,143000,0,50000,80000,1,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x37B5,150,212,540,432,0,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,0,0,0,0,0,0,0,0
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 6d8ccd335..21e6981f1 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -4570,8 +4570,8 @@
 1871,Falling Bishop@NPC_WIDESILENCE,chase,663,5,5000,0,30000,yes,self,always,0,,,,,,
 1871,Falling Bishop@NPC_WIDESILENCE,attack,663,5,5000,0,30000,yes,self,always,0,,,,,,
 1871,Falling Bishop@MG_SAFETYWALL,attack,12,10,1000,0,5000,yes,self,always,0,,,,,,
-1871,Falling Bishop@AL_PNEUMA,attack,25,1,5000,0,10000,yes,target,longrangeattacked,0,,,,,,19
-1871,Falling Bishop@AL_PNEUMA,chase,25,1,5000,0,10000,yes,target,longrangeattacked,0,,,,,,19
+1871,Falling Bishop@AL_PNEUMA,attack,25,1,5000,0,10000,yes,self,longrangeattacked,0,,,,,,19
+1871,Falling Bishop@AL_PNEUMA,chase,25,1,5000,0,10000,yes,self,longrangeattacked,0,,,,,,19
 1871,Falling Bishop@PR_LEXAETERNA,attack,78,1,500,0,5000,yes,target,always,0,,,,,,29
 1871,Falling Bishop@PR_LEXAETERNA,chase,78,1,500,0,5000,yes,target,always,0,,,,,,29
 1871,Falling Bishop@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,
@@ -4582,7 +4582,7 @@
 1872,Beelzebub Fly@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6
 1872,Beelzebub Fly@NPC_WINDATTACK,attack,187,4,2000,0,5000,yes,target,always,0,,,,,,
 1872,Beelzebub Fly@NPC_MENTALBREAKER,attack,159,1,200,0,5000,no,target,always,0,,,,,,
-1873,Beelzebub@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1873,Beelzebub@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1873,Beelzebub@AL_HEAL,idle,28,9,10000,0,2000,yes,self,myhpltmaxrate,99,,,,,,
 1873,Beelzebub@NPC_CALLSLAVE,attack,352,1,10000,0,15000,yes,self,always,0,,,,,,
 1873,Beelzebub@NPC_CALLSLAVE,chase,352,1,10000,0,15000,yes,self,always,0,,,,,,
@@ -4608,7 +4608,7 @@
 1873,Beelzebub@NPC_AGIUP,chase,350,5,10000,0,30000,yes,self,myhpltmaxrate,60,,,,,,
 1874,Beelzebub@NPC_RUN,attack,354,1,10000,0,0,yes,self,myhpltmaxrate,1,,,,,,26
 1874,Beelzebub@NPC_RUN,chase,354,1,10000,0,0,yes,self,myhpltmaxrate,1,,,,,,26
-1874,Beelzebub@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1874,Beelzebub@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1874,Beelzebub@AL_HEAL,idle,28,9,10000,0,2000,yes,self,myhpltmaxrate,99,,,,,,
 1874,Beelzebub@NPC_CALLSLAVE,attack,352,1,10000,0,15000,yes,self,always,0,,,,,,
 1874,Beelzebub@NPC_CALLSLAVE,chase,352,1,10000,0,15000,yes,self,always,0,,,,,,