- Make DealtCombatDamageOnce trigger report the amount of damage dealt in combat. Fixes Sunhome Enforcer.

forge-game/src/main/java/forge/game/combat/Combat.java

@@ -666,6 +666,7 @@ public class Combat {
         // This function handles both Regular and First Strike combat assignment
         final HashMap<Card, Integer> defMap = defendingDamageMap;
         final HashMap<GameEntity, CardCollection> wasDamaged = new HashMap<GameEntity, CardCollection>();
+        final Map<Card, Integer> damageDealtThisCombat = new HashMap<Card, Integer>();
 
         for (final Entry<Card, Integer> entry : defMap.entrySet()) {
             GameEntity defender = getDefenderByAttacker(entry.getKey());
@@ -678,6 +679,7 @@ public class Combat {
                         l.add(entry.getKey());
                         wasDamaged.put(defender, l);
                     }
+                    damageDealtThisCombat.put(entry.getKey(), entry.getValue());
                 }
             }
             else if (defender instanceof Card) { // planeswalker
@@ -697,6 +699,7 @@ public class Combat {
         // this can be much better below here...
 
         final CardCollection combatants = new CardCollection();
+
         combatants.addAll(getAttackers());
         combatants.addAll(getAllBlockers());
         combatants.addAll(getDefendingPlaneswalkers());
@@ -716,6 +719,13 @@ public class Combat {
             for (final Entry<Card, Integer> entry : assignedDamageMap.entrySet()) {
                 final Card crd = entry.getKey();
                 damageMap.put(crd, entry.getValue());
+                if (entry.getValue() > 0) {
+                    if (damageDealtThisCombat.containsKey(crd)) {
+                        damageDealtThisCombat.put(crd, damageDealtThisCombat.get(crd) + entry.getValue());
+                    } else {
+                        damageDealtThisCombat.put(crd, entry.getValue());
+                    }
+                }
             }
             c.addCombatDamage(damageMap);
 
@@ -735,8 +745,10 @@ public class Combat {
         // when ... deals combat damage to one or more
         for (final Card damageSource : dealtDamageTo.keySet()) {
             final HashMap<String, Object> runParams = new HashMap<String, Object>();
+            int dealtDamage = damageDealtThisCombat.containsKey(damageSource) ? damageDealtThisCombat.get(damageSource) : 0;
             runParams.put("DamageSource", damageSource);
             runParams.put("DamageTargets", dealtDamageTo.get(damageSource));
+            runParams.put("DamageAmount", dealtDamage);
             damageSource.getGame().getTriggerHandler().runTrigger(TriggerType.DealtCombatDamageOnce, runParams, false);
         }
         dealtDamageToThisCombat.putAll(dealtDamageTo);

forge-game/src/main/java/forge/game/trigger/TriggerDealtCombatDamageOnce.java

@@ -20,6 +20,7 @@ package forge.game.trigger;
 import forge.game.GameEntity;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
+import forge.util.Expressions;
 
 import java.util.Set;
 
@@ -74,6 +75,23 @@ public class TriggerDealtCombatDamageOnce extends Trigger {
             }
         }
 
+        if (this.mapParams.containsKey("DamageAmount")) {
+            final String fullParam = this.mapParams.get("DamageAmount");
+
+            final String operator = fullParam.substring(0, 2);
+            final int operand = Integer.parseInt(fullParam.substring(2));
+            final int actualAmount = (Integer) runParams2.get("DamageAmount");
+
+            if (!Expressions.compare(actualAmount, operator, operand)) {
+                return false;
+            }
+
+            System.out.print("DealtCombatDamageOnce Amount Operator: ");
+            System.out.println(operator);
+            System.out.print("DealtCombatDamageOnce Amount Operand: ");
+            System.out.println(operand);
+        }
+
         return true;
     }
 
@@ -82,5 +100,6 @@ public class TriggerDealtCombatDamageOnce extends Trigger {
     public final void setTriggeringObjects(final SpellAbility sa) {
         sa.setTriggeringObject("Source", this.getRunParams().get("DamageSource"));
         sa.setTriggeringObject("Targets", this.getRunParams().get("DamageTargets"));
+        sa.setTriggeringObject("DamageAmount", this.getRunParams().get("DamageAmount"));
     }
 }