bore/neftet: replace savedAttackRange with launcher-set attackRange variable; lockandkey: equip_idle state and quest gear swap in nav
All checks were successful
/ test (push) Successful in 37s

This commit is contained in:
Erik 2026-05-12 21:48:32 +02:00
parent e963537f50
commit 2fbd14c4ab
4 changed files with 46 additions and 26 deletions

View file

@ -204,6 +204,7 @@ STATE: {Default} ~~ {
DO: DoAll DO: DoAll
Chat {/ub opt set VTank.PatchExpressionEngine true} Chat {/ub opt set VTank.PatchExpressionEngine true}
Chat {/vt opt set autocram true} Chat {/vt opt set autocram true}
ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
ChatExpr {\/vt nav load bore_circuit+getvar[navNumber]} ChatExpr {\/vt nav load bore_circuit+getvar[navNumber]}
Chat {/vt opt set enablenav true} Chat {/vt opt set enablenav true}
Chat {/vt opt set buffprofile_prots 2} Chat {/vt opt set buffprofile_prots 2}
@ -993,6 +994,7 @@ STATE: {service_use_augment} ~~ {
STATE: {service_reset_main} ~~ { STATE: {service_reset_main} ~~ {
IF: Always IF: Always
DO: DoAll DO: DoAll
ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
DoExpr {clearvar[questsRequested]} DoExpr {clearvar[questsRequested]}
DoExpr {clearvar[stipendNavLoaded]} DoExpr {clearvar[stipendNavLoaded]}
DoExpr {clearvar[augmentNav]} DoExpr {clearvar[augmentNav]}

View file

@ -111,7 +111,7 @@ STATE: {Default} ~~ {
Chat {/vt opt set enablebuffing true} Chat {/vt opt set enablebuffing true}
Chat {/vt opt set enablenav true} Chat {/vt opt set enablenav true}
Chat {/vt opt set navpriorityboost false} Chat {/vt opt set navpriorityboost false}
GetOpt {attackdistance} {savedAttackRange} ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
ChatExpr {\/vt nav load +getvar[navRoute]} ChatExpr {\/vt nav load +getvar[navRoute]}
Chat {/ub fellow create Sawato Rockstyle} Chat {/ub fellow create Sawato Rockstyle}
DoExpr {setvar[pickFlowers, 1]} DoExpr {setvar[pickFlowers, 1]}
@ -127,7 +127,7 @@ STATE: {Default} ~~ {
Chat {/vt opt set enablebuffing true} Chat {/vt opt set enablebuffing true}
Chat {/vt opt set enablenav true} Chat {/vt opt set enablenav true}
Chat {/vt opt set navpriorityboost true} Chat {/vt opt set navpriorityboost true}
GetOpt {attackdistance} {savedAttackRange} ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
SetState {service_quest_refresh} SetState {service_quest_refresh}
~~ } ~~ }
STATE: {Hunt} ~~ { STATE: {Hunt} ~~ {
@ -385,7 +385,7 @@ STATE: {service_decide} ~~ {
IF: Always IF: Always
DO: DoAll DO: DoAll
ChatExpr {\/vt opt set navpriorityboost +iif[getvar[isLeader],`false`,`true`]} ChatExpr {\/vt opt set navpriorityboost +iif[getvar[isLeader],`false`,`true`]}
ChatExpr {\/vt opt set attackdistance +getvar[savedAttackRange]} ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
DoExpr {setvar[serviceClock,stopwatchcreate[]]} DoExpr {setvar[serviceClock,stopwatchcreate[]]}
DoExpr {stopwatchstart[getvar[serviceClock]]} DoExpr {stopwatchstart[getvar[serviceClock]]}
SetState {Hunt} SetState {Hunt}
@ -443,7 +443,7 @@ STATE: {service_bella_backoff} ~~ {
Chat {/a [bella] backoff tripped, disabling augment services for 24h} Chat {/a [bella] backoff tripped, disabling augment services for 24h}
Chat {/vt opt set enablecombat true} Chat {/vt opt set enablecombat true}
Chat {/vt opt set enablenav true} Chat {/vt opt set enablenav true}
ChatExpr {\/vt opt set attackdistance +getvar[savedAttackRange]} ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
DoExpr {setvar[disableAugmentServices, 1]} DoExpr {setvar[disableAugmentServices, 1]}
DoExpr {setvar[bellaStartAttempts, 0]} DoExpr {setvar[bellaStartAttempts, 0]}
DoExpr {setvar[bellaAhPrimaryAttempts, 0]} DoExpr {setvar[bellaAhPrimaryAttempts, 0]}
@ -1072,7 +1072,7 @@ STATE: {service_reset_main} ~~ {
IF: Always IF: Always
DO: DoAll DO: DoAll
ChatExpr {\/vt opt set navpriorityboost +iif[getvar[isLeader],`false`,`true`]} ChatExpr {\/vt opt set navpriorityboost +iif[getvar[isLeader],`false`,`true`]}
ChatExpr {\/vt opt set attackdistance +getvar[savedAttackRange]} ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
DoExpr {clearvar[questsRequested]} DoExpr {clearvar[questsRequested]}
DoExpr {clearvar[stipendNavLoaded]} DoExpr {clearvar[stipendNavLoaded]}
DoExpr {clearvar[augmentNav]} DoExpr {clearvar[augmentNav]}

View file

@ -1990,7 +1990,7 @@ K
V V
n n
n n
13 14
i i
2 2
s s
@ -2011,6 +2011,19 @@ n
s s
e e
s s
\/vt opt set attackdistance +getvar[attackRange]
i
8
TABLE
2
k
v
n
n
1
s
e
s
\/vt nav load bore_circuit+getvar[navNumber] \/vt nav load bore_circuit+getvar[navNumber]
i i
2 2
@ -9391,7 +9404,20 @@ K
V V
n n
n n
12 13
i
8
TABLE
2
k
v
n
n
1
s
e
s
\/vt opt set attackdistance +getvar[attackRange]
i i
7 7
TABLE TABLE

View file

@ -1039,22 +1039,18 @@ i
s s
/vt opt set navpriorityboost false /vt opt set navpriorityboost false
i i
11 8
TABLE TABLE
2 2
k k
v v
n n
n n
2 1
s s
o e
s s
attackdistance \/vt opt set attackdistance +getvar[attackRange]
s
v
s
savedAttackRange
i i
8 8
TABLE TABLE
@ -1173,22 +1169,18 @@ i
s s
/vt opt set navpriorityboost true /vt opt set navpriorityboost true
i i
11 8
TABLE TABLE
2 2
k k
v v
n n
n n
2 1
s s
o e
s s
attackdistance \/vt opt set attackdistance +getvar[attackRange]
s
v
s
savedAttackRange
i i
1 1
s s
@ -3905,7 +3897,7 @@ n
s s
e e
s s
\/vt opt set attackdistance +getvar[savedAttackRange] \/vt opt set attackdistance +getvar[attackRange]
i i
7 7
TABLE TABLE
@ -4370,7 +4362,7 @@ n
s s
e e
s s
\/vt opt set attackdistance +getvar[savedAttackRange] \/vt opt set attackdistance +getvar[attackRange]
i i
7 7
TABLE TABLE
@ -10261,7 +10253,7 @@ n
s s
e e
s s
\/vt opt set attackdistance +getvar[savedAttackRange] \/vt opt set attackdistance +getvar[attackRange]
i i
7 7
TABLE TABLE