From e41bd7e3e3c0a7aa474ccd29d798ce329023c056 Mon Sep 17 00:00:00 2001
From: Johan Lundberg <lundberg@mail.internal>
Date: Tue, 8 Sep 2026 22:52:50 +0200
Subject: [PATCH 1/2] find nearest by object class and name

---
 af/viridian_rise.af   | 2 +-
 met/viridian_rise.met | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/af/viridian_rise.af b/af/viridian_rise.af
index d709efe..95b7f30 100644
--- a/af/viridian_rise.af
+++ b/af/viridian_rise.af
@@ -386,6 +386,6 @@ NAV: nav0__death_pause_nav once ~~ {
 ~~ }
 
 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[wobjectfindnearestbynameandobjectclass[37, getvar[whatToPick]]]}
 	pau 6.85679616481066 -19.8018191655477 2.08332513769468E-05 10000
 ~~ }
\ No newline at end of file
diff --git a/met/viridian_rise.met b/met/viridian_rise.met
index 114b8f7..532275d 100644
--- a/met/viridian_rise.met
+++ b/met/viridian_rise.met
@@ -2601,7 +2601,7 @@ setvar[ObjectClose, 1]
 i
 4
 ba
-239
+266
 pickup.nav
 2
 uTank2 NAV 1.2
@@ -2612,7 +2612,7 @@ uTank2 NAV 1.2
 -19.8018191655477
 2.08332513769468E-05
 0
-/vt mexec actiontryuseitem[wobjectfindnearestbyobjectclass[37]]
+/vt mexec actiontryuseitem[wobjectfindnearestbynameandobjectclass[37, getvar[whatToPick]]]
 3
 6.85679616481066
 -19.8018191655477

From 34d6dfee82081f83eb73ad3701d13862f68d2a84 Mon Sep 17 00:00:00 2001
From: Johan Lundberg <lundberg@mail.internal>
Date: Tue, 8 Sep 2026 22:54:10 +0200
Subject: [PATCH 2/2] change run_away from Default state to vr_run

---
 af/viridian_rise.af | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/af/viridian_rise.af b/af/viridian_rise.af
index 95b7f30..70390ed 100644
--- a/af/viridian_rise.af
+++ b/af/viridian_rise.af
@@ -216,7 +216,8 @@ STATE: {run_away}
 				Chat {/vt opt set enablelooting false}
 				Chat {/vt opt set enablecombat false}
 				Chat {/vt opt set navpriorityboost true}
-				SetState {Default}
+				DoExpr {clearvar[vrRunbackNavLoaded]}
+				SetState {vr_runback}
 	IF:	ChatMatch {^\[Fellowship\].*(say|says), \"#tomuchviteaviridianrise\"$}
 		DO:	SetState {vitae_run}