summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt2
-rw-r--r--db/mob_db.txt24
2 files changed, 14 insertions, 12 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index e34040b4d..1e33787ad 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -43,6 +43,8 @@
2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well.
=======================
+2008/05/14
+ * Rev. 12709 Added Satan Morroc and Morroc Shadow monster stats. [L0ne_W0lf]
2008/05/13
* Rev. 12707 Corrected Fire breath being self-targeted. (bugreport:1503) [L0ne_W0lf]
- In addition corrected Chocolate Strawberry having infinite use. (bugreport:1484)
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 7d9dc2656..bd251eb83 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -954,16 +954,16 @@
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,0,0,1,7,10,29,65,1,1,1,1,6,30,10,12,2,6,87,0x37B5,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
-1917,MOROCC_,Satan Morroc,Satan Morroc,99,60000000,0,0,0,1,7,10,29,65,1,1,1,1,6,30,10,12,2,6,87,0x37B5,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
-1918,MOROCC_1,Morroc's Shadow,Morroc's Shadow,97,190000,0,0,0,1,7,10,20,37,1,1,1,1,6,30,10,12,2,8,26,0x37B5,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
-1919,MOROCC_2,Morroc's Shadow,Morroc's Shadow,97,190000,0,0,0,1,7,10,20,5,1,1,1,1,6,30,10,12,1,6,67,0x37B5,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
-1920,MOROCC_3,Morroc's Shadow,Morroc's Shadow,96,143000,0,0,0,1,7,10,15,30,1,1,1,1,6,30,10,12,1,6,69,0x37B5,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
-1921,MOROCC_4,Morroc's Shadow,Morroc's Shadow,98,150000,0,0,0,1,7,10,18,54,1,1,1,1,6,30,10,12,1,6,68,0x37B5,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
-1922,G_MOROCC_1,Morroc's Shadow,Morroc's Shadow,97,190000,0,0,0,1,7,10,20,37,1,1,1,1,6,30,10,12,2,8,26,0x37B5,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
-1923,G_MOROCC_2,Morroc's Shadow,Morroc's Shadow,97,190000,0,0,0,1,7,10,20,5,1,1,1,1,6,30,10,12,1,6,67,0x37B5,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
-1924,G_MOROCC_3,Morroc's Shadow,Morroc's Shadow,96,143000,0,0,0,1,7,10,15,30,1,1,1,1,6,30,10,12,1,6,69,0x37B5,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
-1925,G_MOROCC_4,Morroc's Shadow,Morroc's Shadow,98,150000,0,0,0,1,7,10,18,54,1,1,1,1,6,30,10,12,1,6,68,0x37B5,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
+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
+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
+1921,MOROCC_4,Morroc Shadow,Morroc Shadow,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,0,0,0,0,0,0,0,0,0,0
+1922,G_MOROCC_1,Morroc Shadow,Morroc Shadow,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
+1923,G_MOROCC_2,Morroc Shadow,Morroc Shadow,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,Morroc Shadow,Morroc Shadow,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,Morroc Shadow,Morroc Shadow,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
// Most of what's below here is just place-holder data. Nothing concrete yet.
1926,JAKK_H,Jakk,Jakk,38,300,0,0,0,1,5,5,5,30,1,38,38,43,75,45,10,12,1,0,43,0x3695,200,1180,648,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
1927,WHISPER_H,Whisper,Whisper,34,100,0,0,0,1,5,5,0,45,1,51,14,0,60,0,10,12,0,6,68,0x3195,150,1960,504,960,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
@@ -1002,9 +1002,9 @@
1960,G_ENTWEIHEN_3,Entweihen Ghost,Entweihen Ghost,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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
1961,G_ENTWEIHEN_4,Entweihen Ghost,Entweihen Ghost,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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
1962,G_ANTONIO,Antoni,Antonio,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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
-//New Pet
+// New Pet
1963,P_CHUNG_E,Chung E,New Year Doll,49,23900,0,2396,993,1,460,1050,8,15,38,65,43,30,90,15,10,12,1,7,40,0x3695,170,1728,816,1188,0,0,0,0,0,0,0,0,7053,4850,740,100,1806,10,518,500,0,0,0,0,0,0,5042,2,0,0,0,0
-//Monster Mercenaries?
+// Monster Mercenaries?
//1964,NIGHTMARE,Nightmare,Nightmare,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
//1965,WILD_RoSE,Wild Rose,Wild Rose,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
//1966,DOPPELGANGER,Doppelganger,Doppelganger,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