From 0954141a916f41767727dc3fe4bd0098be50d722 Mon Sep 17 00:00:00 2001
From: Johan Lundberg <lundberg@mail.internal>
Date: Thu, 3 Sep 2026 20:35:19 +0200
Subject: [PATCH] fix death state, only Default calls vr_runback

---
 af/viridian_rise.af   |  22 ++++----
 met/viridian_rise.met | 127 ++++++++++--------------------------------
 2 files changed, 38 insertions(+), 111 deletions(-)

diff --git a/af/viridian_rise.af b/af/viridian_rise.af
index 12640f7..f7dce1b 100644
--- a/af/viridian_rise.af
+++ b/af/viridian_rise.af
@@ -214,9 +214,7 @@ STATE: {run_away}
 				Chat {/vt opt set enablelooting false}
 				Chat {/vt opt set enablecombat false}
 				Chat {/vt opt set navpriorityboost true}
-				DoExpr {clearvar[deathCount]}
-				DoExpr {clearvar[deathClock]}
-				SetState {vr_runback}
+				SetState {Default}
 	IF:	ChatMatch {^\[Fellowship\].*(say|says), \"#tomuchviteaviridianrise\"$}
 		DO:	SetState {vitae_run}
 
@@ -360,20 +358,16 @@ STATE: {death}
 				Chat {/vt opt set enablenav true}
 				Chat {/vt opt set enablelooting false}
 				Chat {/vt opt set enablecombat false}
-	IF:	All
-			Expr {testvar[vrDeathNavLoaded]}
-			NavEmpty
-		DO:	DoAll
-				DoExpr {clearvar[vrDeathNavLoaded]}
-				SetState {vr_runback}
 	IF:	Always
-		DO:	DoAll
-				DoExpr {setvar[vrDeathNavLoaded, 1]}
-				Chat {/vt nav load vr_death_recall}	
+		DO:	EmbedNav nav0__death_pause_nav {death_pause.nav}
+	IF:	NavEmpty
+		DO:	SetState {Default}				
 	IF:	Expr {vitae[]>12}			
 		DO:	Chat {/fellowship #tomuchviteaviridianrise}
 	IF:	ChatMatch {^\[Fellowship\].*(say|says), \"#tomuchviteaviridianrise\"$}
 		DO:	SetState {vitae_run}
+	IF:	ChatMatch {^\[Fellowship\].*(say|says), \"#vitaerundoneviridianrise\"$}
+		DO:	SetState {Default}
 	IF:	Always
 		DO:	SetWatchdog 5 60 {stuck}
 
@@ -382,6 +376,10 @@ STATE: {stuck}
 		DO:	DoAll				
 				SetState {Default}
 
+NAV: nav0__death_pause_nav once ~~ {
+	pau 47.1262349446615 26.1864453474681 0.225020837783813 5000
+~~ }
+
 NAV: nav2__pickup_nav circular ~~ {
 	cht 6.85679616481066 -19.8018191655477 2.08332513769468E-05 {/vt mexec actiontryuseitem[wobjectfindnearestbyobjectclass[37]]}
 	pau 6.85679616481066 -19.8018191655477 2.08332513769468E-05 10000
diff --git a/met/viridian_rise.met b/met/viridian_rise.met
index 7e7d6fd..e926b1e 100644
--- a/met/viridian_rise.met
+++ b/met/viridian_rise.met
@@ -11,7 +11,7 @@ n
 n
 n
 n
-78
+79
 i
 1
 i
@@ -1785,7 +1785,7 @@ K
 V
 n
 n
-6
+4
 i
 2
 s
@@ -1799,35 +1799,9 @@ i
 s
 /vt opt set navpriorityboost true
 i
-7
-TABLE
-2
-k
-v
-n
-n
 1
 s
-e
-s
-clearvar[deathCount]
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-clearvar[deathClock]
-i
-1
-s
-vr_runback
+Default
 s
 run_away
 i
@@ -2778,89 +2752,34 @@ s
 s
 death
 i
-2
-i
-3
-TABLE
-2
-K
-V
-n
-n
-2
-i
-26
-TABLE
-2
-k
-v
-n
-n
 1
-s
-e
-s
-testvar[vrDeathNavLoaded]
 i
-7
+4
 i
 0
-TABLE
-2
-K
-V
-n
-n
-2
-i
-7
-TABLE
-2
-k
-v
-n
-n
+ba
+109
+death_pause.nav
 1
-s
-e
-s
-clearvar[vrDeathNavLoaded]
-i
+uTank2 NAV 1.2
+4
 1
-s
-vr_runback
+3
+47.1262349446615
+26.1864453474681
+0.225020837783813
+0
+5000
 s
 death
 i
-1
+7
 i
-3
+1
 i
 0
-TABLE
-2
-K
-V
-n
-n
-2
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
 s
-e
-s
-setvar[vrDeathNavLoaded, 1]
-i
-2
-s
-/vt nav load vr_death_recall
+Default
 s
 death
 i
@@ -2893,6 +2812,16 @@ vitae_run
 s
 death
 i
+4
+i
+1
+s
+^\[Fellowship\].*(say|says), \"#vitaerundoneviridianrise\"$
+s
+Default
+s
+death
+i
 1
 i
 9