* Uncommented Cursed Abbey spawns

* Commented unimplemented mob skills

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

6 files changed, 11 insertions, 8 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index daeef3b18..72f4e9cbe 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -28,6 +28,7 @@
 
 ========================
 09/09
+	* Commented unimplemented mob skills [Playtester]
 	* Added Cursed Abbey mob skills thanks to Doddler [Playtester]
 	- also fixed level of MVP heal which was once again 10 instead of 11
 09/08
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index cafe7ea79..3d53aeef5 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -4563,7 +4563,7 @@
 1871,Fallen Bishop@NPC_WIDESILENCE,attack,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,32
 1871,Fallen Bishop@NPC_HELLJUDGEMENT,chase,662,4,10000,800,20000,no,self,myhpltmaxrate,60,,,,,,6
 1871,Fallen Bishop@NPC_HELLJUDGEMENT,attack,662,4,10000,800,20000,no,self,myhpltmaxrate,60,,,,,,6
-1871,Fallen Bishop@NPC_VAMPIRE_GIFT,attack,679,2,10000,800,30000,no,self,myhpltmaxrate,40,,,,,,6
+//1871,Fallen Bishop@NPC_VAMPIRE_GIFT,attack,679,2,10000,800,30000,no,self,myhpltmaxrate,40,,,,,,6
 1871,Fallen Bishop@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,myhpltmaxrate,70,,,,,,
 1871,Fallen Bishop@NPC_EVILLAND,attack,670,10,2000,1000,30000,no,self,myhpltmaxrate,90,,,,,,
 1871,Fallen Bishop@PR_LEXDIVINA,attack,76,5,1000,0,30000,no,target,always,0,,,,,,
@@ -4602,7 +4602,7 @@
 1873,Beelzebub@NPC_WIDESLEEP,attack,668,5,10000,700,25000,no,self,myhpltmaxrate,80,,,,,,
 1873,Beelzebub@NPC_HELLJUDGEMENT,chase,662,5,10000,800,20000,no,self,myhpltmaxrate,90,,,,,,6
 1873,Beelzebub@NPC_HELLJUDGEMENT,attack,662,5,10000,800,20000,no,self,myhpltmaxrate,90,,,,,,6
-1873,Beelzebub@NPC_VAMPIRE_GIFT,attack,679,10,10000,0,30000,no,self,myhpltmaxrate,65,,,,,,6
+//1873,Beelzebub@NPC_VAMPIRE_GIFT,attack,679,10,10000,0,30000,no,self,myhpltmaxrate,65,,,,,,6
 1873,Beelzebub@NPC_PULSESTRIKE,attack,661,5,10000,0,15000,no,self,myhpltmaxrate,60,,,,,,
 1873,Beelzebub@NPC_EVILLAND,attack,670,10,2000,1000,30000,no,self,myhpltmaxrate,90,,,,,,
 1873,Beelzebub@NPC_EXPULSION,attack,674,1,1000,1000,10000,no,self,myhpltmaxrate,99,,,,,,
@@ -4625,11 +4625,11 @@
 1874,Beelzebub True@NPC_SLOWCAST,attack,672,5,10000,0,30000,no,self,myhpltmaxrate,90,,,,,,
 1874,Beelzebub True@NPC_WIDESTONE,chase,666,5,10000,500,20000,no,self,myhpltmaxrate,80,,,,,,
 1874,Beelzebub True@NPC_WIDESTONE,attack,666,5,10000,500,20000,no,self,myhpltmaxrate,80,,,,,,
-1874,Beelzebub True@NPC_WIDESOULDRAIN,chase,680,7,10000,500,20000,no,self,myhpltmaxrate,30,,,,,,
-1874,Beelzebub True@NPC_WIDESOULDRAIN,attack,680,7,10000,500,20000,no,self,myhpltmaxrate,30,,,,,,
+//1874,Beelzebub True@NPC_WIDESOULDRAIN,chase,680,7,10000,500,20000,no,self,myhpltmaxrate,30,,,,,,
+//1874,Beelzebub True@NPC_WIDESOULDRAIN,attack,680,7,10000,500,20000,no,self,myhpltmaxrate,30,,,,,,
 1874,Beelzebub True@NPC_HELLJUDGEMENT,chase,662,2,10000,800,20000,no,self,myhpltmaxrate,90,,,,,,6
 1874,Beelzebub True@NPC_HELLJUDGEMENT,attack,662,2,10000,800,20000,no,self,myhpltmaxrate,90,,,,,,6
-1874,Beelzebub True@NPC_VAMPIRE_GIFT,attack,679,10,10000,0,30000,no,self,myhpltmaxrate,50,,,,,,6
+//1874,Beelzebub True@NPC_VAMPIRE_GIFT,attack,679,10,10000,0,30000,no,self,myhpltmaxrate,50,,,,,,6
 1874,Beelzebub True@NPC_PULSESTRIKE,attack,661,5,10000,0,15000,no,self,always,,,,,,,
 1874,Beelzebub True@NPC_EVILLAND,attack,670,10,2000,1000,30000,no,self,myhpltmaxrate,90,,,,,,
 1874,Beelzebub True@NPC_EXPULSION,attack,674,1,1000,1000,10000,no,self,myhpltmaxrate,99,,,,,,
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 49d2761ee..d02812ee1 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2007/09/09
+	* Uncommented Cursed Abbey spawns [Playtester]
 2007/09/08
 	* Fixed the dye maker npc (see topic:162818) [ultramage]
 2007/09/07
diff --git a/npc/mobs/dungeons/abbey.txt b/npc/mobs/dungeons/abbey.txt
index 82dc57e01..7e5441b9e 100644
--- a/npc/mobs/dungeons/abbey.txt
+++ b/npc/mobs/dungeons/abbey.txt
@@ -32,7 +32,7 @@ abbey02,0,0,0,0	monster	Zombie Slaughter	1864,200,0,0,0
 abbey02,0,0,0,0	monster	Ragged Zombie	1865,30,0,0,0
 abbey02,0,0,0,0	monster	Flame Skull	1869,20,0,0,0
 abbey02,0,0,0,0	monster	Necromancer	1870,10,0,0,0
-abbey02,0,0,0,0	monster	Falling Bishop	1871,1,7200000,3600000,1
+abbey02,0,0,0,0	monster	Fallen Bishop Hibram	1871,1,7200000,3600000,1
 
 // Cursed Abbey Dungeon 3
 abbey03,0,0,0,0	monster	Necromancer	1870,50,0,0,0
diff --git a/npc/scripts_eamonsters.conf b/npc/scripts_eamonsters.conf
index 3377b75f6..ae253d667 100644
--- a/npc/scripts_eamonsters.conf
+++ b/npc/scripts_eamonsters.conf
@@ -51,7 +51,7 @@ npc: npc/eamobs/dungeons/moc_pyramid.txt
 npc: npc/eamobs/dungeons/moc_sphinx.txt
 npc: npc/eamobs/dungeons/sunkenship.txt
 
-//npc: npc/mobs/dungeons/abbey.txt
+npc: npc/mobs/dungeons/abbey.txt
 npc: npc/mobs/dungeons/amatdun.txt
 npc: npc/mobs/dungeons/anthell.txt
 npc: npc/mobs/dungeons/ayodun.txt
diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf
index 4a95c16d5..b9bc3aea9 100644
--- a/npc/scripts_monsters.conf
+++ b/npc/scripts_monsters.conf
@@ -40,7 +40,7 @@ npc: npc/mobs/fields/umbala.txt
 npc: npc/mobs/fields/veins.txt
 npc: npc/mobs/fields/yuno.txt
 
-//npc: npc/mobs/dungeons/abbey.txt
+npc: npc/mobs/dungeons/abbey.txt
 npc: npc/mobs/dungeons/amatdun.txt
 npc: npc/mobs/dungeons/anthell.txt
 npc: npc/mobs/dungeons/ayodun.txt