summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/017-1/_warps.txt1
-rw-r--r--npc/018-3/_mobs.txt1
-rw-r--r--npc/018-3/_warps.txt1
-rw-r--r--npc/018-4/_import.txt1
-rw-r--r--npc/018-4/_warps.txt2
-rw-r--r--npc/018-4/mapflags.txt1
6 files changed, 5 insertions, 2 deletions
diff --git a/npc/017-1/_warps.txt b/npc/017-1/_warps.txt
index 120279689..d25c5e2f2 100644
--- a/npc/017-1/_warps.txt
+++ b/npc/017-1/_warps.txt
@@ -2,7 +2,6 @@
// 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,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
017-1,119,60,0 warp #017-1_119_60 0,0,017-2,31,30
017-1,219,91,0 warp #017-1_219_91 0,0,014-4,95,33
017-1,55,143,0 warp #017-1_55_143 2,0,017-3,32,44
diff --git a/npc/018-3/_mobs.txt b/npc/018-3/_mobs.txt
index ad5608b30..9f4dc715d 100644
--- a/npc/018-3/_mobs.txt
+++ b/npc/018-3/_mobs.txt
@@ -16,3 +16,4 @@
018-3,74,72,56,53 monster Black Mamba 1174,9,20000,0
018-3,56,114,1,1 monster Black Scorpion 1074,1,0,10000
018-3,41,76,1,1 monster Electro Worm 1173,1,0,30000
+018-3,95,94,8,4 monster Black Mamba 1174,3,20000,10000
diff --git a/npc/018-3/_warps.txt b/npc/018-3/_warps.txt
index dc47c4e10..7cd142b11 100644
--- a/npc/018-3/_warps.txt
+++ b/npc/018-3/_warps.txt
@@ -1,3 +1,4 @@
// 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-2-1,27,126
+018-3,94,96,0 warp #018-3_94_96 0,0,018-4,164,104
diff --git a/npc/018-4/_import.txt b/npc/018-4/_import.txt
index 17bc5383e..bfa4ca971 100644
--- a/npc/018-4/_import.txt
+++ b/npc/018-4/_import.txt
@@ -2,3 +2,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/018-4/_mobs.txt",
"npc/018-4/_warps.txt",
+"npc/018-4/mapflags.txt",
diff --git a/npc/018-4/_warps.txt b/npc/018-4/_warps.txt
index 2c215adc5..ed546e4f0 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,018-4-1,102,84
-018-4,164,105,0 warp #018-4_164_105 0,0,017-1,182,196
+018-4,164,105,0 warp #018-4_164_105 0,0,018-3,94,95
018-4,73,24,0 warp #018-4_73_24 0,0,018-4-2,33,34
diff --git a/npc/018-4/mapflags.txt b/npc/018-4/mapflags.txt
new file mode 100644
index 000000000..614a15254
--- /dev/null
+++ b/npc/018-4/mapflags.txt
@@ -0,0 +1 @@
+018-4 mapflag nopenalty