summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-09-07 19:00:23 -0300
committerJesusaves <cpntb1@ymail.com>2019-09-07 19:00:23 -0300
commit42740f8474c56285cb0e8f0f8beb4e04b61c66b1 (patch)
tree8bb876bb3ab97e2ca4d76e1782eb76dd162b5b4e /npc
parented1ea3679bf5aa315f48627a914a7d12f0a0543a (diff)
downloadserverdata-42740f8474c56285cb0e8f0f8beb4e04b61c66b1.tar.gz
serverdata-42740f8474c56285cb0e8f0f8beb4e04b61c66b1.tar.bz2
serverdata-42740f8474c56285cb0e8f0f8beb4e04b61c66b1.tar.xz
serverdata-42740f8474c56285cb0e8f0f8beb4e04b61c66b1.zip
Fix several critical bugs
Diffstat (limited to 'npc')
-rw-r--r--npc/018-6-0/main.txt27
-rw-r--r--npc/018-6-1/main.txt3
2 files changed, 16 insertions, 14 deletions
diff --git a/npc/018-6-0/main.txt b/npc/018-6-0/main.txt
index ef3af5d75..263173022 100644
--- a/npc/018-6-0/main.txt
+++ b/npc/018-6-0/main.txt
@@ -108,6 +108,7 @@ OnTouch:
} else {
warp "018-6-1", 83, 28;
}
+ .alwaysVisible=true;
end;
}
@@ -125,7 +126,7 @@ OnTouch:
.@q2=getq2(LoFQuest_Barbara);
.@q3=getq3(LoFQuest_Barbara);
if (.@q == 2 && .@q3 >= 3) {
- addtimer("#01862_InstCtrl::OnLevel3", 100);
+ addtimer(100, "#01862_InstCtrl::OnLevel3");
enablenpc instance_npcname("#FromWestHall", .@q2);
enablenpc instance_npcname("#FromEastHall", .@q2);
warp BarbaraInstCheck(2), 90, 32;
@@ -158,14 +159,13 @@ OnTouch:
end;
}
- // Monster control
- if (.@q3 & 2)
- addtimer("#01862_InstCtrl::OnLevel2", 100);
- else
- addtimer("#01862_InstCtrl::OnLevel1", 100);
-
// Check if quest must begin
if (!(.@q3 & 1)) {
+ // Monster control
+ if (.@q3 & 2)
+ addtimer(100, "#01862_InstCtrl::OnLevel2");
+ else
+ addtimer(100, "#01862_InstCtrl::OnLevel1");
// Mark the quest in progress as WEST HALL, and warp
setq3 LoFQuest_Barbara, .@q3|64;
enablenpc instance_npcname("#FromSouthHall", .@q2);
@@ -177,6 +177,7 @@ OnTouch:
OnInit:
+ .alwaysVisible=true;
disablenpc .name$;
end;
}
@@ -196,14 +197,13 @@ OnTouch:
end;
}
- // Monster control
- if (.@q3 & 1)
- addtimer("#01862_InstCtrl::OnLevel2", 100);
- else
- addtimer("#01862_InstCtrl::OnLevel1", 100);
-
// Check if quest must begin
if (!(.@q3 & 2)) {
+ // Monster control
+ if (.@q3 & 1)
+ addtimer(100, "#01862_InstCtrl::OnLevel2");
+ else
+ addtimer(100, "#01862_InstCtrl::OnLevel1");
// Mark the quest in progress as EAST HALL, and warp
setq3 LoFQuest_Barbara, .@q3|128;
enablenpc instance_npcname("#FromSouthHall", .@q2);
@@ -215,6 +215,7 @@ OnTouch:
OnInit:
+ .alwaysVisible=true;
disablenpc .name$;
end;
}
diff --git a/npc/018-6-1/main.txt b/npc/018-6-1/main.txt
index 23e086aaf..6cdeaed94 100644
--- a/npc/018-6-1/main.txt
+++ b/npc/018-6-1/main.txt
@@ -97,7 +97,7 @@ OnTouch:
if (.@q == 1) {
setnpcdialogtitle l("Forgotten Chamber");
mesn l("Forgotten Chamber");
- mesq l("You see yourself in a strange chamber. Drawings of stones surronds the walls.");
+ mesq l("You see yourself in a strange chamber. Strange drawings litter the walls.");
next;
mesn l("Forgotten Chamber");
mesq l("You can see in distance two portals working, and two portals offline.");
@@ -172,6 +172,7 @@ OnMain:
close;
OnInit:
+ .sex=G_MALE;
disablenpc .name$;
end;
OnInstanceInit: