From a58f8340aedec0a9bbc8b0cfcd23dd249bd40894 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 6 Apr 2026 14:14:45 +0200 Subject: [PATCH] fix stipend backoff: split into two safe rules, avoid iif (both branches always evaluate), remove debug lines --- af/bore.af | 11 ++++--- met/bore.met | 93 ++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 71 insertions(+), 33 deletions(-) diff --git a/af/bore.af b/af/bore.af index b566dce..35c1823 100644 --- a/af/bore.af +++ b/af/bore.af @@ -291,11 +291,15 @@ STATE: {service_decide} ~~ { DoExpr {clearvar[bellaBackoffClock]} IF: All Expr {getqueststatus[`stipendtimer_0812`]==1} - DO: ChatExpr {\/a [stipend-debug] clockExists=+testvar[stipendBackoffClock]+ elapsed=+iif[testvar[stipendBackoffClock],stopwatchelapsedseconds[getvar[stipendBackoffClock]],`none`]+ backoff=+getvar[stipendBackoffSeconds]+ guard=+isfalse[iif[testvar[stipendBackoffClock],stopwatchelapsedseconds[getvar[stipendBackoffClock]]=getvar[stipendBackoffSeconds]} + DO: DoAll + DoExpr {clearvar[stipendBackoffClock]} + SetState {service_stipend} IF: All Expr {getvar[disableAugmentServices]!=1} ItemCountGE 1 {Blank Augmentation Gem} @@ -324,7 +328,6 @@ STATE: {service_stipend} ~~ { Chat {/vt opt set enablenav true} DoExpr {setvar[stipendBackoffClock, stopwatchcreate[]]} DoExpr {stopwatchstart[getvar[stipendBackoffClock]]} - ChatExpr {\/a [stipend-debug] clock created exists=+testvar[stipendBackoffClock]+ elapsed=+stopwatchelapsedseconds[getvar[stipendBackoffClock]]} DoExpr {touchvar[stipendNavLoaded]} EmbedNav nav0__stipend_nav {stipend.nav} IF: All diff --git a/met/bore.met b/met/bore.met index 07dccc5..ddc870b 100644 --- a/met/bore.met +++ b/met/bore.met @@ -2850,7 +2850,29 @@ service_decide i 2 i -8 +1 +TABLE +2 +K +V +n +n +2 +i +26 +TABLE +2 +k +v +n +n +1 +s +e +s +getqueststatus[`stipendtimer_0812`]==1 +i +21 TABLE 2 K @@ -2870,31 +2892,22 @@ n s e s -getqueststatus[`stipendtimer_0812`]==1 -TABLE -2 -k -v -n -n -1 +testvar[stipendBackoffClock] s -e -s -\/a [stipend-debug] clockExists=+testvar[stipendBackoffClock]+ elapsed=+iif[testvar[stipendBackoffClock],stopwatchelapsedseconds[getvar[stipendBackoffClock]],`none`]+ backoff=+getvar[stipendBackoffSeconds]+ guard=+isfalse[iif[testvar[stipendBackoffClock],stopwatchelapsedseconds[getvar[stipendBackoffClock]]=getvar[stipendBackoffSeconds] +TABLE +2 +K +V +n +n +2 +i +7 +TABLE +2 +k +v +n +n +1 +s +e +s +clearvar[stipendBackoffClock] +i +1 s service_stipend s @@ -3131,7 +3179,7 @@ K V n n -8 +7 i 2 s @@ -3171,19 +3219,6 @@ e s stopwatchstart[getvar[stipendBackoffClock]] i -8 -TABLE -2 -k -v -n -n -1 -s -e -s -\/a [stipend-debug] clock created exists=+testvar[stipendBackoffClock]+ elapsed=+stopwatchelapsedseconds[getvar[stipendBackoffClock]] -i 7 TABLE 2