From 4a2b1c7a53197585774e9c32b4313fe761dff881 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 14:48:54 +0000 Subject: [PATCH] update AF$PutCounter to accept Defined$ --- src/forge/AbilityFactory_Counters.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/forge/AbilityFactory_Counters.java b/src/forge/AbilityFactory_Counters.java index 71ccd8d61c3..1a6eddd7130 100644 --- a/src/forge/AbilityFactory_Counters.java +++ b/src/forge/AbilityFactory_Counters.java @@ -91,6 +91,7 @@ public class AbilityFactory_Counters { } public static String putStackDescription(AbilityFactory af, SpellAbility sa){ + HashMap params = af.getMapParams(); StringBuilder sb = new StringBuilder(); if (!(sa instanceof Ability_Sub)) @@ -99,21 +100,18 @@ public class AbilityFactory_Counters { sb.append(" "); Counters cType = Counters.valueOf(af.getMapParams().get("CounterType")); - String name = af.getHostCard().getName(); + Card card = af.getHostCard(); int amount = AbilityFactory.calculateAmount(af.getHostCard(), af.getMapParams().get("CounterNum"), sa); sb.append("Put ").append(amount).append(" ").append(cType.getName()) .append(" counter"); if(amount != 1) sb.append("s"); sb.append(" on"); + + ArrayList tgts = AbilityFactory.getDefinedCards(card, params.get("Defined"), sa); - if (af.getAbTgt() == null) - sb.append(" ").append(name); - else { - ArrayList tgts = af.getAbTgt().getTargetCards(); - for (Card c : tgts) - sb.append(" ").append(c.getName()); - } + for (Card c : tgts) + sb.append(" ").append(c.getName()); sb.append("."); @@ -368,8 +366,7 @@ public class AbilityFactory_Counters { if (tgt != null) tgtCards = tgt.getTargetCards(); else{ - tgtCards = new ArrayList(); - tgtCards.add(card); + tgtCards = AbilityFactory.getDefinedCards(card, params.get("Defined"), sa); } for(Card tgtCard : tgtCards)