external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

update AF$PutCounter to accept Defined$

Browse Source
This commit is contained in:
jendave
2011-08-06 14:48:54 +00:00
parent ab119f57c5
commit 4a2b1c7a53
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/forge/AbilityFactory_Counters.java
View File

@@ -91,6 +91,7 @@ public class AbilityFactory_Counters {
} }
public static String putStackDescription(AbilityFactory af, SpellAbility sa){ public static String putStackDescription(AbilityFactory af, SpellAbility sa){
HashMap<String,String> params = af.getMapParams();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) if (!(sa instanceof Ability_Sub))
@@ -99,7 +100,7 @@ public class AbilityFactory_Counters {
sb.append(" "); sb.append(" ");
Counters cType = Counters.valueOf(af.getMapParams().get("CounterType")); 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); int amount = AbilityFactory.calculateAmount(af.getHostCard(), af.getMapParams().get("CounterNum"), sa);
sb.append("Put ").append(amount).append(" ").append(cType.getName()) sb.append("Put ").append(amount).append(" ").append(cType.getName())
@@ -107,13 +108,10 @@ public class AbilityFactory_Counters {
if(amount != 1) sb.append("s"); if(amount != 1) sb.append("s");
sb.append(" on"); sb.append(" on");
if (af.getAbTgt() == null) ArrayList<Card> tgts = AbilityFactory.getDefinedCards(card, params.get("Defined"), sa);
sb.append(" ").append(name);
else { for (Card c : tgts)
ArrayList<Card> tgts = af.getAbTgt().getTargetCards(); sb.append(" ").append(c.getName());
for (Card c : tgts)
sb.append(" ").append(c.getName());
}
sb.append("."); sb.append(".");
@@ -368,8 +366,7 @@ public class AbilityFactory_Counters {
if (tgt != null) if (tgt != null)
tgtCards = tgt.getTargetCards(); tgtCards = tgt.getTargetCards();
else{ else{
tgtCards = new ArrayList<Card>(); tgtCards = AbilityFactory.getDefinedCards(card, params.get("Defined"), sa);
tgtCards.add(card);
} }
for(Card tgtCard : tgtCards) for(Card tgtCard : tgtCards)