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]}
|
Expr {getvar[isLeader]}
|
||||||
ChatMatch {cloud of dangerous gas!}
|
ChatMatch {cloud of dangerous gas!}
|
||||||
DO: CallState {vr_gas_dodge} {Hunt}
|
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}
|
DO: SetState {vr_runback}
|
||||||
IF: All
|
IF: All
|
||||||
ItemCountLE 100 {Prismatic Taper}
|
ItemCountLE 100 {Prismatic Taper}
|
||||||
|
|
@ -84,7 +84,9 @@ STATE: {Hunt}
|
||||||
IF: All
|
IF: All
|
||||||
Expr {getvar[isLeader]}
|
Expr {getvar[isLeader]}
|
||||||
ChatCapture {(^(\[[A-z]+?\] |)You|.*\<Tell:IIDString:.+:(?<who>[^\<]*)\>.+\<\\Tell\>) .*, \"#recruitviridianrise\"$} {}
|
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
|
IF: All
|
||||||
Expr {getvar[isLeader]}
|
Expr {getvar[isLeader]}
|
||||||
DistToRteGE 100
|
DistToRteGE 100
|
||||||
|
|
@ -102,7 +104,7 @@ STATE: {Hunt}
|
||||||
STATE: {vr_gas_dodge}
|
STATE: {vr_gas_dodge}
|
||||||
IF: Always
|
IF: Always
|
||||||
DO: Chat {/vt opt set navpriorityboost true}
|
DO: Chat {/vt opt set navpriorityboost true}
|
||||||
IF: SecsInStateGE 2
|
IF: SecsInStateGE 5
|
||||||
DO: DoAll
|
DO: DoAll
|
||||||
Chat {/vt opt set navpriorityboost false}
|
Chat {/vt opt set navpriorityboost false}
|
||||||
Return
|
Return
|
||||||
|
|
@ -145,7 +147,7 @@ STATE: {recomp}
|
||||||
NavEmpty
|
NavEmpty
|
||||||
DO: DoAll
|
DO: DoAll
|
||||||
DoExpr {clearvar[vrRecompNavLoaded]}
|
DoExpr {clearvar[vrRecompNavLoaded]}
|
||||||
SetState {Hunt}
|
SetState {stuck}
|
||||||
IF: Always
|
IF: Always
|
||||||
DO: DoAll
|
DO: DoAll
|
||||||
DoExpr {setvar[diamondMissing, 100 - getitemcountininventorybyname[`Diamond Scarab`]]}
|
DoExpr {setvar[diamondMissing, 100 - getitemcountininventorybyname[`Diamond Scarab`]]}
|
||||||
|
|
@ -158,7 +160,7 @@ STATE: {recomp}
|
||||||
Chat {/vt nav load ah_recomp}
|
Chat {/vt nav load ah_recomp}
|
||||||
Chat {/vt opt set enablenav true}
|
Chat {/vt opt set enablenav true}
|
||||||
IF: Always
|
IF: Always
|
||||||
DO: SetWatchdog 3 300 {stuck}
|
DO: SetWatchdog 3 300 {Default}
|
||||||
|
|
||||||
STATE: {death}
|
STATE: {death}
|
||||||
IF: ExitPortal
|
IF: ExitPortal
|
||||||
|
|
@ -172,7 +174,7 @@ STATE: {death}
|
||||||
NavEmpty
|
NavEmpty
|
||||||
DO: DoAll
|
DO: DoAll
|
||||||
DoExpr {clearvar[vrDeathNavLoaded]}
|
DoExpr {clearvar[vrDeathNavLoaded]}
|
||||||
SetState {Hunt}
|
SetState {vr_runback}
|
||||||
IF: Always
|
IF: Always
|
||||||
DO: DoAll
|
DO: DoAll
|
||||||
DoExpr {setvar[vrDeathNavLoaded, 1]}
|
DoExpr {setvar[vrDeathNavLoaded, 1]}
|
||||||
|
|
|
||||||
|
|
@ -289,7 +289,7 @@ n
|
||||||
s
|
s
|
||||||
p
|
p
|
||||||
s
|
s
|
||||||
^Your fellow "(?<who>[^"]+)" has died!$
|
(?<who>\w[\w ]*\w) has died!$
|
||||||
s
|
s
|
||||||
c
|
c
|
||||||
s
|
s
|
||||||
|
|
@ -499,7 +499,7 @@ Hunt
|
||||||
i
|
i
|
||||||
2
|
2
|
||||||
i
|
i
|
||||||
8
|
3
|
||||||
TABLE
|
TABLE
|
||||||
2
|
2
|
||||||
K
|
K
|
||||||
|
|
@ -537,6 +537,15 @@ s
|
||||||
c
|
c
|
||||||
s
|
s
|
||||||
|
|
||||||
|
TABLE
|
||||||
|
2
|
||||||
|
K
|
||||||
|
V
|
||||||
|
n
|
||||||
|
n
|
||||||
|
2
|
||||||
|
i
|
||||||
|
8
|
||||||
TABLE
|
TABLE
|
||||||
2
|
2
|
||||||
k
|
k
|
||||||
|
|
@ -548,6 +557,10 @@ s
|
||||||
e
|
e
|
||||||
s
|
s
|
||||||
\/ub fellow recruit +getvar[capturegroup_who]
|
\/ub fellow recruit +getvar[capturegroup_who]
|
||||||
|
i
|
||||||
|
1
|
||||||
|
s
|
||||||
|
Hunt
|
||||||
s
|
s
|
||||||
Hunt
|
Hunt
|
||||||
i
|
i
|
||||||
|
|
@ -704,7 +717,7 @@ i
|
||||||
i
|
i
|
||||||
3
|
3
|
||||||
i
|
i
|
||||||
2
|
5
|
||||||
TABLE
|
TABLE
|
||||||
2
|
2
|
||||||
K
|
K
|
||||||
|
|
@ -967,7 +980,7 @@ clearvar[vrRecompNavLoaded]
|
||||||
i
|
i
|
||||||
1
|
1
|
||||||
s
|
s
|
||||||
Hunt
|
stuck
|
||||||
s
|
s
|
||||||
recomp
|
recomp
|
||||||
i
|
i
|
||||||
|
|
@ -1082,7 +1095,7 @@ n
|
||||||
s
|
s
|
||||||
s
|
s
|
||||||
s
|
s
|
||||||
stuck
|
Default
|
||||||
s
|
s
|
||||||
r
|
r
|
||||||
d
|
d
|
||||||
|
|
@ -1175,7 +1188,7 @@ clearvar[vrDeathNavLoaded]
|
||||||
i
|
i
|
||||||
1
|
1
|
||||||
s
|
s
|
||||||
Hunt
|
vr_runback
|
||||||
s
|
s
|
||||||
death
|
death
|
||||||
i
|
i
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue