From fd5a969434e6266b7e97d14a17e16672f52b99b5 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Mon, 11 Jun 2018 20:46:09 +0200 Subject: [PATCH] CardFactoryUtil: xcount added DamageDoneByPlayerThisTurn --- .../src/main/java/forge/game/card/CardFactoryUtil.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 4819a6c7914..bd65d518749 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -898,6 +898,13 @@ public class CardFactoryUtil { if (sq[0].equals("StormCount")) { return doXMath(game.getStack().getSpellsCastThisTurn().size() - 1, m, c); } + if (sq[0].startsWith("DamageDoneByPlayerThisTurn")) { + int sum = 0; + for (Player p : AbilityUtils.getDefinedPlayers(c, sq[1], null)) { + sum += c.getReceivedDamageByPlayerThisTurn(p); + } + return doXMath(sum, m, c); + } if (sq[0].equals("DamageDoneThisTurn")) { return doXMath(c.getDamageDoneThisTurn(), m, c); } @@ -963,7 +970,6 @@ public class CardFactoryUtil { } return doXMath(lost, m, c); } - if (sq[0].equals("TotalDamageDoneByThisTurn")) { return doXMath(c.getTotalDamageDoneBy(), m, c); }