From 1c7a7b6a966f76f328ae4a05087701b56a5c530b Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Fri, 28 Apr 2023 13:07:55 -0400
Subject: [PATCH] v2.1.0: made artif recharge more visually consistent with
 wand recharge

---
 .../actors/buffs/ArtifactRecharge.java        | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ArtifactRecharge.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ArtifactRecharge.java
index 2fac4e385..2265e3cae 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ArtifactRecharge.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ArtifactRecharge.java
@@ -45,20 +45,22 @@ public class ArtifactRecharge extends Buff {
 
 		if (target instanceof Hero) {
 			float chargeAmount = Math.min(1, left);
-			for (Buff b : target.buffs()) {
-				if (b instanceof Artifact.ArtifactBuff) {
-					if (b instanceof HornOfPlenty.hornRecharge && ignoreHornOfPlenty){
-						continue;
-					}
-					if (!((Artifact.ArtifactBuff) b).isCursed()) {
-						((Artifact.ArtifactBuff) b).charge((Hero) target, chargeAmount);
+			if (chargeAmount > 0){
+				for (Buff b : target.buffs()) {
+					if (b instanceof Artifact.ArtifactBuff) {
+						if (b instanceof HornOfPlenty.hornRecharge && ignoreHornOfPlenty){
+							continue;
+						}
+						if (!((Artifact.ArtifactBuff) b).isCursed()) {
+							((Artifact.ArtifactBuff) b).charge((Hero) target, chargeAmount);
+						}
 					}
 				}
 			}
 		}
 
 		left--;
-		if (left <= 0){
+		if (left < 0){ // we expire after 0 to be more consistent with wand recharging visually
 			detach();
 		} else {
 			spend(TICK);
@@ -98,7 +100,7 @@ public class ArtifactRecharge extends Buff {
 
 	@Override
 	public String iconTextDisplay() {
-		return Integer.toString((int)left);
+		return Integer.toString((int)left+1);
 	}
 	
 	@Override