diff --git a/af/ah_primary.af b/af/ah_primary.af index 8917ad1..57327cb 100644 --- a/af/ah_primary.af +++ b/af/ah_primary.af @@ -1,5 +1,5 @@ NAV: nav0 once ~~ { cht 56.7788082122803 33.6335268974304 0.175020837783813 {/tell Lock n Key, primary} pau 56.7788082122803 33.6335268974304 0.175020837783813 15000 - cht 56.7788082122803 33.6335268974304 0.175020837783813 {/ub portal Gateway} + cht 56.7788082122803 33.6335268974304 0.175020837783813 {/ub use Gateway} ~~ } diff --git a/af/lockandkey.af b/af/lockandkey.af index cf65dfb..f388b2e 100644 --- a/af/lockandkey.af +++ b/af/lockandkey.af @@ -51,6 +51,7 @@ STATE: {idle} IF: Always DO: DoAll Chat {/vt opt set enablebuffing false} + Chat {/ub equip load idle.utl} DoExpr {setcombatstate[`peace`]} DoExpr {clearvar[queuePrimary]} DoExpr {clearvar[queueSecondary]} @@ -225,12 +226,13 @@ STATE: {service_stipend} DO: SetState {service_reset_main} STATE: {service_bella_jaw_entry} -~~ Primary Portal Recall into jaw dungeon, then run nav_lockandkeyjaw +~~ Equip quest gear, buff up, then run nav_lockandkeyjaw (nav handles idle/quest swap + recall) IF: Death DO: SetState {death} IF: Always DO: DoAll - Chat {/a [bella] recalling to jaw dungeon via primary portal} + Chat {/a [bella] equipping quest gear and buffing for jaw dungeon} + Chat {/ub equip load quest.utl} Chat {/vt opt set enablecombat true} Chat {/vt opt set enablelooting false} Chat {/vt opt set enablenav true} diff --git a/af/nav_lockandkeyjaw.af b/af/nav_lockandkeyjaw.af index 8e53961..52ebbf5 100644 --- a/af/nav_lockandkeyjaw.af +++ b/af/nav_lockandkeyjaw.af @@ -26,6 +26,10 @@ ~~ } NAV: nav0 once ~~ { + cht 59.3306452433268 -28.5473848342896 0.0500208298365275 {/ub equip load idle.utl} + pau 59.3306452433268 -28.5473848342896 0.0500208298365275 10000 + cht 59.3306452433268 -28.5473848342896 0.0500208298365275 {/ub equip load quest.utl} + pau 59.3306452433268 -28.5473848342896 0.0500208298365275 10000 rcl 59.3306452433268 -28.5473848342896 0.0500208298365275 {Primary Portal Recall} pau 59.3306452433268 -28.5473848342896 0.0500208298365275 2000 pnt -101.643393707275 17.8825289090474 2.08333134651184E-05 diff --git a/met/lockandkey.met b/met/lockandkey.met index 48baa21..be18330 100644 --- a/met/lockandkey.met +++ b/met/lockandkey.met @@ -354,12 +354,16 @@ K V n n -4 +5 i 2 s /vt opt set enablebuffing false i +2 +s +/ub equip load idle.utl +i 7 TABLE 2 @@ -1724,11 +1728,15 @@ K V n n -8 +9 i 2 s -/a [bella] recalling to jaw dungeon via primary portal +/a [bella] equipping quest gear and buffing for jaw dungeon +i +2 +s +/ub equip load quest.utl i 2 s diff --git a/nav/nav_lockandkeyjaw.nav b/nav/nav_lockandkeyjaw.nav index 3fea221..42848f6 100644 --- a/nav/nav_lockandkeyjaw.nav +++ b/nav/nav_lockandkeyjaw.nav @@ -1,6 +1,30 @@ uTank2 NAV 1.2 4 -55 +59 +4 +59.3306452433268 +-28.5473848342896 +0.0500208298365275 +0 +/ub equip load idle.utl +3 +59.3306452433268 +-28.5473848342896 +0.0500208298365275 +0 +10000 +4 +59.3306452433268 +-28.5473848342896 +0.0500208298365275 +0 +/ub equip load quest.utl +3 +59.3306452433268 +-28.5473848342896 +0.0500208298365275 +0 +10000 2 59.3306452433268 -28.5473848342896