summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/006-3/_import.txt4
-rw-r--r--npc/006-3/grotto.txt (renamed from npc/006-3/piouisle.txt)5
-rw-r--r--npc/006-3/jaklab.txt (renamed from npc/006-3/warpcandorbattle.txt)0
-rw-r--r--npc/006-5/_import.txt3
-rw-r--r--npc/006-5/_warps.txt3
-rw-r--r--npc/_import.txt1
6 files changed, 11 insertions, 5 deletions
diff --git a/npc/006-3/_import.txt b/npc/006-3/_import.txt
index 95a6b5c5c..450a0a8ec 100644
--- a/npc/006-3/_import.txt
+++ b/npc/006-3/_import.txt
@@ -3,5 +3,5 @@
"npc/006-3/_mobs.txt",
"npc/006-3/_warps.txt",
"npc/006-3/core.txt",
-"npc/006-3/piouisle.txt",
-"npc/006-3/warpcandorbattle.txt",
+"npc/006-3/grotto.txt",
+"npc/006-3/jaklab.txt",
diff --git a/npc/006-3/piouisle.txt b/npc/006-3/grotto.txt
index 0554c20bd..a58d8bffc 100644
--- a/npc/006-3/piouisle.txt
+++ b/npc/006-3/grotto.txt
@@ -17,8 +17,7 @@ OnInit:
end;
OnTouch:
- //warp "006-2", 49, 53;
- //dispbottom l("Please use the warp to the right");
- dispbottom l("This area is not yet ready. Please use the portal to the right instead.");
+ warp "006-5", 49, 53;
+ //dispbottom l("This area is not yet ready. Please use the portal to the right instead.");
end;
}
diff --git a/npc/006-3/warpcandorbattle.txt b/npc/006-3/jaklab.txt
index f2d119048..f2d119048 100644
--- a/npc/006-3/warpcandorbattle.txt
+++ b/npc/006-3/jaklab.txt
diff --git a/npc/006-5/_import.txt b/npc/006-5/_import.txt
new file mode 100644
index 000000000..e0c3f4199
--- /dev/null
+++ b/npc/006-5/_import.txt
@@ -0,0 +1,3 @@
+// Map 006-5: Groata Grotto
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-5/_warps.txt",
diff --git a/npc/006-5/_warps.txt b/npc/006-5/_warps.txt
new file mode 100644
index 000000000..b9d0bcfa3
--- /dev/null
+++ b/npc/006-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-5: Groata Grotto warps
+006-5,49,54,0 warp #006-5_49_54 0,0,006-3,40,36
diff --git a/npc/_import.txt b/npc/_import.txt
index c2b4ac4dd..615cba83e 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -63,6 +63,7 @@
@include "npc/006-3/_import.txt"
@include "npc/006-4-1/_import.txt"
@include "npc/006-4/_import.txt"
+@include "npc/006-5/_import.txt"
@include "npc/007-1/_import.txt"
@include "npc/008-0/_import.txt"
@include "npc/008-1/_import.txt"