From 76b08c0d8762332627355143998ccedf9c65ce94 Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 12 Mar 2026 19:23:48 +0100 Subject: [PATCH] rework bella service state recovery --- af/bore.af | 98 +++++++--- af/neftet.af | 98 +++++++--- met/bore.met | 505 +++++++++++++++++++++++++++++++++++++++++-------- met/neftet.met | 505 +++++++++++++++++++++++++++++++++++++++++-------- 4 files changed, 978 insertions(+), 228 deletions(-) diff --git a/af/bore.af b/af/bore.af index eafe30d..5ccf247 100644 --- a/af/bore.af +++ b/af/bore.af @@ -173,6 +173,10 @@ STATE: {Default} ~~ { DO: DoExpr {setvar[disableAugmentServices, 0]} IF: Not Expr {testvar[bellaStartAttempts]} DO: DoExpr {setvar[bellaStartAttempts, 0]} + IF: Not Expr {testvar[bellaMpPrimaryAttempts]} + DO: DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + IF: Not Expr {testvar[bellaMpSecondaryAttempts]} + DO: DoExpr {setvar[bellaMpSecondaryAttempts, 0]} IF: Not Expr {testvar[bellaTurnInAttempts]} DO: DoExpr {setvar[bellaTurnInAttempts, 0]} IF: Not Expr {testvar[bellaJawRunRecoverAttempts]} @@ -271,6 +275,8 @@ STATE: {service_decide} ~~ { DO: DoAll DoExpr {setvar[disableAugmentServices, 0]} DoExpr {setvar[bellaStartAttempts, 0]} + DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + DoExpr {setvar[bellaMpSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} DoExpr {clearvar[bellaBackoffClock]} @@ -315,32 +321,49 @@ STATE: {service_bella_start} ~~ { IF: Death DO: SetState {death} IF: Always - DO: Chat {/a [bella] starting marketplace entry} - IF: ExitPortal - DO: SetState {service_bella_mp_primary} + DO: DoExpr {setvar[bellaStartAttempts,getvar[bellaStartAttempts]+1]} + IF: Expr {getvar[bellaStartAttempts]>=3} + DO: SetState {service_bella_backoff} IF: Always - DO: Chat {/mp} + DO: DoAll + Chat {/vt opt set enablecombat false} + Chat {/vt opt set enablelooting false} + Chat {/vt opt set enablenav false} + Chat {/vt opt set enablebuffing true} + IF: SecsInStateGE 2 + DO: DoAll + Chat {/a [bella] starting marketplace entry} + Chat {/vt opt set enablenav false} + Chat {/mp} + IF: ExitPortal + DO: DoAll + DoExpr {setvar[bellaStartAttempts, 0]} + SetState {service_bella_mp_primary} IF: SecsInStateGE 120 - DO: SetState {service_reset_main} + DO: SetState {service_bella_start} ~~ } STATE: {service_bella_backoff} ~~ { IF: Always DO: DoAll Chat {/a [bella] backoff tripped, disabling augment services for 24h} + Chat {/vt opt set enablecombat true} + Chat {/vt opt set enablenav true} DoExpr {setvar[disableAugmentServices, 1]} DoExpr {setvar[bellaStartAttempts, 0]} + DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + DoExpr {setvar[bellaMpSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} DoExpr {setvar[bellaBackoffClock,stopwatchcreate[]]} DoExpr {stopwatchstart[getvar[bellaBackoffClock]]} - SetState {service_reset_main} + SetState {Default} ~~ } STATE: {service_bella_mp_primary} ~~ { IF: Death DO: SetState {death} IF: Always - DO: DoExpr {setvar[bellaStartAttempts,getvar[bellaStartAttempts]+1]} - IF: Expr {getvar[bellaStartAttempts]>3} + DO: DoExpr {setvar[bellaMpPrimaryAttempts,getvar[bellaMpPrimaryAttempts]+1]} + IF: Expr {getvar[bellaMpPrimaryAttempts]>=3} DO: SetState {service_bella_backoff} IF: Always DO: DoAll @@ -359,8 +382,11 @@ STATE: {service_bella_mp_primary} ~~ { Chat {/a [bella] wrong mp_primary landblock, restarting marketplace entry} SetState {service_bella_start} IF: ExitPortal - DO: SetState {service_bella_jaw_run} - IF: SecsInStateGE 300 + DO: DoAll + Chat {/vt opt set enablenav false} + DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + SetState {service_bella_jaw_run} + IF: SecsInStateGE 60 DO: DoAll Chat {/a [bella] mp_primary timed out, restarting marketplace entry} SetState {service_bella_start} @@ -395,12 +421,18 @@ STATE: {service_bella_jaw_run} ~~ { DoExpr {chatbox[`/a [bella] jaw_run stuck, recall retry `+cstr[getvar[bellaJawRunRecoverAttempts]+1]+`/3`]} DoExpr {setvar[bellaJawRunRecoverAttempts,getvar[bellaJawRunRecoverAttempts]+1]} Chat {/vt nav load nav_portal_recall} - SetState {service_bella_jaw_run} + SetState {service_bella_jaw_run_recover} IF: All SecsInStateGE 300 Expr {getvar[bellaJawRunRecoverAttempts]>=3} DO: SetState {service_bella_backoff} ~~ } +STATE: {service_bella_jaw_run_recover} ~~ { + IF: Death + DO: SetState {death} + IF: SecsInStateGE 20 + DO: SetState {service_bella_jaw_run} +~~ } STATE: {service_bella_jaw_hunt} ~~ { IF: Death DO: SetState {death} @@ -410,9 +442,10 @@ STATE: {service_bella_jaw_hunt} ~~ { SetState {service_bella_turn_in_jaw} IF: ItemCountGE 1 {Insatiable Eater Jaw} DO: DoAll + Chat {/vt opt set enablecombat false} Chat {/vt nav load to_fiun} IF: SecsInStateGE 1200 - DO: SetState {service_reset_main} + DO: SetState {service_bella_start} ~~ } STATE: {service_bella_turn_in_jaw} ~~ { IF: Death @@ -446,55 +479,60 @@ STATE: {service_bella_mp_trans} ~~ { IF: Death DO: SetState {death} IF: ExitPortal - DO: DoAll - Chat {/vt nav load mp_secondary} - SetState {service_bella_mp_secondary} + DO: SetState {service_bella_mp_secondary} IF: SecsInStateGE 120 - DO: SetState {service_reset_main} + DO: SetState {service_bella_start} ~~ } STATE: {service_bella_mp_secondary} ~~ { IF: Death DO: SetState {death} + IF: Always + DO: DoExpr {setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1]} + IF: Expr {getvar[bellaMpSecondaryAttempts]>=3} + DO: SetState {service_bella_backoff} IF: Expr {getplayerlandblock[]==23855104} DO: Chat {/vt nav load mp_secondary} IF: All Expr {getplayerlandblock[]!=23855104} - SecsInStateGE 2 + SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong mp_secondary landcell, retrying marketplace portal} - Chat {/mp} - SetState {service_bella_mp_secondary} - IF: All - Expr {getplayerlandblock[]==23855104} - ExitPortal + Chat {/a [bella] wrong mp_secondary landblock, restarting marketplace entry} + SetState {service_bella_start} + IF: ExitPortal DO: DoAll + DoExpr {setvar[bellaMpSecondaryAttempts, 0]} Chat {/vt opt set enablecombat true} Chat {/vt nav load to_bella} SetState {service_bella_kill_bella} - IF: SecsInStateGE 300 - DO: SetState {service_reset_main} + IF: SecsInStateGE 60 + DO: SetState {service_bella_start} ~~ } STATE: {service_bella_kill_bella} ~~ { IF: Death DO: SetState {death} IF: All - Expr {getplayerlandcell[]!=5636705} - SecsInStateGE 2 + Expr {getplayerlandblock[]!=5636096} + SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong bella landcell, retrying secondary marketplace portal} + Chat {/a [bella] wrong bella landblock, returning to mp_secondary} + Chat {/vt opt set enablenav false} Chat {/mp} SetState {service_bella_mp_secondary} IF: ItemCountGE 1 {Blank Augmentation Gem} DO: DoAll Chat {/a [bella] blank gem acquired, escaping and preparing augment} DoExpr {setvar[bellaStartAttempts, 0]} + DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + DoExpr {setvar[bellaMpSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} Chat {/vt opt set enablelooting false} Chat {/vt opt set enablecombat false} SetState {service_bella_escape} - IF: SecsInStateGE 300 - DO: SetState {service_reset_main} + IF: SecsInStateGE 600 + DO: DoAll + Chat {/a [bella] kill_bella timed out, restarting marketplace entry} + SetState {service_bella_start} ~~ } STATE: {service_bella_escape} ~~ { IF: Death diff --git a/af/neftet.af b/af/neftet.af index 660582c..9d76762 100644 --- a/af/neftet.af +++ b/af/neftet.af @@ -84,6 +84,10 @@ STATE: {Default} ~~ { DO: DoExpr {setvar[disableAugmentServices, 0]} IF: Not Expr {testvar[bellaStartAttempts]} DO: DoExpr {setvar[bellaStartAttempts, 0]} + IF: Not Expr {testvar[bellaMpPrimaryAttempts]} + DO: DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + IF: Not Expr {testvar[bellaMpSecondaryAttempts]} + DO: DoExpr {setvar[bellaMpSecondaryAttempts, 0]} IF: Not Expr {testvar[bellaTurnInAttempts]} DO: DoExpr {setvar[bellaTurnInAttempts, 0]} IF: Not Expr {testvar[bellaJawRunRecoverAttempts]} @@ -335,6 +339,8 @@ STATE: {service_decide} ~~ { DO: DoAll DoExpr {setvar[disableAugmentServices, 0]} DoExpr {setvar[bellaStartAttempts, 0]} + DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + DoExpr {setvar[bellaMpSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} DoExpr {clearvar[bellaBackoffClock]} @@ -380,32 +386,49 @@ STATE: {service_bella_start} ~~ { IF: Death DO: SetState {death} IF: Always - DO: Chat {/a [bella] starting marketplace entry} - IF: ExitPortal - DO: SetState {service_bella_mp_primary} + DO: DoExpr {setvar[bellaStartAttempts,getvar[bellaStartAttempts]+1]} + IF: Expr {getvar[bellaStartAttempts]>=3} + DO: SetState {service_bella_backoff} IF: Always - DO: Chat {/mp} + DO: DoAll + Chat {/vt opt set enablecombat false} + Chat {/vt opt set enablelooting false} + Chat {/vt opt set enablenav false} + Chat {/vt opt set enablebuffing true} + IF: SecsInStateGE 2 + DO: DoAll + Chat {/a [bella] starting marketplace entry} + Chat {/vt opt set enablenav false} + Chat {/mp} + IF: ExitPortal + DO: DoAll + DoExpr {setvar[bellaStartAttempts, 0]} + SetState {service_bella_mp_primary} IF: SecsInStateGE 120 - DO: SetState {service_reset_main} + DO: SetState {service_bella_start} ~~ } STATE: {service_bella_backoff} ~~ { IF: Always DO: DoAll Chat {/a [bella] backoff tripped, disabling augment services for 24h} + Chat {/vt opt set enablecombat true} + Chat {/vt opt set enablenav true} DoExpr {setvar[disableAugmentServices, 1]} DoExpr {setvar[bellaStartAttempts, 0]} + DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + DoExpr {setvar[bellaMpSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} DoExpr {setvar[bellaBackoffClock,stopwatchcreate[]]} DoExpr {stopwatchstart[getvar[bellaBackoffClock]]} - SetState {service_reset_main} + SetState {Default} ~~ } STATE: {service_bella_mp_primary} ~~ { IF: Death DO: SetState {death} IF: Always - DO: DoExpr {setvar[bellaStartAttempts,getvar[bellaStartAttempts]+1]} - IF: Expr {getvar[bellaStartAttempts]>3} + DO: DoExpr {setvar[bellaMpPrimaryAttempts,getvar[bellaMpPrimaryAttempts]+1]} + IF: Expr {getvar[bellaMpPrimaryAttempts]>=3} DO: SetState {service_bella_backoff} IF: Always DO: DoAll @@ -424,8 +447,11 @@ STATE: {service_bella_mp_primary} ~~ { Chat {/a [bella] wrong mp_primary landblock, restarting marketplace entry} SetState {service_bella_start} IF: ExitPortal - DO: SetState {service_bella_jaw_run} - IF: SecsInStateGE 300 + DO: DoAll + Chat {/vt opt set enablenav false} + DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + SetState {service_bella_jaw_run} + IF: SecsInStateGE 60 DO: DoAll Chat {/a [bella] mp_primary timed out, restarting marketplace entry} SetState {service_bella_start} @@ -460,12 +486,18 @@ STATE: {service_bella_jaw_run} ~~ { DoExpr {chatbox[`/a [bella] jaw_run stuck, recall retry `+cstr[getvar[bellaJawRunRecoverAttempts]+1]+`/3`]} DoExpr {setvar[bellaJawRunRecoverAttempts,getvar[bellaJawRunRecoverAttempts]+1]} Chat {/vt nav load nav_portal_recall} - SetState {service_bella_jaw_run} + SetState {service_bella_jaw_run_recover} IF: All SecsInStateGE 300 Expr {getvar[bellaJawRunRecoverAttempts]>=3} DO: SetState {service_bella_backoff} ~~ } +STATE: {service_bella_jaw_run_recover} ~~ { + IF: Death + DO: SetState {death} + IF: SecsInStateGE 20 + DO: SetState {service_bella_jaw_run} +~~ } STATE: {service_bella_jaw_hunt} ~~ { IF: Death DO: SetState {death} @@ -475,9 +507,10 @@ STATE: {service_bella_jaw_hunt} ~~ { SetState {service_bella_turn_in_jaw} IF: ItemCountGE 1 {Insatiable Eater Jaw} DO: DoAll + Chat {/vt opt set enablecombat false} Chat {/vt nav load to_fiun} IF: SecsInStateGE 1200 - DO: SetState {service_reset_main} + DO: SetState {service_bella_start} ~~ } STATE: {service_bella_turn_in_jaw} ~~ { IF: Death @@ -511,55 +544,60 @@ STATE: {service_bella_mp_trans} ~~ { IF: Death DO: SetState {death} IF: ExitPortal - DO: DoAll - Chat {/vt nav load mp_secondary} - SetState {service_bella_mp_secondary} + DO: SetState {service_bella_mp_secondary} IF: SecsInStateGE 120 - DO: SetState {service_reset_main} + DO: SetState {service_bella_start} ~~ } STATE: {service_bella_mp_secondary} ~~ { IF: Death DO: SetState {death} + IF: Always + DO: DoExpr {setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1]} + IF: Expr {getvar[bellaMpSecondaryAttempts]>=3} + DO: SetState {service_bella_backoff} IF: Expr {getplayerlandblock[]==23855104} DO: Chat {/vt nav load mp_secondary} IF: All Expr {getplayerlandblock[]!=23855104} - SecsInStateGE 2 + SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong mp_secondary landcell, retrying marketplace portal} - Chat {/mp} - SetState {service_bella_mp_secondary} - IF: All - Expr {getplayerlandblock[]==23855104} - ExitPortal + Chat {/a [bella] wrong mp_secondary landblock, restarting marketplace entry} + SetState {service_bella_start} + IF: ExitPortal DO: DoAll + DoExpr {setvar[bellaMpSecondaryAttempts, 0]} Chat {/vt opt set enablecombat true} Chat {/vt nav load to_bella} SetState {service_bella_kill_bella} - IF: SecsInStateGE 300 - DO: SetState {service_reset_main} + IF: SecsInStateGE 60 + DO: SetState {service_bella_start} ~~ } STATE: {service_bella_kill_bella} ~~ { IF: Death DO: SetState {death} IF: All - Expr {getplayerlandcell[]!=5636705} - SecsInStateGE 2 + Expr {getplayerlandblock[]!=5636096} + SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong bella landcell, retrying secondary marketplace portal} + Chat {/a [bella] wrong bella landblock, returning to mp_secondary} + Chat {/vt opt set enablenav false} Chat {/mp} SetState {service_bella_mp_secondary} IF: ItemCountGE 1 {Blank Augmentation Gem} DO: DoAll Chat {/a [bella] blank gem acquired, escaping and preparing augment} DoExpr {setvar[bellaStartAttempts, 0]} + DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + DoExpr {setvar[bellaMpSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} Chat {/vt opt set enablelooting false} Chat {/vt opt set enablecombat false} SetState {service_bella_escape} - IF: SecsInStateGE 300 - DO: SetState {service_reset_main} + IF: SecsInStateGE 600 + DO: DoAll + Chat {/a [bella] kill_bella timed out, restarting marketplace entry} + SetState {service_bella_start} ~~ } STATE: {service_bella_escape} ~~ { IF: Death diff --git a/met/bore.met b/met/bore.met index 6a27d18..e4c605a 100644 --- a/met/bore.met +++ b/met/bore.met @@ -11,7 +11,7 @@ n n n n -205 +213 i 1 i @@ -1571,6 +1571,80 @@ n s e s +testvar[bellaMpPrimaryAttempts] +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpPrimaryAttempts, 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[bellaMpSecondaryAttempts] +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpSecondaryAttempts, 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[bellaTurnInAttempts] TABLE 2 @@ -2567,7 +2641,7 @@ K V n n -5 +7 i 7 TABLE @@ -2606,6 +2680,32 @@ n s e s +setvar[bellaMpPrimaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpSecondaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s setvar[bellaTurnInAttempts, 0] i 7 @@ -3044,41 +3144,39 @@ service_bella_start i 1 i +7 +i +0 +TABLE 2 -i -0 +k +v +n +n +1 s -/a [bella] starting marketplace entry +e +s +setvar[bellaStartAttempts,getvar[bellaStartAttempts]+1] s service_bella_start i -20 +26 i 1 -i -0 -s -service_bella_mp_primary -s -service_bella_start -i -1 -i +TABLE 2 -i -0 -s -/mp -s -service_bella_start -i -6 -i +k +v +n +n 1 -i -120 s -service_reset_main +e +s +getvar[bellaStartAttempts]>=3 +s +service_bella_backoff s service_bella_start i @@ -3093,12 +3191,120 @@ K V n n -8 +4 +i +2 +s +/vt opt set enablecombat false +i +2 +s +/vt opt set enablelooting false +i +2 +s +/vt opt set enablenav false +i +2 +s +/vt opt set enablebuffing true +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 +2 +k +v +n +n +1 +s +e +s +setvar[bellaStartAttempts, 0] +i +1 +s +service_bella_mp_primary +s +service_bella_start +i +6 +i +1 +i +120 +s +service_bella_start +s +service_bella_start +i +1 +i +3 +i +0 +TABLE +2 +K +V +n +n +12 i 2 s /a [bella] backoff tripped, disabling augment services for 24h i +2 +s +/vt opt set enablecombat true +i +2 +s +/vt opt set enablenav true +i 7 TABLE 2 @@ -3136,6 +3342,32 @@ n s e s +setvar[bellaMpPrimaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpSecondaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s setvar[bellaTurnInAttempts, 0] i 7 @@ -3179,7 +3411,7 @@ stopwatchstart[getvar[bellaBackoffClock]] i 1 s -service_reset_main +Default s service_bella_backoff i @@ -3208,7 +3440,7 @@ n s e s -setvar[bellaStartAttempts,getvar[bellaStartAttempts]+1] +setvar[bellaMpPrimaryAttempts,getvar[bellaMpPrimaryAttempts]+1] s service_bella_mp_primary i @@ -3225,7 +3457,7 @@ n s e s -getvar[bellaStartAttempts]>3 +getvar[bellaMpPrimaryAttempts]>=3 s service_bella_backoff s @@ -3336,9 +3568,35 @@ service_bella_mp_primary i 20 i -1 +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 @@ -3348,7 +3606,7 @@ i i 3 i -300 +60 TABLE 2 K @@ -3595,7 +3853,7 @@ s i 1 s -service_bella_jaw_run +service_bella_jaw_run_recover s service_bella_jaw_run i @@ -3639,6 +3897,26 @@ i s death s +service_bella_jaw_run_recover +i +6 +i +1 +i +20 +s +service_bella_jaw_run +s +service_bella_jaw_run_recover +i +8 +i +1 +i +0 +s +death +s service_bella_jaw_hunt i 20 @@ -3688,7 +3966,11 @@ K V n n -1 +2 +i +2 +s +/vt opt set enablecombat false i 2 s @@ -3702,7 +3984,7 @@ i i 1200 s -service_reset_main +service_bella_start s service_bella_jaw_hunt i @@ -3937,22 +4219,9 @@ service_bella_mp_trans i 20 i -3 +1 i 0 -TABLE -2 -K -V -n -n -2 -i -2 -s -/vt nav load mp_secondary -i -1 s service_bella_mp_secondary s @@ -3964,7 +4233,7 @@ i i 120 s -service_reset_main +service_bella_start s service_bella_mp_trans i @@ -3978,6 +4247,44 @@ death s service_bella_mp_secondary i +1 +i +7 +i +0 +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1] +s +service_bella_mp_secondary +i +26 +i +1 +TABLE +2 +k +v +n +n +1 +s +e +s +getvar[bellaMpSecondaryAttempts]>=3 +s +service_bella_backoff +s +service_bella_mp_secondary +i 26 i 2 @@ -4023,41 +4330,39 @@ getplayerlandblock[]!=23855104 i 6 i -2 +30 TABLE 2 K V n n -3 +2 i 2 s -/a [bella] wrong mp_secondary landcell, retrying marketplace portal -i -2 -s -/mp +/a [bella] wrong mp_secondary landblock, restarting marketplace entry i 1 s -service_bella_mp_secondary +service_bella_start s service_bella_mp_secondary i -2 +20 i 3 +i +0 TABLE 2 K V n n -2 +4 i -26 +7 TABLE 2 k @@ -4068,18 +4373,7 @@ n s e s -getplayerlandblock[]==23855104 -i -20 -i -0 -TABLE -2 -K -V -n -n -3 +setvar[bellaMpSecondaryAttempts, 0] i 2 s @@ -4099,9 +4393,9 @@ i i 1 i -300 +60 s -service_reset_main +service_bella_start s service_bella_mp_secondary i @@ -4137,22 +4431,26 @@ n s e s -getplayerlandcell[]!=5636705 +getplayerlandblock[]!=5636096 i 6 i -2 +30 TABLE 2 K V n n -3 +4 i 2 s -/a [bella] wrong bella landcell, retrying secondary marketplace portal +/a [bella] wrong bella landblock, returning to mp_secondary +i +2 +s +/vt opt set enablenav false i 2 s @@ -4188,7 +4486,7 @@ K V n n -7 +9 i 2 s @@ -4218,6 +4516,32 @@ n s e s +setvar[bellaMpPrimaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpSecondaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s setvar[bellaTurnInAttempts, 0] i 7 @@ -4249,11 +4573,24 @@ service_bella_kill_bella i 6 i -1 +3 i -300 +600 +TABLE +2 +K +V +n +n +2 +i +2 s -service_reset_main +/a [bella] kill_bella timed out, restarting marketplace entry +i +1 +s +service_bella_start s service_bella_kill_bella i diff --git a/met/neftet.met b/met/neftet.met index cab0eaa..b5e140d 100644 --- a/met/neftet.met +++ b/met/neftet.met @@ -11,7 +11,7 @@ n n n n -284 +292 i 20 i @@ -688,6 +688,80 @@ n s e s +testvar[bellaMpPrimaryAttempts] +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpPrimaryAttempts, 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[bellaMpSecondaryAttempts] +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpSecondaryAttempts, 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[bellaTurnInAttempts] TABLE 2 @@ -3306,7 +3380,7 @@ K V n n -5 +7 i 7 TABLE @@ -3345,6 +3419,32 @@ n s e s +setvar[bellaMpPrimaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpSecondaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s setvar[bellaTurnInAttempts, 0] i 7 @@ -3796,41 +3896,39 @@ service_bella_start i 1 i +7 +i +0 +TABLE 2 -i -0 +k +v +n +n +1 s -/a [bella] starting marketplace entry +e +s +setvar[bellaStartAttempts,getvar[bellaStartAttempts]+1] s service_bella_start i -20 +26 i 1 -i -0 -s -service_bella_mp_primary -s -service_bella_start -i -1 -i +TABLE 2 -i -0 -s -/mp -s -service_bella_start -i -6 -i +k +v +n +n 1 -i -120 s -service_reset_main +e +s +getvar[bellaStartAttempts]>=3 +s +service_bella_backoff s service_bella_start i @@ -3845,12 +3943,120 @@ K V n n -8 +4 +i +2 +s +/vt opt set enablecombat false +i +2 +s +/vt opt set enablelooting false +i +2 +s +/vt opt set enablenav false +i +2 +s +/vt opt set enablebuffing true +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 +2 +k +v +n +n +1 +s +e +s +setvar[bellaStartAttempts, 0] +i +1 +s +service_bella_mp_primary +s +service_bella_start +i +6 +i +1 +i +120 +s +service_bella_start +s +service_bella_start +i +1 +i +3 +i +0 +TABLE +2 +K +V +n +n +12 i 2 s /a [bella] backoff tripped, disabling augment services for 24h i +2 +s +/vt opt set enablecombat true +i +2 +s +/vt opt set enablenav true +i 7 TABLE 2 @@ -3888,6 +4094,32 @@ n s e s +setvar[bellaMpPrimaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpSecondaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s setvar[bellaTurnInAttempts, 0] i 7 @@ -3931,7 +4163,7 @@ stopwatchstart[getvar[bellaBackoffClock]] i 1 s -service_reset_main +Default s service_bella_backoff i @@ -3960,7 +4192,7 @@ n s e s -setvar[bellaStartAttempts,getvar[bellaStartAttempts]+1] +setvar[bellaMpPrimaryAttempts,getvar[bellaMpPrimaryAttempts]+1] s service_bella_mp_primary i @@ -3977,7 +4209,7 @@ n s e s -getvar[bellaStartAttempts]>3 +getvar[bellaMpPrimaryAttempts]>=3 s service_bella_backoff s @@ -4088,9 +4320,35 @@ service_bella_mp_primary i 20 i -1 +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 @@ -4100,7 +4358,7 @@ i i 3 i -300 +60 TABLE 2 K @@ -4347,7 +4605,7 @@ s i 1 s -service_bella_jaw_run +service_bella_jaw_run_recover s service_bella_jaw_run i @@ -4391,6 +4649,26 @@ i s death s +service_bella_jaw_run_recover +i +6 +i +1 +i +20 +s +service_bella_jaw_run +s +service_bella_jaw_run_recover +i +8 +i +1 +i +0 +s +death +s service_bella_jaw_hunt i 20 @@ -4440,7 +4718,11 @@ K V n n -1 +2 +i +2 +s +/vt opt set enablecombat false i 2 s @@ -4454,7 +4736,7 @@ i i 1200 s -service_reset_main +service_bella_start s service_bella_jaw_hunt i @@ -4689,22 +4971,9 @@ service_bella_mp_trans i 20 i -3 +1 i 0 -TABLE -2 -K -V -n -n -2 -i -2 -s -/vt nav load mp_secondary -i -1 s service_bella_mp_secondary s @@ -4716,7 +4985,7 @@ i i 120 s -service_reset_main +service_bella_start s service_bella_mp_trans i @@ -4730,6 +4999,44 @@ death s service_bella_mp_secondary i +1 +i +7 +i +0 +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1] +s +service_bella_mp_secondary +i +26 +i +1 +TABLE +2 +k +v +n +n +1 +s +e +s +getvar[bellaMpSecondaryAttempts]>=3 +s +service_bella_backoff +s +service_bella_mp_secondary +i 26 i 2 @@ -4775,41 +5082,39 @@ getplayerlandblock[]!=23855104 i 6 i -2 +30 TABLE 2 K V n n -3 +2 i 2 s -/a [bella] wrong mp_secondary landcell, retrying marketplace portal -i -2 -s -/mp +/a [bella] wrong mp_secondary landblock, restarting marketplace entry i 1 s -service_bella_mp_secondary +service_bella_start s service_bella_mp_secondary i -2 +20 i 3 +i +0 TABLE 2 K V n n -2 +4 i -26 +7 TABLE 2 k @@ -4820,18 +5125,7 @@ n s e s -getplayerlandblock[]==23855104 -i -20 -i -0 -TABLE -2 -K -V -n -n -3 +setvar[bellaMpSecondaryAttempts, 0] i 2 s @@ -4851,9 +5145,9 @@ i i 1 i -300 +60 s -service_reset_main +service_bella_start s service_bella_mp_secondary i @@ -4889,22 +5183,26 @@ n s e s -getplayerlandcell[]!=5636705 +getplayerlandblock[]!=5636096 i 6 i -2 +30 TABLE 2 K V n n -3 +4 i 2 s -/a [bella] wrong bella landcell, retrying secondary marketplace portal +/a [bella] wrong bella landblock, returning to mp_secondary +i +2 +s +/vt opt set enablenav false i 2 s @@ -4940,7 +5238,7 @@ K V n n -7 +9 i 2 s @@ -4970,6 +5268,32 @@ n s e s +setvar[bellaMpPrimaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s +setvar[bellaMpSecondaryAttempts, 0] +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s setvar[bellaTurnInAttempts, 0] i 7 @@ -5001,11 +5325,24 @@ service_bella_kill_bella i 6 i -1 +3 i -300 +600 +TABLE +2 +K +V +n +n +2 +i +2 s -service_reset_main +/a [bella] kill_bella timed out, restarting marketplace entry +i +1 +s +service_bella_start s service_bella_kill_bella i