Route recomp and death recovery through vr_runback
All checks were successful
/ test (push) Successful in 53s
All checks were successful
/ test (push) Successful in 53s
recomp and death now transition through stuck/vr_runback instead of
jumping straight to Hunt, so the character properly retraces vr_run ->
vr_portal back into the hunting area rather than assuming it's still
standing in Viridian Rise after a vendor trip or a Viridian Rise Recall.
recomp's watchdog fallback now matches neftet's SetWatchdog 3 300 {Default}.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
parent
fb9342fcd5
commit
6aaadd36ba
2 changed files with 27 additions and 12 deletions
|
|
@ -59,7 +59,7 @@ STATE: {Hunt}
|
|||
Expr {getvar[isLeader]}
|
||||
ChatMatch {cloud of dangerous gas!}
|
||||
DO: CallState {vr_gas_dodge} {Hunt}
|
||||
IF: ChatCapture {^Your fellow "(?<who>[^"]+)" has died!$} {}
|
||||
IF: ChatCapture {(?<who>\w[\w ]*\w) has died!$} {}
|
||||
DO: SetState {vr_runback}
|
||||
IF: All
|
||||
ItemCountLE 100 {Prismatic Taper}
|
||||
|
|
@ -84,7 +84,9 @@ STATE: {Hunt}
|
|||
IF: All
|
||||
Expr {getvar[isLeader]}
|
||||
ChatCapture {(^(\[[A-z]+?\] |)You|.*\<Tell:IIDString:.+:(?<who>[^\<]*)\>.+\<\\Tell\>) .*, \"#recruitviridianrise\"$} {}
|
||||
DO: ChatExpr {\/ub fellow recruit +getvar[capturegroup_who]}
|
||||
DO: DoAll
|
||||
ChatExpr {\/ub fellow recruit +getvar[capturegroup_who]}
|
||||
SetState {Hunt}
|
||||
IF: All
|
||||
Expr {getvar[isLeader]}
|
||||
DistToRteGE 100
|
||||
|
|
@ -102,7 +104,7 @@ STATE: {Hunt}
|
|||
STATE: {vr_gas_dodge}
|
||||
IF: Always
|
||||
DO: Chat {/vt opt set navpriorityboost true}
|
||||
IF: SecsInStateGE 2
|
||||
IF: SecsInStateGE 5
|
||||
DO: DoAll
|
||||
Chat {/vt opt set navpriorityboost false}
|
||||
Return
|
||||
|
|
@ -145,7 +147,7 @@ STATE: {recomp}
|
|||
NavEmpty
|
||||
DO: DoAll
|
||||
DoExpr {clearvar[vrRecompNavLoaded]}
|
||||
SetState {Hunt}
|
||||
SetState {stuck}
|
||||
IF: Always
|
||||
DO: DoAll
|
||||
DoExpr {setvar[diamondMissing, 100 - getitemcountininventorybyname[`Diamond Scarab`]]}
|
||||
|
|
@ -158,7 +160,7 @@ STATE: {recomp}
|
|||
Chat {/vt nav load ah_recomp}
|
||||
Chat {/vt opt set enablenav true}
|
||||
IF: Always
|
||||
DO: SetWatchdog 3 300 {stuck}
|
||||
DO: SetWatchdog 3 300 {Default}
|
||||
|
||||
STATE: {death}
|
||||
IF: ExitPortal
|
||||
|
|
@ -172,7 +174,7 @@ STATE: {death}
|
|||
NavEmpty
|
||||
DO: DoAll
|
||||
DoExpr {clearvar[vrDeathNavLoaded]}
|
||||
SetState {Hunt}
|
||||
SetState {vr_runback}
|
||||
IF: Always
|
||||
DO: DoAll
|
||||
DoExpr {setvar[vrDeathNavLoaded, 1]}
|
||||
|
|
|
|||
|
|
@ -289,7 +289,7 @@ n
|
|||
s
|
||||
p
|
||||
s
|
||||
^Your fellow "(?<who>[^"]+)" has died!$
|
||||
(?<who>\w[\w ]*\w) has died!$
|
||||
s
|
||||
c
|
||||
s
|
||||
|
|
@ -499,7 +499,7 @@ Hunt
|
|||
i
|
||||
2
|
||||
i
|
||||
8
|
||||
3
|
||||
TABLE
|
||||
2
|
||||
K
|
||||
|
|
@ -537,6 +537,15 @@ s
|
|||
c
|
||||
s
|
||||
|
||||
TABLE
|
||||
2
|
||||
K
|
||||
V
|
||||
n
|
||||
n
|
||||
2
|
||||
i
|
||||
8
|
||||
TABLE
|
||||
2
|
||||
k
|
||||
|
|
@ -548,6 +557,10 @@ s
|
|||
e
|
||||
s
|
||||
\/ub fellow recruit +getvar[capturegroup_who]
|
||||
i
|
||||
1
|
||||
s
|
||||
Hunt
|
||||
s
|
||||
Hunt
|
||||
i
|
||||
|
|
@ -704,7 +717,7 @@ i
|
|||
i
|
||||
3
|
||||
i
|
||||
2
|
||||
5
|
||||
TABLE
|
||||
2
|
||||
K
|
||||
|
|
@ -967,7 +980,7 @@ clearvar[vrRecompNavLoaded]
|
|||
i
|
||||
1
|
||||
s
|
||||
Hunt
|
||||
stuck
|
||||
s
|
||||
recomp
|
||||
i
|
||||
|
|
@ -1082,7 +1095,7 @@ n
|
|||
s
|
||||
s
|
||||
s
|
||||
stuck
|
||||
Default
|
||||
s
|
||||
r
|
||||
d
|
||||
|
|
@ -1175,7 +1188,7 @@ clearvar[vrDeathNavLoaded]
|
|||
i
|
||||
1
|
||||
s
|
||||
Hunt
|
||||
vr_runback
|
||||
s
|
||||
death
|
||||
i
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue