summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-06-18 13:00:35 -0300
committerJesusaves <cpntb1@ymail.com>2019-06-18 13:00:35 -0300
commit3d5beb946b9556e982d492cc41e72aead534f960 (patch)
tree4e37af8120aacb0a9359b7bb6f5bbddeb2424a08
parent9cdc8c3f9a9931cb8f8e55ed3e01768cbe2c423e (diff)
downloadserverdata-3d5beb946b9556e982d492cc41e72aead534f960.tar.gz
serverdata-3d5beb946b9556e982d492cc41e72aead534f960.tar.bz2
serverdata-3d5beb946b9556e982d492cc41e72aead534f960.tar.xz
serverdata-3d5beb946b9556e982d492cc41e72aead534f960.zip
Replace return() with end() when appliable, and if you're redoing the quest,
prevent access to Village. (Yeti challenge won't happen again iirc)
-rw-r--r--npc/001-7/homunculus.txt4
-rw-r--r--npc/023-3-1/logic.txt4
-rw-r--r--npc/023-3-2/logic.txt7
-rw-r--r--npc/023-3/logic.txt11
4 files changed, 18 insertions, 8 deletions
diff --git a/npc/001-7/homunculus.txt b/npc/001-7/homunculus.txt
index ee9d53f1b..19e68dbd3 100644
--- a/npc/001-7/homunculus.txt
+++ b/npc/001-7/homunculus.txt
@@ -16,7 +16,7 @@ OnTouch:
if (.@q < 15) {
warp "Save", 0, 0;
percentheal -100, -100;
- return false;
+ end;
}
if (.@q == 15) {
dispbottom lg("I'm not a coward! I must press forward!");
@@ -37,7 +37,7 @@ OnTouch:
if (.@n < 15) {
warp "Save", 0, 0;
percentheal -100, -100;
- return false;
+ end;
}
mesn l("Magically Sealed Gate");
mesc l("The door is sealed. The riddle says: “I drink, I become, I am. Don't say my name, but say why you know me. For, I am the best in the world.”");
diff --git a/npc/023-3-1/logic.txt b/npc/023-3-1/logic.txt
index 38847b361..feea88abb 100644
--- a/npc/023-3-1/logic.txt
+++ b/npc/023-3-1/logic.txt
@@ -17,7 +17,7 @@ OnTouch:
if (.@n < 15) {
warp "Save", 0, 0;
percentheal -100, -100;
- return false;
+ end;
}
if (.@q < 3) {
dispbottom l("The magic power outflowing in the room prevents you from leaving.");
@@ -42,7 +42,7 @@ OnTouch:
if (.@n < 15) {
warp "Save", 0, 0;
percentheal -100, -100;
- return false;
+ end;
}
if (.@n == 15) {
dispbottom lg("I'm not a coward! I must press forward!");
diff --git a/npc/023-3-2/logic.txt b/npc/023-3-2/logic.txt
index 36c6b88c1..a51826307 100644
--- a/npc/023-3-2/logic.txt
+++ b/npc/023-3-2/logic.txt
@@ -15,14 +15,19 @@ OnTouch:
if (.@q < 15) {
warp "Save", 0, 0;
percentheal -100, -100;
- return false;
+ end;
}
if (.@q == 15) {
dispbottom lg("I'm not a coward! I must press forward!");
end;
}
+ /*
+ Access to the dungeon is now prohibted.
.@mapn$="023-3-1";
warp .@mapn$, 45, 28;
+ */
+ .@mapn$="024-16";
+ warp .@mapn$, 30, 26;
end;
}
diff --git a/npc/023-3/logic.txt b/npc/023-3/logic.txt
index 30efbf3a0..df2f05455 100644
--- a/npc/023-3/logic.txt
+++ b/npc/023-3/logic.txt
@@ -16,7 +16,7 @@ OnTouch:
if (.@q < 15) {
warp "Save", 0, 0;
percentheal -100, -100;
- return false;
+ end;
}
mesc l("Return to Frostia's Castle?");
@@ -35,11 +35,16 @@ OnTouch:
.@q=getq(General_Narrator);
.@q2=getq2(General_Narrator);
// Cheater Detected
- if (.@q < 13) {
+ if (.@q < 15) {
warp "Save", 0, 0;
percentheal -100, -100;
- return false;
+ end;
}
+ // Not allowed to proceed
+ if (.@q > 15) {
+ dispbottom l("Hmm, no, I shouldn't go back there...");
+ end;
+ }
.@mapn$="001-7";
warp .@mapn$, 91, 90;