From 6ded6de74f480322361ce0b51ba37a61fa760898 Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 12 Nov 2012 21:22:19 +0000 Subject: [PATCH] - Bloodthirst is now multiplayer compatible. --- .../card/cardfactory/CardFactoryUtil.java | 4 +-- src/main/java/forge/game/player/Player.java | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 410aff79de7..905e25582b2 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -4674,10 +4674,10 @@ public class CardFactoryUtil { @Override public void execute() { - if (card.getController().getOpponent().getAssignedDamage() > 0) { + if (card.getController().hasBloodthirst()) { int toAdd = -1; if (numCounters.equals("X")) { - toAdd = card.getController().getOpponent().getAssignedDamage(); + toAdd = card.getController().getBloodthirstAmount(); } else { toAdd = Integer.parseInt(numCounters); } diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 01acda161ed..c81bfc47498 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -2286,6 +2286,37 @@ public abstract class Player extends GameEntity implements Comparable { final List list = this.getZone(ZoneType.Battlefield).getCardsAddedThisTurn(null); return Iterables.any(list, CardPredicates.Presets.LANDS); } + + /** + *

+ * hasBloodthirst. + *

+ * + * @return a boolean. + */ + public final boolean hasBloodthirst() { + for (Player opp : this.getOpponents()) { + if (opp.getAssignedDamage() > 0) { + return true; + } + } + return false; + } + + /** + *

+ * getBloodthirstAmount. + *

+ * + * @return a int. + */ + public final int getBloodthirstAmount() { + int blood = 0; + for (Player opp : this.getOpponents()) { + blood += opp.getAssignedDamage(); + } + return blood; + } /** *