diff options
| -rw-r--r-- | db/Changelog.txt | 2 | ||||
| -rw-r--r-- | db/mob_db.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt index 451a93452..0a13bc0f3 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -37,6 +37,8 @@ 2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well. ======================= +2009/04/29 + * Incarnation of Morroc (Angel) is now Shadow 1 instead of Holy 1 [Playtester] 2009/04/21 * Fixed items that use the "AddSPAmount_Action" bonus on aegis [Playtester] - Guillotine gives you 2 SP each time you attack something with a normal attack diff --git a/db/mob_db.txt b/db/mob_db.txt index abd0cffd1..4b72c9659 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -956,11 +956,11 @@ // Satan Morroc 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_,Wounded Morroc,Wounded 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,Incarnation of Morroc,Incarnation of Morroc,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,1541,5,0,0,0,0,0,0 +1918,MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,97,190000,0,61000,140000,2,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,27,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,1541,5,0,0,0,0,0,0 1919,MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,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,2130,5,0,0,0,0,0,0,0,0 1920,MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,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,1182,5,0,0,0,0,0,0 1921,MOROCC_4,Incarnation of Morroc,Incarnation of Morroc,98,150000,0,51000,70000,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x37B5,150,1536,540,432,0,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,2129,3,0,0,0,0,0,0,0,0 -1922,G_MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,97,120000000,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1922,G_MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,97,120000000,0,0,0,2,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,27,0x37B5,110,576,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 1923,G_MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,97,120000000,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1924,G_MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,96,120000000,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1925,G_MOROCC_4,Incarnation of Morroc,Incarnation of Morroc,98,120000000,0,0,0,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x37B5,150,1536,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 |