AS OF SVN REV. 5901, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.

IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS


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

3 files changed, 254 insertions, 0 deletions

diff --git a/npc/warps/other/airplane.txt b/npc/warps/other/airplane.txt
new file mode 100644
index 000000000..debd08afc
--- /dev/null
+++ b/npc/warps/other/airplane.txt
@@ -0,0 +1,74 @@
+//===== Athena Script ========================================

+//= Airports & Airplanes Warp Script

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

+//= Sara-chan (1.0), SSUNNY@YOUNG(1.6)

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

+//= 1.61

+//===== 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]

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

+

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

+//Einbroch - Airport

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

+einbroch.gat,92,280,0	warp	ein_ap01	1,1,airplane.gat,224,64

+einbroch.gat,64,234,0	warp	ein_ap02	1,1,airport.gat,138,51

+airport.gat,142,61,0	warp	ein_ap02a	1,1,einbroch.gat,62,246

+airport.gat,124,13,0	warp	ein_ap03	1,1,airport.gat,19,21

+airport.gat,19,18,0	warp	ein_ap03a	1,1,airport.gat,122,16

+airport.gat,161,13,0	warp	ein_ap04	1,1,airport.gat,47,21

+airport.gat,47,18,0	warp	ein_ap04a	1,1,airport.gat,163,16

+airport.gat,143,14,0	warp	ein_ap05	1,1,einbroch.gat,64,204

+einbroch.gat,64,207,0	warp	ein_ap05a	1,1,airport.gat,143,17

+

+

+// -Lighthalzen Airport-

+lhz_airport.gat,125,14,0	warp	lairp1	1,1,lhz_airport.gat,19,20

+lhz_airport.gat,19,18,0	warp	lairp1a	1,1,lhz_airport.gat,123,14

+lhz_airport.gat,160,14,0	warp	lairp2	1,1,lhz_airport.gat,48,20

+lhz_airport.gat,48,18,0	warp	lairp2a	1,1,lhz_airport.gat,162,14

+lighthalzen.gat,267,76,0	warp	lairp3	1,1,lhz_airport.gat,143,15

+lhz_airport.gat,143,13,0	warp	lairp3a	1,1,lighthalzen.gat,265,76

+lhz_airport.gat,143,63,0	warp	lairp4	1,1,lighthalzen.gat,296,76

+lighthalzen.gat,294,76,0	warp	lairp4a	1,1,lhz_airport.gat,143,60

+lighthalzen.gat,308,76,0	warp	lairp5	1,1,airplane.gat,224,64

+

+

+// -Juno Airport-

+y_airport.gat,125,14,0	warp	jairp1	1,1,y_airport.gat,19,20

+y_airport.gat,19,18,0	warp	jairp1a	1,1,y_airport.gat,123,14

+y_airport.gat,160,14,0	warp	jairp2	1,1,y_airport.gat,48,20

+y_airport.gat,48,18,0	warp	jairp2a	1,1,y_airport.gat,162,14

+yuno.gat,54,217,0	warp	jairp3	1,1,y_airport.gat,143,15

+y_airport.gat,143,13,0	warp	jairp3a	1,1,yuno.gat,54,215

+yuno.gat,52,238,0	warp	jairp4a	1,1,y_airport.gat,143,60

+yuno.gat,55,238,0	warp	jairp5a	1,1,y_airport.gat,143,60

+yuno.gat,8,261,0	warp	jairp6	1,1,airplane_01.gat,224,64

+yuno.gat,97,260,0	warp	jairp7	1,1,airplane.gat,224,64

+

+

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

+//Airplane

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

+airplane.gat,254,54,0	warp	air_1wp01	1,1,airplane.gat,91,67

+airplane.gat,87,67,0	warp	air_1wp01a	1,1,airplane.gat,250,54

+airplane.gat,208,53,0	warp	air_1wp02	1,1,airplane.gat,239,160

+airplane.gat,245,160,0	warp	air_1wp02a	1,1,airplane.gat,214,54

+

+airplane_01.gat,254,54,0	warp	air_2wp01	1,1,airplane_01.gat,91,67

+airplane_01.gat,87,67,0	warp	air_2wp01a	1,1,airplane_01.gat,250,54

+airplane_01.gat,208,53,0	warp	air_2wp02	1,1,airplane_01.gat,239,160

+airplane_01.gat,245,160,0	warp	air_2wp02a	1,1,airplane_01.gat,214,54
\ No newline at end of file
diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt
new file mode 100644
index 000000000..734a87a99
--- /dev/null
+++ b/npc/warps/other/jobquests.txt
@@ -0,0 +1,145 @@
+//===== Athena Script ========================================

+//= Job Quest Warp Script

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

+//= Athena (1.0)

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

+//= 1.3b

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

+//= Any Athena Version; RO Version Ep4+

+//===== Description: =========================================

+//= Warp Points for Job Quest Maps

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

+//= Split off npc_warp.txt

+//= Commented some warps because new Job quests have correct

+//= ones! Added missing warps for Thief/Hunter/Swordman [Lupus]

+//= 1.3 Added missing warps Swordman [Lupus]

+//= Reorganized.  Added complete rogue quest warps.

+//= Removed unused, duplicate warps. [kobra_k88]

+//= 1.3b activated Dancer JQ warp [Lupus]

+//= 1.4 Imported damn noobie warps from jAthena (because it's broken since last year)

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

+

+

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

+//Novice

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

+//new_1-1.gat,148,112,0	warp	new11	2,3,new_1-2.gat,100,9

+//new_1-1.gat,166,112,0	warp	new12	2,2,new_1-2.gat,100,153

+//new_1-2.gat,100,150,0	warp	new12-1	2,1,new_1-1.gat,162,112

+//new_1-1.gat,169,75,0	warp	new13	2,2,new_1-2.gat,182,163

+//new_1-2.gat,182,159,0	warp	new13-1	2,2,new_1-1.gat,165,75

+//new_1-1.gat,169,147,0	warp	new14	2,2,new_1-2.gat,18,163

+//new_1-2.gat,18,159,0	warp	new14-1	2,2,new_1-1.gat,165,147

+//new_1-2.gat,100,122,0	warp	new15	2,1,new_1-2.gat,100,162

+//new_1-2.gat,100,165,0	warp	new15-1	2,1,new_1-2.gat,100,119

+//new_1-2.gat,126,106,0	warp	new16	2,4,new_1-2.gat,160,171

+//new_1-2.gat,153,171,0	warp	new16-1	2,4,new_1-2.gat,123,106

+new_1-1.gat,148,112,0		warp	newwarp6001		2,2,new_1-2.gat,100,9

+new_1-2.gat,100,6,0 		warp	newwarp6002		2,2,new_1-1.gat,144,112

+new_1-2.gat,126,106,0		warp	newwarp6003		2,2,new_1-2.gat,160,171

+new_1-2.gat,156,171,0		warp	newwarp6004		2,2,new_1-2.gat,123,106

+new_1-2.gat,73,106,0		warp	newwarp6005		2,2,new_1-2.gat,41,172

+new_1-2.gat,46,172,0		warp	newwarp6006		2,2,new_1-2.gat,78,106

+new_1-3.gat,96,175,0	warp	new17	3,2,new_1-4.gat,100,14

+

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

+//Swordman

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

+sword_1-1.gat,192,244,0	warp	SwordWarp0	2,2,sword_1-1.gat,215,244

+sword_1-1.gat,223,243,0	warp	SwordWarp1	2,2,sword_1-1.gat,12,206

+sword_1-1.gat,192,206,0	warp	SwordWarp2	2,2,sword_1-1.gat,215,205

+sword_1-1.gat,223,205,0	warp	SwordWarp3	2,2,sword_1-1.gat,12,168

+sword_1-1.gat,192,168,0	warp	SwordWarp4	2,2,sword_1-1.gat,215,167

+sword_2-1.gat,65,117,0	warp	swd201	1,1,sword_2-1.gat,10,245

+sword_2-1.gat,98,27,0	warp	swd202	1,1,sword_2-1.gat,11,207

+sword_2-1.gat,161,27,0	warp	swd203	1,1,sword_2-1.gat,11,207

+sword_2-1.gat,223,205,0	warp	swd204	1,1,sword_2-1.gat,11,168

+sword_2-1.gat,223,243,0	warp	swd205	1,1,sword_2-1.gat,11,206

+sword_2-1.gat,239,117,0	warp	swd206	1,1,sword_2-1.gat,11,169

+sword_3-1.gat,65,117,0	warp	swd301	1,1,sword_3-1.gat,10,245

+sword_3-1.gat,98,27,0	warp	swd302	1,1,sword_3-1.gat,11,207

+sword_3-1.gat,161,27,0	warp	swd303	1,1,sword_3-1.gat,11,207

+sword_3-1.gat,223,205,0	warp	swd304	1,1,sword_3-1.gat,11,168

+sword_3-1.gat,223,243,0	warp	swd305	1,1,sword_3-1.gat,11,206

+sword_3-1.gat,239,117,0	warp	swd306	1,1,sword_3-1.gat,11,169

+// Underground cave

+sword_1-1.gat,65,117,0	warp	swd101	1,1,sword_1-1.gat,10,245

+sword_1-1.gat,98,27,0	warp	swd102	1,1,sword_1-1.gat,11,207

+sword_1-1.gat,161,27,0	warp	swd103	1,1,sword_1-1.gat,11,207

+sword_1-1.gat,239,117,0	warp	swd106	1,1,sword_1-1.gat,11,169

+

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

+//Thief

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

+job_thief1.gat,180,15,0	warp	jthf	7,1,moc_ruins.gat,145,117

+

+

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

+// Assassin

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

+in_moc_16.gat,18,8,0	warp	guild_to_16	2,2,moc_fild16.gat,205,291

+moc_fild16.gat,205,296,0	warp	16_to_guild	2,2,in_moc_16.gat,18,11

+

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

+// Hunter

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

+in_hunter.gat,100,15,0	warp 	jhun01	0,0,pay_fild10.gat,143,250

+

+

+

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

+// Monk (St. Capitolina Abbey)

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

+prt_monk.gat,192,172,0	warp	monk15	1,1,monk_test.gat,329,50

+monk_test.gat,329,47,0	warp	monk16	1,1,prt_monk.gat,193,166

+monk_test.gat,329,76,0	warp	monk17	1,1,monk_test.gat,259,118

+monk_test.gat,259,115,0	warp	monk18	1,1,monk_test.gat,329,71

+monk_test.gat,272,125,0	warp	monk19	1,1,monk_test.gat,301,127

+monk_test.gat,298,127,0	warp	monk20	1,1,monk_test.gat,268,125

+

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

+//Alchemist

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

+//Town - Alchemist , Alchemist - Town

+aldebaran.gat,54,66,0	warp	alche01	1,1,alde_alche.gat,41,174

+alde_alche.gat,41,171,0	warp	alche02	1,1,aldebaran.gat,56,68

+//Alchemist Hall 1st Floor Top Rooms

+alde_alche.gat,129,104,0	warp	alche03	1,1,alde_alche.gat,163,163

+alde_alche.gat,159,163,0	warp	alche04	1,1,alde_alche.gat,126,104

+alde_alche.gat,131,77,0	warp	alche05	1,1,alde_alche.gat,162,107

+alde_alche.gat,159,107,0	warp	alche06	1,1,alde_alche.gat,128,77

+//Alchemist Hall 1st Floor Bottom Rooms

+alde_alche.gat,47,103,0	warp	alche07	1,1,alde_alche.gat,88,18

+alde_alche.gat,92,18,0	warp	alche08	1,1,alde_alche.gat,50,103

+alde_alche.gat,47,77,0	warp	alche09	1,1,alde_alche.gat,155,18

+alde_alche.gat,159,18,0	warp	alche10	1,1,alde_alche.gat,50,77

+//Alchemist Hall 2nd Floor - 1st Floor Link

+alde_alche.gat,14,184,0	warp	alche11	1,1,alde_alche.gat,88,113

+alde_alche.gat,88,117,0	warp	alche12	1,1,alde_alche.gat,14,180

+//Alchemist Hall 2nd Floor Rooms

+alde_alche.gat,19,171,0	warp	alche13	1,1,aldebaran.gat,68,56

+aldebaran.gat,66,54,0	warp	alche14	1,1,alde_alche.gat,19,175

+alde_alche.gat,18,28,0	warp	alche15	1,1,alde_alche.gat,89,66

+alde_alche.gat,89,63,0	warp	alche16	1,1,alde_alche.gat,18,24

+//Alchemist Hall 3rd Floor

+alde_alche.gat,41,187,0	warp	alche17	1,1,alde_alche.gat,114,178

+alde_alche.gat,114,182,0	warp	alche18	1,1,alde_alche.gat,41,183

+

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

+//Rogue

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

+cmd_fild07.gat,193,117,0	warp	fild07-rogue00	1,1,in_rogue.gat,378,46

+in_rogue.gat,375,46,0	warp	rogue00-fild07	1,1,cmd_fild07.gat,195,116

+in_rogue.gat,376,34,0	warp	rogue01-02	1,1,in_rogue.gat,378,125

+in_rogue.gat,375,125,0	warp	rogue02-01	1,1,in_rogue.gat,379,34

+cmd_fild07.gat,352,275,0	warp	fild07-rogue03	1,1,in_rogue.gat,265,122

+in_rogue.gat,265,118,0	warp	rogue03-fild07	1,1,cmd_fild07.gat,349,275

+in_rogue.gat,244,20,0	warp	rogue04-fild09	1,1,cmd_fild09.gat,106,192

+in_rogue.gat,172,34,0	warp	rogue05-fild09	1,1,cmd_fild09.gat,339,143

+in_rogue.gat,160,103,0	warp	rogue06-fild04	1,1,cmd_fild04.gat,301,177

+

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

+//Dancer

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

+//job_duncer.gat,69,43,0	warp 	duncer1	1,1,comodo.gat,185,156

+job_duncer.gat,70,45,0	warp	duncer1	2,2,comodo.gat,193,149

diff --git a/npc/warps/other/other.txt b/npc/warps/other/other.txt
new file mode 100644
index 000000000..f3e208b88
--- /dev/null
+++ b/npc/warps/other/other.txt
@@ -0,0 +1,35 @@
+//===== Athena Script ========================================

+//= Other Warp Script

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

+//= Athena (1.0)

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

+//= 1.0

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

+//= Any Athena Version;

+//===== Description: =========================================

+//= Warp Points for Other Maps

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

+//= Split off npc_warp.txt

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

+

+//guild_room.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs1.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs1.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs1.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs1.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs2.gat,50,88,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs2.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs2.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs2.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs3.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs3.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs3.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs3.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs4.gat,7,50,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs4.gat,50,7,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs4.gat,92,50,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs4.gat,50,92,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs5.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs5.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs5.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0

+//guild_vs5.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
\ No newline at end of file