From 2fbd14c4ab29ba847a0739d050bd8e1adc96ece3 Mon Sep 17 00:00:00 2001
From: Erik <erik.nihlen@gmail.com>
Date: Tue, 12 May 2026 21:48:32 +0200
Subject: [PATCH] bore/neftet: replace savedAttackRange with launcher-set
 attackRange variable; lockandkey: equip_idle state and quest gear swap in nav

---
 af/bore.af     |  2 ++
 af/neftet.af   | 10 +++++-----
 met/bore.met   | 30 ++++++++++++++++++++++++++++--
 met/neftet.met | 30 +++++++++++-------------------
 4 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/af/bore.af b/af/bore.af
index 302348c..be455fd 100644
--- a/af/bore.af
+++ b/af/bore.af
@@ -204,6 +204,7 @@ STATE: {Default} ~~ {
 		DO:	DoAll
 				Chat {/ub opt set VTank.PatchExpressionEngine true}
 				Chat {/vt opt set autocram true}
+				ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
 				ChatExpr {\/vt nav load bore_circuit+getvar[navNumber]}
 				Chat {/vt opt set enablenav true}
 				Chat {/vt opt set buffprofile_prots 2}
@@ -993,6 +994,7 @@ STATE: {service_use_augment} ~~ {
 STATE: {service_reset_main} ~~ {
 	IF:	Always
 		DO:	DoAll
+				ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
 				DoExpr {clearvar[questsRequested]}
 				DoExpr {clearvar[stipendNavLoaded]}
 				DoExpr {clearvar[augmentNav]}
diff --git a/af/neftet.af b/af/neftet.af
index 42ec333..163a849 100644
--- a/af/neftet.af
+++ b/af/neftet.af
@@ -111,7 +111,7 @@ STATE: {Default} ~~ {
 				Chat {/vt opt set enablebuffing true}
 				Chat {/vt opt set enablenav true}
 				Chat {/vt opt set navpriorityboost false}
-				GetOpt {attackdistance} {savedAttackRange}
+				ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
 				ChatExpr {\/vt nav load +getvar[navRoute]}
 				Chat {/ub fellow create Sawato Rockstyle}
 				DoExpr {setvar[pickFlowers, 1]}
@@ -127,7 +127,7 @@ STATE: {Default} ~~ {
 				Chat {/vt opt set enablebuffing true}
 				Chat {/vt opt set enablenav true}
 				Chat {/vt opt set navpriorityboost true}
-				GetOpt {attackdistance} {savedAttackRange}
+				ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
 				SetState {service_quest_refresh}
 ~~ }
 STATE: {Hunt} ~~ {
@@ -385,7 +385,7 @@ STATE: {service_decide} ~~ {
 	IF:	Always
 		DO:	DoAll
 				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 {stopwatchstart[getvar[serviceClock]]}
 				SetState {Hunt}
@@ -443,7 +443,7 @@ STATE: {service_bella_backoff} ~~ {
 				Chat {/a [bella] backoff tripped, disabling augment services for 24h}
 				Chat {/vt opt set enablecombat 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[bellaStartAttempts, 0]}
 				DoExpr {setvar[bellaAhPrimaryAttempts, 0]}
@@ -1072,7 +1072,7 @@ STATE: {service_reset_main} ~~ {
 	IF:	Always
 		DO:	DoAll
 				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[stipendNavLoaded]}
 				DoExpr {clearvar[augmentNav]}
diff --git a/met/bore.met b/met/bore.met
index 3b77c72..54331bb 100644
--- a/met/bore.met
+++ b/met/bore.met
@@ -1990,7 +1990,7 @@ K
 V
 n
 n
-13
+14
 i
 2
 s
@@ -2011,6 +2011,19 @@ n
 s
 e
 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]
 i
 2
@@ -9391,7 +9404,20 @@ K
 V
 n
 n
-12
+13
+i
+8
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+\/vt opt set attackdistance +getvar[attackRange]
 i
 7
 TABLE
diff --git a/met/neftet.met b/met/neftet.met
index 46c3ac6..b148a73 100644
--- a/met/neftet.met
+++ b/met/neftet.met
@@ -1039,22 +1039,18 @@ i
 s
 /vt opt set navpriorityboost false
 i
-11
+8
 TABLE
 2
 k
 v
 n
 n
-2
+1
 s
-o
+e
 s
-attackdistance
-s
-v
-s
-savedAttackRange
+\/vt opt set attackdistance +getvar[attackRange]
 i
 8
 TABLE
@@ -1173,22 +1169,18 @@ i
 s
 /vt opt set navpriorityboost true
 i
-11
+8
 TABLE
 2
 k
 v
 n
 n
-2
+1
 s
-o
+e
 s
-attackdistance
-s
-v
-s
-savedAttackRange
+\/vt opt set attackdistance +getvar[attackRange]
 i
 1
 s
@@ -3905,7 +3897,7 @@ n
 s
 e
 s
-\/vt opt set attackdistance +getvar[savedAttackRange]
+\/vt opt set attackdistance +getvar[attackRange]
 i
 7
 TABLE
@@ -4370,7 +4362,7 @@ n
 s
 e
 s
-\/vt opt set attackdistance +getvar[savedAttackRange]
+\/vt opt set attackdistance +getvar[attackRange]
 i
 7
 TABLE
@@ -10261,7 +10253,7 @@ n
 s
 e
 s
-\/vt opt set attackdistance +getvar[savedAttackRange]
+\/vt opt set attackdistance +getvar[attackRange]
 i
 7
 TABLE