From 9ee86de16b2eeb4310a316411f539ad0fed4f756 Mon Sep 17 00:00:00 2001 From: ArsenalNut Date: Sun, 28 Aug 2011 18:30:50 +0000 Subject: [PATCH] added support for Bloodthirst X --- src/main/java/forge/Card.java | 10 +++++++--- .../java/forge/card/cardFactory/CardFactoryUtil.java | 11 ++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index b6c196c8d17..e578ef7f1d1 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -1545,10 +1545,14 @@ public class Card extends MyObservable implements Comparable { String kk[] = k.split(" "); sbLong.append(keyword.get(i)).append(" (If an opponent was dealt damage this turn, this creature enters the battlefield with "); sbLong.append(kk[1]).append(" +1/+1 counter"); - if (Integer.parseInt(kk[1]) > 1) { - sbLong.append("s"); + if (kk[1].equals("X")){ + sbLong.append("s on it, where X is the damage dealt to your opponents this turn.)").append("\r\n"); + } else { + if (Integer.parseInt(kk[1]) > 1) { + sbLong.append("s"); + } + sbLong.append(" on it.)").append("\r\n"); } - sbLong.append(" on it.)").append("\r\n"); } else if (keyword.get(i).startsWith("Modular")) { String numCounters = keyword.get(i).split(" ")[1]; sbLong.append(keyword.get(i)); diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java index b4ecce0b1d2..689ab763e2a 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java @@ -4892,15 +4892,20 @@ public class CardFactoryUtil { int bloodthirst = hasKeyword(card, "Bloodthirst"); if (bloodthirst != -1) { - final int count = Integer.parseInt(card.getKeyword().get(bloodthirst).split(" ")[1]); + final String numCounters = card.getKeyword().get(bloodthirst).split(" ")[1]; card.addComesIntoPlayCommand(new Command() { private static final long serialVersionUID = -1849308549161972508L; public void execute() { if (card.getController().getOpponent().getAssignedDamage() > 0) { - - card.addCounter(Counters.P1P1, count); + int toAdd = -1; + if (numCounters.equals("X")) { + toAdd = card.getController().getOpponent().getAssignedDamage(); + } else { + toAdd = Integer.parseInt(numCounters); + } + card.addCounter(Counters.P1P1, toAdd); } }