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

- Added Magmasaur

Browse Source 
- Fixed RememberRemoved remembering more counters than were originally on a card
This commit is contained in:
moomarc
2012-11-13 07:12:56 +00:00
parent 39f5c929af
commit afa55bbe90
4 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/forge/card/abilityfactory/effects/CountersRemoveEffect.java
View File

@@ -15,15 +15,15 @@ import forge.game.zone.Zone;
import forge.game.zone.ZoneType;
import forge.gui.GuiChoose;
public class CountersRemoveEffect extends SpellEffect {
public class CountersRemoveEffect extends SpellEffect {
@Override
protected String getStackDescription(SpellAbility sa) {
final StringBuilder sb = new StringBuilder();
final String counterName = sa.getParam("CounterType");
final int amount = AbilityFactory.calculateAmount(sa.getSourceCard(), sa.getParam("CounterNum"), sa);
sb.append("Remove ");
if (sa.hasParam("UpTo")) {
sb.append("up to ");
@@ -43,13 +43,13 @@ public class CountersRemoveEffect extends SpellEffect {
sb.append("s");
}
sb.append(" from");
for (final Card c : getTargetCards(sa)) {
sb.append(" ").append(c);
}
sb.append(".");
return sb.toString();
}
@@ -64,7 +64,7 @@ public class CountersRemoveEffect extends SpellEffect {
}
final Target tgt = sa.getTarget();
boolean rememberRemoved = false;
if (sa.hasParam("RememberRemoved")) {
rememberRemoved = true;
@@ -101,7 +101,7 @@ public class CountersRemoveEffect extends SpellEffect {
chosenAmount = counterAmount;
}
// make list of amount choices
if (chosenAmount > 1) {
final List<Integer> choices = new ArrayList<Integer>();
for (int i = 1; i <= chosenAmount; i++) {
@@ -149,6 +149,9 @@ public class CountersRemoveEffect extends SpellEffect {
}
tgtCard.subtractCounter(Counters.valueOf(type), counterAmount);
if (rememberRemoved) {
if (counterAmount > tgtCard.getCounters(Counters.valueOf(type))) {
counterAmount = tgtCard.getCounters(Counters.valueOf(type));
}
for (int i = 0; i < counterAmount; i++) {
card.addRemembered(Counters.valueOf(type));
}
@@ -158,4 +161,4 @@ public class CountersRemoveEffect extends SpellEffect {
}
}
}
}