10 files changed, 106 insertions, 78 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index cf7a51601..3cee706fb 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -20,6 +20,7 @@ map_list: (
     "002-4",
     "002-5",
     "003-0-1",
+    "003-0-save",
     "003-0",
     "003-1-1",
     "003-1-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index bbee690e1..bcfe8cf84 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -17,81 +17,82 @@
 002-4 17
 002-5 18
 003-0-1 19
-003-0 20
-003-1-1 21
-003-1-2 22
-003-1-3 23
-003-1 24
-003-10 25
-003-13 26
-003-2 27
-003-3 28
-003-4-1 29
-003-4 30
-003-5 31
-003-6 32
-003-7 33
-003-8 34
-004-1 35
-004-2-1 36
-004-2 37
-005-1 38
-005-2-1 39
-005-2 40
-005-3 41
-005-4 42
-005-5 43
-005-6 44
-005-7 45
-006-1 46
-007-1 47
-008-0 48
-008-1 49
-008-2 50
-009-1 51
-009-2 52
-009-3 53
-009-4 54
-009-5 55
-010-1-1 56
-010-1 57
-010-2 58
-011-1 59
-011-2 60
-012-1 61
-012-2 62
-012-3 63
-012-4 64
-012-5 65
-012-6 66
-012-7 67
-014-1 68
-014-2 69
-014-3 70
-014-4 71
-015-1 72
-015-2 73
-015-3 74
-016-1 75
-016-6 76
-016-7 77
-017-1 78
-017-2-1 79
-017-2 80
-017-3 81
-018-1-1 82
-018-1 83
-018-2-1 84
-018-2 85
-018-3-1 86
-018-3 87
-018-4-1 88
-018-4-2 89
-018-4 90
-boss 91
-botcheck 92
-sec_pri 93
-soren-2 94
-soren 95
-test 96
-testbg 97
+003-0-save 20
+003-0 21
+003-1-1 22
+003-1-2 23
+003-1-3 24
+003-1 25
+003-10 26
+003-13 27
+003-2 28
+003-3 29
+003-4-1 30
+003-4 31
+003-5 32
+003-6 33
+003-7 34
+003-8 35
+004-1 36
+004-2-1 37
+004-2 38
+005-1 39
+005-2-1 40
+005-2 41
+005-3 42
+005-4 43
+005-5 44
+005-6 45
+005-7 46
+006-1 47
+007-1 48
+008-0 49
+008-1 50
+008-2 51
+009-1 52
+009-2 53
+009-3 54
+009-4 55
+009-5 56
+010-1-1 57
+010-1 58
+010-2 59
+011-1 60
+011-2 61
+012-1 62
+012-2 63
+012-3 64
+012-4 65
+012-5 66
+012-6 67
+012-7 68
+014-1 69
+014-2 70
+014-3 71
+014-4 72
+015-1 73
+015-2 74
+015-3 75
+016-1 76
+016-6 77
+016-7 78
+017-1 79
+017-2-1 80
+017-2 81
+017-3 82
+018-1-1 83
+018-1 84
+018-2-1 85
+018-2 86
+018-3-1 87
+018-3 88
+018-4-1 89
+018-4-2 90
+018-4 91
+boss 92
+botcheck 93
+sec_pri 94
+soren-2 95
+soren 96
+test 97
+testbg 98
diff --git a/maps/re/003-0-save.mcache b/maps/re/003-0-save.mcache
new file mode 100644
index 000000000..6bc666916
--- /dev/null
+++ b/maps/re/003-0-save.mcache
diff --git a/maps/re/003-0.mcache b/maps/re/003-0.mcache
index 6bc666916..1687dc502 100644
--- a/maps/re/003-0.mcache
+++ b/maps/re/003-0.mcache
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"