diff --git a/.gitattributes b/.gitattributes index dc5983e83d4..dbee4778ce9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11039,6 +11039,7 @@ res/cardsfolder/t/teekas_dragon.txt svneol=native#text/plain res/cardsfolder/t/teetering_peaks.txt svneol=native#text/plain res/cardsfolder/t/teferi_mage_of_zhalfir.txt -text res/cardsfolder/t/teferis_care.txt -text +res/cardsfolder/t/teferis_curse.txt -text res/cardsfolder/t/teferis_drake.txt -text res/cardsfolder/t/teferis_honor_guard.txt -text res/cardsfolder/t/teferis_isle.txt -text diff --git a/res/cardsfolder/t/teferis_curse.txt b/res/cardsfolder/t/teferis_curse.txt new file mode 100644 index 00000000000..b430e3e1433 --- /dev/null +++ b/res/cardsfolder/t/teferis_curse.txt @@ -0,0 +1,8 @@ +Name:Teferi's Curse +ManaCost:1 U +Types:Enchantment Aura +K:Enchant artifact or creature +A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature,Artifact | TgtPrompt$ Select target artifact or creature | AILogic$ Curse +S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Phasing | Description$ Enchanted permanent has phasing. +SVar:Picture:http://www.wizards.com/global/images/magic/general/teferis_curse.jpg +Oracle:Enchant artifact or creature\nEnchanted permanent has phasing. (It phases in or out before its controller untaps during each of his or her untap steps. While it's phased out, it's treated as though it doesn't exist.) diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 648baa01b5c..3346aadeb60 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -54,6 +54,7 @@ import forge.card.staticability.StaticAbility; import forge.card.trigger.TriggerType; import forge.game.GameActionUtil; import forge.game.Game; +import forge.game.GameAge; import forge.game.GlobalRuleChange; import forge.game.event.GameEventCardDiscarded; import forge.game.event.GameEventDrawCard; @@ -1354,7 +1355,9 @@ public class Player extends GameEntity implements Comparable { this.numDrawnThisDrawStep++; // Miracle draws - if (this.numDrawnThisTurn == 1 && game.getPhaseHandler().getTurn() != 1) { + if (this.numDrawnThisTurn == 1 + && game.getPhaseHandler().getTurn() != 1 + && game.getAge() != GameAge.Mulligan) { drawMiracle(c); }