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

CounterEffect: add more Aftermath stuff

Browse Source
This commit is contained in:
Hanmac
2017-05-26 15:48:38 +00:00
parent 52ffee21b2
commit 055ae04ee0
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java
View File

@@ -10,10 +10,12 @@ import forge.game.spellability.SpellAbilityStackInstance;
import forge.game.spellability.SpellPermanent;
import forge.game.trigger.TriggerType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
public class CounterEffect extends SpellAbilityEffect {
@Override
@@ -24,7 +26,7 @@ public class CounterEffect extends SpellAbilityEffect {
final List<SpellAbility> sas;
if (sa.hasParam("AllType")) {
sas = new ArrayList<SpellAbility>();
sas = Lists.newArrayList();
for (SpellAbilityStackInstance si : game.getStack()) {
SpellAbility spell = si.getSpellAbility(true);
if (sa.getParam("AllType").equals("Spell") && !spell.isSpell()) {
@@ -69,7 +71,7 @@ public class CounterEffect extends SpellAbilityEffect {
final List<SpellAbility> sas;
if (sa.hasParam("AllType")) {
sas = new ArrayList<SpellAbility>();
sas = Lists.newArrayList();
for (SpellAbilityStackInstance si : game.getStack()) {
SpellAbility spell = si.getSpellAbility(true);
if (sa.getParam("AllType").equals("Spell") && !spell.isSpell()) {
@@ -150,7 +152,7 @@ public class CounterEffect extends SpellAbilityEffect {
final SpellAbility srcSA, final SpellAbilityStackInstance si) {
final Game game = tgtSA.getActivatingPlayer().getGame();
// Run any applicable replacement effects.
final HashMap<String, Object> repParams = new HashMap<String, Object>();
final Map<String, Object> repParams = Maps.newHashMap();
repParams.put("Event", "Counter");
repParams.put("TgtSA", tgtSA);
repParams.put("Affected", tgtSA.getHostCard());
@@ -168,7 +170,7 @@ public class CounterEffect extends SpellAbilityEffect {
if (tgtSA.isAbility()) {
// For Ability-targeted counterspells - do not move it anywhere,
// even if Destination$ is specified.
} else if (tgtSA.isFlashBackAbility()) {
} else if (tgtSA.isFlashBackAbility() || tgtSA.isAftermath()) {
game.getAction().exile(tgtSA.getHostCard());
} else if (destination.equals("Graveyard")) {
game.getAction().moveToGraveyard(tgtSA.getHostCard());
@@ -198,7 +200,7 @@ public class CounterEffect extends SpellAbilityEffect {
+ srcSA.getHostCard().getName());
}
// Run triggers
final HashMap<String, Object> runParams = new HashMap<String, Object>();
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Player", tgtSA.getActivatingPlayer());
runParams.put("Card", tgtSA.getHostCard());
runParams.put("Cause", srcSA.getHostCard());