Full npc folder reorganization. (I hope I didn't break anything D:)

-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.

TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.

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

1 files changed, 111 insertions, 32 deletions

diff --git a/npc/pre-re/mobs/dungeons/abbey.txt b/npc/pre-re/mobs/dungeons/abbey.txt
index c39adfe4e..922356452 100644
--- a/npc/pre-re/mobs/dungeons/abbey.txt
+++ b/npc/pre-re/mobs/dungeons/abbey.txt
@@ -12,39 +12,118 @@
 //= 1.2 More official spawns [Playtester]
 //============================================================
 
-//==================================================
-// nameless_n - Nameless Island
-//==================================================
-nameless_n,0,0,0,0	monster	Ghoul	1036,40,5000,0,0
-nameless_n,0,0,0,0	monster	Hellhound	1866,17,5000,0,0
-nameless_n,0,0,0,0	monster	Banshee	1867,16,5000,0,0
-nameless_n,0,0,0,0	monster	Ragged Zombie	1865,12,5000,0,0
-nameless_n,0,0,0,0	monster	Zombie Slaughter	1864,12,5000,0,0
-nameless_n,0,0,0,0	monster	Flame Skull	1869,3,5000,0,0
+// Nameless Island
+nameless_n,93,211,51,62	monster	Zombie Slaughter	1864,3,15000,0,1
+nameless_n,93,211,51,62	monster	Ragged Zombie	1865,3,15000,0,1
+nameless_n,93,211,51,62	monster	Hell Poodle	1866,5,15000,0,1
+nameless_n,93,211,51,62	monster	Banshee	1867,4,15000,0,1
+nameless_n,93,211,51,62	monster	Flame Skull	1869,1,30000,0,1
+nameless_n,93,211,51,62	monster	Ghoul	1036,10,30000,0,1
+nameless_n,204,225,57,70	monster	Zombie Slaughter	1864,5,15000,0,1
+nameless_n,204,225,57,70	monster	Ragged Zombie	1865,5,15000,0,1
+nameless_n,204,225,57,70	monster	Hell Poodle	1866,5,15000,0,1
+nameless_n,204,225,57,70	monster	Banshee	1867,4,15000,0,1
+nameless_n,204,225,57,70	monster	Flame Skull	1869,1,30000,0,1
+nameless_n,204,225,57,70	monster	Ghoul	1036,10,30000,0,1
+nameless_n,127,103,59,46	monster	Zombie Slaughter	1864,2,15000,0,1
+nameless_n,127,103,59,46	monster	Ragged Zombie	1865,2,15000,0,1
+nameless_n,127,103,59,46	monster	Hell Poodle	1866,5,15000,0,1
+nameless_n,127,103,59,46	monster	Banshee	1867,4,15000,0,1
+nameless_n,127,103,59,46	monster	Flame Skull	1869,1,30000,0,1
+nameless_n,127,103,59,46	monster	Ghoul	1036,10,30000,0,1
+nameless_n,234,95,40,58	monster	Zombie Slaughter	1864,2,15000,0,1
+nameless_n,234,95,40,58	monster	Ragged Zombie	1865,2,15000,0,1
+nameless_n,234,95,40,58	monster	Hell Poodle	1866,2,15000,0,1
+nameless_n,234,95,40,58	monster	Banshee	1867,4,15000,0,1
+nameless_n,234,95,40,58	monster	Ghoul	1036,10,30000,0,1
 
-//==================================================
-// abbey01 - Cursed Monastery
-//==================================================
-abbey01,0,0,0,0	monster	Banshee	1867,93,5000,0,0
-abbey01,0,0,0,0	monster	Ghoul	1036,56,5000,0,0
-abbey01,0,0,0,0	monster	Ragged Zombie	1865,33,5000,0,0
-abbey01,0,0,0,0	monster	Zombie Slaughter	1864,30,5000,0,0
-abbey01,0,0,0,0	monster	Hellhound	1866,25,5000,0,0
-abbey01,0,0,0,0	monster	Flame Skull	1869,21,5000,0,0
+// Cursed Abbey Dungeon 1
+abbey01,0,0,0,0	monster	Banshee	1867,30,0,0,1
+abbey01,97,270,87,87	monster	Banshee	1867,30,0,0,1
+abbey01,97,270,87,87	monster	Hell Poodle	1866,15,0,0,1
+abbey01,97,270,87,87	monster	Zombie Slaughter	1864,10,0,0,1
+abbey01,97,270,87,87	monster	Ragged Zombie	1865,10,0,0,1
+abbey01,97,270,87,87	monster	Flame Skull	1869,9,0,0,1
+abbey01,97,270,87,87	monster	Ghoul	1036,10,0,0,1
+abbey01,250,370,49,50	monster	Banshee	1867,3,0,0,1
+abbey01,250,370,49,50	monster	Hell Poodle	1866,2,0,0,1
+abbey01,250,370,49,50	monster	Zombie Slaughter	1864,3,0,0,1
+abbey01,250,370,49,50	monster	Ragged Zombie	1865,3,0,0,1
+abbey01,250,370,49,50	monster	Flame Skull	1869,2,0,0,1
+abbey01,250,370,49,50	monster	Ghoul	1036,4,0,0,1
+abbey01,374,207,39,100	monster	Banshee	1867,3,0,0,1
+abbey01,374,207,39,100	monster	Hell Poodle	1866,1,0,0,1
+abbey01,374,207,39,100	monster	Zombie Slaughter	1864,1,0,0,1
+abbey01,374,207,39,100	monster	Ragged Zombie	1865,2,0,0,1
+abbey01,374,207,39,100	monster	Flame Skull	1869,1,0,0,1
+abbey01,374,207,39,100	monster	Ghoul	1036,4,0,0,1
+abbey01,283,283,99,100	monster	Banshee	1867,10,0,0,1
+abbey01,283,283,99,100	monster	Hell Poodle	1866,5,0,0,1
+abbey01,283,283,99,100	monster	Zombie Slaughter	1864,7,0,0,1
+abbey01,283,283,99,100	monster	Ragged Zombie	1865,7,0,0,1
+abbey01,283,283,99,100	monster	Flame Skull	1869,3,0,0,1
+abbey01,283,283,99,100	monster	Ghoul	1036,10,0,0,1
+abbey01,71,67,64,58	monster	Banshee	1867,3,0,0,1
+abbey01,71,67,64,58	monster	Zombie Slaughter	1864,3,0,0,1
+abbey01,71,67,64,58	monster	Ragged Zombie	1865,3,0,0,1
+abbey01,71,67,64,58	monster	Flame Skull	1869,1,0,0,1
+abbey01,71,67,64,58	monster	Ghoul	1036,10,0,0,1
+abbey01,71,67,64,58	monster	Zombie Slaughter	1864,4,0,0,1
+abbey01,71,67,64,58	monster	Ragged Zombie	1865,4,0,0,1
+abbey01,71,67,64,58	monster	Flame Skull	1869,3,0,0,1
+abbey01,71,67,64,58	monster	Ghoul	1036,10,0,0,1
+abbey01,260,70,35,30	monster	Banshee	1867,7,0,0,1
+abbey01,260,70,35,30	monster	Hell Poodle	1866,1,0,0,1
+abbey01,260,70,35,30	monster	Zombie Slaughter	1864,1,0,0,1
+abbey01,260,70,35,30	monster	Ragged Zombie	1865,2,0,0,1
+abbey01,260,70,35,30	monster	Flame Skull	1869,1,0,0,1
+abbey01,260,70,35,30	monster	Ghoul	1036,4,0,0,1
+abbey01,260,100,35,30	monster	Banshee	1867,7,0,0,1
+abbey01,260,100,35,30	monster	Hell Poodle	1866,1,0,0,1
+abbey01,260,100,35,30	monster	Zombie Slaughter	1864,1,0,0,1
+abbey01,260,100,35,30	monster	Ragged Zombie	1865,2,0,0,1
+abbey01,260,100,35,30	monster	Flame Skull	1869,1,0,0,1
+abbey01,260,100,35,30	monster	Ghoul	1036,4,0,0,1
 
-//==================================================
-// abbey02 - Cursed Monastery
-//==================================================
-abbey02,0,0,0,0	monster	Zombie Slaughter	1864,210,5000,0,0
-abbey02,0,0,0,0	monster	Ragged Zombie	1865,70,5000,0,0
-abbey02,0,0,0,0	monster	Flame Skull	1869,21,5000,0,0
-abbey02,0,0,0,0	monster	Necromancer	1870,7,5000,0,0
-abbey02,236,78,21,18	boss_monster	Fallen Bishop	1871,1,7200000,600000,1
+// Cursed Abbey Dungeon 2
+abbey02,150,66,36,64	monster	Zombie Slaughter	1864,30,60000,0,1
+abbey02,150,66,36,64	monster	Ragged Zombie	1865,10,0,0,1
+abbey02,150,66,36,64	monster	Flame Skull	1869,3,0,0,1
+abbey02,150,66,36,64	monster	Necromancer	1870,1,0,0,1
+abbey02,67,75,46,54	monster	Zombie Slaughter	1864,30,124000,0,1
+abbey02,67,75,46,54	monster	Ragged Zombie	1865,10,0,0,1
+abbey02,67,75,46,54	monster	Flame Skull	1869,3,0,0,1
+abbey02,67,75,46,54	monster	Necromancer	1870,1,0,0,1
+abbey02,232,76,46,54	monster	Zombie Slaughter	1864,30,63000,0,1
+abbey02,232,76,46,54	monster	Ragged Zombie	1865,10,0,0,1
+abbey02,232,76,46,54	monster	Flame Skull	1869,3,0,0,1
+abbey02,232,76,46,54	monster	Necromancer	1870,1,0,0,1
+abbey02,236,78,21,18	boss_monster	Fallen Bishop Hibram	1871,1,7200000,600000,1
+abbey02,150,153,142,23	monster	Zombie Slaughter	1864,30,122000,0,1
+abbey02,150,153,142,23	monster	Ragged Zombie	1865,10,0,0,1
+abbey02,150,153,142,23	monster	Flame Skull	1869,3,0,0,1
+abbey02,150,153,142,23	monster	Necromancer	1870,1,0,0,1
+abbey02,68,220,46,58	monster	Zombie Slaughter	1864,30,6000,0,1
+abbey02,68,220,46,58	monster	Ragged Zombie	1865,10,0,0,1
+abbey02,68,220,46,58	monster	Flame Skull	1869,3,0,0,1
+abbey02,68,220,46,58	monster	Necromancer	1870,1,0,0,1
+abbey02,150,240,35,44	monster	Zombie Slaughter	1864,30,120000,0,1
+abbey02,150,240,35,44	monster	Ragged Zombie	1865,10,0,0,1
+abbey02,150,240,35,44	monster	Flame Skull	1869,3,0,0,1
+abbey02,150,240,35,44	monster	Necromancer	1870,1,0,0,1
+abbey02,232,220,46,58	monster	Zombie Slaughter	1864,30,60000,0,1
+abbey02,232,220,46,58	monster	Ragged Zombie	1865,10,0,0,1
+abbey02,232,220,46,58	monster	Flame Skull	1869,3,0,0,1
+abbey02,232,220,46,58	monster	Necromancer	1870,1,0,0,1
 
-//==================================================
-// abbey03 - Cursed Monastery
-//==================================================
-abbey03,0,0,0,0	monster	Necromancer	1870,60,5000,0,0
-abbey03,0,0,0,0	monster	Banshee	1867,30,5000,0,0
-abbey03,0,0,0,0	monster	Flame Skull	1869,25,5000,0,0
+// Cursed Abbey Dungeon 3
 abbey03,0,0,0,0	boss_monster	Beelzebub	1873,1,43200000,600000,1
+abbey03,120,212,116,24	monster	Necromancer	1870,10,0,0,1
+abbey03,120,212,116,24	monster	Banshee	1867,10,0,0,1
+abbey03,120,212,116,24	monster	Flame Skull	1869,5,0,0,1
+abbey03,122,152,111,36	monster	Necromancer	1870,20,0,0,1
+abbey03,122,152,111,36	monster	Banshee	1867,10,0,0,1
+abbey03,122,152,111,36	monster	Flame Skull	1869,10,0,0,1
+abbey03,120,64,117,53	monster	Necromancer	1870,30,0,0,1
+abbey03,120,64,117,53	monster	Banshee	1867,10,0,0,1
+abbey03,120,64,117,53	monster	Flame Skull	1869,10,0,0,1