From d865a8ba0c28151883025e62b6ac2d1047f1c021 Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 5 Oct 2017 03:48:01 +0000 Subject: [PATCH] - Some Ixalan card logic update. --- forge-ai/src/main/java/forge/ai/ability/DestroyAi.java | 10 ++++++++++ forge-gui/res/cardsfolder/j/jace_cunning_castaway.txt | 2 +- forge-gui/res/cardsfolder/v/vona_butcher_of_magan.txt | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java b/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java index b4c35ead074..a69a79afb32 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java @@ -55,6 +55,16 @@ public class DestroyAi extends SpellAbilityAi { if (ph.getPlayerTurn() == ai || ph.getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS)) { return false; } + } else if ("AtEOT".equals(sa.getParam("AILogic"))) { + PhaseHandler ph = ai.getGame().getPhaseHandler(); + if (!ph.is(PhaseType.END_OF_TURN)) { + return false; + } + } else if ("AtEOTIfNotAttacking".equals(sa.getParam("AILogic"))) { + PhaseHandler ph = ai.getGame().getPhaseHandler(); + if (!ph.is(PhaseType.END_OF_TURN) || ai.getAttackedWithCreatureThisTurn()) { + return false; + } } if (ComputerUtil.preventRunAwayActivations(sa)) { diff --git a/forge-gui/res/cardsfolder/j/jace_cunning_castaway.txt b/forge-gui/res/cardsfolder/j/jace_cunning_castaway.txt index bd764c83f6d..b8ca40bdfaf 100644 --- a/forge-gui/res/cardsfolder/j/jace_cunning_castaway.txt +++ b/forge-gui/res/cardsfolder/j/jace_cunning_castaway.txt @@ -2,7 +2,7 @@ Name:Jace, Cunning Castaway ManaCost:1 U U Types:Legendary Planeswalker Jace Loyalty:3 -A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Triggers$ TrigDrawDiscard | SVars$ DBDraw,DBDiscard | Duration$ EndOfTurn | Name$ Jace, Cunning Castaway Effect | SpellDescription$ Whenever one or more creatures you control deal combat damage to a player this turn, draw a card, then discard a card. +A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Triggers$ TrigDrawDiscard | SVars$ DBDraw,DBDiscard | Duration$ EndOfTurn | AILogic$ Main2 | Name$ Jace, Cunning Castaway Effect | SpellDescription$ Whenever one or more creatures you control deal combat damage to a player this turn, draw a card, then discard a card. SVar:TrigDrawDiscard:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl | TriggerZones$ Command | ValidTarget$ Player | Execute$ DBDraw | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player this turn, draw a card, then discard a card. SVar:DBDraw:DB$ Draw | NumCards$ 1 | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then discard a card. SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose diff --git a/forge-gui/res/cardsfolder/v/vona_butcher_of_magan.txt b/forge-gui/res/cardsfolder/v/vona_butcher_of_magan.txt index 52ab4edfbaa..edafd9983ee 100644 --- a/forge-gui/res/cardsfolder/v/vona_butcher_of_magan.txt +++ b/forge-gui/res/cardsfolder/v/vona_butcher_of_magan.txt @@ -4,7 +4,8 @@ Types:Legendary Creature Vampire Knight PT:4/4 K:Vigilance K:Lifelink -A:AB$ Destroy | Cost$ T PayLife<7> | PlayerTurn$ True | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SpellDescription$ Destroy target nonland permanent. Activate this ability only during your turn. +A:AB$ Destroy | Cost$ T PayLife<7> | PlayerTurn$ True | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | AILogic$ AtEOTIfNotAttacking | SpellDescription$ Destroy target nonland permanent. Activate this ability only during your turn. DeckHas:Ability$LifeGain +SVar:RemRandomDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/vona_butcher_of_magan.jpg Oracle:Vigilance, lifelink\n{T}, Pay 7 life: Destroy target nonland permanent. Activate this ability only during your turn.