summaryrefslogtreecommitdiff
path: root/npc/warps/cities
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-09 18:46:57 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-09 18:46:57 +0000
commit87372e334b904e0b54c18d06aa99b256f4ab634d (patch)
tree63a4e617534d575b5a352b530cdbaa6c4328d45d /npc/warps/cities
parentb1abcccd21d7a5bf280ae20c71161622e0cf2bd5 (diff)
downloadhercules-87372e334b904e0b54c18d06aa99b256f4ab634d.tar.gz
hercules-87372e334b904e0b54c18d06aa99b256f4ab634d.tar.bz2
hercules-87372e334b904e0b54c18d06aa99b256f4ab634d.tar.xz
hercules-87372e334b904e0b54c18d06aa99b256f4ab634d.zip
- Added svn:eol-style=native property to some recently added text files.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15413 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/warps/cities')
-rw-r--r--npc/warps/cities/dewata.txt40
-rw-r--r--npc/warps/cities/dicastes.txt384
-rw-r--r--npc/warps/cities/eclage.txt66
-rw-r--r--npc/warps/cities/malangdo.txt126
-rw-r--r--npc/warps/cities/malaya.txt92
5 files changed, 354 insertions, 354 deletions
diff --git a/npc/warps/cities/dewata.txt b/npc/warps/cities/dewata.txt
index 22a43a1cd..62bf4013c 100644
--- a/npc/warps/cities/dewata.txt
+++ b/npc/warps/cities/dewata.txt
@@ -1,20 +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
+//===== 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
index 14ebb7428..7efc17a8e 100644
--- a/npc/warps/cities/dicastes.txt
+++ b/npc/warps/cities/dicastes.txt
@@ -1,192 +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;
- }
-}
+//===== 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
index 5a09b8252..b1011ba9e 100644
--- a/npc/warps/cities/eclage.txt
+++ b/npc/warps/cities/eclage.txt
@@ -1,33 +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
+//===== 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
index 1bdc0bbcb..67d8c9334 100644
--- a/npc/warps/cities/malangdo.txt
+++ b/npc/warps/cities/malangdo.txt
@@ -1,63 +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
+//===== 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
index 340e72b59..2ba7af270 100644
--- a/npc/warps/cities/malaya.txt
+++ b/npc/warps/cities/malaya.txt
@@ -1,46 +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
+//===== 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