From e75edcbfa1d87dc0525a41fa687f6a8b2bae02aa Mon Sep 17 00:00:00 2001
From: Erik <erik.nihlen@gmail.com>
Date: Mon, 6 Apr 2026 14:15:12 +0200
Subject: [PATCH] fix stipend backoff in neftet and aphus: same two-rule
 pattern as bore

---
 af/aphus.af    | 11 +++++++---
 af/neftet.af   | 11 +++++++---
 met/aphus.met  | 58 ++++++++++++++++++++++++++++++++++++++++++++++++--
 met/neftet.met | 58 ++++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 128 insertions(+), 10 deletions(-)

diff --git a/af/aphus.af b/af/aphus.af
index 7fcc5ab..9d528be 100644
--- a/af/aphus.af
+++ b/af/aphus.af
@@ -233,10 +233,15 @@ STATE: {service_decide} ~~ {
 				DoExpr {clearvar[bellaBackoffClock]}
 	IF:	All
 			Expr {getqueststatus[`stipendtimer_0812`]==1}
-			Not All
-				Expr {testvar[stipendBackoffClock]}
-				Expr {stopwatchelapsedseconds[getvar[stipendBackoffClock]]<getvar[stipendBackoffSeconds]}
+			Not Expr {testvar[stipendBackoffClock]}
 		DO:	SetState {service_stipend}
+	IF:	All
+			Expr {getqueststatus[`stipendtimer_0812`]==1}
+			Expr {testvar[stipendBackoffClock]}
+			Expr {stopwatchelapsedseconds[getvar[stipendBackoffClock]]>=getvar[stipendBackoffSeconds]}
+		DO:	DoAll
+				DoExpr {clearvar[stipendBackoffClock]}
+				SetState {service_stipend}
 	IF:	All
 			Expr {getvar[disableAugmentServices]!=1}
 			ItemCountGE 1 {Blank Augmentation Gem}
diff --git a/af/neftet.af b/af/neftet.af
index 2f201ba..aba7739 100644
--- a/af/neftet.af
+++ b/af/neftet.af
@@ -364,10 +364,15 @@ STATE: {service_decide} ~~ {
 				DoExpr {clearvar[bellaBackoffClock]}
 	IF:	All
 			Expr {getqueststatus[`stipendtimer_0812`]==1}
-			Not All
-				Expr {testvar[stipendBackoffClock]}
-				Expr {stopwatchelapsedseconds[getvar[stipendBackoffClock]]<getvar[stipendBackoffSeconds]}
+			Not Expr {testvar[stipendBackoffClock]}
 		DO:	SetState {service_stipend}
+	IF:	All
+			Expr {getqueststatus[`stipendtimer_0812`]==1}
+			Expr {testvar[stipendBackoffClock]}
+			Expr {stopwatchelapsedseconds[getvar[stipendBackoffClock]]>=getvar[stipendBackoffSeconds]}
+		DO:	DoAll
+				DoExpr {clearvar[stipendBackoffClock]}
+				SetState {service_stipend}
 	IF:	All
 			Expr {getvar[disableAugmentServices]!=1}
 			ItemCountGE 1 {Blank Augmentation Gem}
diff --git a/met/aphus.met b/met/aphus.met
index 3f9cfc4..f715ef0 100644
--- a/met/aphus.met
+++ b/met/aphus.met
@@ -11,7 +11,7 @@ n
 n
 n
 n
-197
+198
 i
 16
 i
@@ -2215,14 +2215,46 @@ n
 n
 1
 i
+26
+TABLE
 2
+k
+v
+n
+n
+1
+s
+e
+s
+testvar[stipendBackoffClock]
+s
+service_stipend
+s
+service_decide
+i
+2
+i
+3
 TABLE
 2
 K
 V
 n
 n
+3
+i
+26
+TABLE
 2
+k
+v
+n
+n
+1
+s
+e
+s
+getqueststatus[`stipendtimer_0812`]==1
 i
 26
 TABLE
@@ -2248,7 +2280,29 @@ n
 s
 e
 s
-stopwatchelapsedseconds[getvar[stipendBackoffClock]]<getvar[stipendBackoffSeconds]
+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
diff --git a/met/neftet.met b/met/neftet.met
index e109e32..00cd290 100644
--- a/met/neftet.met
+++ b/met/neftet.met
@@ -11,7 +11,7 @@ n
 n
 n
 n
-303
+304
 i
 20
 i
@@ -3681,14 +3681,46 @@ n
 n
 1
 i
+26
+TABLE
 2
+k
+v
+n
+n
+1
+s
+e
+s
+testvar[stipendBackoffClock]
+s
+service_stipend
+s
+service_decide
+i
+2
+i
+3
 TABLE
 2
 K
 V
 n
 n
+3
+i
+26
+TABLE
 2
+k
+v
+n
+n
+1
+s
+e
+s
+getqueststatus[`stipendtimer_0812`]==1
 i
 26
 TABLE
@@ -3714,7 +3746,29 @@ n
 s
 e
 s
-stopwatchelapsedseconds[getvar[stipendBackoffClock]]<getvar[stipendBackoffSeconds]
+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