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

8 files changed, 3 insertions, 285 deletions

diff --git a/npc/pre-re/warps/other/airplane.txt b/npc/pre-re/warps/other/airplane.txt
deleted file mode 100644
index 83afc6893..000000000
--- a/npc/pre-re/warps/other/airplane.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-//===== 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/pre-re/warps/other/bossnia.txt b/npc/pre-re/warps/other/bossnia.txt
deleted file mode 100644
index 28cfda019..000000000
--- a/npc/pre-re/warps/other/bossnia.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-//===== 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/pre-re/warps/other/god.txt b/npc/pre-re/warps/other/god.txt
deleted file mode 100644
index f649b7e57..000000000
--- a/npc/pre-re/warps/other/god.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-//===== 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/pre-re/warps/other/jobquests.txt b/npc/pre-re/warps/other/jobquests.txt
index fc922f819..5b1b5c227 100644
--- a/npc/pre-re/warps/other/jobquests.txt
+++ b/npc/pre-re/warps/other/jobquests.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 2.1
+//= 2.0
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Version Ep4+
 //===== Description: =========================================
@@ -23,7 +23,6 @@
 //= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.9 Added Gungslinger and Ninja warps. [L0ne_W0lf]
 //= 2.0 Updated Novice warps to use correct maps. [L0ne_W0lf]
-//= 2.1 Added one Shadow Chaser job warp. [Euphy]
 //============================================================
 
 
@@ -124,8 +123,3 @@ que_ng,10,183,0	warp	ninja03	1,1,que_ng,33,64
 que_ng,37,64,0	warp	ninja04	1,1,que_ng,15,182
 que_ng,30,37,0	warp	ninja05	1,1,que_ng,67,28
 que_ng,63,30,0	warp	ninja06	1,1,que_ng,25,37
-
-//==============================================================================
-//Shadow Chaser
-//==============================================================================
-job3_sha01,71,19,0	warp	shadowc1	1,1,tha_t01,149,224
\ No newline at end of file
diff --git a/npc/pre-re/warps/other/kiel.txt b/npc/pre-re/warps/other/kiel.txt
deleted file mode 100644
index 76df1b28f..000000000
--- a/npc/pre-re/warps/other/kiel.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-//===== 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
diff --git a/npc/pre-re/warps/other/paradise.txt b/npc/pre-re/warps/other/paradise.txt
deleted file mode 100644
index fec766ec4..000000000
--- a/npc/pre-re/warps/other/paradise.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-//===== rAthena Script =======================================
-//= Paradise Group Warp Script
-//===== By: ==================================================
-//= Chilly
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN;
-//===== Description: =========================================
-//= Warp Points for Paradise Group
-//===== Additional Comments: =================================
-//= 1.0 First Release
-//============================================================
-
-moc_para01,57,27,0	warp	#warp_2_pub	1,1,moc_para01,162,26
-moc_para01,158,26,0	warp	#warp_2_din_1	1,1,moc_para01,55,27
-moc_para01,48,16,0	warp	#warp_2_2f	1,1,moc_para01,48,164
-moc_para01,47,161,0	warp	#warp_2_1f	1,1,moc_para01,47,18
-moc_para01,107,12,0	warp	#warp_2_din_2	1,1,moc_para01,47,37
-moc_para01,100,27,0	warp	#warp_2_gym	1,1,moc_para01,47,85
-moc_para01,49,86,0	warp	#warp_2_pass_1	1,1,moc_para01,103,27
-moc_para01,113,32,0	warp	#warp_2_ware	1,1,moc_para01,105,92
-moc_para01,102,92,0	warp	#warp_2_pass_2	1,1,moc_para01,109,33
-moc_para01,41,187,0	warp	#warp_2_room2	1,1,moc_para01,179,93
-moc_para01,179,90,0	warp	#warp_2_2fhall_3	1,1,moc_para01,41,185
diff --git a/npc/pre-re/warps/other/s_workshop.txt b/npc/pre-re/warps/other/s_workshop.txt
deleted file mode 100644
index 884d77202..000000000
--- a/npc/pre-re/warps/other/s_workshop.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-//===== rAthena Script =======================================
-//= Shadow Workshop Warp Script
-//===== By: ==================================================
-//= Chilly
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
-//= Warp Points for Shadow Workshop
-//===== Additional Comments: =================================
-//= 1.0 First Release
-//= 1.1 Added warps for Shadow Chaser job quest. [Euphy]
-//============================================================
-
-rachel,180,115,0	warp	s_atelier0001	1,1,s_atelier,131,72
-s_atelier,131,75,0	warp	s_atelier0002	1,1,rachel,180,118
-s_atelier,117,71,0	warp	s_atelier0003	1,1,s_atelier,169,72
-s_atelier,166,72,0	warp	s_atelier0004	1,1,s_atelier,117,68
-prontera,272,108,0	warp	s_atelier0005	1,1,s_atelier,13,119
-s_atelier,9,119,0	warp	s_atelier0006	1,1,prontera,269,108
-s_atelier,31,128,0	warp	s_atelier0007	1,1,s_atelier,76,125
-s_atelier,76,128,0	warp	s_atelier0008	1,1,s_atelier,28,128
-s_atelier,19,79,0	warp	s_atelier0009	1,1,lighthalzen,41,58
-lighthalzen,41,52,0	warp	s_atelier0010	1,1,s_atelier,18,72
-s_atelier,32,65,0	warp	s_atelier0011	1,1,s_atelier,80,59
-s_atelier,80,66,0	warp	s_atelier0012	1,1,s_atelier,32,56
-s_atelier,109,129,0	warp	s_atelier0013	1,1,s_atelier,159,125
-s_atelier,160,130,0	warp	s_atelier0014	1,1,s_atelier,114,129
-yuno,278,66,0	warp	s_atelier0015	1,1,s_atelier,111,122
-s_atelier,107,122,0	warp	s_atelier0016	1,1,yuno,274,66
\ No newline at end of file
diff --git a/npc/pre-re/warps/other/sign.txt b/npc/pre-re/warps/other/sign.txt
index b4e3d370c..5a18a99e8 100644
--- a/npc/pre-re/warps/other/sign.txt
+++ b/npc/pre-re/warps/other/sign.txt
@@ -12,7 +12,6 @@
 //= 1.0 A few warps.  [MasterOfMuppets]
 //= 1.1 A few more warps. [MasterOfMuppets]
 //= 1.2 Completed the warps [MasterOfMuppets]
-//= 1.3 Added Renewal Changes. [Kisuka]
 //= 1.3 Correct AEGIS Warps. [Kisuka]
 //============================================================
 
@@ -29,8 +28,8 @@ himinn,49,72,0	warp	sign04a	1,1,himinn,49,63
 um_in,33,18,0	warp	sign05	1,1,um_in,89,11
 um_in,89,9,0	warp	sign05a	1,1,um_in,33,16
 
-umbala,107,118,0	warp	sign06	1,1,um_in,15,20
-um_in,11,18,0	warp	sign06a	1,1,umbala,111,121
+um_dun01,132,91,0	warp	sign06	1,1,um_in,15,20
+um_in,11,18,0	warp	sign06a	1,1,um_dun01,129,90
 
 que_sign01,113,132,0	warp	sign07	1,1,nif_in,117,173