diff --git a/forge-ai/src/main/java/forge/ai/ability/ScryAi.java b/forge-ai/src/main/java/forge/ai/ability/ScryAi.java index 6a6f3defee0..bac3af415d0 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ScryAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ScryAi.java @@ -56,6 +56,12 @@ public class ScryAi extends SpellAbilityAi { } } + if ("AtOpponentsCombatOrAfter".equals(sa.getParam("AILogic"))) { + if (ph.getPlayerTurn() == ai || ph.getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS)) { + return false; + } + } + // in the playerturn Scry should only be done in Main1 or in upkeep if able if (ph.isPlayerTurn(ai)) { if (SpellAbilityAi.isSorcerySpeed(sa)) { diff --git a/forge-gui/res/cardsfolder/g/glimmer_of_genius.txt b/forge-gui/res/cardsfolder/g/glimmer_of_genius.txt index c142717c365..227040f10a2 100644 --- a/forge-gui/res/cardsfolder/g/glimmer_of_genius.txt +++ b/forge-gui/res/cardsfolder/g/glimmer_of_genius.txt @@ -1,7 +1,7 @@ Name:Glimmer of Genius ManaCost:3 U Types:Instant -A:SP$ Scry | Cost$ 3 U | ScryNum$ 2 | SubAbility$ DBDraw | SpellDescription$ Scry 2, then draw two cards. You get {E}{E} (two energy counters). +A:SP$ Scry | Cost$ 3 U | ScryNum$ 2 | SubAbility$ DBDraw | AILogic$ AtOpponentsCombatOrAfter | SpellDescription$ Scry 2, then draw two cards. You get {E}{E} (two energy counters). SVar:DBDraw:DB$Draw | NumCards$ 2 | SubAbility$ DBEnergy SVar:DBEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 2 SVar:Picture:http://www.wizards.com/global/images/magic/general/glimmer_of_genius.jpg