Merge pull request #1 from HerculesWS/master

- 合并Hercules最新的内容

23 files changed, 133 insertions, 77 deletions

diff --git a/npc/re/warps/cities/dewata.txt b/npc/re/warps/cities/dewata.txt
index 9ca29688c..4e7476ec8 100644
--- a/npc/re/warps/cities/dewata.txt
+++ b/npc/re/warps/cities/dewata.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Dewata Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.2
 //===== Compatible With: =====================================
-//= rAthena SVN
+//= 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 d80e178a9..d2c84ad0a 100644
--- a/npc/re/warps/cities/dicastes.txt
+++ b/npc/re/warps/cities/dicastes.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= El Dicastes Warp Script
 //===== By: ==================================================
 //= Chilly, Muad_Dib
 //===== Current Version: =====================================
 //= 1.3
 //===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for El Dicastes
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/cities/eclage.txt b/npc/re/warps/cities/eclage.txt
index c67bf202f..0400489f5 100644
--- a/npc/re/warps/cities/eclage.txt
+++ b/npc/re/warps/cities/eclage.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Eclage Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Eclage
 //===== Additional Comments: =================================
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
diff --git a/npc/re/warps/cities/rachel.txt b/npc/re/warps/cities/rachel.txt
index 8610fa3bf..eb2b0722f 100644
--- a/npc/re/warps/cities/rachel.txt
+++ b/npc/re/warps/cities/rachel.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Rachel Warp Script
 //===== By: ==================================================
 //= erKURITA & RockmanEXE
 //===== Current Version: =====================================
 //= 1.5
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= 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 92f084372..3076d22b1 100644
--- a/npc/re/warps/cities/yggdrasil.txt
+++ b/npc/re/warps/cities/yggdrasil.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Yggdrasil Tree Warp Script
 //===== By: ==================================================
 //= PKGINGO (1.0)
 //===== Current Version: =====================================
 //= 1.1
 //===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
+//= Hercules; RO Episode 6+
 //===== Description: =========================================
 //= Warp Points for Yggdrasil Tree
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/dungeons/dic_dun.txt b/npc/re/warps/dungeons/dic_dun.txt
index 2af6d4445..9016c3e0c 100644
--- a/npc/re/warps/dungeons/dic_dun.txt
+++ b/npc/re/warps/dungeons/dic_dun.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Scaraba Hole Warp Script
 //===== By: ==================================================
 //= Chilly, Muad_Dib
 //===== Current Version: =====================================
 //= 1.1
 //===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Scaraba Hole
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/dungeons/ecl_dun.txt b/npc/re/warps/dungeons/ecl_dun.txt
index 6d6bb321a..5209c4f25 100644
--- a/npc/re/warps/dungeons/ecl_dun.txt
+++ b/npc/re/warps/dungeons/ecl_dun.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Eclage Dungeon Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Eclage Dungeon
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/dungeons/iz_dun.txt b/npc/re/warps/dungeons/iz_dun.txt
index 3ef9ab86e..bbe68f8b8 100644
--- a/npc/re/warps/dungeons/iz_dun.txt
+++ b/npc/re/warps/dungeons/iz_dun.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Izlude Dungeon Renewal Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
@@ -6,7 +6,7 @@
 //===== Current Version: =====================================
 //= 1.3
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Bibilyn Island & Undersea Cave
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/com_fild.txt b/npc/re/warps/fields/com_fild.txt
index 765874af1..c90257eb3 100644
--- a/npc/re/warps/fields/com_fild.txt
+++ b/npc/re/warps/fields/com_fild.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Comodo Field Warp Script
 //===== By: ==================================================
 //= Nana
 //===== Current Version: =====================================
 //= 1.2
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= Hercules
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Warp Points for Comodo Fields
diff --git a/npc/re/warps/fields/dic_fild.txt b/npc/re/warps/fields/dic_fild.txt
index d49b5f5c7..41ac07aaf 100644
--- a/npc/re/warps/fields/dic_fild.txt
+++ b/npc/re/warps/fields/dic_fild.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= El Dicastes Field Warp Script
 //===== By: ==================================================
 //= Chilly, Muad_Dib
 //===== Current Version: =====================================
 //= 1.1
 //===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for El Dicastes Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/geffen_fild.txt b/npc/re/warps/fields/geffen_fild.txt
index 08b0e46e2..289ad3a6c 100644
--- a/npc/re/warps/fields/geffen_fild.txt
+++ b/npc/re/warps/fields/geffen_fild.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Geffen Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Geffen Field's
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/hugel_fild.txt b/npc/re/warps/fields/hugel_fild.txt
index 8b5de97b2..309ba8cc1 100644
--- a/npc/re/warps/fields/hugel_fild.txt
+++ b/npc/re/warps/fields/hugel_fild.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Hugel Field Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0)
 //===== Current Version: =====================================
 //= 1.3
 //===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 10+
+//= Hercules; RO Episode 10+
 //===== Description: =========================================
 //= Warp Points for Hugel Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/morroc_fild.txt b/npc/re/warps/fields/morroc_fild.txt
index 6cd6c64b5..b256e9413 100644
--- a/npc/re/warps/fields/morroc_fild.txt
+++ b/npc/re/warps/fields/morroc_fild.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Morroc Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.4b
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Morroc Fields
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/payon_fild.txt b/npc/re/warps/fields/payon_fild.txt
index d991f2280..5bec271e8 100644
--- a/npc/re/warps/fields/payon_fild.txt
+++ b/npc/re/warps/fields/payon_fild.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Payon Field Warps
 //===== By: ================================================== 
 //= Nana (1.0)
 //===== Current Version: ===================================== 
 //= 1.3
 //===== Compatible With: ===================================== 
-//= Any rAthena Mod
+//= Hercules
 //===== Description: ========================================= 
 //= Payon Field Warps
 //===== Additional Comments: ================================= 
diff --git a/npc/re/warps/fields/prontera_fild.txt b/npc/re/warps/fields/prontera_fild.txt
index 16d3c8238..2267c298d 100644
--- a/npc/re/warps/fields/prontera_fild.txt
+++ b/npc/re/warps/fields/prontera_fild.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Prontera Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.3
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Prontera Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/rachel_fild.txt b/npc/re/warps/fields/rachel_fild.txt
index 475557200..87d4f16d7 100644
--- a/npc/re/warps/fields/rachel_fild.txt
+++ b/npc/re/warps/fields/rachel_fild.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Rachel Field Warp Script
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
 //= 1.3
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Rachel Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/veins_fild.txt b/npc/re/warps/fields/veins_fild.txt
index ac05163ff..c1a5cce5a 100644
--- a/npc/re/warps/fields/veins_fild.txt
+++ b/npc/re/warps/fields/veins_fild.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Veins Field Warp Script
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
 //= 1.5
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Veins Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/yuno_fild.txt b/npc/re/warps/fields/yuno_fild.txt
index 32d1924f5..b570fca9e 100644
--- a/npc/re/warps/fields/yuno_fild.txt
+++ b/npc/re/warps/fields/yuno_fild.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Yuno Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0), Sara
 //===== Current Version: =====================================
 //= 1.3
 //===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 5+
+//= Hercules; RO Episode 5+
 //===== Description: =========================================
 //= Warp Points for Yuno Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/other/jobquests.txt b/npc/re/warps/other/jobquests.txt
index 5dec2077c..5b62a74a4 100644
--- a/npc/re/warps/other/jobquests.txt
+++ b/npc/re/warps/other/jobquests.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Job Quest Renewal Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 2.2
 //===== Compatible With: =====================================
-//= Any Athena Version; RO Version Ep4+
+//= Hercules; RO Version Ep4+
 //===== Description: =========================================
 //= Warp Points for Job Quest Maps
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/other/paradise.txt b/npc/re/warps/other/paradise.txt
index fec766ec4..4d4b241a9 100644
--- a/npc/re/warps/other/paradise.txt
+++ b/npc/re/warps/other/paradise.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Paradise Group Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= rAthena SVN;
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Paradise Group
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/other/s_workshop.txt b/npc/re/warps/other/s_workshop.txt
index 884d77202..bc04509b3 100644
--- a/npc/re/warps/other/s_workshop.txt
+++ b/npc/re/warps/other/s_workshop.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Shadow Workshop Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.1
 //===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Shadow Workshop
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/other/sign.txt b/npc/re/warps/other/sign.txt
index fb24620f8..84895c26b 100644
--- a/npc/re/warps/other/sign.txt
+++ b/npc/re/warps/other/sign.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Sign Quest Warps
 //===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
 //= 1.4
 //===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
+//= Hercules; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points related to the Sign Quest will be put here
 //===== Additional Comments: =================================