Merge pull request #1 from HerculesWS/master

- 合并Hercules最新的内容

1 files changed, 89 insertions, 33 deletions

diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt
index 3a8b1002e..a792c4690 100644
--- a/npc/re/warps/cities/malaya.txt
+++ b/npc/re/warps/cities/malaya.txt
@@ -1,38 +1,94 @@
-//===== rAthena Script =======================================
-//= Malaya Port Warp Script
-//===== By: ==================================================
+//===== Hercules Script ====================================== 
+//= Mayala Port Town Warps
+//===== By: ================================================== 
 //= Chilly
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
-//= Warp Points for Malaya Port
-//===== Additional Comments: =================================
-//= 1.0 First Version.
-//============================================================
+//===== 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].
+//============================================================ 
+
+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.";
+		close;
+    }
+	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 +99,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