diff --git a/af/bore.af b/af/bore.af index 0867c94..788991a 100644 --- a/af/bore.af +++ b/af/bore.af @@ -389,15 +389,12 @@ STATE: {service_bella_jaw_run} ~~ { Chat {/vt opt set lootonlyrarecorpses false} SetState {service_bella_jaw_hunt} IF: All - SecsInStateGE 300 + SecsInStateGE 30 Expr {getvar[bellaJawRunRecoverAttempts]<3} DO: DoAll DoExpr {chatbox[`/a [bella] jaw_run stuck, recall retry `+cstr[getvar[bellaJawRunRecoverAttempts]+1]+`/3`]} DoExpr {setvar[bellaJawRunRecoverAttempts,getvar[bellaJawRunRecoverAttempts]+1]} - DoExpr {actiontrycastbyid[2645]} - DoExpr {actiontrycastbyid[2645]} - DoExpr {actiontrycastbyid[2645]} - Chat {/vt nav load jaw_1} + Chat {/vt nav load nav_portal_recall} SetState {service_bella_jaw_run} IF: SecsInStateGE 300 DO: SetState {service_bella_backoff} diff --git a/af/neftet.af b/af/neftet.af index 3fb1e6a..2c97e1c 100644 --- a/af/neftet.af +++ b/af/neftet.af @@ -454,15 +454,12 @@ STATE: {service_bella_jaw_run} ~~ { Chat {/vt opt set lootonlyrarecorpses false} SetState {service_bella_jaw_hunt} IF: All - SecsInStateGE 300 + SecsInStateGE 30 Expr {getvar[bellaJawRunRecoverAttempts]<3} DO: DoAll DoExpr {chatbox[`/a [bella] jaw_run stuck, recall retry `+cstr[getvar[bellaJawRunRecoverAttempts]+1]+`/3`]} DoExpr {setvar[bellaJawRunRecoverAttempts,getvar[bellaJawRunRecoverAttempts]+1]} - DoExpr {actiontrycastbyid[2645]} - DoExpr {actiontrycastbyid[2645]} - DoExpr {actiontrycastbyid[2645]} - Chat {/vt nav load jaw_1} + Chat {/vt nav load nav_portal_recall} SetState {service_bella_jaw_run} IF: SecsInStateGE 300 DO: SetState {service_bella_backoff} diff --git a/met/bore.met b/met/bore.met index c4e8cad..db0adf6 100644 --- a/met/bore.met +++ b/met/bore.met @@ -3541,7 +3541,7 @@ n i 6 i -300 +30 i 26 TABLE @@ -3561,7 +3561,7 @@ K V n n -7 +4 i 7 TABLE @@ -3589,48 +3589,9 @@ e s setvar[bellaJawRunRecoverAttempts,getvar[bellaJawRunRecoverAttempts]+1] i -7 -TABLE -2 -k -v -n -n -1 -s -e -s -actiontrycastbyid[2645] -i -7 -TABLE -2 -k -v -n -n -1 -s -e -s -actiontrycastbyid[2645] -i -7 -TABLE -2 -k -v -n -n -1 -s -e -s -actiontrycastbyid[2645] -i 2 s -/vt nav load jaw_1 +/vt nav load nav_portal_recall i 1 s diff --git a/met/neftet.met b/met/neftet.met index 367c435..d15a5cf 100644 --- a/met/neftet.met +++ b/met/neftet.met @@ -4293,7 +4293,7 @@ n i 6 i -300 +30 i 26 TABLE @@ -4313,7 +4313,7 @@ K V n n -7 +4 i 7 TABLE @@ -4341,48 +4341,9 @@ e s setvar[bellaJawRunRecoverAttempts,getvar[bellaJawRunRecoverAttempts]+1] i -7 -TABLE -2 -k -v -n -n -1 -s -e -s -actiontrycastbyid[2645] -i -7 -TABLE -2 -k -v -n -n -1 -s -e -s -actiontrycastbyid[2645] -i -7 -TABLE -2 -k -v -n -n -1 -s -e -s -actiontrycastbyid[2645] -i 2 s -/vt nav load jaw_1 +/vt nav load nav_portal_recall i 1 s diff --git a/nav/nav_portal_recall.nav b/nav/nav_portal_recall.nav new file mode 100644 index 0000000..0ccf753 --- /dev/null +++ b/nav/nav_portal_recall.nav @@ -0,0 +1,9 @@ +uTank2 NAV 1.2 +4 +1 +2 +-101.658333333333 +17.8833333333333 +2.08333134651184E-05 +0 +2645