From e3afdc2af4c5e50c79237ee092e25f39b7428e47 Mon Sep 17 00:00:00 2001 From: Michieru Date: Thu, 24 Oct 2013 12:10:43 +0200 Subject: Update to last rAthena npc. Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt --- npc/re/warps/cities/brasilis.txt | 2 +- npc/re/warps/cities/dewata.txt | 2 - npc/re/warps/cities/dicastes.txt | 4 +- npc/re/warps/cities/eclage.txt | 7 +- npc/re/warps/cities/izlude.txt | 95 +++++++++++++++++++------ npc/re/warps/cities/malangdo.txt | 2 - npc/re/warps/cities/malaya.txt | 146 +++++++++++++++++++++++++------------- npc/re/warps/cities/rachel.txt | 2 - npc/re/warps/cities/yggdrasil.txt | 2 - 9 files changed, 172 insertions(+), 90 deletions(-) (limited to 'npc/re/warps/cities') diff --git a/npc/re/warps/cities/brasilis.txt b/npc/re/warps/cities/brasilis.txt index e5e8a5386..289ab235d 100644 --- a/npc/re/warps/cities/brasilis.txt +++ b/npc/re/warps/cities/brasilis.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 1.2 //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Brasilis //===== Additional Comments: ================================= //= 1.0 First version. diff --git a/npc/re/warps/cities/dewata.txt b/npc/re/warps/cities/dewata.txt index 602e40fb4..c134df537 100644 --- a/npc/re/warps/cities/dewata.txt +++ b/npc/re/warps/cities/dewata.txt @@ -4,8 +4,6 @@ //= Chilly //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= Warp Points for Dewata //===== Additional Comments: ================================= diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt index 1a59f5241..8d43c8edd 100644 --- a/npc/re/warps/cities/dicastes.txt +++ b/npc/re/warps/cities/dicastes.txt @@ -4,8 +4,6 @@ //= Chilly, Muad_Dib //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= Warp Points for El Dicastes //===== Additional Comments: ================================= @@ -71,4 +69,4 @@ dic_in01,57,48,0 duplicate(Elevator#main) Elevator#9 844 dic_in01,137,46,0 duplicate(Elevator#main) Elevator#10 844 dic_in01,222,46,0 duplicate(Elevator#main) Elevator#11 844 dic_in01,388,272,0 duplicate(Elevator#main) Elevator#12 844 -dic_in01,389,208,0 duplicate(Elevator#main) Elevator#13 844 +dic_in01,389,208,0 duplicate(Elevator#main) Elevator#13 844 \ No newline at end of file diff --git a/npc/re/warps/cities/eclage.txt b/npc/re/warps/cities/eclage.txt index 0400489f5..dd9e1d55e 100644 --- a/npc/re/warps/cities/eclage.txt +++ b/npc/re/warps/cities/eclage.txt @@ -3,19 +3,18 @@ //===== By: ================================================== //= Chilly //===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Hercules +//= 1.0a //===== Description: ========================================= //= Warp Points for Eclage //===== Additional Comments: ================================= //= 1.0 First Version. +//= 1.0a Disabled quest warp. [Euphy] //============================================================ // Town Warps bif_fild02,292,351,0 warp eclage_field0001 1,1,ecl_fild01,205,74 ecl_fild01,207,72,0 warp eclage_field0002 1,1,bif_fild02,294,349 -ecl_fild01,97,320,0 warp eclage_field0003 1,1,eclage,100,28 +//ecl_fild01,97,320,0 warp eclage_field0003 1,1,eclage,100,28 eclage,98,26,0 warp eclage_field0004 1,1,ecl_fild01,97,317 eclage,299,309,0 warp eclage_field0005 1,1,ecl_in01,47,11 ecl_in01,47,8,0 warp eclage_field0006 1,1,eclage,297,307 diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt index fa888c7fb..8bf26e31d 100644 --- a/npc/re/warps/cities/izlude.txt +++ b/npc/re/warps/cities/izlude.txt @@ -3,39 +3,88 @@ //===== By: ================================================== //= Athena (1.0), Nana (1.1) //===== Current Version: ===================================== -//= 1.7 -//===== Compatible With: ===================================== -//= Any Athena & Hercules Version +//= 1.8 //===== Description: ========================================= //= Warp Points for Izlude //===== Additional Comments: ================================= //= 1.3 Added warps to Izlude Airship [Justin84] //= 1.4 Minor correction on airport warps //= 1.5 Updated to match the new Izlude Map. [Masao] -//= 1.6 Added new warps [Streusel] -//= 1.7 Removed indoor warps [Streusel] +//= 1.6 Added new warps. [Streusel] +//= 1.7 Updated to match the official scripts. [Euphy] +//= 1.8 Added Izlude & Prontera Field 8 duplicates. [Euphy] //============================================================ //= Izlude City ============================================== -izlude,109,182,0 warp iz01 3,3,izlude_in,65,87 -izlude,216,162,0 warp iz03 3,2,izlude_in,151,127 -izlude,21,98,0 warp iz001 3,3,prt_fild08,367,212 +prt_fild08,371,212,0 warp prtf005 3,3,izlude,24,98 +izlude,20,98,0 warp iz001 3,3,prt_fild08,367,212 +izlude_in,116,46,0 warp iz02-1 3,2,izlude,128,98 +izlude,110,182,0 warp iz01 2,2,izlude_in,65,87 +izlude_in,65,84,0 warp iz01-1 2,2,izlude,112,179 izlude,52,172,0 warp iz04 2,2,izlude_in,74,161 -izlude,130,257,0 warp iz09#1 2,2,iz_ac01,99,29 -izlude,125,257,0 warp iz09#2 2,2,iz_ac01,99,29 -izlude,213,161,0 warp iz10 2,2,arena_room,100,30 -arena_room,99,24,0 warp iz_arena 2,2,izlude,209,161 +izlude_in,74,158,0 warp iz04-1 3,2,izlude,52,168 +izlude_in,43,169,0 warp w219 2,3,izlude_in,63,169 +izlude_in,87,169,0 warp iz05-1 2,3,izlude_in,111,169 izlude_in,108,169,0 warp iz05 2,3,izlude_in,84,169 -izlude_in,148,127,0 warp iz03-1 2,5,izlude,207,162 +izlude_in,148,127,0 warp iz03-1 2,5,izlude,210,161 +izlude_in,172,139,0 warp iz07 3,2,izlude_in,172,161 +izlude_in,172,158,0 warp iz07-1 3,2,izlude_in,172,136 +izlude_in,172,116,0 warp iz06-1 3,2,izlude_in,172,94 +izlude_in,171,97,0 warp iz06 3,2,izlude_in,172,119 -izlude_in,43,169,0 warp w219 2,3,izlude_in,64,169 -izlude_in,65,84,0 warp iz01-1 5,2,izlude,113,178 -izlude_in,74,158,0 warp iz04-1 3,2,izlude,52,166 -izlude_in,87,169,0 warp iz05-1 2,3,izlude_in,111,169 +//= Izlude & Prontera Field 8 Duplicates ===================== +prt_fild08a,371,212,0 warp prtf005_a 3,3,izlude_a,24,98 +prt_fild08b,371,212,0 warp prtf005_b 3,3,izlude_b,24,98 +prt_fild08c,371,212,0 warp prtf005_c 3,3,izlude_c,24,98 +prt_fild08d,371,212,0 warp prtf005_d 3,3,izlude_d,24,98 +izlude_a,20,98,0 warp iz001_a 3,3,prt_fild08a,367,212 +izlude_b,20,98,0 warp iz001_b 3,3,prt_fild08b,367,212 +izlude_c,20,98,0 warp iz001_c 3,3,prt_fild08c,367,212 +izlude_d,20,98,0 warp iz001_d 3,3,prt_fild08d,367,212 +izlude_a,110,182,0 warp iz01_a 2,2,izlude_in,65,87 +izlude_b,110,182,0 warp iz01_b 2,2,izlude_in,65,87 +izlude_c,110,182,0 warp iz01_c 2,2,izlude_in,65,87 +izlude_d,110,182,0 warp iz01_d 2,2,izlude_in,65,87 +izlude_a,52,172,0 warp iz04_a 2,2,izlude_in,74,161 +izlude_b,52,172,0 warp iz04_b 2,2,izlude_in,74,161 +izlude_c,52,172,0 warp iz04_c 2,2,izlude_in,74,161 +izlude_d,52,172,0 warp iz04_d 2,2,izlude_in,74,161 + +//= Izlude Academy =========================================== +izlude,125,257,0 warp #to_ac01 2,2,iz_ac01,99,29 +izlude,130,257,0 warp #to_ac02 2,2,iz_ac01,99,29 +iz_ac01,100,24,0 warp #to_ac01-1 2,2,izlude,127,253 +iz_ac01,78,25,0 warp #to_ac2f01 2,2,iz_ac02,104,27 +iz_ac01,122,25,0 warp #to_ac2f02 2,2,iz_ac02,104,27 +iz_ac02,94,27,0 warp #to_ac1f01 2,2,iz_ac01,78,28 +iz_ac02,113,27,0 warp #to_ac1f02 2,2,iz_ac01,122,28 -//Izlude Academy -iz_ac01,100,24,0 warp iz_ac01 2,2,izlude,127,253 -iz_ac01,122,25,0 warp iz_ac02 2,2,iz_ac02,104,27 -iz_ac01,78,25,0 warp iz_ac03 2,2,iz_ac02,104,27 -iz_ac02,113,27,0 warp iz_ac04 2,2,iz_ac01,122,28 -iz_ac02,94,27,0 warp iz_ac05 2,2,iz_ac01,78,28 +//= Izlude Academy Duplicates ================================ +izlude_a,125,257,0 warp #to_ac01_a 2,2,iz_ac01_a,99,29 +izlude_b,125,257,0 warp #to_bc01_b 2,2,iz_ac01_b,99,29 +izlude_c,125,257,0 warp #to_cc01_c 2,2,iz_ac01_c,99,29 +izlude_d,125,257,0 warp #to_dc01_d 2,2,iz_ac01_d,99,29 +izlude_a,130,257,0 warp #to_ac02_a 2,2,iz_ac01_a,99,29 +izlude_b,130,257,0 warp #to_bc02_b 2,2,iz_ac01_b,99,29 +izlude_c,130,257,0 warp #to_cc02_c 2,2,iz_ac01_c,99,29 +izlude_d,130,257,0 warp #to_dc02_d 2,2,iz_ac01_d,99,29 +iz_ac01_a,100,24,0 warp #to_ac01-1_a 2,2,izlude_a,127,253 +iz_ac01_b,100,24,0 warp #to_bc01-1_b 2,2,izlude_b,127,253 +iz_ac01_c,100,24,0 warp #to_cc01-1_c 2,2,izlude_c,127,253 +iz_ac01_d,100,24,0 warp #to_dc01-1_d 2,2,izlude_d,127,253 +iz_ac01_a,78,25,0 warp #to_ac2f01_a 2,2,iz_ac02_a,104,27 +iz_ac01_b,78,25,0 warp #to_bc2f01_b 2,2,iz_ac02_b,104,27 +iz_ac01_c,78,25,0 warp #to_cc2f01_c 2,2,iz_ac02_c,104,27 +iz_ac01_d,78,25,0 warp #to_dc2f01_d 2,2,iz_ac02_d,104,27 +iz_ac01_a,122,25,0 warp #to_ac2f02_a 2,2,iz_ac02_a,104,27 +iz_ac01_b,122,25,0 warp #to_bc2f02_b 2,2,iz_ac02_b,104,27 +iz_ac01_c,122,25,0 warp #to_cc2f02_c 2,2,iz_ac02_c,104,27 +iz_ac01_d,122,25,0 warp #to_dc2f02_d 2,2,iz_ac02_d,104,27 +iz_ac02_a,94,27,0 warp #to_ac1f01_a 2,2,iz_ac01_a,78,28 +iz_ac02_b,94,27,0 warp #to_bc1f01_b 2,2,iz_ac01_b,78,28 +iz_ac02_c,94,27,0 warp #to_cc1f01_c 2,2,iz_ac01_c,78,28 +iz_ac02_d,94,27,0 warp #to_dc1f01_d 2,2,iz_ac01_d,78,28 +iz_ac02_a,113,27,0 warp #to_ac1f02_a 2,2,iz_ac01_a,122,28 +iz_ac02_b,113,27,0 warp #to_bc1f02_b 2,2,iz_ac01_b,122,28 +iz_ac02_c,113,27,0 warp #to_cc1f02_c 2,2,iz_ac01_c,122,28 +iz_ac02_d,113,27,0 warp #to_dc1f02_d 2,2,iz_ac01_d,122,28 diff --git a/npc/re/warps/cities/malangdo.txt b/npc/re/warps/cities/malangdo.txt index f2bf50572..501c9e85b 100644 --- a/npc/re/warps/cities/malangdo.txt +++ b/npc/re/warps/cities/malangdo.txt @@ -4,8 +4,6 @@ //= Chilly //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= Warp Points for Malangdo Island //===== Additional Comments: ================================= diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt index 38e67e3e0..b18a1f52d 100644 --- a/npc/re/warps/cities/malaya.txt +++ b/npc/re/warps/cities/malaya.txt @@ -1,36 +1,53 @@ -//===== Hercules Script ====================================== -//= Mayala Port Town Warps -//===== By: ================================================== +//===== Hercules Script ====================================== +//= Port Malaya Warp Script +//===== By: ================================================== //= Chilly -//===== Current Version: ===================================== -//= 1.0a -//===== Compatible With: ===================================== -//= Hercules -//===== Description: ========================================= -//= Warps for Mayala Port Town. -//===== Additional Comments: ================================= -//= 1.0 First Version [Chilly]. -//= 1.0a Updated the file with new / missing warps [Masao]. -//============================================================ +//===== Current Version: ===================================== +//= 1.2 +//===== Description: ========================================= +//= Warp Points for Port Malaya +//===== Additional Comments: ================================= +//= 1.0 First Version. +//= 1.1 Updated to match official scripts. [Masao] +//= 1.2 Added official Jeepney warp scripts. [Euphy] +//============================================================ +// Town Warps +//============================================================ +ma_in01,86,16,0 warp mal_in_ws 1,1,malaya,115,212 +ma_in01,24,77,0 warp mal_in_inn 1,1,malaya,178,208 +malaya,370,277,0 warp malaya_mal_fild01 1,1,ma_fild01,40,272 +ma_fild01,37,272,0 warp mal_fild01_malaya 1,1,malaya,367,277 +ma_in01,33,152,0 warp mal_in_house01 1,1,malaya,52,75 +malaya,309,70,0 warp malaya_ship_mal_in_ship 1,1,ma_in01,108,92 +ma_in01,105,92,0 warp mal_in_ship_malaya_ship 1,1,malaya,310,67 +ma_fild01,266,359,0 warp mafild01_to02 1,1,ma_fild02,248,36 +ma_fild02,248,33,0 warp mafild02_to01 1,1,ma_fild01,266,356 +ma_fild01,288,52,0 warp mafild01_tobknw 1,1,ma_scene01,142,78 +ma_scene01,140,80,0 warp bknw_tofild01 1,1,ma_fild01,288,55 +ma_in01,9,24,0 warp mal_in_ts 1,1,malaya,296,167 +ma_in01,126,17,0 warp mal_in_shop_malaya_shop 1,1,malaya,261,237 +ma_fild01,251,190,0 warp mf_minga_mf_in_minga 1,1,ma_in01,108,160 +ma_in01,105,160,0 warp mf_in_minga_mf_minga 1,1,ma_fild01,248,190 + +// Locked Warps +//============================================================ malaya,178,211,0 script malaya_inn 45,1,1,{ end; - OnTouch: if (malaya_hi < 10) { - mes "Door is closed. It seems keeping its eyes on you."; + mes "Door is closed. It seems to be keeping its eyes on you."; close; - } + } warp "ma_in01",24,80; end; } malaya,112,212,0 script malaya_ws 45,1,1,{ end; - OnTouch: if (malaya_hi < 20) { - mes "Door is closed. It seems keeping its eyes on you."; + mes "Door is closed. It seems to be keeping its eyes on you."; close; } warp "ma_in01",83,16; @@ -39,10 +56,9 @@ OnTouch: malaya,299,167,0 script malaya_ts 45,1,1,{ end; - OnTouch: if (malaya_hi < 20) { - mes "Door is closed. It seems keeping its eyes on you."; + mes "Door is closed. It seems to be keeping its eyes on you."; close; } warp "ma_in01",12,24; @@ -51,10 +67,9 @@ OnTouch: malaya,261,240,0 script malaya_shop 45,1,1,{ end; - OnTouch: if (malaya_hi < 20) { - mes "Door is closed. It seems keeping its eyes on you."; + mes "Door is closed. It seems to be keeping its eyes on you."; close; } warp "ma_in01",126,20; @@ -63,40 +78,69 @@ OnTouch: malaya,300,211,0 script malaya_house01 45,1,1,{ end; - OnTouch: if (malaya_hi < 10) { - mes "Door is closed. It seems keeping its eyes on you."; + mes "Door is closed. It seems to be keeping its eyes on you."; close; - } + } warp "ma_in01",36,152; end; } -// Town Warps -ma_in01,86,16,0 warp mal_in_ws 1,1,malaya,115,212 -ma_in01,24,77,0 warp mal_in_inn 1,1,malaya,178,208 -malaya,370,277,0 warp malaya_mal_fild01 1,1,ma_fild01,40,272 -ma_fild01,37,272,0 warp mal_fild01_malaya 1,1,malaya,367,277 -ma_in01,33,152,0 warp mal_in_house01 1,1,malaya,52,75 -malaya,309,70,0 warp malaya_ship_mal_in_ship 1,1,ma_in01,108,92 -ma_in01,105,92,0 warp mal_in_ship_malaya_ship 1,1,malaya,310,67 -ma_fild01,266,359,0 warp mafild01_to02 1,1,ma_fild02,248,36 -ma_fild02,248,33,0 warp mafild02_to01 1,1,ma_fild01,266,356 -ma_fild01,288,52,0 warp mafild01_tobknw 1,1,ma_scene01,142,78 -ma_scene01,140,80,0 warp bknw_tofild01 1,1,ma_fild01,288,55 -ma_in01,9,24,0 warp mal_in_ts 1,1,malaya,296,167 -ma_in01,126,17,0 warp mal_in_shop_malaya_shop 1,1,malaya,261,237 -ma_fild01,251,190,0 warp mf_minga_mf_in_minga 1,1,ma_in01,108,160 -ma_in01,105,160,0 warp mf_in_minga_mf_minga 1,1,ma_fild01,248,190 +// Jeepney Warps +//============================================================ +function script F_Malaya_Warp { + mes "Where would you like to go?"; + next; + set .@i$, getarg(select("Back outside",getarg(1)+" Jeepney",getarg(2)+" Jeepney") - 1); + close2; + switch(getarg(3)) { + case 1: // 12 passenger + if (.@i$ == "Center") + warp "malaya",241,238; + if (.@i$ == "Southwest") + warp "malaya",71,43; + else if (.@i$ == "Southeast") + warp "malaya",284,129; + break; + case 2: // 30 passenger + if (.@i$ == "Northwest") + warp "malaya",134,247; + else if (.@i$ == "Southeast") + warp "malaya",341,150; + else if (.@i$ == "Northeast") + warp "malaya",294,293; + break; + case 3: // 60 passenger + if (.@i$ == "Center") + warp "malaya",239,221; + else if (.@i$ == "Northwest") + warp "malaya",59,246; + else if (.@i$ == "Southeast") + warp "malaya",254,68; + break; + } + end; +} + +ma_zif01,30,22,0 script Town Warp#zif01 45,1,1,{ callfunc "F_Malaya_Warp","Center","Southwest","Southeast",1; } +ma_zif02,30,22,0 script Town Warp#zif02 45,1,1,{ callfunc "F_Malaya_Warp","Southwest","Center","Southeast",1; } +ma_zif03,30,22,0 script Town Warp#zif03 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Southwest",1; } + +ma_zif04,30,22,0 script Town Warp#zif04 45,1,1,{ callfunc "F_Malaya_Warp","Northwest","Southeast","Northeast",2; } +ma_zif05,30,22,0 script Town Warp#zif05 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Northwest","Northeast",2; } +ma_zif06,30,22,0 script Town Warp#zif06 45,1,1,{ callfunc "F_Malaya_Warp","Northeast","Northwest","Southeast",2; } + +ma_zif07,30,22,0 script Town Warp#zif07 45,1,1,{ callfunc "F_Malaya_Warp","Center","Northwest","Southeast",3; } +ma_zif08,30,22,0 script Town Warp#zif08 45,1,1,{ callfunc "F_Malaya_Warp","Northwest","Center","Southeast",3; } +ma_zif09,30,22,0 script Town Warp#zif09 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Northwest",3; } -// Car Warps -ma_zif01,30,22,0 warp malaya_car0001 1,1,malaya,241,238 -ma_zif02,30,22,0 warp malaya_car0002 1,1,malaya,71,43 -ma_zif03,30,22,0 warp malaya_car0003 1,1,malaya,284,129 -ma_zif04,30,22,0 warp malaya_car0004 1,1,malaya,134,247 -ma_zif05,30,22,0 warp malaya_car0005 1,1,malaya,341,150 -ma_zif06,30,22,0 warp malaya_car0006 1,1,malaya,294,293 -ma_zif07,30,22,0 warp malaya_car0007 1,1,malaya,239,221 -ma_zif08,30,22,0 warp malaya_car0008 1,1,malaya,59,246 -ma_zif09,30,22,0 warp malaya_car0009 1,1,malaya,254,68 +//ma_zif01,30,22,0 warp malaya_car0001 1,1,malaya,241,238 +//ma_zif02,30,22,0 warp malaya_car0002 1,1,malaya,71,43 +//ma_zif03,30,22,0 warp malaya_car0003 1,1,malaya,284,129 +//ma_zif04,30,22,0 warp malaya_car0004 1,1,malaya,134,247 +//ma_zif05,30,22,0 warp malaya_car0005 1,1,malaya,341,150 +//ma_zif06,30,22,0 warp malaya_car0006 1,1,malaya,294,293 +//ma_zif07,30,22,0 warp malaya_car0007 1,1,malaya,239,221 +//ma_zif08,30,22,0 warp malaya_car0008 1,1,malaya,59,246 +//ma_zif09,30,22,0 warp malaya_car0009 1,1,malaya,254,68 diff --git a/npc/re/warps/cities/rachel.txt b/npc/re/warps/cities/rachel.txt index eb2b0722f..608e7ec2b 100644 --- a/npc/re/warps/cities/rachel.txt +++ b/npc/re/warps/cities/rachel.txt @@ -4,8 +4,6 @@ //= erKURITA & RockmanEXE //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= Warp Points for Rachel City, shops & other locations //===== Additional Comments: ================================= diff --git a/npc/re/warps/cities/yggdrasil.txt b/npc/re/warps/cities/yggdrasil.txt index 3076d22b1..72004882a 100644 --- a/npc/re/warps/cities/yggdrasil.txt +++ b/npc/re/warps/cities/yggdrasil.txt @@ -4,8 +4,6 @@ //= PKGINGO (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Hercules; RO Episode 6+ //===== Description: ========================================= //= Warp Points for Yggdrasil Tree //===== Additional Comments: ================================= -- cgit v1.2.3-60-g2f50