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, 219 insertions, 0 deletions

diff --git a/npc/warps/other/airplane.txt b/npc/warps/other/airplane.txt
new file mode 100644
index 000000000..83afc6893
--- /dev/null
+++ b/npc/warps/other/airplane.txt
@@ -0,0 +1,79 @@
+//===== rAthena Script =======================================
+//= Airports & Airplanes Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.0), SSUNNY@YOUNG(1.6)
+//===== Current Version: =====================================
+//= 1.7
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for All Airplanes and Airports
+//===== Additional Comments: =================================
+//= Not really sure where this belongs, feel free to move
+//= it to wherever suits the script better ^^; [Celest]
+//= 1.3 Removed warps dupes from other files.
+//= disabled direct warp to airplane [Lupus]
+//= 1.4 added some warps as recomended by Justin84 [Skotlex]
+//= (those commented are direct warps into the airplanes, left here
+//= temporarily since the NPC isn't quite there yet)
+//= 1.5 Uncomented the airplane warps and remove two unnecessary ones [MasterOfMuppets]
+//= 1.6 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious]
+//= 1.61 Corrected the first einbroch warp [Zephiris]
+//= 1.7 Corrected Juno's Aiport entrance locations. [Musashiden]
+//============================================================
+
+//==========================================================================
+//Einbroch - Airport
+//==========================================================================
+einbroch,92,281,0	warp	ein_ap01	1,1,airplane,224,64
+einbroch,64,234,0	warp	ein_ap02	1,1,airport,138,51
+airport,142,61,0	warp	ein_ap02a	1,1,einbroch,62,246
+airport,124,13,0	warp	ein_ap03	1,1,airport,19,21
+airport,19,18,0	warp	ein_ap03a	1,1,airport,122,16
+airport,161,13,0	warp	ein_ap04	1,1,airport,47,21
+airport,47,18,0	warp	ein_ap04a	1,1,airport,163,16
+airport,143,14,0	warp	ein_ap05	1,1,einbroch,64,204
+einbroch,64,207,0	warp	ein_ap05a	1,1,airport,143,17
+
+
+// -Lighthalzen Airport-
+lhz_airport,125,14,0	warp	lairp1	1,1,lhz_airport,19,20
+lhz_airport,19,18,0	warp	lairp1a	1,1,lhz_airport,123,14
+lhz_airport,160,14,0	warp	lairp2	1,1,lhz_airport,48,20
+lhz_airport,48,18,0	warp	lairp2a	1,1,lhz_airport,162,14
+lighthalzen,267,76,0	warp	lairp3	1,1,lhz_airport,143,15
+lhz_airport,143,13,0	warp	lairp3a	1,1,lighthalzen,265,76
+lhz_airport,142,60,0	warp	lairp4	1,1,lighthalzen,296,76
+lighthalzen,294,76,0	warp	lairp4a	1,1,lhz_airport,143,53
+lighthalzen,308,76,0	warp	lairp5	1,1,airplane,224,58
+
+
+// -Juno Airport-
+y_airport,125,14,0	warp	jairp1	1,1,y_airport,19,20
+y_airport,19,18,0	warp	jairp1a	1,1,y_airport,123,14
+y_airport,160,14,0	warp	jairp2	1,1,y_airport,48,20
+y_airport,48,18,0	warp	jairp2a	1,1,y_airport,162,14
+yuno,53,214,0	warp	jairp3	1,1,y_airport,143,23
+y_airport,143,16,0	warp	jairp3a	1,1,yuno,52,207
+yuno,47,240,0	warp	jairp4a	1,1,y_airport,143,54
+yuno,59,240,0	warp	jairp5a	1,1,y_airport,143,54
+yuno,6,261,0	warp	jairp6	1,1,airplane_01,244,58
+yuno,96,261,0	warp	jairp7	1,1,airplane,244,58
+
+
+//=========================================================================
+//Airplane
+//=========================================================================
+airplane,254,54,0	warp	air_1wp01	1,1,airplane,91,67
+airplane,87,67,0	warp	air_1wp01a	1,1,airplane,250,54
+airplane,208,53,0	warp	air_1wp02	1,1,airplane,239,160
+airplane,245,160,0	warp	air_1wp02a	1,1,airplane,214,54
+
+airplane_01,254,54,0	warp	air_2wp01	1,1,airplane_01,91,67
+airplane_01,87,67,0	warp	air_2wp01a	1,1,airplane_01,250,54
+airplane_01,208,53,0	warp	air_2wp02	1,1,airplane_01,239,160
+airplane_01,245,160,0	warp	air_2wp02a	1,1,airplane_01,214,54
+airplane_01,104,199,0	warp	air_2wp03	1,1,airplane_01,105,72
+airplane_01,103,72,0	warp	air_2wp03a	1,1,airplane_01,102,199
+airplane_01,104,176,0	warp	air_2wp04	1,1,airplane_01,105,52
+airplane_01,103,52,0	warp	air_2wp04a	1,1,airplane_01,102,176
diff --git a/npc/warps/other/bossnia.txt b/npc/warps/other/bossnia.txt
new file mode 100644
index 000000000..28cfda019
--- /dev/null
+++ b/npc/warps/other/bossnia.txt
@@ -0,0 +1,18 @@
+//===== rAthena Script =======================================
+//= Bossnia Warps
+//===== By: ==================================================
+//= Masao
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any rAthena Version
+//===== Description: =========================================
+//= Back Warp Points related to the Bossnia event.
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+bossnia_01,204,204,0	warp	bossnia01	1,1,prontera,155,180
+bossnia_02,204,204,0	warp	bossnia02	1,1,prontera,155,180
+bossnia_03,204,204,0	warp	bossnia03	1,1,prontera,155,180
+bossnia_04,204,204,0	warp	bossnia04	1,1,prontera,155,180
diff --git a/npc/warps/other/god.txt b/npc/warps/other/god.txt
new file mode 100644
index 000000000..f649b7e57
--- /dev/null
+++ b/npc/warps/other/god.txt
@@ -0,0 +1,21 @@
+//===== rAthena Script =======================================
+//= God Seal Quest Warps
+//===== By: ==================================================
+//= MasterOfMuppets && SinSloth
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//=
+//===== Description: =========================================
+//= Warp Points related to the God Seal Quest.
+//===== Additional Comments: =================================
+//= 1.0 Added some warps of the Sleipnir part [SinSloth]
+//============================================================
+
+yuno,218,180,0	warp	yuno_god01	1,1,que_god01,99,84
+que_god01,99,81,0	warp	god01_yuno	1,1,yuno,218,177
+que_god01,63,88,0	warp	god_sl_w0-1	1,1,que_god01,87,92
+que_god01,62,116,0	warp	god_sl_w1-1	1,1,que_god01,46,94
+que_god01,12,116,0	warp	god_sl_w2-1	1,1,que_god01,16,94
+que_god01,12,55,0	warp	god_sl_w3-1	1,1,que_god01,17,83
+que_god01,50,55,0	warp	god_sl_w4-1	1,1,que_god01,47,83
diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt
new file mode 100644
index 000000000..76df1b28f
--- /dev/null
+++ b/npc/warps/other/kiel.txt
@@ -0,0 +1,101 @@
+//===== rAthena Script =======================================
+//= Kiel Warp Script (Kiel Buildings)
+//===== By: ==================================================
+//= Playtester; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.6
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for all Kiel Buildings
+//===== Additional Comments: =================================
+//= 1.0 Added Kiel warps thanks to Celestria [Playtester]
+//= 1.1 Added more warps thanks to Celestria [Playtester]
+//= 1.2 Added warps according to Kiel quest [Playtester]
+//= 1.3 Removed and altered exploitable warps for Kiel Hyre Quest. [L0ne_W0lf]
+//= 1.4 Removed FIELD entrance into Kiel Hyre's Villa. [L0ne_W0lf]
+//= 1.5 Rewrite of the warps. No more exploits/bugs should be present after this. [L0ne_W0lf]
+//= 1.6 Thanks Tsuyuki for pointing out that bug! Bah! [L0ne_W0lf]
+//============================================================
+
+//============================================================
+// Kiel Hyre Academy (kh_school)
+//============================================================
+kh_school,76,156,0	warp	kh_school_01	1,1,yuno_fild08,155,189
+kh_school,30,125,0	warp	kh_school_02a	1,1,kh_school,67,14
+kh_school,71,14,0	warp	kh_school_02b	1,1,kh_school,36,125
+kh_school,35,133,0	warp	kh_school_03a	1,1,kh_school,148,16
+kh_school,153,16,0	warp	kh_school_03b	1,1,kh_school,39,136
+kh_school,30,155,0	warp	kh_school_04a	1,1,kh_school,182,116
+kh_school,186,117,0	warp	kh_school_04b	1,1,kh_school,35,155
+kh_school,35,176,0	warp	kh_school_05a	1,1,kh_school,148,56
+kh_school,153,56,0	warp	kh_school_05b	1,1,kh_school,40,176
+kh_school,30,185,0	warp	kh_school_06a	1,1,kh_school,67,74
+kh_school,71,74,0	warp	kh_school_06b	1,1,kh_school,35,184
+
+//============================================================
+// Kiel Hyre's Cottage (kh_vila)
+//============================================================
+kh_vila,79,11,0	warp	kh_vila_01	1,1,yuno_fild02,92,208
+kh_vila,71,38,0	warp	kh_vila_02a	1,1,kh_vila,42,38
+kh_vila,46,38,0	warp	kh_vila_02b	1,1,kh_vila,75,38
+kh_vila,71,54,0	warp	kh_vila_03a	1,1,kh_vila,42,54
+kh_vila,46,54,0	warp	kh_vila_03b	1,1,kh_vila,75,54
+kh_vila,34,66,0	warp	kh_vila_04a	1,1,kh_vila,20,108
+kh_vila,20,103,0	warp	kh_vila_04b	1,1,kh_vila,34,61
+kh_vila,84,66,0	warp	kh_vila_05a	1,1,kh_vila,44,107
+kh_vila,44,103,0	warp	kh_vila_05b	1,1,kh_vila,84,62
+kh_vila,32,128,0	warp	kh_vila_06a	1,1,kh_vila,23,171
+kh_vila,22,167,0	warp	kh_vila_06b	1,1,kh_vila,32,123
+kh_vila,90,47,0	warp	kh_vila_07a	1,1,kh_vila,119,47
+kh_vila,115,47,0	warp	kh_vila_07b	1,1,kh_vila,85,47
+kh_vila,126,75,0	warp	kh_vila_08a	1,1,kh_vila,180,176
+kh_vila,180,171,0	warp	kh_vila_08b	1,1,kh_vila,126,70
+kh_vila,175,71,0	warp	kh_vila_09	1,1,kh_vila,136,64
+kh_vila,191,19,0	warp	kh_vila_10	1,1,yuno_fild02,74,215
+
+//============================================================
+// Kiel Hyre's Mansion (kh_mansion)
+//============================================================
+lighthalzen,188,204,0	warp	kh_mansion_01a	1,1,kh_mansion,84,49
+kh_mansion,88,50,0	warp	kh_mansion_01b	1,1,lighthalzen,188,199
+kh_mansion,21,11,0	warp	kh_mansion_02	1,1,kh_mansion,72,49
+
+//============================================================
+// Abandoned Rosimir Mansion (kh_rossi)
+//============================================================
+kh_rossi,15,92,0	warp	kh_rossi_01	1,1,yuno,270,139
+kh_rossi,35,87,0	warp	kh_rossi_02a	1,1,kh_rossi,27,37
+kh_rossi,27,42,0	warp	kh_rossi_02b	1,1,kh_rossi,35,91
+kh_rossi,63,87,0	warp	kh_rossi_03a	1,1,kh_rossi,99,38
+kh_rossi,99,42,0	warp	kh_rossi_03b	1,1,kh_rossi,63,91
+kh_rossi,90,87,0	warp	kh_rossi_04a	1,1,kh_rossi,168,30
+kh_rossi,168,34,0	warp	kh_rossi_04b	1,1,kh_rossi,90,90
+kh_rossi,35,98,0	warp	kh_rossi_05a	1,1,kh_rossi,27,147
+kh_rossi,27,143,0	warp	kh_rossi_01b	1,1,kh_rossi,35,94
+kh_rossi,90,101,0	warp	kh_rossi_06a	1,1,kh_rossi,282,64
+kh_rossi,42,26,0	warp	kh_rossi_06b	1,1,kh_rossi,92,25
+kh_rossi,87,25,0	warp	kh_rossi_07a	1,1,kh_rossi,36,26
+kh_rossi,282,60,0	warp	kh_rossi_07b	1,1,kh_rossi,90,96
+kh_rossi,222,68,0	warp	kh_rossi_08a	1,1,kh_rossi,22,277
+kh_rossi,22,273,0	warp	kh_rossi_08b	1,1,kh_rossi,222,64
+kh_rossi,248,68,0	warp	kh_rossi_09a	1,1,kh_rossi,88,277
+kh_rossi,88,273,0	warp	kh_rossi_09b	1,1,kh_rossi,248,64
+kh_rossi,222,25,0	warp	kh_rossi_10a	1,1,kh_rossi,22,219
+kh_rossi,22,222,0	warp	kh_rossi_10b	1,1,kh_rossi,222,29
+kh_rossi,248,25,0	warp	kh_rossi_11a	1,1,kh_rossi,88,217
+kh_rossi,88,222,0	warp	kh_rossi_11b	1,1,kh_rossi,248,29
+kh_rossi,259,46,0	warp	kh_rossi_12a	1,1,kh_rossi,224,234
+kh_rossi,228,234,0	warp	kh_rossi_12b	1,1,kh_rossi,263,46
+kh_rossi,220,231,0	warp	kh_rossi_13a	1,1,kh_rossi,260,186
+kh_rossi,260,190,0	warp	kh_rossi_13b	1,1,kh_rossi,220,234
+kh_rossi,204,231,0	warp	kh_rossi_14a	1,1,kh_rossi,204,186
+kh_rossi,204,190,0	warp	kh_rossi_14b	1,1,kh_rossi,204,234
+kh_rossi,188,231,0	warp	kh_rossi_15a	1,1,kh_rossi,148,186
+kh_rossi,148,190,0	warp	kh_rossi_15b	1,1,kh_rossi,188,234
+kh_rossi,188,238,0	warp	kh_rossi_16a	1,1,kh_rossi,148,283
+kh_rossi,148,279,0	warp	kh_rossi_16b	1,1,kh_rossi,188,235
+kh_rossi,204,238,0	warp	kh_rossi_17a	1,1,kh_rossi,204,283
+kh_rossi,204,279,0	warp	kh_rossi_17b	1,1,kh_rossi,204,235
+kh_rossi,220,238,0	warp	kh_rossi_18a	1,1,kh_rossi,261,283
+kh_rossi,260,279,0	warp	kh_rossi_18b	1,1,kh_rossi,220,235