fix death state, only Default calls vr_runback
All checks were successful
/ test (push) Successful in 30s

This commit is contained in:
Johan Lundberg 2026-09-03 20:35:19 +02:00
parent 81345ed1c9
commit 0954141a91
2 changed files with 38 additions and 111 deletions

View file

@ -214,9 +214,7 @@ STATE: {run_away}
Chat {/vt opt set enablelooting false} Chat {/vt opt set enablelooting false}
Chat {/vt opt set enablecombat false} Chat {/vt opt set enablecombat false}
Chat {/vt opt set navpriorityboost true} Chat {/vt opt set navpriorityboost true}
DoExpr {clearvar[deathCount]} SetState {Default}
DoExpr {clearvar[deathClock]}
SetState {vr_runback}
IF: ChatMatch {^\[Fellowship\].*(say|says), \"#tomuchviteaviridianrise\"$} IF: ChatMatch {^\[Fellowship\].*(say|says), \"#tomuchviteaviridianrise\"$}
DO: SetState {vitae_run} DO: SetState {vitae_run}
@ -360,20 +358,16 @@ STATE: {death}
Chat {/vt opt set enablenav true} Chat {/vt opt set enablenav true}
Chat {/vt opt set enablelooting false} Chat {/vt opt set enablelooting false}
Chat {/vt opt set enablecombat false} Chat {/vt opt set enablecombat false}
IF: All
Expr {testvar[vrDeathNavLoaded]}
NavEmpty
DO: DoAll
DoExpr {clearvar[vrDeathNavLoaded]}
SetState {vr_runback}
IF: Always IF: Always
DO: DoAll DO: EmbedNav nav0__death_pause_nav {death_pause.nav}
DoExpr {setvar[vrDeathNavLoaded, 1]} IF: NavEmpty
Chat {/vt nav load vr_death_recall} DO: SetState {Default}
IF: Expr {vitae[]>12} IF: Expr {vitae[]>12}
DO: Chat {/fellowship #tomuchviteaviridianrise} DO: Chat {/fellowship #tomuchviteaviridianrise}
IF: ChatMatch {^\[Fellowship\].*(say|says), \"#tomuchviteaviridianrise\"$} IF: ChatMatch {^\[Fellowship\].*(say|says), \"#tomuchviteaviridianrise\"$}
DO: SetState {vitae_run} DO: SetState {vitae_run}
IF: ChatMatch {^\[Fellowship\].*(say|says), \"#vitaerundoneviridianrise\"$}
DO: SetState {Default}
IF: Always IF: Always
DO: SetWatchdog 5 60 {stuck} DO: SetWatchdog 5 60 {stuck}
@ -382,6 +376,10 @@ STATE: {stuck}
DO: DoAll DO: DoAll
SetState {Default} SetState {Default}
NAV: nav0__death_pause_nav once ~~ {
pau 47.1262349446615 26.1864453474681 0.225020837783813 5000
~~ }
NAV: nav2__pickup_nav circular ~~ { NAV: nav2__pickup_nav circular ~~ {
cht 6.85679616481066 -19.8018191655477 2.08332513769468E-05 {/vt mexec actiontryuseitem[wobjectfindnearestbyobjectclass[37]]} cht 6.85679616481066 -19.8018191655477 2.08332513769468E-05 {/vt mexec actiontryuseitem[wobjectfindnearestbyobjectclass[37]]}
pau 6.85679616481066 -19.8018191655477 2.08332513769468E-05 10000 pau 6.85679616481066 -19.8018191655477 2.08332513769468E-05 10000

View file

@ -11,7 +11,7 @@ n
n n
n n
n n
78 79
i i
1 1
i i
@ -1785,7 +1785,7 @@ K
V V
n n
n n
6 4
i i
2 2
s s
@ -1799,35 +1799,9 @@ i
s s
/vt opt set navpriorityboost true /vt opt set navpriorityboost true
i i
7
TABLE
2
k
v
n
n
1 1
s s
e Default
s
clearvar[deathCount]
i
7
TABLE
2
k
v
n
n
1
s
e
s
clearvar[deathClock]
i
1
s
vr_runback
s s
run_away run_away
i i
@ -2778,89 +2752,34 @@ s
s s
death death
i i
2
i
3
TABLE
2
K
V
n
n
2
i
26
TABLE
2
k
v
n
n
1 1
s
e
s
testvar[vrDeathNavLoaded]
i i
7 4
i i
0 0
TABLE ba
2 109
K death_pause.nav
V
n
n
2
i
7
TABLE
2
k
v
n
n
1 1
s uTank2 NAV 1.2
e 4
s
clearvar[vrDeathNavLoaded]
i
1 1
s 3
vr_runback 47.1262349446615
26.1864453474681
0.225020837783813
0
5000
s s
death death
i i
1 7
i i
3 1
i i
0 0
TABLE
2
K
V
n
n
2
i
7
TABLE
2
k
v
n
n
1
s s
e Default
s
setvar[vrDeathNavLoaded, 1]
i
2
s
/vt nav load vr_death_recall
s s
death death
i i
@ -2893,6 +2812,16 @@ vitae_run
s s
death death
i i
4
i
1
s
^\[Fellowship\].*(say|says), \"#vitaerundoneviridianrise\"$
s
Default
s
death
i
1 1
i i
9 9