diff options
Diffstat (limited to 'npc/018-6-0/main.txt')
| -rw-r--r-- | npc/018-6-0/main.txt | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/npc/018-6-0/main.txt b/npc/018-6-0/main.txt index 9789d82f7..2d30b3f48 100644 --- a/npc/018-6-0/main.txt +++ b/npc/018-6-0/main.txt @@ -11,12 +11,17 @@ OnTouch: .@q=getq(LoFQuest_Barbara); - if (.@q >= 2) { - warp BarbaraInstCheck(3), 31, 151; - //warp BarbaraInstCheck(0), 90+any(-1, 1), 90+any(-1,1); - } else { - Exception("ERROR, YOU SHOULD NOT BEEN SEEING THIS. 018-6-1.TFC"); + .@q2=getq2(LoFQuest_Barbara); + .@q3=getq3(LoFQuest_Barbara); + if (.@q < 2 || .@q3 != 5) + Exception("ERROR, YOU SHOULD NOT BEEN SEEING THIS. 018-6-1.TFC.INVALID", RB_DEFAULT|RB_ISFATAL); + // Make the speech + if (.@q == 2) { + setq1 LoFQuest_Barbara, 3; + setq3 LoFQuest_Barbara, 0; } + // Execute the warp + warp BarbaraInstCheck(3), 31, 151; end; @@ -58,6 +63,8 @@ OnTouch: .@q2=getq2(LoFQuest_Barbara); .@q3=getq3(LoFQuest_Barbara); if (.@q == 2 && .@q3 >= 3) { + enablenpc instance_npcname("#FromWestHall", .@q2); + enablenpc instance_npcname("#FromEastHall", .@q2); warp BarbaraInstCheck(2), 90, 32; //warp BarbaraInstCheck(0), 90+any(-1, 1), 90+any(-1,1); } else { |