merged crusader job q to stable. Added initial ABBEY mob spawn

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

4 files changed, 44 insertions, 6 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 57313f933..776d4e5b9 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2007/06/14
+	* Added initial mob spawn of Abbey Dun, thanks to $ephiroth
 2007/06/12
 	* Added first part of Hugel quests. Credits go to MasterOfMuppets. [SinSloth]
 	- Moved some Hugel NPCs to proper quest file. [SinSloth]
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 579fff62d..7d9cd0359 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -4,7 +4,7 @@
 //= Made by: Black Dragon
 //= Converted by: Shin
 //===== Current Version: ===================================== 
-//= 2.5
+//= 2.6
 //===== Compatible With: ===================================== 
 //= eAthena  0.5.2 +
 //===== Description: ========================================= 
@@ -40,11 +40,11 @@
 //=	- Fixed some indentation.
 //= 2.5 Fixed some spelling and grammar in crusader quest. [L0ne_W0lf]
 //= 2.6 Fixed bug (about totally blocked baby class), optimized,
-//=		made some NPC more unique names: Monster Summon#Cr1 [Lupus]
+//=		made some NPC more unique names: Monster Summon#cr1 [Lupus]
 //============================================================
 
 
-//=============== Senior Crusader: 1º Collect Items Test============================
+//=============== Senior Crusader: 1st Collect Items Test============================
 prt_castle,45,169,5	script	Senior Crusader	752,{
 	mes "[Michael Halig]";
 	if (Upper == 1) { //the baby classes were totally blocked... due to missing == 1
@@ -309,7 +309,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 	close;
 }
 
-//===================== Suffering Man: 2º Endurance Test ===============================================
+//===================== Suffering Man: 2nd Endurance Test ===============================================
 prt_castle,164,32,1	script	Man in Anguish	733,{
 	mes "[Murnak Mijoul]";
 	if(BaseJob != Job_Swordman) {
@@ -441,7 +441,7 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 	close;
 }
 
-//===================== Gabriel Valentine: 3º Knowledge Test =================================
+//===================== Gabriel Valentine: 3rd Knowledge Test =================================
 prt_church,95,127,3	script	Crusader	745,{
 	mes "[Gabriel Valentine]";
 	if(BaseJob != Job_Swordman) {
@@ -784,7 +784,7 @@ C_Questions:
 	close;
 }
 
-//===================== Crusader: 4º Purification Test =====================================================
+//===================== Crusader: 4th Purification Test =====================================================
 prt_castle,35,151,5	script	Patron Knight	751,{
 	mes "[Bliant Piyord]";
 	mes "Welcome.";
diff --git a/npc/mobs/dungeons/abbey.txt b/npc/mobs/dungeons/abbey.txt
new file mode 100644
index 000000000..2d7dd859c
--- /dev/null
+++ b/npc/mobs/dungeons/abbey.txt
@@ -0,0 +1,35 @@
+//===== Athena Script ========================================

+//= Abbey Dungeon Monster Spawn Script

+//===== By: ==================================================

+//= $ephiroth

+//===== Current Version: =====================================

+//= 1.0

+//===== Compatible With: =====================================

+//= Any Athena Version

+//===== Additional Comments: =================================

+//= 1.0 Initial version [$ephiroth]

+//============================================================

+

+// Nameless Island

+nameless_n.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0

+nameless_n.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0

+nameless_n.gat,0,0,0,0	monster	Hell Poodle	1866,20,0,0,0

+

+// Cursed Abbey Dungeon [01]

+abbey01.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0

+abbey01.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0

+abbey01.gat,0,0,0,0	monster	Flame Skull	1869,20,0,0,0

+

+// Cursed Abbey Dungeon [02]

+abbey02.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0

+abbey02.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0

+abbey02.gat,0,0,0,0	monster	Banshee	1867,20,0,0,0

+abbey01.gat,0,0,0,0	monster	Flame Skull	1869,20,0,0,0

+abbey02.gat,0,0,0,0	monster	Falling Bishop	1871,1,7200000,3600000,1

+

+// Cursed Abbey Dungeon [03]

+abbey03.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0

+abbey03.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0

+abbey03.gat,0,0,0,0	monster	Banshee	1867,20,0,0,0

+abbey03.gat,0,0,0,0	monster	Necromancer	1870,20,0,0,0

+abbey03.gat,0,0,0,0	monster	Beelzebub	1873,1,39600000,19800000,1
\ No newline at end of file
diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf
index 64e4c121b..b9bc3aea9 100644
--- a/npc/scripts_monsters.conf
+++ b/npc/scripts_monsters.conf
@@ -40,6 +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/amatdun.txt
 npc: npc/mobs/dungeons/anthell.txt
 npc: npc/mobs/dungeons/ayodun.txt