Fix investigatethefactions: merge ChatMatch into travel states, remove Wait states
All checks were successful
/ test (push) Successful in 34s

This commit is contained in:
Erik 2026-06-09 21:11:02 +02:00
parent 745546f7ff
commit 8b65cbf85a
2 changed files with 29 additions and 399 deletions

View file

@ -20,57 +20,28 @@ STATE: {Default}
DO: SetState {GoToJondor}
~~ Step 1: Travel to Zaikhal and talk to Jondor Torgren
~~ ChatMatch fires in the same state while the tlk nav node triggers the dialog
STATE: {GoToJondor}
IF: Death
DO: SetState {Death}
IF: All
NavEmpty
Expr {testvar[jondorNavLoaded]}
DO: SetState {WaitJondor}
IF: ChatMatch {^Jondor Torgren tells you,}
DO: SetState {GoToJawaq}
IF: Always
DO: DoAll
EmbedNav nav_jondortorgren {Travel to Jondor Torgren}
DoExpr {touchvar[jondorNavLoaded]}
SetWatchdog 10.0 300.0 {Stuck}
STATE: {WaitJondor}
IF: Death
DO: SetState {Death}
IF: ChatMatch {^Jondor Torgren tells you,}
DO: DoAll
DoExpr {clearvar[jondorNavLoaded]}
SetState {GoToJawaq}
IF: SecsInStateGE 30
DO: DoAll
DoExpr {clearvar[jondorNavLoaded]}
SetState {GoToJawaq}
~~ Step 2: Travel to Jawaq ibn Janath and talk to him
STATE: {GoToJawaq}
IF: Death
DO: SetState {Death}
IF: All
NavEmpty
Expr {testvar[jawaqNavLoaded]}
DO: SetState {WaitJawaq}
IF: ChatMatch {^Jawaq ibn Janath tells you,}
DO: SetState {GoToLictorPit}
IF: Always
DO: DoAll
EmbedNav nav_jawaqibnjanath {Travel to Jawaq ibn Janath}
DoExpr {touchvar[jawaqNavLoaded]}
SetWatchdog 10.0 300.0 {Stuck}
STATE: {WaitJawaq}
IF: Death
DO: SetState {Death}
IF: ChatMatch {^Jawaq ibn Janath tells you,}
DO: DoAll
DoExpr {clearvar[jawaqNavLoaded]}
SetState {GoToLictorPit}
IF: SecsInStateGE 30
DO: DoAll
DoExpr {clearvar[jawaqNavLoaded]}
SetState {GoToLictorPit}
~~ Step 3: Move to the Blight Revenant Pit and kill Blight Lictor
STATE: {GoToLictorPit}
IF: Death
@ -98,32 +69,18 @@ STATE: {HuntLictor}
SetWatchdog 10.0 600.0 {Stuck}
~~ Step 4: Return to Jawaq and give him the head
~~ nav_givehead nav walks back to Jawaq and issues /ub give via cht node
~~ nav_givehead walks back to Jawaq and issues /ub give via cht node
~~ Advance when letter appears in inventory
STATE: {GiveHead}
IF: Death
DO: SetState {Death}
IF: All
NavEmpty
Expr {testvar[giveHeadNavLoaded]}
DO: SetState {WaitLetter}
IF: ItemCountGE 1 {Radiant Blood Letter of Introduction}
DO: SetState {GoToVierana}
IF: Always
DO: DoAll
EmbedNav nav_givehead {Return to Jawaq, give Blight Lictor's Head}
DoExpr {touchvar[giveHeadNavLoaded]}
SetWatchdog 10.0 300.0 {Stuck}
STATE: {WaitLetter}
IF: Death
DO: SetState {Death}
IF: ItemCountGE 1 {Radiant Blood Letter of Introduction}
DO: DoAll
DoExpr {clearvar[giveHeadNavLoaded]}
SetState {GoToVierana}
IF: SecsInStateGE 30
DO: DoAll
DoExpr {clearvar[giveHeadNavLoaded]}
SetState {GiveHead}
~~ Step 5: Travel to Ayan Baqur and give letter to Vierana du Canamorra
~~ nav_vieranaducanamorra walks to Vierana and issues /ub give via cht node
STATE: {GoToVierana}