From 92b9b69ee20b2600da7f15650c56a8e6e5d6877c Mon Sep 17 00:00:00 2001 From: Sloth Date: Sun, 20 Sep 2015 08:33:52 +0000 Subject: [PATCH] - Added support for Unnatural Aggression. --- .../java/forge/game/ability/effects/FightEffect.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java index 6c54925f99a..c0825a0afdf 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java @@ -35,12 +35,21 @@ public class FightEffect extends SpellAbilityEffect { */ @Override public void resolve(SpellAbility sa) { + final Card host = sa.getHostCard(); List fighters = getFighters(sa); if (fighters.size() < 2 || !fighters.get(0).isInPlay() || !fighters.get(1).isInPlay()) { return; } + + if (sa.hasParam("RememberObjects")) { + final String remembered = sa.getParam("RememberObjects"); + for (final Object o : AbilityUtils.getDefinedObjects(host, remembered, sa)) { + host.addRemembered(o); + } + } + boolean fightToughness = sa.hasParam("FightWithToughness"); final int dmg1 = fightToughness ? fighters.get(0).getNetToughness() : fighters.get(0).getNetPower(); final int dmg2 = fightToughness ? fighters.get(1).getNetToughness() : fighters.get(1).getNetPower();