Move 001-7 logic parts to 001-7/ folder

4 files changed, 63 insertions, 53 deletions

diff --git a/npc/001-7/_import.txt b/npc/001-7/_import.txt
index 808e1ca58..733e72626 100644
--- a/npc/001-7/_import.txt
+++ b/npc/001-7/_import.txt
@@ -4,4 +4,5 @@
 "npc/001-7/_warps.txt",
 "npc/001-7/barbarian.txt",
 "npc/001-7/celestia_bossfight.txt",
+"npc/001-7/homunculus.txt",
 "npc/001-7/mapflags.txt",
diff --git a/npc/001-7/homunculus.txt b/npc/001-7/homunculus.txt
new file mode 100644
index 000000000..bd14db3a4
--- /dev/null
+++ b/npc/001-7/homunculus.txt
@@ -0,0 +1,51 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    001-7 Monster King's Village Configuration File
+//    Part of Player Quest, see 023-3 scope and 024-16
+//    (C) Moubootaur Legends, 2019
+
+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 == 15) {
+        dispbottom lg("I'm not a coward! I must press forward!");
+        end;
+    }
+	.@mapn$="023-3";
+    warp .@mapn$, 48, 23;
+    end;
+}
+
+001-7,59,44,0	script	#Init02331	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    .@n=getq(General_Narrator);
+    .@q=getq2(FrostiaQuest_Homunculus);
+    // Cheater Detected
+    if (.@n < 13) { 
+        warp "Save", 0, 0;
+        percentheal -100, -100;
+        return false;
+    }
+    if (.@q < 15) {
+        dispbottom l("It seems to be sealed.");
+        end;
+    }
+	.@mapn$="023-3-1";
+    warp .@mapn$, any(45,46), 79;
+    end;
+}
+// Okay, we're done with basic warps
+
diff --git a/npc/023-3-1/logic.txt b/npc/023-3-1/logic.txt
index 9ce0bc4f0..62ce7d33e 100644
--- a/npc/023-3-1/logic.txt
+++ b/npc/023-3-1/logic.txt
@@ -9,15 +9,15 @@
 023-3,39,59,0	script	#Exit02331	NPC_HIDDEN,1,0,{
     end;
 OnTouch:
-    .@q=getq(General_Narrator);
-    .@q2=getq2(General_Narrator);
+    .@n=getq(General_Narrator);
+    .@q=getq2(FrostiaQuest_Homunculus);
     // Cheater Detected
-    if (.@q < 15) { 
+    if (.@n < 15) { 
         warp "Save", 0, 0;
         percentheal -100, -100;
         return false;
     }
-    if (.@q == 15) {
+    if (.@n == 15) {
         dispbottom lg("I'm not a coward! I must press forward!");
         end;
     }
@@ -30,10 +30,10 @@ OnTouch:
     end;
 
 OnTouch:
-    .@q=getq(General_Narrator);
-    .@q2=getq2(General_Narrator);
+    .@n=getq(General_Narrator);
+    .@q=getq2(FrostiaQuest_Homunculus);
     // Cheater Detected
-    if (.@q < 13) { 
+    if (.@n < 13) { 
         warp "Save", 0, 0;
         percentheal -100, -100;
         return false;
@@ -47,15 +47,15 @@ OnTouch:
 023-3,45,27,0	script	#Leave02331	NPC_HIDDEN,1,0,{
     end;
 OnTouch:
-    .@q=getq(General_Narrator);
-    .@q2=getq2(General_Narrator);
+    .@n=getq(General_Narrator);
+    .@q=getq2(FrostiaQuest_Homunculus);
     // Cheater Detected
-    if (.@q < 15) { 
+    if (.@n < 15) { 
         warp "Save", 0, 0;
         percentheal -100, -100;
         return false;
     }
-    if (.@q == 15) {
+    if (.@n == 15) {
         dispbottom lg("I'm not a coward! I must press forward!");
         end;
     }
@@ -64,24 +64,3 @@ OnTouch:
     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 == 15) {
-        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/logic.txt b/npc/023-3/logic.txt
index f3410d5ea..30efbf3a0 100644
--- a/npc/023-3/logic.txt
+++ b/npc/023-3/logic.txt
@@ -46,27 +46,6 @@ OnTouch:
     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 == 15) {
-        dispbottom lg("I'm not a coward! I must press forward!");
-        end;
-    }
-	.@mapn$="023-3";
-    warp .@mapn$, 48, 23;
-    end;
-}
-
 // A simple random treasure chest - to be sure players were introduced to this
 // awesome system. Same rules as any treasure box still applies.
 023-3,94,212,0	script	#chest_02330	NPC_CHEST,{