From b17e2b7eca10674cc9bde7b2f4838bdd29b373dc Mon Sep 17 00:00:00 2001 From: Masao Date: Mon, 27 May 2013 22:55:07 +0200 Subject: - Added custom HD Refiner NPC Dwarf Mighty Hammer. (Disabled by default.) * This NPC uses the cash shop HD ores to upgrade your weapon or gear up to +10 when your current gear or weapon is already +7 without breaking it but downgrading it. - Moved Malaya Port NPC's to re folder and updated the Malaya Port warps. - Fixed Bug where players weren't able to finish the Guardian of Yggdrasil Quest and didn't get their reward. - Fixed that players weren't able to start the "Ring of the wise king" and "Finding a Fairy" quest using the Cat Hand Agent warper inside Eden Group Headquarters. Signed-off-by: Masao --- npc/re/warps/cities/malaya.txt | 119 ++++++++++++++++++++++++++++++----------- 1 file changed, 87 insertions(+), 32 deletions(-) (limited to 'npc/re/warps') diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt index 3a8b1002e..eb558fbbb 100644 --- a/npc/re/warps/cities/malaya.txt +++ b/npc/re/warps/cities/malaya.txt @@ -1,38 +1,93 @@ -//===== rAthena Script ======================================= -//= Malaya Port Warp Script -//===== By: ================================================== -//= Chilly -//===== Current Version: ===================================== +//===== rAthena Script ======================================= +//= Mayala Town Warps +//===== By: ================================================== +//= Masao +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= -//= Warp Points for Malaya Port -//===== Additional Comments: ================================= +//===== Compatible With: ===================================== +//= Hecules +//===== Description: ========================================= +//= Warps for Mayala Town. +//===== Additional Comments: ================================= //= 1.0 First Version. -//============================================================ +//============================================================ + +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."; + 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."; + close; + } + warp "ma_in01",83,16; + end; +} + +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."; + close; + } + warp "ma_in01",12,24; + end; +} + +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."; + close; + } + warp "ma_in01",126,20; + end; +} + +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."; + close2; + } + warp "ma_in01",36,152; + end; +} // Town Warps -malaya,309,70,0 warp malaya_field0001 1,1,ma_in01,108,92 -ma_in01,105,92,0 warp malaya_field0002 1,1,malaya,310,67 -malaya,300,211,0 warp malaya_field0003 1,1,ma_in01,36,152 -ma_in01,33,152,0 warp malaya_field0004 1,1,malaya,297,211 -malaya,178,211,0 warp malaya_field0005 1,1,ma_in01,24,80 -ma_in01,24,77,0 warp malaya_field0006 1,1,malaya,178,208 -malaya,112,212,0 warp malaya_field0007 1,1,ma_in01,83,16 -ma_in01,86,16,0 warp malaya_field0008 1,1,malaya,115,212 -malaya,299,167,0 warp malaya_field0009 1,1,ma_in01,12,24 -ma_in01,9,24,0 warp malaya_field0010 1,1,malaya,296,167 -malaya,261,240,0 warp malaya_field0011 1,1,ma_in01,126,20 -ma_in01,126,17,0 warp malaya_field0012 1,1,malaya,261,237 -malaya,370,277,0 warp malaya_field0013 1,1,ma_fild01,40,272 -ma_fild01,37,272,0 warp malaya_field0014 1,1,malaya,367,277 -ma_fild01,266,359,0 warp malaya_field0015 1,1,ma_fild02,248,36 -ma_fild02,248,33,0 warp malaya_field0016 1,1,ma_fild01,266,356 -ma_fild01,251,190,0 warp malaya_field0017 1,1,ma_in01,108,160 -ma_in01,105,160,0 warp malaya_field0018 1,1,ma_fild01,249,192 -ma_fild01,288,52,0 warp malaya_field0019 1,1,ma_scene01,142,78 -ma_scene01,140,80,0 warp malaya_field0020 1,1,ma_fild01,288,55 +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 // Car Warps ma_zif01,30,22,0 warp malaya_car0001 1,1,malaya,241,238 @@ -43,4 +98,4 @@ 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_zif09,30,22,0 warp malaya_car0009 1,1,malaya,254,68 \ No newline at end of file -- cgit v1.2.3-70-g09d2