From 9c90b19c8201ff31dce868a83b5c77b5e6cf824d Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Tue, 28 Feb 2023 23:57:43 +0100
Subject: [PATCH] Fix Reverse Polarity

---
 .../src/main/java/forge/game/ability/AbilityUtils.java       | 5 ++++-
 forge-gui/res/cardsfolder/r/reverse_polarity.txt             | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index 6ddc3266723..0dd3f2a444f 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -18,6 +18,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
+import com.google.common.base.Functions;
 import com.google.common.base.Predicate;
 
 import forge.card.CardStateName;
@@ -2404,8 +2405,10 @@ public class AbilityUtils {
             List<Integer> dmgInstances = game.getDamageDoneThisTurn(isCombat, false, props[1], props[2], c, player, ctb);
             if (!dmgInstances.isEmpty() && sq[0].contains("Max")) {
                 num = Collections.max(dmgInstances);
-            } else {
+            } else if (sq[0].startsWith("Num")) {
                 num = dmgInstances.size();
+            } else {
+                num = Aggregates.sum(dmgInstances, Functions.identity());
             }
             return doXMath(num, expr, c, ctb);
         }
diff --git a/forge-gui/res/cardsfolder/r/reverse_polarity.txt b/forge-gui/res/cardsfolder/r/reverse_polarity.txt
index 0a1cf2027fb..09e25f31022 100644
--- a/forge-gui/res/cardsfolder/r/reverse_polarity.txt
+++ b/forge-gui/res/cardsfolder/r/reverse_polarity.txt
@@ -2,7 +2,7 @@ Name:Reverse Polarity
 ManaCost:W W
 Types:Instant
 A:SP$ GainLife | Cost$ W W | Defined$ You | LifeAmount$ X | SpellDescription$ You gain X life, where X is twice the damage dealt to you so far this turn by artifacts.
-SVar:X:Count$YourTypeDamageThisTurn Artifact/Times.2
+SVar:X:Count$DamageThisTurn Artifact You/Times.2
 AI:RemoveDeck:Random
 DeckHas:Ability$LifeGain
 Oracle:You gain X life, where X is twice the damage dealt to you so far this turn by artifacts.