From 79f82bff9ea69134ba5a4e5fa5d211b909ce1dbb Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 17 Jun 2019 17:13:44 -0300
Subject: Move 001-7 logic parts to 001-7/ folder
---
maps/re/023-3.mcache | Bin 1625 -> 1633 bytes
npc/001-7/_import.txt | 1 +
npc/001-7/homunculus.txt | 51 +++++++++++++++++++++++++++++++++++++++++++++++
npc/023-3-1/logic.txt | 43 ++++++++++-----------------------------
npc/023-3/logic.txt | 21 -------------------
5 files changed, 63 insertions(+), 53 deletions(-)
create mode 100644 npc/001-7/homunculus.txt
diff --git a/maps/re/023-3.mcache b/maps/re/023-3.mcache
index 2dc3b354e..e0b964918 100644
Binary files a/maps/re/023-3.mcache and b/maps/re/023-3.mcache differ
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,{
--
cgit v1.2.3-70-g09d2