lockandkey: replace marketplace bella entry with Primary Portal Recall via nav_lockandkeyjaw

met/lockandkey.met

@@ -11,81 +11,7 @@ n
 n
 n
 n
-95
-i
-21
-i
-7
-TABLE
-2
-K
-V
-n
-n
-1
-i
-26
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-testvar[bellaStartAttempts]
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-setvar[bellaStartAttempts, 0]
-s
-Default
-i
-21
-i
-7
-TABLE
-2
-K
-V
-n
-n
-1
-i
-26
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-testvar[bellaMpPrimaryAttempts]
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-setvar[bellaMpPrimaryAttempts, 0]
-s
-Default
+75
 i
 21
 i
@@ -1270,7 +1196,7 @@ K
 V
 n
 n
-6
+4
 i
 7
 TABLE
@@ -1296,32 +1222,6 @@ n
 s
 e
 s
-setvar[bellaStartAttempts, 0]
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-setvar[bellaMpPrimaryAttempts, 0]
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
 setvar[bellaTurnInAttempts, 0]
 i
 7
@@ -1515,7 +1415,7 @@ e
 s
 getqueststatus[`insatiableeaterjaw`]==1
 s
-service_bella_start
+service_bella_jaw_entry
 s
 service_decide
 i
@@ -1811,45 +1711,7 @@ i
 s
 death
 s
-service_bella_start
-i
-1
-i
-7
-i
-0
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-setvar[bellaStartAttempts,getvar[bellaStartAttempts]+1]
-s
-service_bella_start
-i
-26
-i
-1
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-getvar[bellaStartAttempts]>=3
-s
-service_bella_backoff
-s
-service_bella_start
+service_bella_jaw_entry
 i
 1
 i
@@ -1862,7 +1724,11 @@ K
 V
 n
 n
-4
+8
+i
+2
+s
+/a [bella] recalling to jaw dungeon via primary portal
 i
 2
 s
@@ -1874,53 +1740,11 @@ s
 i
 2
 s
-/vt opt set enablenav false
+/vt opt set enablenav true
 i
 2
 s
 /vt opt set enablebuffing false
-s
-service_bella_start
-i
-6
-i
-3
-i
-2
-TABLE
-2
-K
-V
-n
-n
-3
-i
-2
-s
-/a [bella] starting marketplace entry
-i
-2
-s
-/vt opt set enablenav false
-i
-2
-s
-/mp
-s
-service_bella_start
-i
-20
-i
-3
-i
-0
-TABLE
-2
-K
-V
-n
-n
-2
 i
 7
 TABLE
@@ -1933,316 +1757,34 @@ n
 s
 e
 s
-setvar[bellaStartAttempts, 0]
+touchvar[jawEntryNavLoaded]
 i
-1
+2
 s
-service_bella_mp_primary
-s
-service_bella_start
+/vt nav load nav_lockandkeyjaw
 i
-6
-i
-1
-i
-120
-s
-service_bella_start
-s
-service_bella_start
-i
-8
-i
-1
-i
-0
-s
-death
-s
-service_bella_mp_primary
-i
-1
-i
-7
-i
-0
+9
 TABLE
 2
 k
 v
 n
 n
-1
+3
 s
-e
 s
-setvar[bellaMpPrimaryAttempts,getvar[bellaMpPrimaryAttempts]+1]
-s
-service_bella_mp_primary
-i
-26
-i
-1
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-getvar[bellaMpPrimaryAttempts]>=3
 s
 service_bella_backoff
 s
-service_bella_mp_primary
-i
-1
-i
+r
+d
 3
-i
-0
-TABLE
-2
-K
-V
-n
-n
-5
-i
-2
 s
-/vt opt set enablenav true
-i
-2
+t
+d
+600
 s
-/vt opt set enablecombat false
-i
-2
-s
-/vt opt set enablelooting false
-i
-2
-s
-/vt opt set NavPriorityBoost false
-i
-2
-s
-/vt opt set navclosestoprange 0.008
-s
-service_bella_mp_primary
-i
-26
-i
-2
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-getplayerlandblock[]==23855104
-s
-/vt nav load mp_primary
-s
-service_bella_mp_primary
-i
-2
-i
-3
-TABLE
-2
-K
-V
-n
-n
-2
-i
-26
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-getplayerlandblock[]!=23855104
-i
-6
-i
-30
-TABLE
-2
-K
-V
-n
-n
-2
-i
-2
-s
-/a [bella] wrong mp_primary landblock, restarting marketplace entry
-i
-1
-s
-service_bella_start
-s
-service_bella_mp_primary
-i
-20
-i
-3
-i
-0
-TABLE
-2
-K
-V
-n
-n
-3
-i
-2
-s
-/vt opt set enablenav false
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-setvar[bellaMpPrimaryAttempts, 0]
-i
-1
-s
-service_bella_jaw_run
-s
-service_bella_mp_primary
-i
-6
-i
-3
-i
-60
-TABLE
-2
-K
-V
-n
-n
-2
-i
-2
-s
-/a [bella] mp_primary timed out, restarting marketplace entry
-i
-1
-s
-service_bella_start
-s
-service_bella_mp_primary
-i
-8
-i
-1
-i
-0
-s
-death
-s
-service_bella_jaw_run
-i
-26
-i
-3
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-getplayerlandblock[]==9830400
-TABLE
-2
-K
-V
-n
-n
-2
-i
-2
-s
-/vt opt set enablenav true
-i
-2
-s
-/vt nav load jaw_1
-s
-service_bella_jaw_run
-i
-2
-i
-3
-TABLE
-2
-K
-V
-n
-n
-2
-i
-26
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-getplayerlandblock[]!=9830400
-i
-6
-i
-30
-TABLE
-2
-K
-V
-n
-n
-2
-i
-2
-s
-/a [bella] wrong jaw_run landblock, restarting marketplace entry
-i
-1
-s
-service_bella_start
-s
-service_bella_jaw_run
+service_bella_jaw_entry
 i
 2
 i
@@ -2266,15 +1808,15 @@ n
 s
 e
 s
-getplayerlandblock[]==9830400
-i
-6
-i
-30
+testvar[jawEntryNavLoaded]
 i
 7
 i
 0
+i
+6
+i
+2
 TABLE
 2
 K
@@ -2294,7 +1836,7 @@ n
 s
 e
 s
-setvar[bellaStartAttempts, 0]
+clearvar[jawEntryNavLoaded]
 i
 7
 TABLE
@@ -2329,110 +1871,7 @@ i
 s
 service_bella_jaw_hunt
 s
-service_bella_jaw_run
-i
-2
-i
-3
-TABLE
-2
-K
-V
-n
-n
-2
-i
-6
-i
-300
-i
-26
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-getvar[bellaJawRunRecoverAttempts]<3
-TABLE
-2
-K
-V
-n
-n
-4
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-chatbox[`/a [bella] jaw_run stuck, recall retry `+cstr[getvar[bellaJawRunRecoverAttempts]+1]+`/3`]
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-setvar[bellaJawRunRecoverAttempts,getvar[bellaJawRunRecoverAttempts]+1]
-i
-2
-s
-/vt nav load nav_portal_recall
-i
-1
-s
-service_bella_jaw_run_recover
-s
-service_bella_jaw_run
-i
-2
-i
-1
-TABLE
-2
-K
-V
-n
-n
-2
-i
-6
-i
-300
-i
-26
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-getvar[bellaJawRunRecoverAttempts]>=3
-s
-service_bella_backoff
-s
-service_bella_jaw_run
+service_bella_jaw_entry
 i
 8
 i
@@ -2450,7 +1889,7 @@ i
 i
 20
 s
-service_bella_jaw_run
+service_bella_jaw_entry
 s
 service_bella_jaw_run_recover
 i
@@ -2539,7 +1978,7 @@ i
 i
 1200
 s
-service_bella_start
+service_bella_backoff
 s
 service_bella_jaw_hunt
 i
@@ -2769,7 +2208,7 @@ K
 V
 n
 n
-11
+9
 i
 2
 s
@@ -2807,32 +2246,6 @@ n
 s
 e
 s
-setvar[bellaStartAttempts, 0]
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-setvar[bellaMpPrimaryAttempts, 0]
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
 setvar[bellaTurnInAttempts, 0]
 i
 7