summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/018-6-0/main.txt6
-rw-r--r--npc/018-6-1/main.txt47
2 files changed, 48 insertions, 5 deletions
diff --git a/npc/018-6-0/main.txt b/npc/018-6-0/main.txt
index 25fe3d288..53c544ec9 100644
--- a/npc/018-6-0/main.txt
+++ b/npc/018-6-0/main.txt
@@ -79,11 +79,7 @@ OnTouch:
setq1 LoFQuest_Barbara, 3;
setq3 LoFQuest_Barbara, 0;
}
- if (!is_staff()) {
- // TODO stop here FIXME
- mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
- close;
- }
+
// Execute the warp (randomly)
if (any(true,false))
warp BarbaraInstCheck(3), 31, 151;
diff --git a/npc/018-6-1/main.txt b/npc/018-6-1/main.txt
index 2dce61042..c40fd03c4 100644
--- a/npc/018-6-1/main.txt
+++ b/npc/018-6-1/main.txt
@@ -202,3 +202,50 @@ OnInit:
end;
}
+///////////////////////////// Minievents
+018-6-1,89,70,0 script Barbara#01861 NPC_GUARD_DEAD,{
+ //npctalk3 l("Please find her and don't worry with me! And be careful!");
+ npctalk3 l("*scream in pain*");
+ close;
+
+OnMain:
+ .@q=getq(LoFQuest_Barbara);
+ .@q2=getq2(LoFQuest_Barbara);
+ .@q3=getq3(LoFQuest_Barbara);
+
+ // TODO stop here FIXME
+ mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
+ close;
+
+ // Barbara was taken hostage or murdered - save this data
+ setq3 LoFQuest_Barbara, .@q3|2;
+ disablenpc instance_npcname(.name$); // NPC will now go to rest
+ close;
+
+OnInit:
+ .sex=G_FEMALE;
+ disablenpc .name$;
+ end;
+OnInstanceInit:
+ disablenpc instance_npcname(.name$);
+ end;
+}
+
+// Event trigger
+018-6-1,84,71,0 script #01861TriggerBB1 NPC_HIDDEN, 0, 10,{
+ end;
+OnTouch:
+ .@q=getq(LoFQuest_Barbara);
+ .@q2=getq2(LoFQuest_Barbara);
+ .@q3=getq3(LoFQuest_Barbara);
+ if (.@q == 4 && !(.@q3 & 2)) {
+ enablenpc instance_npcname("Barbara#01861", .@q2);
+ addtimer2(500, instance_npcname("Barbara#01861", .@q2)+"::OnMain");
+ }
+ end;
+
+OnInit:
+ disablenpc .name$;
+ end;
+}
+