summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/017-1/_import.txt1
-rw-r--r--npc/017-1/_warps.txt6
-rw-r--r--npc/018-1-1/_import.txt2
-rw-r--r--npc/018-1-1/_mobs.txt2
-rw-r--r--npc/018-1-1/_warps.txt2
-rw-r--r--npc/018-1/_warps.txt1
-rw-r--r--npc/018-2-1/_warps.txt4
-rw-r--r--npc/018-2/_warps.txt2
-rw-r--r--npc/018-3/_warps.txt2
-rw-r--r--npc/018-4/_warps.txt4
10 files changed, 17 insertions, 9 deletions
diff --git a/npc/017-1/_import.txt b/npc/017-1/_import.txt
index 8c471e380..5720d3607 100644
--- a/npc/017-1/_import.txt
+++ b/npc/017-1/_import.txt
@@ -1,2 +1,3 @@
// Map 017-1: Land Of Fire Village
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/017-1/_warps.txt",
diff --git a/npc/017-1/_warps.txt b/npc/017-1/_warps.txt
new file mode 100644
index 000000000..ad9e84da6
--- /dev/null
+++ b/npc/017-1/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 017-1: Land Of Fire Village warps
+017-1,176,197,0 warp #017-1_176_197 0,0,018-2,63,105
+017-1,185,197,0 warp #017-1_185_197 0,0,018-3,114,24
+017-1,179,197,0 warp #017-1_179_197 0,0,018-1,32,66
+017-1,182,197,0 warp #017-1_182_197 0,0,018-4,164,104
diff --git a/npc/018-1-1/_import.txt b/npc/018-1-1/_import.txt
index 6b5a866b5..29f69c5d4 100644
--- a/npc/018-1-1/_import.txt
+++ b/npc/018-1-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 018-1-1: Easter Island Cave
+// Map 018-1-1: Sincerity Island Cave
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/018-1-1/_mobs.txt",
"npc/018-1-1/_warps.txt",
diff --git a/npc/018-1-1/_mobs.txt b/npc/018-1-1/_mobs.txt
index f4832e4e2..35c00a8fb 100644
--- a/npc/018-1-1/_mobs.txt
+++ b/npc/018-1-1/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 018-1-1: Easter Island Cave mobs
+// Map 018-1-1: Sincerity Island Cave mobs
018-1-1,51,49,11,7 monster Silkworm 1034,10,30000,3000
018-1-1,43,35,0,0 monster Evil Mushroom 1042,3,40000,5000
018-1-1,27,31,0,0 monster Evil Mushroom 1042,3,40000,5000
diff --git a/npc/018-1-1/_warps.txt b/npc/018-1-1/_warps.txt
index af442022e..c30c4fc11 100644
--- a/npc/018-1-1/_warps.txt
+++ b/npc/018-1-1/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 018-1-1: Easter Island Cave warps
+// Map 018-1-1: Sincerity Island Cave warps
018-1-1,33,78,0 warp #018-1-1_33_78 0,0,018-1,54,38
diff --git a/npc/018-1/_warps.txt b/npc/018-1/_warps.txt
index 7ab989c07..d162146cc 100644
--- a/npc/018-1/_warps.txt
+++ b/npc/018-1/_warps.txt
@@ -1,3 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 018-1: Sincerity warps
018-1,54,37,0 warp #018-1_54_37 0,0,018-1-1,33,77
+018-1,32,67,0 warp #018-1_32_67 0,0,018-1,179,196
diff --git a/npc/018-2-1/_warps.txt b/npc/018-2-1/_warps.txt
index dfce15daf..fddc866d2 100644
--- a/npc/018-2-1/_warps.txt
+++ b/npc/018-2-1/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 018-2-1: Heroes' Hold - Castle warps
-018-2-1,26,33,0 warp #018-2-1_26_33 2,0,hh-outside,72,65
-018-2-1,26,33,0 warp #018-2-1_26_33 2,0,018-2,0,0
+018-2-1,26,33,0 warp #018-2-1_26_33 2,0,018-2,72,65
+018-2-1,26,27,0 warp #018-2-1_26_27 2,0,018-2,0,0
diff --git a/npc/018-2/_warps.txt b/npc/018-2/_warps.txt
index b264d1e6a..3a4af7540 100644
--- a/npc/018-2/_warps.txt
+++ b/npc/018-2/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 018-2: Heroes' Hold - Outside warps
-018-2,63,106,0 warp #018-2_63_106 0,0,000-1,22,22
+018-2,63,106,0 warp #018-2_63_106 0,0,017-1,176,196
018-2,72,63,0 warp #018-2_72_63 3,0,018-2-1,26,32
diff --git a/npc/018-3/_warps.txt b/npc/018-3/_warps.txt
index 248a3e687..ebb84bd5c 100644
--- a/npc/018-3/_warps.txt
+++ b/npc/018-3/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 018-3: Somber Cave warps
-018-3,114,23,0 warp #018-3_114_23 0,0,017-1,1,1
+018-3,114,23,0 warp #018-3_114_23 0,0,017-1,185,196
diff --git a/npc/018-4/_warps.txt b/npc/018-4/_warps.txt
index b97533d59..2c215adc5 100644
--- a/npc/018-4/_warps.txt
+++ b/npc/018-4/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 018-4: Secret Island warps
-018-4,94,89,0 warp #018-4_94_89 0,0,si-cave,102,84
-018-4,164,105,0 warp #018-4_164_105 0,0,017-1,0,0
+018-4,94,89,0 warp #018-4_94_89 0,0,018-4-1,102,84
+018-4,164,105,0 warp #018-4_164_105 0,0,017-1,182,196
018-4,73,24,0 warp #018-4_73_24 0,0,018-4-2,33,34