summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/003-0-save/_import.txt2
-rw-r--r--npc/003-0/_import.txt1
-rw-r--r--npc/003-0/_warps.txt3
-rw-r--r--npc/003-1/_import.txt1
-rw-r--r--npc/003-1/magic.txt18
-rw-r--r--npc/_import.txt1
6 files changed, 26 insertions, 0 deletions
diff --git a/npc/003-0-save/_import.txt b/npc/003-0-save/_import.txt
new file mode 100644
index 000000000..7a29e92c8
--- /dev/null
+++ b/npc/003-0-save/_import.txt
@@ -0,0 +1,2 @@
+// Map 003-0-save: The Magic Guild
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/003-0/_import.txt b/npc/003-0/_import.txt
index b64702ef4..e83060718 100644
--- a/npc/003-0/_import.txt
+++ b/npc/003-0/_import.txt
@@ -1,2 +1,3 @@
// Map 003-0: The Magic Guild
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-0/_warps.txt",
diff --git a/npc/003-0/_warps.txt b/npc/003-0/_warps.txt
new file mode 100644
index 000000000..90fb829a0
--- /dev/null
+++ b/npc/003-0/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-0: The Magic Guild warps
+003-0,48,52,0 warp #003-0_48_52 2,0,003-1,34,34
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index 5b98f434d..26d57714e 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -18,6 +18,7 @@
"npc/003-1/jakod.txt",
"npc/003-1/jerican.txt",
"npc/003-1/lieutenantdausen.txt",
+"npc/003-1/magic.txt",
"npc/003-1/mahoud.txt",
"npc/003-1/malivox.txt",
"npc/003-1/mapflags.txt",
diff --git a/npc/003-1/magic.txt b/npc/003-1/magic.txt
new file mode 100644
index 000000000..1cd76a50b
--- /dev/null
+++ b/npc/003-1/magic.txt
@@ -0,0 +1,18 @@
+// TMW2 scripts.
+// Authors:
+// Jesusalva
+// Description:
+// Controlled Warp to Magic School (+whatever magic stuff we need to add later)
+
+003-1,34,33,0 script #MagicSchoolGate1 NPC_HIDDEN,0,0,{
+ end;
+OnTouch:
+ if (countitem(JesusalvaGrimorium) <= 0 || $MAGIC_LVL < 2) {
+ slide 36, 39;
+ percentheal -5, -10;
+ dispbottom l("Powerful magic repels you away from this magic place!");
+ } else {
+ warp "003-0", 48, 51;
+ }
+ end;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 8ce94c29e..75273a7e8 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -19,6 +19,7 @@
@include "npc/002-4/_import.txt"
@include "npc/002-5/_import.txt"
@include "npc/003-0-1/_import.txt"
+@include "npc/003-0-save/_import.txt"
@include "npc/003-0/_import.txt"
@include "npc/003-1-1/_import.txt"
@include "npc/003-1-2/_import.txt"