summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-05-09 04:54:49 -0300
committerJesusaves <cpntb1@ymail.com>2020-05-09 04:54:49 -0300
commit3842b99fda4de51bf6c3faeb4744a28e4760c22b (patch)
tree002c12ce99991fa10ce59b587f635baf665c861a
parent6eb908ac9c17298537eaf70f71388d8d000b64fb (diff)
downloadserverdata-3842b99fda4de51bf6c3faeb4744a28e4760c22b.tar.gz
serverdata-3842b99fda4de51bf6c3faeb4744a28e4760c22b.tar.bz2
serverdata-3842b99fda4de51bf6c3faeb4744a28e4760c22b.tar.xz
serverdata-3842b99fda4de51bf6c3faeb4744a28e4760c22b.zip
Fix bugs. When being caught, warp you to Artis before being arrested.
-rw-r--r--npc/001-2-43/core.txt16
-rw-r--r--npc/001-3-2/henry.txt2
2 files changed, 13 insertions, 5 deletions
diff --git a/npc/001-2-43/core.txt b/npc/001-2-43/core.txt
index 9ccd09a0..0ab81895 100644
--- a/npc/001-2-43/core.txt
+++ b/npc/001-2-43/core.txt
@@ -50,16 +50,16 @@ OnRead:
mes "";
switch (@menu) {
case 2:
- .@t$=faction_addrep("Legion", 50)
+ .@t$=faction_addrep("Legion", 50);
mesc .@t$;
- .@t$=faction_addrep("Thief", -50)
+ .@t$=faction_addrep("Thief", -50);
mesc .@t$;
next;
break;
case 3:
- .@t$=faction_addrep("Legion", -50)
+ .@t$=faction_addrep("Legion", -50);
mesc .@t$;
- .@t$=faction_addrep("Thief", 50)
+ .@t$=faction_addrep("Thief", 50);
mesc .@t$;
next;
break;
@@ -67,6 +67,8 @@ OnRead:
dispbottom l("You notice by chance that the file does not have any picture on it.");
setq ThiefQuests_Artis, 2, 0, 0;
closeclientdialog;
+ } else {
+ dispbottom l("Not here, lets look elsewhere!");
}
end;
@@ -123,6 +125,12 @@ OnBust3:
OnBust4:
if (getmap() == .map$) {
+ // Warp you elsewhere before actually arresting
+ // Otherwise, you would return at Archives without this timer =/
+ warp "001-1", 90, 55;
+ sleep2(10);
+
+ // Check if you'll be caught
if (ArrestedChances()) {
mesc l("Arrested!");
mesc l("You'll now spend a few minutes on the jail to reflect on your actions.");
diff --git a/npc/001-3-2/henry.txt b/npc/001-3-2/henry.txt
index e3d36e46..3e59172b 100644
--- a/npc/001-3-2/henry.txt
+++ b/npc/001-3-2/henry.txt
@@ -62,7 +62,7 @@ function proposeFirstQuest {
if (askyesno() == ASK_YES) {
mesn;
mesq l("Great! Then I'll be counting on you!");
- setq ThiefQuests_Artis, 1, 0, 2**rand2(17));
+ setq ThiefQuests_Artis, 1, 0, 2**rand2(17);
}
return;
}