summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorChilly0123 <Chilly0123@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-06 09:20:37 +0000
committerChilly0123 <Chilly0123@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-06 09:20:37 +0000
commitd64a5afd7c7815e8c938f968b753e5849eb90985 (patch)
treec9e77c9eb0bf985af25db27122a453837c1a5583 /npc
parentd092e39978999e443d6d8b0fa5ea3130f37de263 (diff)
downloadhercules-d64a5afd7c7815e8c938f968b753e5849eb90985.tar.gz
hercules-d64a5afd7c7815e8c938f968b753e5849eb90985.tar.bz2
hercules-d64a5afd7c7815e8c938f968b753e5849eb90985.tar.xz
hercules-d64a5afd7c7815e8c938f968b753e5849eb90985.zip
*Fixed bug in 13.1 quest which caused quest log to remain after completion.
*Added warps up to Episode 14.2. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15400 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/quests/quests_13_1.txt96
-rw-r--r--npc/scripts_warps.conf12
-rw-r--r--npc/warps/cities/dewata.txt20
-rw-r--r--npc/warps/cities/dicastes.txt192
-rw-r--r--npc/warps/cities/eclage.txt33
-rw-r--r--npc/warps/cities/malangdo.txt63
-rw-r--r--npc/warps/cities/malaya.txt46
-rw-r--r--npc/warps/dungeons/dic_dun.txt24
-rw-r--r--npc/warps/dungeons/ecl_dun.txt24
-rw-r--r--npc/warps/fields/bif_fild.txt22
-rw-r--r--npc/warps/fields/dic_fild.txt19
-rw-r--r--npc/warps/other/paradise.txt25
-rw-r--r--npc/warps/other/s_workshop.txt22
13 files changed, 549 insertions, 49 deletions
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 6d551141f..b71f06605 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -2286,51 +2286,39 @@ moc_fild22b,230,197,5 script Munkenro#2 967,{
close;
}
}
- if ($@ep13_test == 2) {
+ if (ep13_ryu == 20) {
mes "[Munkenro]";
- mes "You're quite shrewd...";
- mes "How come you passed the test";
- mes "before? I can't believe this.";
+ mes "I am the head of the Three Kingdoms Alliance. You've come here for the discovery of the dimensional rift. Am I right?";
next;
mes "[Munkenro]";
- mes "I will give you one more chance.";
- mes "Don't make any mistakes again.";
+ mes "Um. You're the one that";
+ mes "did some favors before...";
+ mes "Your name is " + strcharinfo(0) + "?";
+ mes "I remember you.";
next;
- set ep13_ryu,21;
- set $@ep13_test,0;
mes "[Munkenro]";
- mes "Once you get ready,";
- mes "just let me know,";
- mes "to start!";
- close;
- }
- if ($@ep13_test == 1) {
+ mes "Sikaiz retired from his position urgently. I am his replacement.";
+ next;
mes "[Munkenro]";
- mes "We are testing the other adventurers, so unless you have any business with me, visit me later.";
- close;
- }
- if (($@ep13_test == 0) && (ep13_ryu == 22)) {
+ mes "You don't need to know in detail all about it now. That's not important to you. Is it?";
+ next;
mes "[Munkenro]";
- mes "Good! You did a good job!";
- mes "Though we didn't get enough time to test, I think it's almost perfect.";
+ mes "You are here for the discovery of the dimensional rift. I can't send you there right away. I know that you've passed your tests, but that's the past. You have not been tested by me. ~";
next;
mes "[Munkenro]";
- mes "You can feel I am too strict... I'm just doing what I need to do as head of the Alliance.";
+ mes "So you need to be tested again. I don't have too much time to test you now. So let's just do a short test.";
next;
mes "[Munkenro]";
- mes "If I can't manage the alliance well, I will feel guilty, that I am not doing Sikaiz's job any justice. Anyway, I will do my best.";
+ mes "Now the soldiers here will start to attack you... If you survive, I will approve of you. Just do it in good time.";
next;
mes "[Munkenro]";
- mes "Huh? I'm just whining.";
- mes "You don't need to hear this.";
- mes "Just forget it.";
+ mes "This can prove that you're strong enough. That's the minimum test I can perform.";
next;
- completequest 10078;
- set ep13_ryu,100;
- getexp 66000,21000;
+ changequest 10076,10077;
+ set ep13_ryu,21;
mes "[Munkenro]";
- mes "I will let you go there.";
- mes "Let me know once you are ready.";
+ mes "Once you get ready,";
+ mes "just let me know.";
close;
}
if (ep13_ryu == 21) {
@@ -2358,39 +2346,51 @@ moc_fild22b,230,197,5 script Munkenro#2 967,{
close;
}
}
- if (ep13_ryu == 20) {
+ if ($@ep13_test == 2) {
mes "[Munkenro]";
- mes "I am the head of the Three Kingdoms Alliance. You've come here for the discovery of the dimensional rift. Am I right?";
+ mes "You're quite shrewd...";
+ mes "How come you passed the test";
+ mes "before? I can't believe this.";
next;
mes "[Munkenro]";
- mes "Um. You're the one that";
- mes "did some favors before...";
- mes "Your name is " + strcharinfo(0) + "?";
- mes "I remember you.";
+ mes "I will give you one more chance.";
+ mes "Don't make any mistakes again.";
next;
+ set ep13_ryu,21;
+ set $@ep13_test,0;
mes "[Munkenro]";
- mes "Sikaiz retired from his position urgently. I am his replacement.";
- next;
+ mes "Once you get ready,";
+ mes "just let me know,";
+ mes "to start!";
+ close;
+ }
+ if ($@ep13_test == 1) {
mes "[Munkenro]";
- mes "You don't need to know in detail all about it now. That's not important to you. Is it?";
- next;
+ mes "We are testing the other adventurers, so unless you have any business with me, visit me later.";
+ close;
+ }
+ if (($@ep13_test == 0) && (ep13_ryu == 22)) {
mes "[Munkenro]";
- mes "You are here for the discovery of the dimensional rift. I can't send you there right away. I know that you've passed your tests, but that's the past. You have not been tested by me. ~";
+ mes "Good! You did a good job!";
+ mes "Though we didn't get enough time to test, I think it's almost perfect.";
next;
mes "[Munkenro]";
- mes "So you need to be tested again. I don't have too much time to test you now. So let's just do a short test.";
+ mes "You can feel I am too strict... I'm just doing what I need to do as head of the Alliance.";
next;
mes "[Munkenro]";
- mes "Now the soldiers here will start to attack you... If you survive, I will approve of you. Just do it in good time.";
+ mes "If I can't manage the alliance well, I will feel guilty, that I am not doing Sikaiz's job any justice. Anyway, I will do my best.";
next;
mes "[Munkenro]";
- mes "This can prove that you're strong enough. That's the minimum test I can perform.";
+ mes "Huh? I'm just whining.";
+ mes "You don't need to hear this.";
+ mes "Just forget it.";
next;
- changequest 10076,10077;
- set ep13_ryu,21;
+ completequest 10078;
+ set ep13_ryu,100;
+ getexp 66000,21000;
mes "[Munkenro]";
- mes "Once you get ready,";
- mes "just let me know.";
+ mes "I will let you go there.";
+ mes "Let me know once you are ready.";
close;
}
}
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf
index c1a38a2e6..750bb2942 100644
--- a/npc/scripts_warps.conf
+++ b/npc/scripts_warps.conf
@@ -9,6 +9,9 @@ npc: npc/warps/cities/amatsu.txt
npc: npc/warps/cities/ayothaya.txt
npc: npc/warps/cities/brasilis.txt
npc: npc/warps/cities/comodo.txt
+npc: npc/warps/cities/dewata.txt
+npc: npc/warps/cities/dicastes.txt
+npc: npc/warps/cities/eclage.txt
npc: npc/warps/cities/einbech.txt
npc: npc/warps/cities/einbroch.txt
npc: npc/warps/cities/geffen.txt
@@ -18,6 +21,8 @@ npc: npc/warps/cities/izlude.txt
npc: npc/warps/cities/lighthalzen.txt
npc: npc/warps/cities/louyang.txt
npc: npc/warps/cities/lutie.txt
+npc: npc/warps/cities/malangdo.txt
+npc: npc/warps/cities/malaya.txt
npc: npc/warps/cities/manuk.txt
npc: npc/warps/cities/mid_camp.txt
npc: npc/warps/cities/morroc.txt
@@ -26,7 +31,6 @@ npc: npc/warps/cities/nameless.txt
npc: npc/warps/cities/niflheim.txt
npc: npc/warps/cities/payon.txt
npc: npc/warps/cities/prontera.txt
-
npc: npc/warps/cities/splendide.txt
npc: npc/warps/cities/rachel.txt
npc: npc/warps/cities/umbala.txt
@@ -43,6 +47,8 @@ npc: npc/warps/dungeons/ayo_dun.txt
npc: npc/warps/dungeons/beach_dun.txt
npc: npc/warps/dungeons/bra_dun.txt
npc: npc/warps/dungeons/c_tower.txt
+npc: npc/warps/dungeons/dic_dun.txt
+npc: npc/warps/dungeons/ecl_dun.txt
npc: npc/warps/dungeons/ein_dun.txt
npc: npc/warps/dungeons/gef_dun.txt
npc: npc/warps/dungeons/gon_dun.txt
@@ -71,8 +77,10 @@ npc: npc/warps/dungeons/xmas_dun.txt
// --------------------------- Fields ---------------------------
npc: npc/warps/fields/abyss_warper.txt
npc: npc/warps/fields/amatsu_fild.txt
+npc: npc/warps/fields/bif_fild.txt
npc: npc/warps/fields/bra_fild.txt
npc: npc/warps/fields/com_fild.txt
+npc: npc/warps/fields/dic_fild.txt
npc: npc/warps/fields/ein_fild.txt
npc: npc/warps/fields/gefenia.txt
npc: npc/warps/fields/geffen_fild.txt
@@ -100,5 +108,7 @@ npc: npc/warps/other/arena.txt
npc: npc/warps/other/kiel.txt
npc: npc/warps/other/sign.txt
npc: npc/warps/other/god.txt
+npc: npc/warps/other/paradise.txt
+npc: npc/warps/other/s_workshop.txt
npc: npc/warps/pvp/pvp.txt
// --------------------------------------------------------------
diff --git a/npc/warps/cities/dewata.txt b/npc/warps/cities/dewata.txt
new file mode 100644
index 000000000..22a43a1cd
--- /dev/null
+++ b/npc/warps/cities/dewata.txt
@@ -0,0 +1,20 @@
+//===== eAthena Script =======================================
+//= Dewata Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Dewata
+//===== Additional Comments: =================================
+//= 1.0 First version
+//============================================================
+
+dewata,44,252,0 warp dewata0001 1,1,dew_fild01,372,212
+dew_fild01,375,212,0 warp dewata0002 1,1,dewata,47,252
+dew_fild01,57,273,0 warp dewata0003 1,1,dew_in01,16,34
+dew_in01,16,31,0 warp dewata0004 1,1,dew_fild01,60,273
+dew_fild01,48,65,0 warp dewata0005 1,1,dew_dun02,302,30
+dew_dun02,305,30,0 warp dewata0006 1,1,dew_fild01,51,65
diff --git a/npc/warps/cities/dicastes.txt b/npc/warps/cities/dicastes.txt
new file mode 100644
index 000000000..14ebb7428
--- /dev/null
+++ b/npc/warps/cities/dicastes.txt
@@ -0,0 +1,192 @@
+//===== eAthena Script =======================================
+//= El Dicastes Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for El Dicastes
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//= 1.1 Added Elevators.
+//============================================================
+
+// Town Warps
+dicastes01,283,285,0 warp eldicastes0001 1,1,dic_in01,45,31
+dic_in01,45,28,0 warp eldicastes0002 1,1,dicastes01,281,283
+dicastes01,163,297,0 warp eldicastes0003 1,1,dic_in01,372,102
+dic_in01,372,99,0 warp eldicastes0004 1,1,dicastes01,163,294
+dicastes01,94,259,0 warp eldicastes0005 1,1,dic_in01,390,52
+dic_in01,390,55,0 warp eldicastes0006 1,1,dicastes01,96,257
+dicastes01,136,103,0 warp eldicastes0007 1,1,dic_in01,26,99
+dic_in01,26,96,0 warp eldicastes0008 1,1,dicastes01,136,106
+dicastes01,255,175,0 warp eldicastes0009 1,1,dic_in01,345,271
+dic_in01,342,271,0 warp eldicastes0010 1,1,dicastes01,255,172
+dicastes01,198,353,0 warp eldicastes0011 1,1,dicastes02,120,81
+dicastes02,120,77,0 warp eldicastes0012 1,1,dicastes01,198,349
+dicastes02,120,237,0 warp eldicastes0013 1,1,dic_in01,45,247
+dic_in01,45,244,0 warp eldicastes0014 1,1,dicastes02,120,234
+dic_in01,138,226,0 warp eldicastes0015 1,1,dic_in01,242,177
+dic_in01,242,180,0 warp eldicastes0016 1,1,dic_in01,138,223
+dic_in01,300,248,0 warp eldicastes0017 1,1,dic_in01,262,191
+
+// Elevators
+dic_in01,46,288,4 script Elevator#01 111,{
+ switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
+ case 1:
+ warp "dic_in01",46,286;
+ end;
+ case 2:
+ warp "dic_in01",36,212;
+ end;
+ case 3:
+ warp "dic_in01",122,282;
+ end;
+ case 4:
+ warp "dic_in01",122,201;
+ end;
+ }
+}
+
+dic_in01,36,214,4 script Elevator#02 111,{
+ switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
+ case 1:
+ warp "dic_in01",46,286;
+ end;
+ case 2:
+ warp "dic_in01",36,212;
+ end;
+ case 3:
+ warp "dic_in01",122,282;
+ end;
+ case 4:
+ warp "dic_in01",122,201;
+ end;
+ }
+}
+
+dic_in01,122,284,4 script Elevator#03 111,{
+ switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
+ case 1:
+ warp "dic_in01",46,286;
+ end;
+ case 2:
+ warp "dic_in01",36,212;
+ end;
+ case 3:
+ warp "dic_in01",122,282;
+ end;
+ case 4:
+ warp "dic_in01",122,201;
+ end;
+ }
+}
+
+dic_in01,123,205,4 script Elevator#04 111,{
+ switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
+ case 1:
+ warp "dic_in01",46,286;
+ end;
+ case 2:
+ warp "dic_in01",36,212;
+ end;
+ case 3:
+ warp "dic_in01",122,282;
+ end;
+ case 4:
+ warp "dic_in01",122,202;
+ end;
+ }
+}
+
+dic_in01,44,116,4 script Elevator#05 111,{
+ switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
+ case 1:
+ warp "dic_in01",42,116;
+ end;
+ case 2:
+ warp "dic_in01",110,108;
+ end;
+ case 3:
+ warp "dic_in01",178,108;
+ end;
+ case 4:
+ warp "dic_in01",260,116;
+ end;
+ }
+}
+
+dic_in01,112,108,4 script Elevator#06 111,{
+ switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
+ case 1:
+ warp "dic_in01",42,116;
+ end;
+ case 2:
+ warp "dic_in01",110,108;
+ end;
+ case 3:
+ warp "dic_in01",178,108;
+ end;
+ case 4:
+ warp "dic_in01",260,116;
+ end;
+ }
+}
+
+dic_in01,180,108,4 script Elevator#07 111,{
+ switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
+ case 1:
+ warp "dic_in01",42,116;
+ end;
+ case 2:
+ warp "dic_in01",110,108;
+ end;
+ case 3:
+ warp "dic_in01",178,108;
+ end;
+ case 4:
+ warp "dic_in01",260,116;
+ end;
+ }
+}
+
+dic_in01,262,116,4 script Elevator#08 111,{
+ switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
+ case 1:
+ warp "dic_in01",42,116;
+ end;
+ case 2:
+ warp "dic_in01",110,108;
+ end;
+ case 3:
+ warp "dic_in01",178,108;
+ end;
+ case 4:
+ warp "dic_in01",260,116;
+ end;
+ }
+}
+
+dic_in01,388,272,4 script Elevator#09 111,{
+ switch(select("Battle Room","Residence Area")) {
+ case 1:
+ warp "dic_in01",386,272;
+ end;
+ case 2:
+ warp "dic_in01",386,208;
+ end;
+ }
+}
+
+dic_in01,388,208,4 script Elevator#10 111,{
+ switch(select("Battle Room","Residence Area")) {
+ case 1:
+ warp "dic_in01",386,272;
+ end;
+ case 2:
+ warp "dic_in01",386,208;
+ end;
+ }
+}
diff --git a/npc/warps/cities/eclage.txt b/npc/warps/cities/eclage.txt
new file mode 100644
index 000000000..5a09b8252
--- /dev/null
+++ b/npc/warps/cities/eclage.txt
@@ -0,0 +1,33 @@
+//===== eAthena Script =======================================
+//= Eclage Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Eclage
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+// 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
+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
+ecl_in01,8,67,0 warp eclage_field0007 1,1,ecl_hub01,38,94
+ecl_hub01,40,95,0 warp eclage_field0008 1,1,ecl_in01,11,67
+ecl_hub01,22,109,0 warp eclage_field0009 1,1,ecl_in02,98,7
+ecl_in02,98,4,0 warp eclage_field0010 1,1,ecl_hub01,23,107
+ecl_in02,81,18,0 warp eclage_field0011 1,1,ecl_in02,157,65
+ecl_in02,157,68,0 warp eclage_field0012 1,1,ecl_in02,83,18
+ecl_in01,84,68,0 warp eclage_field0013 1,1,ecl_hub01,107,107
+ecl_hub01,107,110,0 warp eclage_field0014 1,1,ecl_in01,81,68
+ecl_hub01,127,95,0 warp eclage_field0015 1,1,ecl_hub01,18,31
+ecl_hub01,18,34,0 warp eclage_field0016 1,1,ecl_hub01,124,95
+ecl_hub01,40,14,0 warp eclage_field0017 1,1,ecl_in03,144,17
+ecl_in03,144,14,0 warp eclage_field0018 1,1,ecl_hub01,40,11
diff --git a/npc/warps/cities/malangdo.txt b/npc/warps/cities/malangdo.txt
new file mode 100644
index 000000000..1bdc0bbcb
--- /dev/null
+++ b/npc/warps/cities/malangdo.txt
@@ -0,0 +1,63 @@
+//===== eAthena Script =======================================
+//= Malangdo Island Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Malangdo Island
+//===== Additional Comments: =================================
+//= 1.0 First version
+//============================================================
+
+// Town Warps
+malangdo,240,150,0 warp malangdo0001 1,1,mal_in01,12,16
+mal_in01,9,16,0 warp malangdo0002 1,1,malangdo,237,150
+mal_in01,20,15,0 warp malangdo0003 1,1,mal_in01,67,9
+mal_in01,67,12,0 warp malangdo0004 1,1,mal_in01,20,12
+malangdo,112,168,0 warp malangdo0005 1,1,mal_in01,18,164
+mal_in01,18,161,0 warp malangdo0006 1,1,malangdo,114,166
+mal_in01,18,173,0 warp malangdo0007 1,1,mal_in01,72,174
+mal_in01,75,174,0 warp malangdo0008 1,1,mal_in01,18,170
+mal_in01,73,170,0 warp malangdo0009 1,1,mal_in01,124,172
+mal_in01,124,175,0 warp malangdo0010 1,1,mal_in01,70,170
+malangdo,113,151,0 warp malangdo0011 1,1,mal_in01,27,119
+mal_in01,30,119,0 warp malangdo0012 1,1,malangdo,116,151
+mal_in01,20,119,0 warp malangdo0013 1,1,mal_in01,67,115
+mal_in01,67,118,0 warp malangdo0014 1,1,mal_in01,20,116
+malangdo,119,137,0 warp malangdo0015 1,1,mal_in01,35,217
+mal_in01,38,217,0 warp malangdo0016 1,1,malangdo,122,137
+mal_in01,11,218,0 warp malangdo0017 1,1,mal_in01,75,219
+mal_in01,75,222,0 warp malangdo0018 1,1,mal_in01,11,221
+mal_in01,79,219,0 warp malangdo0019 1,1,mal_in01,140,216
+mal_in01,140,213,0 warp malangdo0020 1,1,mal_in01,79,216
+malangdo,135,109,0 warp malangdo0021 1,1,mal_in01,18,75
+mal_in01,18,78,0 warp malangdo0022 1,1,malangdo,135,112
+mal_in01,18,67,0 warp malangdo0023 1,1,mal_in01,67,63
+mal_in01,67,66,0 warp malangdo0024 1,1,mal_in01,21,67
+malangdo,135,276,0 warp malangdo0025 1,1,mal_in01,163,16
+mal_in01,163,13,0 warp malangdo0026 1,1,malangdo,135,273
+malangdo,73,239,0 warp malangdo0027 1,1,mal_dun01,33,230
+mal_dun01,30,230,0 warp malangdo0028 1,1,malangdo,75,237
+
+// Ship Warps
+malangdo,162,163,0 warp malangdo_ship0001 1,1,mal_in02,57,61
+mal_in02,60,61,0 warp malangdo_ship0002 1,1,malangdo,164,161
+mal_in02,51,60,0 warp malangdo_ship0003 1,1,mal_in02,31,60
+mal_in02,34,60,0 warp malangdo_ship0004 1,1,mal_in02,54,60
+mal_in02,63,53,0 warp malangdo_ship0005 1,1,mal_in02,63,32
+mal_in02,63,35,0 warp malangdo_ship0006 1,1,mal_in02,63,56
+mal_in02,63,66,0 warp malangdo_ship0007 1,1,mal_in02,64,90
+mal_in02,64,87,0 warp malangdo_ship0008 1,1,mal_in02,63,63
+mal_in02,101,53,0 warp malangdo_ship0009 1,1,mal_in02,101,32
+mal_in02,101,35,0 warp malangdo_ship0010 1,1,mal_in02,101,56
+mal_in02,101,66,0 warp malangdo_ship0011 1,1,mal_in02,102,90
+mal_in02,102,87,0 warp malangdo_ship0012 1,1,mal_in02,101,63
+mal_in02,137,53,0 warp malangdo_ship0013 1,1,mal_in02,139,32
+mal_in02,139,35,0 warp malangdo_ship0014 1,1,mal_in02,137,56
+mal_in02,137,66,0 warp malangdo_ship0015 1,1,mal_in02,140,90
+mal_in02,140,87,0 warp malangdo_ship0016 1,1,mal_in02,137,63
+mal_in02,142,60,0 warp malangdo_ship0017 1,1,mal_in02,162,61
+mal_in02,159,61,0 warp malangdo_ship0018 1,1,mal_in02,139,60
diff --git a/npc/warps/cities/malaya.txt b/npc/warps/cities/malaya.txt
new file mode 100644
index 000000000..340e72b59
--- /dev/null
+++ b/npc/warps/cities/malaya.txt
@@ -0,0 +1,46 @@
+//===== eAthena Script =======================================
+//= Malaya Port Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Malaya Port
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+// 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
+
+// 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
diff --git a/npc/warps/dungeons/dic_dun.txt b/npc/warps/dungeons/dic_dun.txt
new file mode 100644
index 000000000..7692a1bae
--- /dev/null
+++ b/npc/warps/dungeons/dic_dun.txt
@@ -0,0 +1,24 @@
+//===== eAthena Script =======================================
+//= Scaraba Hole Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Scaraba Hole
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+dic_dun01,88,212,0 warp scarabahole0001 1,1,dic_dun01,168,228
+dic_dun01,164,228,0 warp scarabahole0002 1,1,dic_dun01,84,212
+dic_dun01,371,228,0 warp scarabahole0003 1,1,dic_dun01,32,156
+dic_dun01,28,156,0 warp scarabahole0004 1,1,dic_dun01,367,228
+dic_dun01,371,172,0 warp scarabahole0005 1,1,dic_dun01,32,100
+dic_dun01,28,100,0 warp scarabahole0006 1,1,dic_dun01,367,172
+dic_dun02,102,148,0 warp scarabahole0007 1,1,dic_dun01,290,103
+dic_dun01,370,100,0 warp scarabahole0008 1,1,dic_dun01,33,44
+dic_dun01,29,44,0 warp scarabahole0009 1,1,dic_dun01,366,100
+dic_dun03,102,148,0 warp scarabahole0010 1,1,dic_dun01,290,103
diff --git a/npc/warps/dungeons/ecl_dun.txt b/npc/warps/dungeons/ecl_dun.txt
new file mode 100644
index 000000000..7d60ff337
--- /dev/null
+++ b/npc/warps/dungeons/ecl_dun.txt
@@ -0,0 +1,24 @@
+//===== eAthena Script =======================================
+//= Eclage Dungeon Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Eclage Dungeon
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+ecl_fild01,182,82,0 warp eclage_dun0001 1,1,ecl_tdun01,60,13
+ecl_tdun01,61,11,0 warp eclage_dun0002 1,1,ecl_fild01,182,85
+ecl_tdun01,67,106,0 warp eclage_dun0003 1,1,ecl_tdun02,60,88
+ecl_tdun02,60,90,0 warp eclage_dun0004 1,1,ecl_tdun01,70,105
+ecl_tdun02,52,9,0 warp eclage_dun0005 1,1,ecl_tdun03,47,13
+ecl_tdun03,49,11,0 warp eclage_dun0006 1,1,ecl_tdun02,50,11
+ecl_tdun03,50,46,0 warp eclage_dun0007 1,1,ecl_tdun04,26,23
+ecl_tdun04,26,26,0 warp eclage_dun0008 1,1,ecl_tdun03,50,43
+ecl_tdun04,34,17,0 warp eclage_dun0009 1,1,ecl_fild01,183,73
+ecl_fild01,183,70,0 warp eclage_dun0010 1,1,ecl_tdun04,32,19
diff --git a/npc/warps/fields/bif_fild.txt b/npc/warps/fields/bif_fild.txt
new file mode 100644
index 000000000..89db0e7be
--- /dev/null
+++ b/npc/warps/fields/bif_fild.txt
@@ -0,0 +1,22 @@
+//===== eAthena Script =======================================
+//= Bifrost Field Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Bifrost Field
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+splendide,275,390,0 warp bifrost_field0001 1,1,bif_fild01,316,50
+bif_fild01,318,48,0 warp bifrost_field0002 1,1,splendide,275,387
+bif_fild02,285,333,0 warp bifrost_field0003 1,1,mora,179,74
+mora,182,74,0 warp bifrost_field0004 1,1,bif_fild02,285,330
+bif_fild02,95,310,0 warp bifrost_field0005 1,1,mora,22,157
+mora,20,159,0 warp bifrost_field0006 1,1,bif_fild02,98,309
+bif_fild02,174,162,0 warp bifrost_field0007 1,1,mora,58,27
+mora,56,25,0 warp bifrost_field0008 1,1,bif_fild02,177,162
diff --git a/npc/warps/fields/dic_fild.txt b/npc/warps/fields/dic_fild.txt
new file mode 100644
index 000000000..5cd25c974
--- /dev/null
+++ b/npc/warps/fields/dic_fild.txt
@@ -0,0 +1,19 @@
+//===== eAthena Script =======================================
+//= El Dicastes Field Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for El Dicastes Field
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+dic_dun01,371,44,0 warp dic_field0001 1,1,dic_fild01,28,79
+dic_fild01,24,79,0 warp dic_field0002 1,1,dic_dun01,367,44
+dic_fild01,69,23,0 warp dic_field0003 1,1,dic_fild02,71,371
+dic_fild02,71,375,0 warp dic_field0004 1,1,dic_fild01,69,27
+dicastes01,199,34,0 warp dic_field0005 1,1,dic_fild01,150,277
diff --git a/npc/warps/other/paradise.txt b/npc/warps/other/paradise.txt
new file mode 100644
index 000000000..aa2fd5001
--- /dev/null
+++ b/npc/warps/other/paradise.txt
@@ -0,0 +1,25 @@
+//===== eAthena Script =======================================
+//= Paradise Group Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version;
+//===== Description: =========================================
+//= Warp Points for Paradise Group
+//===== Additional Comments: =================================
+//= 1.0 First Release
+//============================================================
+
+moc_para01,57,27,0 warp parawarp001 1,1,moc_para01,161,26
+moc_para01,158,26,0 warp parawarp002 1,1,moc_para01,54,27
+moc_para01,48,16,0 warp parawarp003 1,1,moc_para01,47,164
+moc_para01,47,161,0 warp parawarp004 1,1,moc_para01,48,19
+moc_para01,41,187,0 warp parawarp005 1,1,moc_para01,179,93
+moc_para01,179,90,0 warp parawarp006 1,1,moc_para01,41,184
+moc_para01,100,27,0 warp parawarp007 1,1,moc_para01,46,86
+moc_para01,49,86,0 warp parawarp008 1,1,moc_para01,103,27
+moc_para01,113,32,0 warp parawarp009 1,1,moc_para01,105,92
+moc_para01,102,92,0 warp parawarp010 1,1,moc_para01,110,32
+moc_para01,107,12,0 warp parawarp011 1,1,moc_para01,48,36
diff --git a/npc/warps/other/s_workshop.txt b/npc/warps/other/s_workshop.txt
new file mode 100644
index 000000000..077dc4acf
--- /dev/null
+++ b/npc/warps/other/s_workshop.txt
@@ -0,0 +1,22 @@
+//===== eAthena Script =======================================
+//= Shadow Workshop Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Shadow Workshop
+//===== Additional Comments: =================================
+//= 1.0 First Release
+//============================================================
+
+rachel,180,115,0 warp s_atelier0001 1,1,s_atelier,131,72
+s_atelier,131,75,0 warp s_atelier0002 1,1,rachel,180,118
+s_atelier,117,71,0 warp s_atelier0003 1,1,s_atelier,169,72
+s_atelier,166,72,0 warp s_atelier0004 1,1,s_atelier,117,68
+prontera,272,108,0 warp s_atelier0005 1,1,s_atelier,13,119
+s_atelier,9,119,0 warp s_atelier0006 1,1,prontera,269,108
+s_atelier,31,128,0 warp s_atelier0007 1,1,s_atelier,76,125
+s_atelier,76,128,0 warp s_atelier0008 1,1,s_atelier,28,128