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

make AF_Counters.removeResolve and removeStackDescription use getDefinedCards(...)

Browse Source
This commit is contained in:
jendave
2011-08-06 19:18:37 +00:00
parent c397a9b7e9
commit 416ac49681
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/forge/AbilityFactory_Counters.java
View File

@@ -576,15 +576,16 @@ public class AbilityFactory_Counters {
}
public static String removeStackDescription(AbilityFactory af, SpellAbility sa){
HashMap<String,String> params = af.getMapParams();
Card card = af.getHostCard();
StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub))
sb.append(sa.getSourceCard().getName()).append(" - ");
sb.append(card).append(" - ");
else
sb.append(" ");
Counters cType = Counters.valueOf(af.getMapParams().get("CounterType"));
String name = af.getHostCard().getName();
Counters cType = Counters.valueOf(params.get("CounterType"));
int amount = AbilityFactory.calculateAmount(af.getHostCard(), af.getMapParams().get("CounterNum"), sa);
sb.append("Remove ").append(amount).append(" ").append(cType.getName())
@@ -592,13 +593,9 @@ public class AbilityFactory_Counters {
if(amount != 1) sb.append("s");
sb.append(" from");
if (af.getAbTgt() == null)
sb.append(" ").append(name);
else {
ArrayList<Card> tgts = af.getAbTgt().getTargetCards();
for (Card c : tgts)
sb.append(" ").append(c.getName());
}
ArrayList<Card> tgts = AbilityFactory.getDefinedCards(card, params.get("Defined"), sa);
for (Card c : tgts)
sb.append(" ").append(c);
sb.append(".");
@@ -719,11 +716,10 @@ public class AbilityFactory_Counters {
public static void removeResolve(final AbilityFactory af, final SpellAbility sa){
HashMap<String,String> params = af.getMapParams();
String type = params.get("CounterType");
int counterAmount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("CounterNum"), sa);
String DrawBack = params.get("SubAbility");
Card card = af.getHostCard();
String type = params.get("CounterType");
int counterAmount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("CounterNum"), sa);
ArrayList<Card> tgtCards;
@@ -731,8 +727,7 @@ public class AbilityFactory_Counters {
if (tgt != null)
tgtCards = tgt.getTargetCards();
else{
tgtCards = new ArrayList<Card>();
tgtCards.add(card);
tgtCards = AbilityFactory.getDefinedCards(card, params.get("Defined"), sa);
}
for(Card tgtCard : tgtCards)