From bbbb4a68efcc73ddb6520186a65346ed59a4dab5 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 17 Apr 2020 06:21:35 -0300
Subject: Final patches (Groata Grotto)

---
 npc/006-3/_import.txt          |  4 ++--
 npc/006-3/grotto.txt           | 23 +++++++++++++++++++++++
 npc/006-3/jaklab.txt           | 27 +++++++++++++++++++++++++++
 npc/006-3/piouisle.txt         | 24 ------------------------
 npc/006-3/warpcandorbattle.txt | 27 ---------------------------
 npc/006-5/_import.txt          |  3 +++
 npc/006-5/_warps.txt           |  3 +++
 npc/_import.txt                |  1 +
 8 files changed, 59 insertions(+), 53 deletions(-)
 create mode 100644 npc/006-3/grotto.txt
 create mode 100644 npc/006-3/jaklab.txt
 delete mode 100644 npc/006-3/piouisle.txt
 delete mode 100644 npc/006-3/warpcandorbattle.txt
 create mode 100644 npc/006-5/_import.txt
 create mode 100644 npc/006-5/_warps.txt

(limited to 'npc')

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/grotto.txt b/npc/006-3/grotto.txt
new file mode 100644
index 000000000..a58d8bffc
--- /dev/null
+++ b/npc/006-3/grotto.txt
@@ -0,0 +1,23 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-3,41,36,0	script	Sign#0063PI	NPC_SWORDS_SIGN,{
+    mesc l("*the text is too faded out to read*");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    end;
+}
+
+// Effective warp
+006-3,40,35,0	script	Magic Barrier#Bug63	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    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/jaklab.txt b/npc/006-3/jaklab.txt
new file mode 100644
index 000000000..f2d119048
--- /dev/null
+++ b/npc/006-3/jaklab.txt
@@ -0,0 +1,27 @@
+// TMW2 Script
+// Author:
+//    Crazyfefe
+//    Jesusalva
+
+
+006-3,53,36,0	script	Sign#0063CF	NPC_SWORDS_SIGN,{
+    mesc l("To the courageous, thy foe is rancorous.");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    end;
+}
+
+// Effective warp
+006-3,54,35,0	script	Magic Barrier#0064	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    if (BaseLevel > 40)
+        warp "006-4", 32, 258;
+    else
+        dispbottom l("Your strength is not enough to power on this portal.");
+    end;
+}
diff --git a/npc/006-3/piouisle.txt b/npc/006-3/piouisle.txt
deleted file mode 100644
index 0554c20bd..000000000
--- a/npc/006-3/piouisle.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// TMW2 Script
-// Author:
-//    Jesusalva
-
-006-3,41,36,0	script	Sign#0063PI	NPC_SWORDS_SIGN,{
-    mesc l("*the text is too faded out to read*");
-    close;
-
-OnInit:
-    .sex = G_OTHER;
-    .distance = 3;
-    end;
-}
-
-// Effective warp
-006-3,40,35,0	script	Magic Barrier#Bug63	NPC_HIDDEN,0,0,{
-    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.");
-    end;
-}
diff --git a/npc/006-3/warpcandorbattle.txt b/npc/006-3/warpcandorbattle.txt
deleted file mode 100644
index f2d119048..000000000
--- a/npc/006-3/warpcandorbattle.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// TMW2 Script
-// Author:
-//    Crazyfefe
-//    Jesusalva
-
-
-006-3,53,36,0	script	Sign#0063CF	NPC_SWORDS_SIGN,{
-    mesc l("To the courageous, thy foe is rancorous.");
-    close;
-
-OnInit:
-    .sex = G_OTHER;
-    .distance = 3;
-    end;
-}
-
-// Effective warp
-006-3,54,35,0	script	Magic Barrier#0064	NPC_HIDDEN,0,0,{
-    end;
-
-OnTouch:
-    if (BaseLevel > 40)
-        warp "006-4", 32, 258;
-    else
-        dispbottom l("Your strength is not enough to power on this portal.");
-    end;
-}
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"
-- 
cgit v1.2.3-70-g09d2