summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/012-4/_warps.txt1
-rw-r--r--world/map/npc/012-5/_import.txt6
-rw-r--r--world/map/npc/012-5/_mobs.txt3
-rw-r--r--world/map/npc/012-5/_nodes.txt4
-rw-r--r--world/map/npc/012-5/_warps.txt4
-rw-r--r--world/map/npc/017-9/_warps.txt4
-rw-r--r--world/map/npc/020-3/_mobs.txt9
-rw-r--r--world/map/npc/031-3/_mobs.txt5
-rw-r--r--world/map/npc/_import.txt1
9 files changed, 28 insertions, 9 deletions
diff --git a/world/map/npc/012-4/_warps.txt b/world/map/npc/012-4/_warps.txt
index eaff1897..354ffbc9 100644
--- a/world/map/npc/012-4/_warps.txt
+++ b/world/map/npc/012-4/_warps.txt
@@ -4,3 +4,4 @@
012-4,193,58|warp|-1,-1,012-3,448,62
012-4,363,26|warp|-1,-1,012-4,474,187
012-4,474,188|warp|-1,-1,012-4,363,27
+012-4,278,73|warp|-1,-1,012-5,217,198
diff --git a/world/map/npc/012-5/_import.txt b/world/map/npc/012-5/_import.txt
new file mode 100644
index 00000000..e7f2912d
--- /dev/null
+++ b/world/map/npc/012-5/_import.txt
@@ -0,0 +1,6 @@
+// Map 012-5: Lower Terranite Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 012-5
+npc: npc/012-5/_mobs.txt
+npc: npc/012-5/_nodes.txt
+npc: npc/012-5/_warps.txt
diff --git a/world/map/npc/012-5/_mobs.txt b/world/map/npc/012-5/_mobs.txt
new file mode 100644
index 00000000..300c5c16
--- /dev/null
+++ b/world/map/npc/012-5/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Lower Terranite Cave mobs
+
diff --git a/world/map/npc/012-5/_nodes.txt b/world/map/npc/012-5/_nodes.txt
new file mode 100644
index 00000000..52903884
--- /dev/null
+++ b/world/map/npc/012-5/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Lower Terranite Cave nodes
+
+// (no nodes)
diff --git a/world/map/npc/012-5/_warps.txt b/world/map/npc/012-5/_warps.txt
new file mode 100644
index 00000000..32cd2333
--- /dev/null
+++ b/world/map/npc/012-5/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Lower Terranite Cave warps
+
+012-5,217,199|warp|-1,-1,012-4,278,74
diff --git a/world/map/npc/017-9/_warps.txt b/world/map/npc/017-9/_warps.txt
index 15bde415..424978bd 100644
--- a/world/map/npc/017-9/_warps.txt
+++ b/world/map/npc/017-9/_warps.txt
@@ -2,7 +2,7 @@
// GM Lounge warps
017-9,29,20|warp|-1,-1,020-1,60,75
-017-9,26,21|warp|-1,-1,009-1,43,45
-017-9,21,20|warp|-1,-1,001-1,54,118
+017-9,26,21|warp|-1,-1,009-1,42,44
+017-9,21,20|warp|-1,-1,001-1,55,118
017-9,31,20|warp|-1,-1,027-2,46,110
017-9,23,20|warp|-1,-1,029-1,34,95
diff --git a/world/map/npc/020-3/_mobs.txt b/world/map/npc/020-3/_mobs.txt
index 2e7ed4a0..f9d4cee7 100644
--- a/world/map/npc/020-3/_mobs.txt
+++ b/world/map/npc/020-3/_mobs.txt
@@ -1,7 +1,8 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Ice cave mobs
-020-3,40,36,29,4|monster|Bat|1017,1,100000ms,30000ms
-020-3,40,49,34,7|monster|Pinkie|1018,1,100000ms,30000ms
-020-3,0,0,0,0|monster|Bat|1017,20,0ms,0ms
-020-3,0,0,0,0|monster|Pinkie|1018,10,0ms,0ms
+020-3,40,36,29,4|monster|Moggun|1061,1,100000ms,30000ms
+020-3,40,49,34,7|monster|Bluepar|1107,1,100000ms,30000ms
+020-3,0,0,0,0|monster|Moggun|1061,20,0ms,0ms
+020-3,0,0,0,0|monster|Bluepar|1107,10,0ms,0ms
+020-3,0,0,0,0|monster|WhiteSlime|1093,20,0ms,0ms
diff --git a/world/map/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt
index db4ebe19..5eb79a5b 100644
--- a/world/map/npc/031-3/_mobs.txt
+++ b/world/map/npc/031-3/_mobs.txt
@@ -25,12 +25,11 @@
031-3,282,196,62,16|monster|Moggun|1061,3,100000ms,30000ms
031-3,229,226,27,34|monster|Yeti|1072,3,100000ms,30000ms
031-3,230,227,12,42|monster|IceGoblin|1058,5,100000ms,30000ms
-031-3,209,199,12,17|monster|Yeti|1072,2,100000ms,30000ms
-031-3,193,216,12,17|monster|Yeti|1072,1,100000ms,30000ms
031-3,213,282,66,43|monster|Bat|1017,5,100000ms,30000ms
031-3,213,282,66,43|monster|Pollett|1113,5,100000ms,30000ms
+031-3,193,216,12,17|monster|Yeti|1072,1,100000ms,30000ms
+031-3,209,199,12,17|monster|Yeti|1072,4,100000ms,30000ms
031-3,199,200,45,14|monster|Bat|1017,13,100000ms,30000ms
-031-3,209,199,12,17|monster|Yeti|1072,2,100000ms,30000ms
031-3,234,141,18,19|monster|Yeti|1072,2,100000ms,30000ms
031-3,282,196,62,16|monster|Moggun|1061,3,100000ms,30000ms
031-3,212,159,62,16|monster|Moggun|1061,7,100000ms,30000ms
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 2e832cdb..a44f7f89 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -38,6 +38,7 @@ import: npc/011-6/_import.txt
import: npc/012-1/_import.txt
import: npc/012-3/_import.txt
import: npc/012-4/_import.txt
+import: npc/012-5/_import.txt
import: npc/013-1/_import.txt
import: npc/013-2/_import.txt
import: npc/013-3/_import.txt