7 files changed, 167 insertions, 1 deletions
diff --git a/npc/001-7/_warps.txt b/npc/001-7/_warps.txt
index 3c4a37560..631b7b53d 100644
--- a/npc/001-7/_warps.txt
+++ b/npc/001-7/_warps.txt
@@ -12,7 +12,6 @@
 001-7,67,44,0	warp	#001-7_67_44	0,0,001-7,43,69
 001-7,58,81,0	warp	#001-7_58_81	0,0,001-7,31,52
 001-7,31,51,0	warp	#001-7_31_51	0,0,001-7,58,82
-001-7,91,89,0	warp	#001-7_91_89	0,0,001-7,153,31
 001-7,39,75,0	warp	#001-7_39_75	0,0,001-7,61,123
 001-7,61,122,0	warp	#001-7_61_122	0,0,001-7,39,76
 001-7,90,67,0	warp	#001-7_90_67	0,0,001-7,104,51
diff --git a/npc/023-3-1/_import.txt b/npc/023-3-1/_import.txt
index 39a6bd59a..1f9e05ca3 100644
--- a/npc/023-3-1/_import.txt
+++ b/npc/023-3-1/_import.txt
@@ -1,2 +1,3 @@
 // Map 023-3-1: Ice Caves
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/023-3-1/logic.txt",
diff --git a/npc/023-3-1/logic.txt b/npc/023-3-1/logic.txt
new file mode 100644
index 000000000..1962edfb3
--- /dev/null
+++ b/npc/023-3-1/logic.txt
@@ -0,0 +1,67 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    023-3-1 The First Monster King's Throne Room Configuration File
+
+023-3-1	mapflag	zone	MMO
+
+023-3,39,59,0	script	#Exit02331	NPC_HIDDEN,1,0,{
+    end;
+OnTouch:
+    .@q=getq(General_Narrator);
+    .@q2=getq2(General_Narrator);
+    // Cheater Detected
+    if (.@q < 13) { 
+        warp "Save", 0, 0;
+        percentheal -100, -100;
+        return false;
+    }
+    if (.@q == 13) {
+        dispbottom lg("I'm not a coward! I must press forward!");
+        end;
+    }
+	.@mapn$="001-7";
+    warp .@mapn$, 59, 45;
+    end;
+}
+
+023-3-1,45,27,0	script	#Finish02331	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    .@q=getq(General_Narrator);
+    .@q2=getq2(General_Narrator);
+    // Cheater Detected
+    if (.@q < 13) { 
+        warp "Save", 0, 0;
+        percentheal -100, -100;
+        return false;
+    }
+
+	.@mapn$="023-3-2";
+    warp .@mapn$, any(39,40), 58;
+    end;
+}
+
+001-7,59,44,0	script	#Init02331	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    .@q=getq(General_Narrator);
+    .@q2=getq2(General_Narrator);
+    // Cheater Detected
+    if (.@q < 13) { 
+        warp "Save", 0, 0;
+        percentheal -100, -100;
+        return false;
+    }
+    if (.@q == 13) {
+        dispbottom lg("I'm not a coward! I must press forward!");
+        end;
+    }
+	.@mapn$="023-3-1";
+    warp .@mapn$, any(45,46), 79;
+    end;
+}
+
diff --git a/npc/023-3-2/_import.txt b/npc/023-3-2/_import.txt
index 0573c4d25..b163d8fb9 100644
--- a/npc/023-3-2/_import.txt
+++ b/npc/023-3-2/_import.txt
@@ -1,2 +1,3 @@
 // Map 023-3-2: Ice Caves
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/023-3-2/logic.txt",
diff --git a/npc/023-3-2/logic.txt b/npc/023-3-2/logic.txt
new file mode 100644
index 000000000..17ea27118
--- /dev/null
+++ b/npc/023-3-2/logic.txt
@@ -0,0 +1,28 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    023-3-2 Isbamuth's Study Room Configuration File
+
+023-3-2	mapflag	zone	MMO
+
+023-3,39,59,0	script	#Exit02332	NPC_HIDDEN,1,0,{
+    end;
+OnTouch:
+    .@q=getq(General_Narrator);
+    .@q2=getq2(General_Narrator);
+    // Cheater Detected
+    if (.@q < 13) { 
+        warp "Save", 0, 0;
+        percentheal -100, -100;
+        return false;
+    }
+    if (.@q == 13) {
+        dispbottom lg("I'm not a coward! I must press forward!");
+        end;
+    }
+	.@mapn$="023-3-1";
+    warp .@mapn$, 45, 28;
+    end;
+}
+
diff --git a/npc/023-3/_import.txt b/npc/023-3/_import.txt
index a9e60c143..24d3ec798 100644
--- a/npc/023-3/_import.txt
+++ b/npc/023-3/_import.txt
@@ -1,2 +1,3 @@
 // Map 023-3: Ice Caves
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/023-3/logic.txt",
diff --git a/npc/023-3/logic.txt b/npc/023-3/logic.txt
new file mode 100644
index 000000000..623b573b0
--- /dev/null
+++ b/npc/023-3/logic.txt
@@ -0,0 +1,69 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    023-3 Abandoned Ice Caves Configuration File
+
+023-3	mapflag	zone	MMO
+
+023-3,63,220,0	script	#Exit0233	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    .@q=getq(General_Narrator);
+    .@q2=getq2(General_Narrator);
+    // Cheater Detected
+    if (.@q < 13) { 
+        warp "Save", 0, 0;
+        percentheal -100, -100;
+        return false;
+    }
+
+	mesc l("Return to Frostia's Castle?");
+	if (askyesno() == ASK_YES) {
+		.@mapn$="024-16";
+	    warp .@mapn$, 30, 26;
+	}
+	closeclientdialog;
+	close;
+}
+
+023-3,48,22,0	script	#Finish0233	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    .@q=getq(General_Narrator);
+    .@q2=getq2(General_Narrator);
+    // Cheater Detected
+    if (.@q < 13) { 
+        warp "Save", 0, 0;
+        percentheal -100, -100;
+        return false;
+    }
+
+	.@mapn$="001-7";
+    warp .@mapn$, 91, 90;
+    end;
+}
+
+001-7,91,89,0	script	#Init0233	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    .@q=getq(General_Narrator);
+    .@q2=getq2(General_Narrator);
+    // Cheater Detected
+    if (.@q < 13) { 
+        warp "Save", 0, 0;
+        percentheal -100, -100;
+        return false;
+    }
+    if (.@q == 13) {
+        dispbottom lg("I'm not a coward! I must press forward!");
+        end;
+    }
+	.@mapn$="023-3";
+    warp .@mapn$, 48, 23;
+    end;
+}
+