diff --git a/af/ah_primary.af b/af/ah_primary.af new file mode 100644 index 0000000..8917ad1 --- /dev/null +++ b/af/ah_primary.af @@ -0,0 +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} +~~ } diff --git a/af/ah_secondary.af b/af/ah_secondary.af new file mode 100644 index 0000000..6c280c1 --- /dev/null +++ b/af/ah_secondary.af @@ -0,0 +1,5 @@ +NAV: nav0 once ~~ { + cht 56.7788082122803 33.6335268974304 0.175020837783813 {/tell Lock n Key, secondary} + pau 56.7788082122803 33.6335268974304 0.175020837783813 15000 + cht 56.7788082122803 33.6335268974304 0.175020837783813 {/ub portal Gateway} +~~ } diff --git a/af/bore.af b/af/bore.af index 6ffe6a1..fa595da 100644 --- a/af/bore.af +++ b/af/bore.af @@ -182,10 +182,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[bellaAhPrimaryAttempts]} + DO: DoExpr {setvar[bellaAhPrimaryAttempts, 0]} + IF: Not Expr {testvar[bellaAhSecondaryAttempts]} + DO: DoExpr {setvar[bellaAhSecondaryAttempts, 0]} IF: Not Expr {testvar[bellaTurnInAttempts]} DO: DoExpr {setvar[bellaTurnInAttempts, 0]} IF: Not Expr {testvar[bellaJawRunRecoverAttempts]} @@ -283,8 +283,8 @@ STATE: {service_decide} ~~ { DO: DoAll DoExpr {setvar[disableAugmentServices, 0]} DoExpr {setvar[bellaStartAttempts, 0]} - DoExpr {setvar[bellaMpPrimaryAttempts, 0]} - DoExpr {setvar[bellaMpSecondaryAttempts, 0]} + DoExpr {setvar[bellaAhPrimaryAttempts, 0]} + DoExpr {setvar[bellaAhSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} DoExpr {clearvar[bellaBackoffClock]} @@ -350,13 +350,13 @@ STATE: {service_bella_start} ~~ { Chat {/vt opt set enablebuffing true} IF: SecsInStateGE 2 DO: DoAll - Chat {/a [bella] starting marketplace entry} + Chat {/a [bella] starting AH entry} Chat {/vt opt set enablenav false} - Chat {/mp} + Chat {/ah} IF: ExitPortal DO: DoAll DoExpr {setvar[bellaStartAttempts, 0]} - SetState {service_bella_mp_primary} + SetState {service_bella_ah_primary} IF: SecsInStateGE 120 DO: SetState {service_bella_start} ~~ } @@ -368,20 +368,20 @@ STATE: {service_bella_backoff} ~~ { Chat {/vt opt set enablenav true} DoExpr {setvar[disableAugmentServices, 1]} DoExpr {setvar[bellaStartAttempts, 0]} - DoExpr {setvar[bellaMpPrimaryAttempts, 0]} - DoExpr {setvar[bellaMpSecondaryAttempts, 0]} + DoExpr {setvar[bellaAhPrimaryAttempts, 0]} + DoExpr {setvar[bellaAhSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} DoExpr {setvar[bellaBackoffClock,stopwatchcreate[]]} DoExpr {stopwatchstart[getvar[bellaBackoffClock]]} SetState {Default} ~~ } -STATE: {service_bella_mp_primary} ~~ { +STATE: {service_bella_ah_primary} ~~ { IF: Death DO: SetState {death} IF: Always - DO: DoExpr {setvar[bellaMpPrimaryAttempts,getvar[bellaMpPrimaryAttempts]+1]} - IF: Expr {getvar[bellaMpPrimaryAttempts]>=3} + DO: DoExpr {setvar[bellaAhPrimaryAttempts,getvar[bellaAhPrimaryAttempts]+1]} + IF: Expr {getvar[bellaAhPrimaryAttempts]>=3} DO: SetState {service_bella_backoff} IF: Always DO: DoAll @@ -391,22 +391,22 @@ STATE: {service_bella_mp_primary} ~~ { Chat {/vt opt set enablelooting false} Chat {/vt opt set NavPriorityBoost false} Chat {/vt opt set navclosestoprange 0.008} - IF: Expr {getplayerlandblock[]==23855104} - DO: Chat {/vt nav load mp_primary} + IF: Expr {getplayerlandblock[]==3378348032} + DO: Chat {/vt nav load ah_primary} IF: All - Expr {getplayerlandblock[]!=23855104} + Expr {getplayerlandblock[]!=3378348032} SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong mp_primary landblock, restarting marketplace entry} + Chat {/a [bella] wrong ah_primary landblock, restarting AH entry} SetState {service_bella_start} IF: ExitPortal DO: DoAll Chat {/vt opt set enablenav false} - DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + DoExpr {setvar[bellaAhPrimaryAttempts, 0]} SetState {service_bella_jaw_run} IF: SecsInStateGE 60 DO: DoAll - Chat {/a [bella] mp_primary timed out, restarting marketplace entry} + Chat {/a [bella] ah_primary timed out, restarting AH entry} SetState {service_bella_start} ~~ } STATE: {service_bella_jaw_run} ~~ { @@ -420,7 +420,7 @@ STATE: {service_bella_jaw_run} ~~ { Expr {getplayerlandblock[]!=9830400} SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong jaw_run landblock, restarting marketplace entry} + Chat {/a [bella] wrong jaw_run landblock, restarting AH entry} SetState {service_bella_start} IF: All Expr {getplayerlandblock[]==9830400} @@ -472,10 +472,10 @@ STATE: {service_bella_turn_in_jaw} ~~ { DO: SetState {death} IF: ChatMatch {^.*One who obtains such as this is truly worthy of that which we would teach\. The highest peak of the deadliest isle contains that which you seek.*$} DO: DoAll - Chat {/a [bella] jaw turned in, heading to secondary marketplace path} + Chat {/a [bella] jaw turned in, heading to secondary AH path} DoExpr {setvar[bellaTurnInAttempts, 0]} - Chat {/mp} - SetState {service_bella_mp_trans} + Chat {/ah} + SetState {service_bella_ah_trans} IF: All SecsInStateGE 300 ItemCountGE 1 {Insatiable Eater Jaw} @@ -495,28 +495,28 @@ STATE: {service_bella_turn_in_jaw} ~~ { DoExpr {setvar[bellaTurnInAttempts, 0]} SetState {service_reset_main} ~~ } -STATE: {service_bella_mp_trans} ~~ { +STATE: {service_bella_ah_trans} ~~ { IF: Death DO: SetState {death} IF: ExitPortal - DO: SetState {service_bella_mp_secondary} + DO: SetState {service_bella_ah_secondary} IF: SecsInStateGE 120 DO: SetState {service_bella_start} ~~ } -STATE: {service_bella_mp_secondary} ~~ { +STATE: {service_bella_ah_secondary} ~~ { IF: Death DO: SetState {death} IF: Always - DO: DoExpr {setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1]} - IF: Expr {getvar[bellaMpSecondaryAttempts]>=3} + DO: DoExpr {setvar[bellaAhSecondaryAttempts,getvar[bellaAhSecondaryAttempts]+1]} + IF: Expr {getvar[bellaAhSecondaryAttempts]>=3} DO: SetState {service_bella_backoff} - IF: Expr {getplayerlandblock[]==23855104} - DO: Chat {/vt nav load mp_secondary} + IF: Expr {getplayerlandblock[]==3378348032} + DO: Chat {/vt nav load ah_secondary} IF: All - Expr {getplayerlandblock[]!=23855104} + Expr {getplayerlandblock[]!=3378348032} SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong mp_secondary landblock, restarting marketplace entry} + Chat {/a [bella] wrong ah_secondary landblock, restarting AH entry} SetState {service_bella_start} IF: ExitPortal DO: DoAll @@ -531,11 +531,11 @@ STATE: {service_bella_secondary_recovery} ~~ { DO: SetState {death} IF: Always DO: Chat {/vt opt set enablenav false} - IF: Expr {getvar[bellaMpSecondaryAttempts]>=3} + IF: Expr {getvar[bellaAhSecondaryAttempts]>=3} DO: SetState {service_bella_backoff} IF: SecsInStateGE 20 DO: DoAll - DoExpr {setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1]} + DoExpr {setvar[bellaAhSecondaryAttempts,getvar[bellaAhSecondaryAttempts]+1]} Chat {/vt opt set enablenav true} Chat {/vt nav load nav_portal_recall} IF: All @@ -555,16 +555,16 @@ STATE: {service_bella_kill_bella} ~~ { Expr {getplayerlandblock[]!=5636096} SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong bella landblock, returning to mp_secondary} + Chat {/a [bella] wrong bella landblock, returning to ah_secondary} Chat {/vt opt set enablenav false} - Chat {/mp} - SetState {service_bella_mp_secondary} + Chat {/ah} + SetState {service_bella_ah_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[bellaAhPrimaryAttempts, 0]} + DoExpr {setvar[bellaAhSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} Chat {/vt opt set enablelooting false} @@ -572,7 +572,7 @@ STATE: {service_bella_kill_bella} ~~ { SetState {service_bella_escape} IF: SecsInStateGE 600 DO: DoAll - Chat {/a [bella] kill_bella timed out, restarting marketplace entry} + Chat {/a [bella] kill_bella timed out, restarting AH entry} SetState {service_bella_start} ~~ } STATE: {service_bella_escape} ~~ { diff --git a/af/neftet.af b/af/neftet.af index 6b85c16..1f7f54f 100644 --- a/af/neftet.af +++ b/af/neftet.af @@ -84,10 +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[bellaAhPrimaryAttempts]} + DO: DoExpr {setvar[bellaAhPrimaryAttempts, 0]} + IF: Not Expr {testvar[bellaAhSecondaryAttempts]} + DO: DoExpr {setvar[bellaAhSecondaryAttempts, 0]} IF: Not Expr {testvar[bellaTurnInAttempts]} DO: DoExpr {setvar[bellaTurnInAttempts, 0]} IF: Not Expr {testvar[bellaJawRunRecoverAttempts]} @@ -356,8 +356,8 @@ STATE: {service_decide} ~~ { DO: DoAll DoExpr {setvar[disableAugmentServices, 0]} DoExpr {setvar[bellaStartAttempts, 0]} - DoExpr {setvar[bellaMpPrimaryAttempts, 0]} - DoExpr {setvar[bellaMpSecondaryAttempts, 0]} + DoExpr {setvar[bellaAhPrimaryAttempts, 0]} + DoExpr {setvar[bellaAhSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} DoExpr {clearvar[bellaBackoffClock]} @@ -427,13 +427,13 @@ STATE: {service_bella_start} ~~ { Chat {/vt opt set attackdistance 0.0208333333333333} IF: SecsInStateGE 2 DO: DoAll - Chat {/a [bella] starting marketplace entry} + Chat {/a [bella] starting AH entry} Chat {/vt opt set enablenav false} - Chat {/mp} + Chat {/ah} IF: ExitPortal DO: DoAll DoExpr {setvar[bellaStartAttempts, 0]} - SetState {service_bella_mp_primary} + SetState {service_bella_ah_primary} IF: SecsInStateGE 120 DO: SetState {service_bella_start} ~~ } @@ -446,20 +446,20 @@ STATE: {service_bella_backoff} ~~ { ChatExpr {\/vt opt set attackdistance +getvar[savedAttackRange]} DoExpr {setvar[disableAugmentServices, 1]} DoExpr {setvar[bellaStartAttempts, 0]} - DoExpr {setvar[bellaMpPrimaryAttempts, 0]} - DoExpr {setvar[bellaMpSecondaryAttempts, 0]} + DoExpr {setvar[bellaAhPrimaryAttempts, 0]} + DoExpr {setvar[bellaAhSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} DoExpr {setvar[bellaBackoffClock,stopwatchcreate[]]} DoExpr {stopwatchstart[getvar[bellaBackoffClock]]} SetState {Default} ~~ } -STATE: {service_bella_mp_primary} ~~ { +STATE: {service_bella_ah_primary} ~~ { IF: Death DO: SetState {death} IF: Always - DO: DoExpr {setvar[bellaMpPrimaryAttempts,getvar[bellaMpPrimaryAttempts]+1]} - IF: Expr {getvar[bellaMpPrimaryAttempts]>=3} + DO: DoExpr {setvar[bellaAhPrimaryAttempts,getvar[bellaAhPrimaryAttempts]+1]} + IF: Expr {getvar[bellaAhPrimaryAttempts]>=3} DO: SetState {service_bella_backoff} IF: Always DO: DoAll @@ -469,22 +469,22 @@ STATE: {service_bella_mp_primary} ~~ { Chat {/vt opt set enablelooting false} Chat {/vt opt set NavPriorityBoost false} Chat {/vt opt set navclosestoprange 0.008} - IF: Expr {getplayerlandblock[]==23855104} - DO: Chat {/vt nav load mp_primary} + IF: Expr {getplayerlandblock[]==3378348032} + DO: Chat {/vt nav load ah_primary} IF: All - Expr {getplayerlandblock[]!=23855104} + Expr {getplayerlandblock[]!=3378348032} SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong mp_primary landblock, restarting marketplace entry} + Chat {/a [bella] wrong ah_primary landblock, restarting AH entry} SetState {service_bella_start} IF: ExitPortal DO: DoAll Chat {/vt opt set enablenav false} - DoExpr {setvar[bellaMpPrimaryAttempts, 0]} + DoExpr {setvar[bellaAhPrimaryAttempts, 0]} SetState {service_bella_jaw_run} IF: SecsInStateGE 60 DO: DoAll - Chat {/a [bella] mp_primary timed out, restarting marketplace entry} + Chat {/a [bella] ah_primary timed out, restarting AH entry} SetState {service_bella_start} ~~ } STATE: {service_bella_jaw_run} ~~ { @@ -498,7 +498,7 @@ STATE: {service_bella_jaw_run} ~~ { Expr {getplayerlandblock[]!=9830400} SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong jaw_run landblock, restarting marketplace entry} + Chat {/a [bella] wrong jaw_run landblock, restarting AH entry} SetState {service_bella_start} IF: All Expr {getplayerlandblock[]==9830400} @@ -550,10 +550,10 @@ STATE: {service_bella_turn_in_jaw} ~~ { DO: SetState {death} IF: ChatMatch {^.*One who obtains such as this is truly worthy of that which we would teach\. The highest peak of the deadliest isle contains that which you seek.*$} DO: DoAll - Chat {/a [bella] jaw turned in, heading to secondary marketplace path} + Chat {/a [bella] jaw turned in, heading to secondary AH path} DoExpr {setvar[bellaTurnInAttempts, 0]} - Chat {/mp} - SetState {service_bella_mp_trans} + Chat {/ah} + SetState {service_bella_ah_trans} IF: All SecsInStateGE 300 ItemCountGE 1 {Insatiable Eater Jaw} @@ -573,28 +573,28 @@ STATE: {service_bella_turn_in_jaw} ~~ { DoExpr {setvar[bellaTurnInAttempts, 0]} SetState {service_reset_main} ~~ } -STATE: {service_bella_mp_trans} ~~ { +STATE: {service_bella_ah_trans} ~~ { IF: Death DO: SetState {death} IF: ExitPortal - DO: SetState {service_bella_mp_secondary} + DO: SetState {service_bella_ah_secondary} IF: SecsInStateGE 120 DO: SetState {service_bella_start} ~~ } -STATE: {service_bella_mp_secondary} ~~ { +STATE: {service_bella_ah_secondary} ~~ { IF: Death DO: SetState {death} IF: Always - DO: DoExpr {setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1]} - IF: Expr {getvar[bellaMpSecondaryAttempts]>=3} + DO: DoExpr {setvar[bellaAhSecondaryAttempts,getvar[bellaAhSecondaryAttempts]+1]} + IF: Expr {getvar[bellaAhSecondaryAttempts]>=3} DO: SetState {service_bella_backoff} - IF: Expr {getplayerlandblock[]==23855104} - DO: Chat {/vt nav load mp_secondary} + IF: Expr {getplayerlandblock[]==3378348032} + DO: Chat {/vt nav load ah_secondary} IF: All - Expr {getplayerlandblock[]!=23855104} + Expr {getplayerlandblock[]!=3378348032} SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong mp_secondary landblock, restarting marketplace entry} + Chat {/a [bella] wrong ah_secondary landblock, restarting AH entry} SetState {service_bella_start} IF: ExitPortal DO: DoAll @@ -609,11 +609,11 @@ STATE: {service_bella_secondary_recovery} ~~ { DO: SetState {death} IF: Always DO: Chat {/vt opt set enablenav false} - IF: Expr {getvar[bellaMpSecondaryAttempts]>=3} + IF: Expr {getvar[bellaAhSecondaryAttempts]>=3} DO: SetState {service_bella_backoff} IF: SecsInStateGE 20 DO: DoAll - DoExpr {setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1]} + DoExpr {setvar[bellaAhSecondaryAttempts,getvar[bellaAhSecondaryAttempts]+1]} Chat {/vt opt set enablenav true} Chat {/vt nav load nav_portal_recall} IF: All @@ -633,16 +633,16 @@ STATE: {service_bella_kill_bella} ~~ { Expr {getplayerlandblock[]!=5636096} SecsInStateGE 30 DO: DoAll - Chat {/a [bella] wrong bella landblock, returning to mp_secondary} + Chat {/a [bella] wrong bella landblock, returning to ah_secondary} Chat {/vt opt set enablenav false} - Chat {/mp} - SetState {service_bella_mp_secondary} + Chat {/ah} + SetState {service_bella_ah_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[bellaAhPrimaryAttempts, 0]} + DoExpr {setvar[bellaAhSecondaryAttempts, 0]} DoExpr {setvar[bellaTurnInAttempts, 0]} DoExpr {setvar[bellaJawRunRecoverAttempts, 0]} Chat {/vt opt set enablelooting false} @@ -650,7 +650,7 @@ STATE: {service_bella_kill_bella} ~~ { SetState {service_bella_escape} IF: SecsInStateGE 600 DO: DoAll - Chat {/a [bella] kill_bella timed out, restarting marketplace entry} + Chat {/a [bella] kill_bella timed out, restarting AH entry} SetState {service_bella_start} ~~ } STATE: {service_bella_escape} ~~ { diff --git a/met/bore.met b/met/bore.met index 76a721e..ca2fda5 100644 --- a/met/bore.met +++ b/met/bore.met @@ -1683,7 +1683,7 @@ n s e s -testvar[bellaMpPrimaryAttempts] +testvar[bellaAhPrimaryAttempts] TABLE 2 k @@ -1694,7 +1694,7 @@ n s e s -setvar[bellaMpPrimaryAttempts, 0] +setvar[bellaAhPrimaryAttempts, 0] s Default i @@ -1720,7 +1720,7 @@ n s e s -testvar[bellaMpSecondaryAttempts] +testvar[bellaAhSecondaryAttempts] TABLE 2 k @@ -1731,7 +1731,7 @@ n s e s -setvar[bellaMpSecondaryAttempts, 0] +setvar[bellaAhSecondaryAttempts, 0] s Default i @@ -2777,7 +2777,7 @@ n s e s -setvar[bellaMpPrimaryAttempts, 0] +setvar[bellaAhPrimaryAttempts, 0] i 7 TABLE @@ -2790,7 +2790,7 @@ n s e s -setvar[bellaMpSecondaryAttempts, 0] +setvar[bellaAhSecondaryAttempts, 0] i 7 TABLE @@ -3449,7 +3449,7 @@ n i 2 s -/a [bella] starting marketplace entry +/a [bella] starting AH entry i 2 s @@ -3457,7 +3457,7 @@ s i 2 s -/mp +/ah s service_bella_start i @@ -3489,7 +3489,7 @@ setvar[bellaStartAttempts, 0] i 1 s -service_bella_mp_primary +service_bella_ah_primary s service_bella_start i @@ -3565,7 +3565,7 @@ n s e s -setvar[bellaMpPrimaryAttempts, 0] +setvar[bellaAhPrimaryAttempts, 0] i 7 TABLE @@ -3578,7 +3578,7 @@ n s e s -setvar[bellaMpSecondaryAttempts, 0] +setvar[bellaAhSecondaryAttempts, 0] i 7 TABLE @@ -3646,7 +3646,7 @@ i s death s -service_bella_mp_primary +service_bella_ah_primary i 1 i @@ -3663,9 +3663,9 @@ n s e s -setvar[bellaMpPrimaryAttempts,getvar[bellaMpPrimaryAttempts]+1] +setvar[bellaAhPrimaryAttempts,getvar[bellaAhPrimaryAttempts]+1] s -service_bella_mp_primary +service_bella_ah_primary i 26 i @@ -3680,11 +3680,11 @@ n s e s -getvar[bellaMpPrimaryAttempts]>=3 +getvar[bellaAhPrimaryAttempts]>=3 s service_bella_backoff s -service_bella_mp_primary +service_bella_ah_primary i 1 i @@ -3723,7 +3723,7 @@ i s /vt opt set navclosestoprange 0.008 s -service_bella_mp_primary +service_bella_ah_primary i 26 i @@ -3738,11 +3738,11 @@ n s e s -getplayerlandblock[]==23855104 +getplayerlandblock[]==3378348032 s -/vt nav load mp_primary +/vt nav load ah_primary s -service_bella_mp_primary +service_bella_ah_primary i 2 i @@ -3766,7 +3766,7 @@ n s e s -getplayerlandblock[]!=23855104 +getplayerlandblock[]!=3378348032 i 6 i @@ -3781,13 +3781,13 @@ n i 2 s -/a [bella] wrong mp_primary landblock, restarting marketplace entry +/a [bella] wrong ah_primary landblock, restarting AH entry i 1 s service_bella_start s -service_bella_mp_primary +service_bella_ah_primary i 20 i @@ -3817,13 +3817,13 @@ n s e s -setvar[bellaMpPrimaryAttempts, 0] +setvar[bellaAhPrimaryAttempts, 0] i 1 s service_bella_jaw_run s -service_bella_mp_primary +service_bella_ah_primary i 6 i @@ -3840,13 +3840,13 @@ n i 2 s -/a [bella] mp_primary timed out, restarting marketplace entry +/a [bella] ah_primary timed out, restarting AH entry i 1 s service_bella_start s -service_bella_mp_primary +service_bella_ah_primary i 8 i @@ -3927,7 +3927,7 @@ n i 2 s -/a [bella] wrong jaw_run landblock, restarting marketplace entry +/a [bella] wrong jaw_run landblock, restarting AH entry i 1 s @@ -4249,7 +4249,7 @@ n i 2 s -/a [bella] jaw turned in, heading to secondary marketplace path +/a [bella] jaw turned in, heading to secondary AH path i 7 TABLE @@ -4266,11 +4266,11 @@ setvar[bellaTurnInAttempts, 0] i 2 s -/mp +/ah i 1 s -service_bella_mp_trans +service_bella_ah_trans s service_bella_turn_in_jaw i @@ -4451,7 +4451,7 @@ i s death s -service_bella_mp_trans +service_bella_ah_trans i 20 i @@ -4459,9 +4459,9 @@ i i 0 s -service_bella_mp_secondary +service_bella_ah_secondary s -service_bella_mp_trans +service_bella_ah_trans i 6 i @@ -4471,7 +4471,7 @@ i s service_bella_start s -service_bella_mp_trans +service_bella_ah_trans i 8 i @@ -4481,7 +4481,7 @@ i s death s -service_bella_mp_secondary +service_bella_ah_secondary i 1 i @@ -4498,9 +4498,9 @@ n s e s -setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1] +setvar[bellaAhSecondaryAttempts,getvar[bellaAhSecondaryAttempts]+1] s -service_bella_mp_secondary +service_bella_ah_secondary i 26 i @@ -4515,11 +4515,11 @@ n s e s -getvar[bellaMpSecondaryAttempts]>=3 +getvar[bellaAhSecondaryAttempts]>=3 s service_bella_backoff s -service_bella_mp_secondary +service_bella_ah_secondary i 26 i @@ -4534,11 +4534,11 @@ n s e s -getplayerlandblock[]==23855104 +getplayerlandblock[]==3378348032 s -/vt nav load mp_secondary +/vt nav load ah_secondary s -service_bella_mp_secondary +service_bella_ah_secondary i 2 i @@ -4562,7 +4562,7 @@ n s e s -getplayerlandblock[]!=23855104 +getplayerlandblock[]!=3378348032 i 6 i @@ -4577,13 +4577,13 @@ n i 2 s -/a [bella] wrong mp_secondary landblock, restarting marketplace entry +/a [bella] wrong ah_secondary landblock, restarting AH entry i 1 s service_bella_start s -service_bella_mp_secondary +service_bella_ah_secondary i 20 i @@ -4610,7 +4610,7 @@ i s service_bella_kill_bella s -service_bella_mp_secondary +service_bella_ah_secondary i 6 i @@ -4620,7 +4620,7 @@ i s service_bella_start s -service_bella_mp_secondary +service_bella_ah_secondary i 8 i @@ -4655,7 +4655,7 @@ n s e s -getvar[bellaMpSecondaryAttempts]>=3 +getvar[bellaAhSecondaryAttempts]>=3 s service_bella_backoff s @@ -4685,7 +4685,7 @@ n s e s -setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1] +setvar[bellaAhSecondaryAttempts,getvar[bellaAhSecondaryAttempts]+1] i 2 s @@ -4803,7 +4803,7 @@ n i 2 s -/a [bella] wrong bella landblock, returning to mp_secondary +/a [bella] wrong bella landblock, returning to ah_secondary i 2 s @@ -4811,11 +4811,11 @@ s i 2 s -/mp +/ah i 1 s -service_bella_mp_secondary +service_bella_ah_secondary s service_bella_kill_bella i @@ -4873,7 +4873,7 @@ n s e s -setvar[bellaMpPrimaryAttempts, 0] +setvar[bellaAhPrimaryAttempts, 0] i 7 TABLE @@ -4886,7 +4886,7 @@ n s e s -setvar[bellaMpSecondaryAttempts, 0] +setvar[bellaAhSecondaryAttempts, 0] i 7 TABLE @@ -4943,7 +4943,7 @@ n i 2 s -/a [bella] kill_bella timed out, restarting marketplace entry +/a [bella] kill_bella timed out, restarting AH entry i 1 s diff --git a/met/neftet.met b/met/neftet.met index bdb64e2..6909b58 100644 --- a/met/neftet.met +++ b/met/neftet.met @@ -688,7 +688,7 @@ n s e s -testvar[bellaMpPrimaryAttempts] +testvar[bellaAhPrimaryAttempts] TABLE 2 k @@ -699,7 +699,7 @@ n s e s -setvar[bellaMpPrimaryAttempts, 0] +setvar[bellaAhPrimaryAttempts, 0] s Default i @@ -725,7 +725,7 @@ n s e s -testvar[bellaMpSecondaryAttempts] +testvar[bellaAhSecondaryAttempts] TABLE 2 k @@ -736,7 +736,7 @@ n s e s -setvar[bellaMpSecondaryAttempts, 0] +setvar[bellaAhSecondaryAttempts, 0] s Default i @@ -3574,7 +3574,7 @@ n s e s -setvar[bellaMpPrimaryAttempts, 0] +setvar[bellaAhPrimaryAttempts, 0] i 7 TABLE @@ -3587,7 +3587,7 @@ n s e s -setvar[bellaMpSecondaryAttempts, 0] +setvar[bellaAhSecondaryAttempts, 0] i 7 TABLE @@ -4280,7 +4280,7 @@ n i 2 s -/a [bella] starting marketplace entry +/a [bella] starting AH entry i 2 s @@ -4288,7 +4288,7 @@ s i 2 s -/mp +/ah s service_bella_start i @@ -4320,7 +4320,7 @@ setvar[bellaStartAttempts, 0] i 1 s -service_bella_mp_primary +service_bella_ah_primary s service_bella_start i @@ -4409,7 +4409,7 @@ n s e s -setvar[bellaMpPrimaryAttempts, 0] +setvar[bellaAhPrimaryAttempts, 0] i 7 TABLE @@ -4422,7 +4422,7 @@ n s e s -setvar[bellaMpSecondaryAttempts, 0] +setvar[bellaAhSecondaryAttempts, 0] i 7 TABLE @@ -4490,7 +4490,7 @@ i s death s -service_bella_mp_primary +service_bella_ah_primary i 1 i @@ -4507,9 +4507,9 @@ n s e s -setvar[bellaMpPrimaryAttempts,getvar[bellaMpPrimaryAttempts]+1] +setvar[bellaAhPrimaryAttempts,getvar[bellaAhPrimaryAttempts]+1] s -service_bella_mp_primary +service_bella_ah_primary i 26 i @@ -4524,11 +4524,11 @@ n s e s -getvar[bellaMpPrimaryAttempts]>=3 +getvar[bellaAhPrimaryAttempts]>=3 s service_bella_backoff s -service_bella_mp_primary +service_bella_ah_primary i 1 i @@ -4567,7 +4567,7 @@ i s /vt opt set navclosestoprange 0.008 s -service_bella_mp_primary +service_bella_ah_primary i 26 i @@ -4582,11 +4582,11 @@ n s e s -getplayerlandblock[]==23855104 +getplayerlandblock[]==3378348032 s -/vt nav load mp_primary +/vt nav load ah_primary s -service_bella_mp_primary +service_bella_ah_primary i 2 i @@ -4610,7 +4610,7 @@ n s e s -getplayerlandblock[]!=23855104 +getplayerlandblock[]!=3378348032 i 6 i @@ -4625,13 +4625,13 @@ n i 2 s -/a [bella] wrong mp_primary landblock, restarting marketplace entry +/a [bella] wrong ah_primary landblock, restarting AH entry i 1 s service_bella_start s -service_bella_mp_primary +service_bella_ah_primary i 20 i @@ -4661,13 +4661,13 @@ n s e s -setvar[bellaMpPrimaryAttempts, 0] +setvar[bellaAhPrimaryAttempts, 0] i 1 s service_bella_jaw_run s -service_bella_mp_primary +service_bella_ah_primary i 6 i @@ -4684,13 +4684,13 @@ n i 2 s -/a [bella] mp_primary timed out, restarting marketplace entry +/a [bella] ah_primary timed out, restarting AH entry i 1 s service_bella_start s -service_bella_mp_primary +service_bella_ah_primary i 8 i @@ -4771,7 +4771,7 @@ n i 2 s -/a [bella] wrong jaw_run landblock, restarting marketplace entry +/a [bella] wrong jaw_run landblock, restarting AH entry i 1 s @@ -5093,7 +5093,7 @@ n i 2 s -/a [bella] jaw turned in, heading to secondary marketplace path +/a [bella] jaw turned in, heading to secondary AH path i 7 TABLE @@ -5110,11 +5110,11 @@ setvar[bellaTurnInAttempts, 0] i 2 s -/mp +/ah i 1 s -service_bella_mp_trans +service_bella_ah_trans s service_bella_turn_in_jaw i @@ -5295,7 +5295,7 @@ i s death s -service_bella_mp_trans +service_bella_ah_trans i 20 i @@ -5303,9 +5303,9 @@ i i 0 s -service_bella_mp_secondary +service_bella_ah_secondary s -service_bella_mp_trans +service_bella_ah_trans i 6 i @@ -5315,7 +5315,7 @@ i s service_bella_start s -service_bella_mp_trans +service_bella_ah_trans i 8 i @@ -5325,7 +5325,7 @@ i s death s -service_bella_mp_secondary +service_bella_ah_secondary i 1 i @@ -5342,9 +5342,9 @@ n s e s -setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1] +setvar[bellaAhSecondaryAttempts,getvar[bellaAhSecondaryAttempts]+1] s -service_bella_mp_secondary +service_bella_ah_secondary i 26 i @@ -5359,11 +5359,11 @@ n s e s -getvar[bellaMpSecondaryAttempts]>=3 +getvar[bellaAhSecondaryAttempts]>=3 s service_bella_backoff s -service_bella_mp_secondary +service_bella_ah_secondary i 26 i @@ -5378,11 +5378,11 @@ n s e s -getplayerlandblock[]==23855104 +getplayerlandblock[]==3378348032 s -/vt nav load mp_secondary +/vt nav load ah_secondary s -service_bella_mp_secondary +service_bella_ah_secondary i 2 i @@ -5406,7 +5406,7 @@ n s e s -getplayerlandblock[]!=23855104 +getplayerlandblock[]!=3378348032 i 6 i @@ -5421,13 +5421,13 @@ n i 2 s -/a [bella] wrong mp_secondary landblock, restarting marketplace entry +/a [bella] wrong ah_secondary landblock, restarting AH entry i 1 s service_bella_start s -service_bella_mp_secondary +service_bella_ah_secondary i 20 i @@ -5454,7 +5454,7 @@ i s service_bella_kill_bella s -service_bella_mp_secondary +service_bella_ah_secondary i 6 i @@ -5464,7 +5464,7 @@ i s service_bella_start s -service_bella_mp_secondary +service_bella_ah_secondary i 8 i @@ -5499,7 +5499,7 @@ n s e s -getvar[bellaMpSecondaryAttempts]>=3 +getvar[bellaAhSecondaryAttempts]>=3 s service_bella_backoff s @@ -5529,7 +5529,7 @@ n s e s -setvar[bellaMpSecondaryAttempts,getvar[bellaMpSecondaryAttempts]+1] +setvar[bellaAhSecondaryAttempts,getvar[bellaAhSecondaryAttempts]+1] i 2 s @@ -5647,7 +5647,7 @@ n i 2 s -/a [bella] wrong bella landblock, returning to mp_secondary +/a [bella] wrong bella landblock, returning to ah_secondary i 2 s @@ -5655,11 +5655,11 @@ s i 2 s -/mp +/ah i 1 s -service_bella_mp_secondary +service_bella_ah_secondary s service_bella_kill_bella i @@ -5717,7 +5717,7 @@ n s e s -setvar[bellaMpPrimaryAttempts, 0] +setvar[bellaAhPrimaryAttempts, 0] i 7 TABLE @@ -5730,7 +5730,7 @@ n s e s -setvar[bellaMpSecondaryAttempts, 0] +setvar[bellaAhSecondaryAttempts, 0] i 7 TABLE @@ -5787,7 +5787,7 @@ n i 2 s -/a [bella] kill_bella timed out, restarting marketplace entry +/a [bella] kill_bella timed out, restarting AH entry i 1 s diff --git a/nav/ah_primary.nav b/nav/ah_primary.nav new file mode 100644 index 0000000..85f45ba --- /dev/null +++ b/nav/ah_primary.nav @@ -0,0 +1,21 @@ +uTank2 NAV 1.2 +4 +3 +4 +56.7788082122803 +33.6335268974304 +0.175020837783813 +0 +/tell Lock n Key, primary +3 +56.7788082122803 +33.6335268974304 +0.175020837783813 +0 +15000 +4 +56.7788082122803 +33.6335268974304 +0.175020837783813 +0 +/ub portal Gateway diff --git a/nav/ah_secondary.nav b/nav/ah_secondary.nav new file mode 100644 index 0000000..3bff381 --- /dev/null +++ b/nav/ah_secondary.nav @@ -0,0 +1,21 @@ +uTank2 NAV 1.2 +4 +3 +4 +56.7788082122803 +33.6335268974304 +0.175020837783813 +0 +/tell Lock n Key, secondary +3 +56.7788082122803 +33.6335268974304 +0.175020837783813 +0 +15000 +4 +56.7788082122803 +33.6335268974304 +0.175020837783813 +0 +/ub portal Gateway