diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-09-07 19:17:54 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-09-07 19:17:54 -0300 |
| commit | 4c2b2614e276364807bbf48295c876c7646567b5 (patch) | |
| tree | 69ccc14853b4a7e48ab17aa4650eaf57ac3c3737 | |
| parent | 66f4929ac6e7ceb63e4970b1e5aeb8403038b114 (diff) | |
| download | serverdata-4c2b2614e276364807bbf48295c876c7646567b5.tar.gz serverdata-4c2b2614e276364807bbf48295c876c7646567b5.tar.bz2 serverdata-4c2b2614e276364807bbf48295c876c7646567b5.tar.xz serverdata-4c2b2614e276364807bbf48295c876c7646567b5.zip | |
Should fix all errors until this point
| -rw-r--r-- | npc/018-6-0/main.txt | 4 | ||||
| -rw-r--r-- | npc/018-6-2/main.txt | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/npc/018-6-0/main.txt b/npc/018-6-0/main.txt index 919e83c78..0a5b667c3 100644 --- a/npc/018-6-0/main.txt +++ b/npc/018-6-0/main.txt @@ -72,7 +72,7 @@ OnTouch: .@q=getq(LoFQuest_Barbara); .@q2=getq2(LoFQuest_Barbara); .@q3=getq3(LoFQuest_Barbara); - if (.@q < 2 || .@q3 != 5) + if (.@q < 2 || .@q3 != 7) Exception("ERROR, YOU SHOULD NOT BEEN SEEING THIS. 018-6-1.TFC.INVALID", RB_DEFAULT|RB_ISFATAL); // Make the speech if (.@q == 2) { @@ -125,7 +125,7 @@ OnTouch: .@q=getq(LoFQuest_Barbara); .@q2=getq2(LoFQuest_Barbara); .@q3=getq3(LoFQuest_Barbara); - if (.@q == 2 && .@q3 >= 3) { + if (.@q == 2 && .@q3 == 3) { addtimer(100, "#01862_InstCtrl::OnLevel3"); enablenpc instance_npcname("#FromWestHall", .@q2); enablenpc instance_npcname("#FromEastHall", .@q2); diff --git a/npc/018-6-2/main.txt b/npc/018-6-2/main.txt index d34deb632..0e1ebf7ce 100644 --- a/npc/018-6-2/main.txt +++ b/npc/018-6-2/main.txt @@ -76,13 +76,13 @@ OnTouch: // East hall not yet enabled, we must repeat if (!(.@q3 & 128)) { // Mark the west hall as complete (again) - addtimer("#01862_InstCtrl::OnLevel4", 100); + addtimer(100, "#01862_InstCtrl::OnLevel4"); setq3 LoFQuest_Barbara, .@q3|64; disablenpc instance_npcname(.name$, .@q2); warp BarbaraInstCheck(2), 90, 32; } else { // Quest is over! - setq3 LoFQuest_Barbara, 5; + setq3 LoFQuest_Barbara, 7; disablenpc instance_npcname(.name$, .@q2); enablenpc instance_npcname("#ToForgottenShrine", .@q2); warp BarbaraInstCheck(0), 90, 112; @@ -113,13 +113,13 @@ OnTouch: // West hall not yet enabled, we must repeat if (!(.@q3 & 64)) { // Mark the east hall as complete (again) - addtimer("#01862_InstCtrl::OnLevel4", 100); + addtimer(100, "#01862_InstCtrl::OnLevel4"); setq3 LoFQuest_Barbara, .@q3|128; disablenpc instance_npcname(.name$, .@q2); warp BarbaraInstCheck(2), 90, 32; } else { // Quest is over! - setq3 LoFQuest_Barbara, 5; + setq3 LoFQuest_Barbara, 7; disablenpc instance_npcname(.name$, .@q2); enablenpc instance_npcname("#ToForgottenShrine", .@q2); warp BarbaraInstCheck(0), 90, 112; |