diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-09-01 14:34:10 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-09-01 14:34:10 -0300 |
| commit | aca448ae2ad09914783fcba80505fc6f78d597a6 (patch) | |
| tree | f6b3f9a1a0a79b5db079ef8803d478f24e768ee9 | |
| parent | f73c9057273a044b93d45e3daaba1b08022c7e2d (diff) | |
| download | serverdata-aca448ae2ad09914783fcba80505fc6f78d597a6.tar.gz serverdata-aca448ae2ad09914783fcba80505fc6f78d597a6.tar.bz2 serverdata-aca448ae2ad09914783fcba80505fc6f78d597a6.tar.xz serverdata-aca448ae2ad09914783fcba80505fc6f78d597a6.zip | |
State 64 and 128 from Forgotten Chamber
| -rw-r--r-- | npc/018-6-0/ctrl | 2 | ||||
| -rw-r--r-- | npc/018-6-1/main.txt | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/npc/018-6-0/ctrl b/npc/018-6-0/ctrl index e1f7f6140..865cd9903 100644 --- a/npc/018-6-0/ctrl +++ b/npc/018-6-0/ctrl @@ -15,6 +15,8 @@ q1 3 South puzzle unlocked (w/e lever) 4 South puzzle node (e/w lever) 5 South puzzle solved, access to shrine granted + &64 West Puzzle in Progress + &128 East Puzzle in Progress 3 Forgotten Shrine has been allowed (warp on / remember to reenable NPCs on resume) Bitwise boss fights: 1, 2, 4, 8, 16, 32, 64, 128, 256 (enable warps as win) diff --git a/npc/018-6-1/main.txt b/npc/018-6-1/main.txt index 87c9b8daa..e38d102f4 100644 --- a/npc/018-6-1/main.txt +++ b/npc/018-6-1/main.txt @@ -95,8 +95,22 @@ OnTouch: setq3 LoFQuest_Barbara, 0; } // Update M0 NPCs based on quest state - if (.@q3 == 5) + if (.@q > 2) enablenpc instance_npcname("#ToForgottenShrine", .@q2); + if (.@q == 2) { + if (.@q3 == 5) + enablenpc instance_npcname("#ToForgottenShrine", .@q2); + if (.@q3 == 3) + enablenpc instance_npcname("#ToSouthHall", .@q2); + // Note: state 64 and 128 are temporary and must be removed + if (.@q3 & 64) + setq3 LoFQuest_Barbara, .@q3^64; + // Safety update + .@q3=getq3(LoFQuest_Barbara); + if (.@q3 & 128) + setq3 LoFQuest_Barbara, .@q3^128; + + } } else { Exception("ERROR, YOU SHOULD NOT BEEN SEEING THIS. 018-6-1.TFC"); |