From 9079a7fa333168b67a3d542d1ddcca3e14f321bd Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 12 Mar 2026 09:55:56 +0100 Subject: [PATCH] redesign bella marketplace and jaw flow --- af/bore.af | 39 +++++------ af/neftet.af | 39 +++++------ met/bore.met | 178 +++++++++++++++++++++---------------------------- met/neftet.met | 178 +++++++++++++++++++++---------------------------- 4 files changed, 188 insertions(+), 246 deletions(-) diff --git a/af/bore.af b/af/bore.af index aac384f..c7f0049 100644 --- a/af/bore.af +++ b/af/bore.af @@ -351,39 +351,34 @@ STATE: {service_bella_mp_primary} ~~ { Chat {/vt opt set NavPriorityBoost false} Chat {/vt opt set navclosestoprange 0.008} IF: Expr {getplayerlandblock[]==23855104} - DO: DoAll - Chat {/vt nav load mp_primary} + DO: Chat {/vt nav load mp_primary} IF: All Expr {getplayerlandblock[]!=23855104} - SecsInStateGE 2 + SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong mp_primary landcell, retrying marketplace portal} - Chat {/mp} - SetState {service_bella_mp_primary} - IF: All - Expr {getplayerlandblock[]==23855104} - ExitPortal - DO: DoAll - Chat {/vt nav load jaw_1} - SetState {service_bella_jaw_run} + 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 {/cast Portal Recall} - Chat {/vt nav load jaw_1} - SetState {service_bella_jaw_run} + Chat {/a [bella] mp_primary timed out, restarting marketplace entry} + SetState {service_bella_start} ~~ } STATE: {service_bella_jaw_run} ~~ { IF: Death DO: SetState {death} + IF: Expr {getplayerlandblock[]==9830400} + DO: Chat {/vt nav load jaw_1} IF: All - Expr {getplayerlandcell[]!=9831201} - SecsInStateGE 2 + Expr {getplayerlandblock[]!=9830400} + SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong jaw_run landcell, returning to marketplace entry} - Chat {/mp} - SetState {service_bella_mp_primary} + Chat {/a [bella] wrong jaw_run landblock, restarting marketplace entry} + SetState {service_bella_start} IF: All - Expr {getplayerlandcell[]==9831201} + Expr {getplayerlandblock[]==9830400} + SecsInStateGE 30 NavEmpty DO: DoAll DoExpr {setvar[bellaStartAttempts, 0]} @@ -399,7 +394,7 @@ STATE: {service_bella_jaw_run} ~~ { DO: DoAll ChatExpr {\/a [bella] jaw_run stuck, recall retry +cstr[getvar[bellaJawRunRecoverAttempts]+1]+`/3`} DoExpr {setvar[bellaJawRunRecoverAttempts,getvar[bellaJawRunRecoverAttempts]+1]} - Chat {/cast Portal Recall} + DoExpr {actiontrycastbyid[2645]} Chat {/vt nav load jaw_1} SetState {service_bella_jaw_run} IF: SecsInStateGE 300 diff --git a/af/neftet.af b/af/neftet.af index a9ff261..053b1a6 100644 --- a/af/neftet.af +++ b/af/neftet.af @@ -416,39 +416,34 @@ STATE: {service_bella_mp_primary} ~~ { Chat {/vt opt set NavPriorityBoost false} Chat {/vt opt set navclosestoprange 0.008} IF: Expr {getplayerlandblock[]==23855104} - DO: DoAll - Chat {/vt nav load mp_primary} + DO: Chat {/vt nav load mp_primary} IF: All Expr {getplayerlandblock[]!=23855104} - SecsInStateGE 2 + SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong mp_primary landcell, retrying marketplace portal} - Chat {/mp} - SetState {service_bella_mp_primary} - IF: All - Expr {getplayerlandblock[]==23855104} - ExitPortal - DO: DoAll - Chat {/vt nav load jaw_1} - SetState {service_bella_jaw_run} + 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 {/cast Portal Recall} - Chat {/vt nav load jaw_1} - SetState {service_bella_jaw_run} + Chat {/a [bella] mp_primary timed out, restarting marketplace entry} + SetState {service_bella_start} ~~ } STATE: {service_bella_jaw_run} ~~ { IF: Death DO: SetState {death} + IF: Expr {getplayerlandblock[]==9830400} + DO: Chat {/vt nav load jaw_1} IF: All - Expr {getplayerlandcell[]!=9831201} - SecsInStateGE 2 + Expr {getplayerlandblock[]!=9830400} + SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong jaw_run landcell, returning to marketplace entry} - Chat {/mp} - SetState {service_bella_mp_primary} + Chat {/a [bella] wrong jaw_run landblock, restarting marketplace entry} + SetState {service_bella_start} IF: All - Expr {getplayerlandcell[]==9831201} + Expr {getplayerlandblock[]==9830400} + SecsInStateGE 30 NavEmpty DO: DoAll DoExpr {setvar[bellaStartAttempts, 0]} @@ -464,7 +459,7 @@ STATE: {service_bella_jaw_run} ~~ { DO: DoAll ChatExpr {\/a [bella] jaw_run stuck, recall retry +cstr[getvar[bellaJawRunRecoverAttempts]+1]+`/3`} DoExpr {setvar[bellaJawRunRecoverAttempts,getvar[bellaJawRunRecoverAttempts]+1]} - Chat {/cast Portal Recall} + DoExpr {actiontrycastbyid[2645]} Chat {/vt nav load jaw_1} SetState {service_bella_jaw_run} IF: SecsInStateGE 300 diff --git a/met/bore.met b/met/bore.met index 28cc879..6c680d5 100644 --- a/met/bore.met +++ b/met/bore.met @@ -11,7 +11,7 @@ n n n n -204 +205 i 1 i @@ -3272,7 +3272,7 @@ service_bella_mp_primary i 26 i -3 +2 TABLE 2 k @@ -3284,15 +3284,6 @@ s e s getplayerlandblock[]==23855104 -TABLE -2 -K -V -n -n -1 -i -2 s /vt nav load mp_primary s @@ -3324,32 +3315,7 @@ getplayerlandblock[]!=23855104 i 6 i -2 -TABLE -2 -K -V -n -n -3 -i -2 -s -/a [bella] wrong mp_primary landcell, retrying marketplace portal -i -2 -s -/mp -i -1 -s -service_bella_mp_primary -s -service_bella_mp_primary -i -2 -i -3 +30 TABLE 2 K @@ -3358,35 +3324,21 @@ n n 2 i -26 -TABLE 2 -k -v -n -n +s +/a [bella] wrong mp_primary landblock, restarting marketplace entry +i 1 s -e +service_bella_start s -getplayerlandblock[]==23855104 +service_bella_mp_primary i 20 i -0 -TABLE -2 -K -V -n -n -2 -i -2 -s -/vt nav load jaw_1 -i 1 +i +0 s service_bella_jaw_run s @@ -3403,19 +3355,15 @@ K V n n -3 +2 i 2 s -/cast Portal Recall -i -2 -s -/vt nav load jaw_1 +/a [bella] mp_primary timed out, restarting marketplace entry i 1 s -service_bella_jaw_run +service_bella_start s service_bella_mp_primary i @@ -3429,18 +3377,9 @@ death s service_bella_jaw_run i -2 -i -3 -TABLE -2 -K -V -n -n -2 -i 26 +i +2 TABLE 2 k @@ -3451,30 +3390,9 @@ n s e s -getplayerlandcell[]!=9831201 -i -6 -i -2 -TABLE -2 -K -V -n -n -3 -i -2 +getplayerlandblock[]==9830400 s -/a [bella] wrong jaw_run landcell, returning to marketplace entry -i -2 -s -/mp -i -1 -s -service_bella_mp_primary +/vt nav load jaw_1 s service_bella_jaw_run i @@ -3500,7 +3418,56 @@ n s e s -getplayerlandcell[]==9831201 +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 +i +2 +i +3 +TABLE +2 +K +V +n +n +3 +i +26 +TABLE +2 +k +v +n +n +1 +s +e +s +getplayerlandblock[]==9830400 +i +6 +i +30 i 7 i @@ -3622,9 +3589,18 @@ e s setvar[bellaJawRunRecoverAttempts,getvar[bellaJawRunRecoverAttempts]+1] i +7 +TABLE 2 +k +v +n +n +1 s -/cast Portal Recall +e +s +actiontrycastbyid[2645] i 2 s diff --git a/met/neftet.met b/met/neftet.met index 390c243..fe557a0 100644 --- a/met/neftet.met +++ b/met/neftet.met @@ -11,7 +11,7 @@ n n n n -283 +284 i 20 i @@ -4024,7 +4024,7 @@ service_bella_mp_primary i 26 i -3 +2 TABLE 2 k @@ -4036,15 +4036,6 @@ s e s getplayerlandblock[]==23855104 -TABLE -2 -K -V -n -n -1 -i -2 s /vt nav load mp_primary s @@ -4076,32 +4067,7 @@ getplayerlandblock[]!=23855104 i 6 i -2 -TABLE -2 -K -V -n -n -3 -i -2 -s -/a [bella] wrong mp_primary landcell, retrying marketplace portal -i -2 -s -/mp -i -1 -s -service_bella_mp_primary -s -service_bella_mp_primary -i -2 -i -3 +30 TABLE 2 K @@ -4110,35 +4076,21 @@ n n 2 i -26 -TABLE 2 -k -v -n -n +s +/a [bella] wrong mp_primary landblock, restarting marketplace entry +i 1 s -e +service_bella_start s -getplayerlandblock[]==23855104 +service_bella_mp_primary i 20 i -0 -TABLE -2 -K -V -n -n -2 -i -2 -s -/vt nav load jaw_1 -i 1 +i +0 s service_bella_jaw_run s @@ -4155,19 +4107,15 @@ K V n n -3 +2 i 2 s -/cast Portal Recall -i -2 -s -/vt nav load jaw_1 +/a [bella] mp_primary timed out, restarting marketplace entry i 1 s -service_bella_jaw_run +service_bella_start s service_bella_mp_primary i @@ -4181,18 +4129,9 @@ death s service_bella_jaw_run i -2 -i -3 -TABLE -2 -K -V -n -n -2 -i 26 +i +2 TABLE 2 k @@ -4203,30 +4142,9 @@ n s e s -getplayerlandcell[]!=9831201 -i -6 -i -2 -TABLE -2 -K -V -n -n -3 -i -2 +getplayerlandblock[]==9830400 s -/a [bella] wrong jaw_run landcell, returning to marketplace entry -i -2 -s -/mp -i -1 -s -service_bella_mp_primary +/vt nav load jaw_1 s service_bella_jaw_run i @@ -4252,7 +4170,56 @@ n s e s -getplayerlandcell[]==9831201 +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 +i +2 +i +3 +TABLE +2 +K +V +n +n +3 +i +26 +TABLE +2 +k +v +n +n +1 +s +e +s +getplayerlandblock[]==9830400 +i +6 +i +30 i 7 i @@ -4374,9 +4341,18 @@ e s setvar[bellaJawRunRecoverAttempts,getvar[bellaJawRunRecoverAttempts]+1] i +7 +TABLE 2 +k +v +n +n +1 s -/cast Portal Recall +e +s +actiontrycastbyid[2645] i 2 s