lockandkey: add equip_idle state for gear swap after bella service, move quest gear equip to nav
All checks were successful
/ test (push) Successful in 38s

This commit is contained in:
Erik 2026-04-15 00:39:11 +02:00
parent 6d9dc89b21
commit c5f0d95231
2 changed files with 47 additions and 13 deletions

View file

@ -51,7 +51,6 @@ STATE: {idle}
IF: Always IF: Always
DO: DoAll DO: DoAll
Chat {/vt opt set enablebuffing false} Chat {/vt opt set enablebuffing false}
Chat {/ub equip load idle.utl}
DoExpr {setcombatstate[`peace`]} DoExpr {setcombatstate[`peace`]}
DoExpr {clearvar[queuePrimary]} DoExpr {clearvar[queuePrimary]}
DoExpr {clearvar[queueSecondary]} DoExpr {clearvar[queueSecondary]}
@ -286,7 +285,7 @@ STATE: {service_bella_turn_in_jaw}
DO: DoAll DO: DoAll
Chat {/a [bella] jaw turned in, returning home (partial bella)} Chat {/a [bella] jaw turned in, returning home (partial bella)}
DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]}
SetState {service_reset_main} SetState {equip_idle}
IF: All IF: All
SecsInStateGE 300 SecsInStateGE 300
ItemCountGE 1 {Insatiable Eater Jaw} ItemCountGE 1 {Insatiable Eater Jaw}
@ -305,7 +304,7 @@ STATE: {service_bella_turn_in_jaw}
IF: SecsInStateGE 300 IF: SecsInStateGE 300
DO: DoAll DO: DoAll
DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]}
SetState {service_reset_main} SetState {equip_idle}
STATE: {service_bella_backoff} STATE: {service_bella_backoff}
~~ Disable bella services for 24h, return home ~~ Disable bella services for 24h, return home
@ -319,7 +318,16 @@ STATE: {service_bella_backoff}
DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]}
DoExpr {setvar[bellaBackoffClock,stopwatchcreate[]]} DoExpr {setvar[bellaBackoffClock,stopwatchcreate[]]}
DoExpr {stopwatchstart[getvar[bellaBackoffClock]]} DoExpr {stopwatchstart[getvar[bellaBackoffClock]]}
SetState {service_reset_main} SetState {equip_idle}
STATE: {equip_idle}
~~ Swap back to idle gear before heading home
IF: Death
DO: SetState {death}
IF: Always
DO: Chat {/ub equip load idle.utl}
IF: SecsInStateGE 12
DO: SetState {service_reset_main}
STATE: {service_reset_main} STATE: {service_reset_main}
~~ Clear service vars, load ah_recall to return home, then go to idle ~~ Clear service vars, load ah_recall to return home, then go to idle

View file

@ -11,7 +11,7 @@ n
n n
n n
n n
75 78
i i
21 21
i i
@ -354,16 +354,12 @@ K
V V
n n
n n
5 4
i i
2 2
s s
/vt opt set enablebuffing false /vt opt set enablebuffing false
i i
2
s
/ub equip load idle.utl
i
7 7
TABLE TABLE
2 2
@ -2032,7 +2028,7 @@ setvar[bellaTurnInAttempts, 0]
i i
1 1
s s
service_reset_main equip_idle
s s
service_bella_turn_in_jaw service_bella_turn_in_jaw
i i
@ -2201,7 +2197,7 @@ setvar[bellaTurnInAttempts, 0]
i i
1 1
s s
service_reset_main equip_idle
s s
service_bella_turn_in_jaw service_bella_turn_in_jaw
i i
@ -2297,7 +2293,7 @@ stopwatchstart[getvar[bellaBackoffClock]]
i i
1 1
s s
service_reset_main equip_idle
s s
service_bella_backoff service_bella_backoff
i i
@ -2309,6 +2305,36 @@ i
s s
death death
s s
equip_idle
i
1
i
2
i
0
s
/ub equip load idle.utl
s
equip_idle
i
6
i
1
i
12
s
service_reset_main
s
equip_idle
i
8
i
1
i
0
s
death
s
service_reset_main service_reset_main
i i
1 1