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

4 files changed, 295 insertions, 0 deletions

diff --git a/npc/mobs/bossnia.txt b/npc/mobs/bossnia.txt
new file mode 100644
index 000000000..31b5e25d0
--- /dev/null
+++ b/npc/mobs/bossnia.txt
@@ -0,0 +1,187 @@
+//===== rAthena Script =======================================
+//= Bossnia Monster Spawn Script
+//===== By: ==================================================
+//= Masao
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any rAthena Version
+//===== Description: =========================================
+//= Spawns boss monsters / MvP's in the Bossnia Dungeons.
+//============================================================
+
+//==================================================
+// bossnia_01 - Bossnia
+//==================================================
+bossnia_01,0,0,0,0	boss_monster	Garm	1252,5,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Dark Lord	1272,3,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Doppelganger	1046,10,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Dracula	1389,5,1800000,0,1
+bossnia_01,0,0,0,0	boss_monster	Drake	1112,10,1800000,0,1
+bossnia_01,0,0,0,0	boss_monster	Detale	1719,2,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Maya	1147,10,1800000,0,1
+bossnia_01,0,0,0,0	boss_monster	Mistress	1059,1,1800000,0,1
+bossnia_01,0,0,0,0	boss_monster	Baphomet	1039,10,1800000,0,1
+bossnia_01,0,0,0,0	boss_monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_01,0,0,0,0	boss_monster	Amon Ra	1511,1,1800000,0,1
+bossnia_01,0,0,0,0	boss_monster	Atroce	1785,10,1800000,0,1
+bossnia_01,0,0,0,0	boss_monster	Vesper	1685,2,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Eddga	1115,1,1800000,0,1
+bossnia_01,0,0,0,0	boss_monster	Osiris	1038,10,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Orc Lord	1190,10,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Orc Hero	1087,2,1800000,0,1
+bossnia_01,0,0,0,0	boss_monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_01,0,0,0,0	boss_monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_01,0,0,0,0	boss_monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_01,0,0,0,0	boss_monster	Ktullanux	1779,2,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_01,0,0,0,0	boss_monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_01,0,0,0,0	boss_monster	Turtle General	1312,10,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Pharaoh	1157,2,3600000,0,1
+bossnia_01,0,0,0,0	boss_monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_01,0,0,0,0	boss_monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Phreeoni	1159,10,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_01,0,0,0,0	boss_monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	RSX-0806	1623,5,7200000,0,1
+bossnia_01,0,0,0,0	boss_monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_01,137,118,1,1	boss_monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_01,122,195,1,1	boss_monster	Beelzebub	1873,1,0,0,1
+bossnia_01,45,118,1,1	boss_monster	Beelzebub	1873,1,0,0,1
+bossnia_01,196,122,1,1	boss_monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_01,142,61,1,1	boss_monster	Ifrit	1832,1,0,0,1
+
+//==================================================
+// bossnia_02 - Bossnia
+//==================================================
+bossnia_02,0,0,0,0	boss_monster	Garm	1252,5,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Dark Lord	1272,3,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Doppelganger	1046,10,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Dracula	1389,5,1800000,0,1
+bossnia_02,0,0,0,0	boss_monster	Drake	1112,10,1800000,0,1
+bossnia_02,0,0,0,0	boss_monster	Detale	1719,2,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Maya	1147,10,1800000,0,1
+bossnia_02,0,0,0,0	boss_monster	Mistress	1059,1,1800000,0,1
+bossnia_02,0,0,0,0	boss_monster	Baphomet	1039,10,1800000,0,1
+bossnia_02,0,0,0,0	boss_monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_02,0,0,0,0	boss_monster	Amon Ra	1511,1,1800000,0,1
+bossnia_02,0,0,0,0	boss_monster	Atroce	1785,10,1800000,0,1
+bossnia_02,0,0,0,0	boss_monster	Vesper	1685,2,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Eddga	1115,1,1800000,0,1
+bossnia_02,0,0,0,0	boss_monster	Osiris	1038,10,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Orc Lord	1190,10,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Orc Hero	1087,2,1800000,0,1
+bossnia_02,0,0,0,0	boss_monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_02,0,0,0,0	boss_monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_02,0,0,0,0	boss_monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_02,0,0,0,0	boss_monster	Ktullanux	1779,2,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_02,0,0,0,0	boss_monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_02,0,0,0,0	boss_monster	Turtle General	1312,10,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Pharaoh	1157,2,3600000,0,1
+bossnia_02,0,0,0,0	boss_monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_02,0,0,0,0	boss_monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Phreeoni	1159,10,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_02,0,0,0,0	boss_monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	RSX-0806	1623,5,7200000,0,1
+bossnia_02,0,0,0,0	boss_monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_02,137,118,1,1	boss_monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_02,122,195,1,1	boss_monster	Beelzebub	1873,1,0,0,1
+bossnia_02,45,118,1,1	boss_monster	Beelzebub	1873,1,0,0,1
+bossnia_02,196,122,1,1	boss_monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_02,142,61,1,1	boss_monster	Ifrit	1832,1,0,0,1
+
+//==================================================
+// bossnia_03 - Bossnia
+//==================================================
+bossnia_03,0,0,0,0	boss_monster	Garm	1252,5,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Dark Lord	1272,3,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Doppelganger	1046,10,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Dracula	1389,5,1800000,0,1
+bossnia_03,0,0,0,0	boss_monster	Drake	1112,10,1800000,0,1
+bossnia_03,0,0,0,0	boss_monster	Detale	1719,2,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Maya	1147,10,1800000,0,1
+bossnia_03,0,0,0,0	boss_monster	Mistress	1059,1,1800000,0,1
+bossnia_03,0,0,0,0	boss_monster	Baphomet	1039,10,1800000,0,1
+bossnia_03,0,0,0,0	boss_monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_03,0,0,0,0	boss_monster	Amon Ra	1511,1,1800000,0,1
+bossnia_03,0,0,0,0	boss_monster	Atroce	1785,10,1800000,0,1
+bossnia_03,0,0,0,0	boss_monster	Vesper	1685,2,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Eddga	1115,1,1800000,0,1
+bossnia_03,0,0,0,0	boss_monster	Osiris	1038,10,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Orc Lord	1190,10,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Orc Hero	1087,2,1800000,0,1
+bossnia_03,0,0,0,0	boss_monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_03,0,0,0,0	boss_monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_03,0,0,0,0	boss_monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_03,0,0,0,0	boss_monster	Ktullanux	1779,2,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_03,0,0,0,0	boss_monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_03,0,0,0,0	boss_monster	Turtle General	1312,10,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Pharaoh	1157,2,3600000,0,1
+bossnia_03,0,0,0,0	boss_monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_03,0,0,0,0	boss_monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Phreeoni	1159,10,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_03,0,0,0,0	boss_monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	RSX-0806	1623,5,7200000,0,1
+bossnia_03,0,0,0,0	boss_monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_03,137,118,1,1	boss_monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_03,122,195,1,1	boss_monster	Beelzebub	1873,1,0,0,1
+bossnia_03,45,118,1,1	boss_monster	Beelzebub	1873,1,0,0,1
+bossnia_03,196,122,1,1	boss_monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_03,142,61,1,1	boss_monster	Ifrit	1832,1,0,0,1
+
+//==================================================
+// bossnia_04 - Bossnia
+//==================================================
+bossnia_04,0,0,0,0	boss_monster	Garm	1252,5,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Dark Lord	1272,3,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Doppelganger	1046,10,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Dracula	1389,5,1800000,0,1
+bossnia_04,0,0,0,0	boss_monster	Drake	1112,10,1800000,0,1
+bossnia_04,0,0,0,0	boss_monster	Detale	1719,2,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Maya	1147,10,1800000,0,1
+bossnia_04,0,0,0,0	boss_monster	Mistress	1059,1,1800000,0,1
+bossnia_04,0,0,0,0	boss_monster	Baphomet	1039,10,1800000,0,1
+bossnia_04,0,0,0,0	boss_monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_04,0,0,0,0	boss_monster	Amon Ra	1511,1,1800000,0,1
+bossnia_04,0,0,0,0	boss_monster	Atroce	1785,10,1800000,0,1
+bossnia_04,0,0,0,0	boss_monster	Vesper	1685,2,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Eddga	1115,1,1800000,0,1
+bossnia_04,0,0,0,0	boss_monster	Osiris	1038,10,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Orc Lord	1190,10,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Orc Hero	1087,2,1800000,0,1
+bossnia_04,0,0,0,0	boss_monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_04,0,0,0,0	boss_monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_04,0,0,0,0	boss_monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_04,0,0,0,0	boss_monster	Ktullanux	1779,2,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_04,0,0,0,0	boss_monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_04,0,0,0,0	boss_monster	Turtle General	1312,10,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Pharaoh	1157,2,3600000,0,1
+bossnia_04,0,0,0,0	boss_monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_04,0,0,0,0	boss_monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Phreeoni	1159,10,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_04,0,0,0,0	boss_monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	RSX-0806	1623,5,7200000,0,1
+bossnia_04,0,0,0,0	boss_monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_04,137,118,1,1	boss_monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_04,122,195,1,1	boss_monster	Beelzebub	1873,1,0,0,1
+bossnia_04,45,118,1,1	boss_monster	Beelzebub	1873,1,0,0,1
+bossnia_04,196,122,1,1	boss_monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_04,142,61,1,1	boss_monster	Ifrit	1832,1,0,0,1
diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt
new file mode 100644
index 000000000..b866ce123
--- /dev/null
+++ b/npc/mobs/citycleaners.txt
@@ -0,0 +1,50 @@
+//===== rAthena Script =======================================
+//= City Monster Spawn Script
+//===== By: ==================================================
+//= massdriller
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Spawns monsters to clean up city. Apparently spawning
+//= occured in iRO and kRO. Enable this if you want. 
+//= 0.1a Added a few more towns to spawn Wild rose [MasterOfMuppets]
+//= 0.1b And even more from Poki#3 [Komurka]
+//= 1.0 Removed unofficial city cleaners [Playtester]
+//= 1.1 Added other city spawns [Playtester]
+//============================================================
+
+//==================================================
+// Wild Rose City Spawns
+//==================================================
+prontera,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+morocc,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+alberta,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+aldebaran,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+geffen,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+payon,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+comodo,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+izlude,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+yuno,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+einbroch,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+lighthalzen,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+hugel,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+umbala,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+amatsu,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+gonryun,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+louyang,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+ayothaya,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+moscovia,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+brasilis,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+
+//==================================================
+// einbech - Einbech, the Mining Village
+//==================================================
+einbech,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0
+einbech,0,0,0,0	monster	Tarou	1175,5,1800000,1500000,0
+
+//==================================================
+// payon_in02 - Inside Payon
+//==================================================
+payon_in02,23,68,5,5	monster	Thief Bug Egg	1048,7,1200000,600000,0
diff --git a/npc/mobs/jail.txt b/npc/mobs/jail.txt
new file mode 100644
index 000000000..4ff6b0b48
--- /dev/null
+++ b/npc/mobs/jail.txt
@@ -0,0 +1,18 @@
+//===== rAthena Script =======================================
+//= Jail Monster Spawn Script
+//===== By: ==================================================
+//= Masao
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any rAthena Version
+//===== Description: =========================================
+//= Spawns monsters in Jail.
+//============================================================
+
+sec_in02,139,80,20	monster	Poring	1002,10,0,0,0
+sec_in02,138,54,20,20	monster	Marin	1242,5,0,0,0
+sec_in02,161,46,15,15	monster	Poporing	1031,5,0,0,0
+sec_in02,114,47,10,10	monster	Drops	1113,5,0,0,0
+sec_in02,114,47,10,10	monster	Bigfoot	1060,10,0,0,0
+sec_in02,139,80,30,30	monster	Flora	1118,10,0,0,0
diff --git a/npc/mobs/pvp.txt b/npc/mobs/pvp.txt
new file mode 100644
index 000000000..9af49474e
--- /dev/null
+++ b/npc/mobs/pvp.txt
@@ -0,0 +1,40 @@
+//===== rAthena Script =======================================
+//= PvP Nightmare Rooms Monster Spawn Script
+//===== By: ==================================================
+//= Athena (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Additional Comments: =================================
+//=
+//============================================================
+
+//==================================================
+// pvp_n_8-1 - PvP : Room Sandwich
+//==================================================
+pvp_n_8-1,0,0,0,0	monster	Side Winder	1037,2,360000,180000,1
+pvp_n_8-1,0,0,0,0	monster	Bigfoot	1060,2,360000,180000,1
+
+//==================================================
+// pvp_n_8-2 - PvP : Room Rock On
+//==================================================
+pvp_n_8-2,0,0,0,0	monster	Cramp	1209,4,360000,180000,1
+
+//==================================================
+// pvp_n_8-3 - PvP : Four Room
+//==================================================
+pvp_n_8-3,0,0,0,0	monster	Whisper	1179,3,360000,180000,1
+pvp_n_8-3,0,0,0,0	monster	Giant Whisper	1186,2,360000,180000,1
+
+//==================================================
+// pvp_n_8-4 - PvP : Room Undercross
+//==================================================
+pvp_n_8-4,0,0,0,0	monster	Zombie	1015,4,360000,180000,1
+pvp_n_8-4,0,0,0,0	monster	Ghoul	1036,3,360000,180000,1
+
+//==================================================
+// pvp_n_8-5 - PvP : Room Copass
+//==================================================
+pvp_n_8-5,0,0,0,0	monster	Khalitzburg	1132,1,360000,180000,1
+pvp_n_8-5,0,0,0,0	monster	Raydric	1163,2,360000,180000,1