diff --git a/.gitattributes b/.gitattributes index bd5aa0c5a46..70a6f6ac597 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5642,6 +5642,7 @@ forge-gui/res/cardsfolder/e/ezuri_claw_of_progress.txt -text forge-gui/res/cardsfolder/e/ezuri_renegade_leader.txt svneol=native#text/plain forge-gui/res/cardsfolder/e/ezuris_archers.txt svneol=native#text/plain forge-gui/res/cardsfolder/e/ezuris_brigade.txt svneol=native#text/plain +forge-gui/res/cardsfolder/e/ezuris_predation.txt -text forge-gui/res/cardsfolder/f/faadiyah_seer.txt -text forge-gui/res/cardsfolder/f/fable_of_wolf_and_owl.txt svneol=native#text/plain forge-gui/res/cardsfolder/f/fabled_hero.txt -text 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 c0825a0afdf..60e18838aaa 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 @@ -78,6 +78,10 @@ public class FightEffect extends SpellAbilityEffect { if (sa.hasParam("Defined")) { List defined = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("Defined"), sa); // Allow both fighters to come from defined list if first fighter not already found + if (sa.hasParam("ExtraDefined")) { + defined.addAll(AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("ExtraDefined"), sa)); + } + if (!defined.isEmpty()) { if (defined.size() > 1 && fighter1 == null) { fighter1 = defined.get(0); diff --git a/forge-gui/res/cardsfolder/e/ezuris_predation.txt b/forge-gui/res/cardsfolder/e/ezuris_predation.txt new file mode 100644 index 00000000000..e9e33b5ddf2 --- /dev/null +++ b/forge-gui/res/cardsfolder/e/ezuris_predation.txt @@ -0,0 +1,10 @@ +Name:Ezuri's Predation +ManaCost:5 G G G +Types:Sorcery +A:SP$ RepeatEach | Cost$ 5 G G G | RepeatCards$ Creature.OppCtrl | UseImprinted$ True | RepeatSubAbility$ DBToken | SpellDescription$ For each creature your opponents control, put a 4/4 green Beast creature token onto the battlefield. Each of those Beasts fights a different one of those creatures. +SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast| TokenOwner$ You | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4 | TokenImage$ g 4 4 beast | RememberTokens$ True | SubAbility$ DBFight +SVar:DBFight:DB$ Fight | Defined$ Imprinted | ExtraDefined$ Remembered | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:RemAIDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/ezuris_predation.jpg +Oracle:For each creature your opponents control, put a 4/4 green Beast creature token onto the battlefield. Each of those Beasts fights a different one of those creatures.