summaryrefslogtreecommitdiff
path: root/npc/warps
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-10 08:45:19 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-10 08:45:19 +0000
commit1753d5ae8dce576b021b91822440a10ff740f404 (patch)
tree2879f9f98636cd2e4fae83ec3b6cdf687b1e5e8a /npc/warps
parent8e2460f8eb756ed7eb1ffba7244af7b1cb68b3fd (diff)
downloadhercules-1753d5ae8dce576b021b91822440a10ff740f404.tar.gz
hercules-1753d5ae8dce576b021b91822440a10ff740f404.tar.bz2
hercules-1753d5ae8dce576b021b91822440a10ff740f404.tar.xz
hercules-1753d5ae8dce576b021b91822440a10ff740f404.zip
NPC typo fixes, eol style definitons, newline at end of file
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10738 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/warps')
-rw-r--r--npc/warps/cities/moscovia.txt90
-rw-r--r--npc/warps/cities/rachel.txt2
-rw-r--r--npc/warps/dungeons/kiel_dun.txt2
-rw-r--r--npc/warps/dungeons/mosk_dun.txt44
-rw-r--r--npc/warps/dungeons/rachel_dun.txt2
-rw-r--r--npc/warps/dungeons/thana_dun.txt2
-rw-r--r--npc/warps/other/kiel.txt1
7 files changed, 71 insertions, 72 deletions
diff --git a/npc/warps/cities/moscovia.txt b/npc/warps/cities/moscovia.txt
index 27b6faa84..db7529f1b 100644
--- a/npc/warps/cities/moscovia.txt
+++ b/npc/warps/cities/moscovia.txt
@@ -1,45 +1,45 @@
-//===== Athena Script ========================================
-//= Moscovia City Warp Script
-//===== By: ==================================================
-//= $ephiroth
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Moscovia City
-//===== Additional Comments: =================================
-//= 1.0 Initial version [$ephiroth]
-//============================================================
-
-// ---[ Mansion ]---
-moscovia,224,235,0 warp moskwarp1001 1,1,mosk_in,96,91
-mosk_in,93,91,0 warp moskwarp1002 1,1,moscovia,224,232
-mosk_in,100,126,0 warp moskwarp1003 1,1,mosk_in,21,116
-mosk_in,21,113,0 warp moskwarp1004 1,1,mosk_in,100,123
-// ---[ Weapon House ]---
-moscovia,185,189,0 warp moskwarp1005 1,1,mosk_in,16,179
-mosk_in,13,179,0 warp moskwarp1006 1,1,moscovia,188,193
-moscovia,203,171,0 warp moskwarp1007 1,1,mosk_in,85,179
-mosk_in,88,179,0 warp moskwarp1008 1,1,moscovia,205,168
-// ---[ Instrument House / Tool Dealer ]---
-moscovia,223,174,0 warp moskwarp1009 1,1,mosk_in,14,245
-mosk_in,11,245,0 warp moskwarp1010 1,1,moscovia,220,177
-// ---[ Inn ]---
-moscovia,229,207,0 warp moskwarp1011 1,1,mosk_in,141,178
-mosk_in,141,175,0 warp moskwarp1012 1,1,moscovia,226,204
-mosk_in,150,191,0 warp moskwarp1013 1,1,mosk_in,206,187
-mosk_in,203,187,0 warp moskwarp1014 1,1,mosk_in,147,191
-// ---[ Mansion ]---
-moscovia,256,138,0 warp moskwarp1015 1,1,mosk_in,211,114
-mosk_in,211,111,0 warp moskwarp1016 1,1,moscovia,254,141
-mosk_in,221,128,0 warp moskwarp1017 1,1,mosk_in,287,120
-mosk_in,287,117,0 warp moskwarp1018 1,1,mosk_in,221,125
-// ---[ Private House ]---
-moscovia,195,80,0 warp moskwarp1019 1,1,mosk_in,215,40
-mosk_in,215,37,0 warp moskwarp1020 1,1,moscovia,194,78
-// ---[ Private House ]---
-moscovia,146,112,0 warp moskwarp1021 1,1,mosk_in,213,256
-mosk_in,213,253,0 warp moskwarp1022 1,1,moscovia,146,109
-mosk_in,219,272,0 warp moskwarp1023 1,1,mosk_in,151,276
-mosk_in,151,273,0 warp moskwarp1024 1,1,mosk_in,219,269 \ No newline at end of file
+//===== Athena Script ========================================
+//= Moscovia City Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Moscovia City
+//===== Additional Comments: =================================
+//= 1.0 Initial version [$ephiroth]
+//============================================================
+
+// ---[ Mansion ]---
+moscovia,224,235,0 warp moskwarp1001 1,1,mosk_in,96,91
+mosk_in,93,91,0 warp moskwarp1002 1,1,moscovia,224,232
+mosk_in,100,126,0 warp moskwarp1003 1,1,mosk_in,21,116
+mosk_in,21,113,0 warp moskwarp1004 1,1,mosk_in,100,123
+// ---[ Weapon House ]---
+moscovia,185,189,0 warp moskwarp1005 1,1,mosk_in,16,179
+mosk_in,13,179,0 warp moskwarp1006 1,1,moscovia,188,193
+moscovia,203,171,0 warp moskwarp1007 1,1,mosk_in,85,179
+mosk_in,88,179,0 warp moskwarp1008 1,1,moscovia,205,168
+// ---[ Instrument House / Tool Dealer ]---
+moscovia,223,174,0 warp moskwarp1009 1,1,mosk_in,14,245
+mosk_in,11,245,0 warp moskwarp1010 1,1,moscovia,220,177
+// ---[ Inn ]---
+moscovia,229,207,0 warp moskwarp1011 1,1,mosk_in,141,178
+mosk_in,141,175,0 warp moskwarp1012 1,1,moscovia,226,204
+mosk_in,150,191,0 warp moskwarp1013 1,1,mosk_in,206,187
+mosk_in,203,187,0 warp moskwarp1014 1,1,mosk_in,147,191
+// ---[ Mansion ]---
+moscovia,256,138,0 warp moskwarp1015 1,1,mosk_in,211,114
+mosk_in,211,111,0 warp moskwarp1016 1,1,moscovia,254,141
+mosk_in,221,128,0 warp moskwarp1017 1,1,mosk_in,287,120
+mosk_in,287,117,0 warp moskwarp1018 1,1,mosk_in,221,125
+// ---[ Private House ]---
+moscovia,195,80,0 warp moskwarp1019 1,1,mosk_in,215,40
+mosk_in,215,37,0 warp moskwarp1020 1,1,moscovia,194,78
+// ---[ Private House ]---
+moscovia,146,112,0 warp moskwarp1021 1,1,mosk_in,213,256
+mosk_in,213,253,0 warp moskwarp1022 1,1,moscovia,146,109
+mosk_in,219,272,0 warp moskwarp1023 1,1,mosk_in,151,276
+mosk_in,151,273,0 warp moskwarp1024 1,1,mosk_in,219,269
diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index 84fd9f6b8..49d3aeb1a 100644
--- a/npc/warps/cities/rachel.txt
+++ b/npc/warps/cities/rachel.txt
@@ -120,4 +120,4 @@ ra_in01,375,109,0 warp rachel85 1,1,rachel,116,154
rachel,116,158,0 warp rachel86 1,1,ra_in01,375,114
//Additional Temple warp
-ra_temin,275,243,0 warp rachel87 1,1,ra_temin,131,131 \ No newline at end of file
+ra_temin,275,243,0 warp rachel87 1,1,ra_temin,131,131
diff --git a/npc/warps/dungeons/kiel_dun.txt b/npc/warps/dungeons/kiel_dun.txt
index fe0b27141..096e5fd03 100644
--- a/npc/warps/dungeons/kiel_dun.txt
+++ b/npc/warps/dungeons/kiel_dun.txt
@@ -35,4 +35,4 @@ OnTouch:
warp "kh_dun01",32,199;
}
-} \ No newline at end of file
+}
diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt
index 30b79c6ee..6cbbfde42 100644
--- a/npc/warps/dungeons/mosk_dun.txt
+++ b/npc/warps/dungeons/mosk_dun.txt
@@ -1,22 +1,22 @@
-//===== Athena Script ========================================
-//= Moscovia Dungeon Warp Script
-//===== By: ==================================================
-//= $ephiroth
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Moscovia Dungeon
-//===== Additional Comments: =================================
-//= 1.0 Initial version [$ephiroth]
-//============================================================
-
-mosk_fild02,190,256,0 warp moskwarp4001 1,1,mosk_dun01,190,46
-mosk_dun01,190,43,0 warp moskwarp4002 1,1,mosk_fild02,190,253
-
-mosk_dun01,200,272,0 warp moskwarp4003 1,1,mosk_dun02,163,31
-mosk_dun02,165,28,0 warp moskwarp4004 1,1,mosk_dun01,200,269
-
-mosk_dun02,266,117,0 warp moskwarp4005 1,1,mosk_dun03,33,136
-mosk_dun03,30,133,0 warp moskwarp4006 1,1,mosk_dun02,263,118 \ No newline at end of file
+//===== Athena Script ========================================
+//= Moscovia Dungeon Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Moscovia Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Initial version [$ephiroth]
+//============================================================
+
+mosk_fild02,190,256,0 warp moskwarp4001 1,1,mosk_dun01,190,46
+mosk_dun01,190,43,0 warp moskwarp4002 1,1,mosk_fild02,190,253
+
+mosk_dun01,200,272,0 warp moskwarp4003 1,1,mosk_dun02,163,31
+mosk_dun02,165,28,0 warp moskwarp4004 1,1,mosk_dun01,200,269
+
+mosk_dun02,266,117,0 warp moskwarp4005 1,1,mosk_dun03,33,136
+mosk_dun03,30,133,0 warp moskwarp4006 1,1,mosk_dun02,263,118
diff --git a/npc/warps/dungeons/rachel_dun.txt b/npc/warps/dungeons/rachel_dun.txt
index 932609912..aa724c6c9 100644
--- a/npc/warps/dungeons/rachel_dun.txt
+++ b/npc/warps/dungeons/rachel_dun.txt
@@ -40,4 +40,4 @@ ra_san04,35,221,0 warp sanctuary13 1,1,ra_san02,213,9
ra_san02,30,21,0 warp sanctuary14 1,1,ra_san05,14,149
//Additional Dungeon warp. (Exit)
-ra_san01,139,139,0 warp sanctuary15 1,1,ra_temin,27,314 \ No newline at end of file
+ra_san01,139,139,0 warp sanctuary15 1,1,ra_temin,27,314
diff --git a/npc/warps/dungeons/thana_dun.txt b/npc/warps/dungeons/thana_dun.txt
index de237b5d1..36f8ab8cd 100644
--- a/npc/warps/dungeons/thana_dun.txt
+++ b/npc/warps/dungeons/thana_dun.txt
@@ -57,4 +57,4 @@ thana_step,15,15,0 warp WarpThana11a 1,1,tha_t11,50,17
tha_t11,92,36,0 warp WarpThana11b 1,1,thana_step,180,73
// Thanatos Tower Level 12 (tha_t12)
-thana_step,181,15,0 warp WarpThana12a 1,1,tha_t12,115,16 \ No newline at end of file
+thana_step,181,15,0 warp WarpThana12a 1,1,tha_t12,115,16
diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt
index 32709a43a..7ca01c475 100644
--- a/npc/warps/other/kiel.txt
+++ b/npc/warps/other/kiel.txt
@@ -99,4 +99,3 @@ kh_rossi,204,238,0 warp kh_rossi_17a 1,1,kh_rossi,204,283
kh_rossi,204,279,0 warp kh_rossi_17b 1,1,kh_rossi,204,235
kh_rossi,220,238,0 warp kh_rossi_18a 1,1,kh_rossi,261,283
kh_rossi,260,279,0 warp kh_rossi_18b 1,1,kh_rossi,220,235
-