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

fix the stack description when AF:RemoveCounter targets a card that is not Self. Added an UpTo parameter that when set prompts the user for a number of "up to" NumCounters to be removed.

Browse Source
This commit is contained in:
jendave
2011-08-06 22:56:24 +00:00
parent ddb7340b84
commit 2644a24bc7
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/forge/card/abilityFactory/AbilityFactory_Counters.java
View File

@@ -617,13 +617,22 @@ public class AbilityFactory_Counters {
Counters cType = Counters.valueOf(params.get("CounterType")); Counters cType = Counters.valueOf(params.get("CounterType"));
int amount = AbilityFactory.calculateAmount(af.getHostCard(), af.getMapParams().get("CounterNum"), sa); int amount = AbilityFactory.calculateAmount(af.getHostCard(), af.getMapParams().get("CounterNum"), sa);
sb.append("Remove ").append(amount).append(" ").append(cType.getName()) sb.append("Remove ");
if(params.containsKey("UpTo")) sb.append("up to ");
sb.append(amount).append(" ").append(cType.getName())
.append(" counter"); .append(" counter");
if(amount != 1) sb.append("s"); if(amount != 1) sb.append("s");
sb.append(" from"); sb.append(" from");
ArrayList<Card> tgts = AbilityFactory.getDefinedCards(card, params.get("Defined"), sa); ArrayList<Card> tgtCards;
for (Card c : tgts)
Target tgt = af.getAbTgt();
if (tgt != null)
tgtCards = tgt.getTargetCards();
else{
tgtCards = AbilityFactory.getDefinedCards(card, params.get("Defined"), sa);
}
for (Card c : tgtCards)
sb.append(" ").append(c); sb.append(" ").append(c);
sb.append("."); sb.append(".");
@@ -764,6 +773,12 @@ public class AbilityFactory_Counters {
PlayerZone zone = AllZone.getZone(tgtCard); PlayerZone zone = AllZone.getZone(tgtCard);
if (zone.is(Constant.Zone.Battlefield) || zone.is(Constant.Zone.Exile)) if (zone.is(Constant.Zone.Battlefield) || zone.is(Constant.Zone.Exile))
if(params.containsKey("UpTo") && sa.getActivatingPlayer().isHuman()) {
ArrayList<String> choices = new ArrayList<String>();
for(int i = 0; i <= counterAmount; i++) choices.add(""+i);
Object o = GuiUtils.getChoice("Select the number of "+type+" counters to remove", choices.toArray());
counterAmount = Integer.parseInt((String)o);
}
tgtCard.subtractCounter(Counters.valueOf(type), counterAmount); tgtCard.subtractCounter(Counters.valueOf(type), counterAmount);
} }