diff --git a/res/cardsfolder/l/leyline_of_anticipation.txt b/res/cardsfolder/l/leyline_of_anticipation.txt index 2f63e9a6ac5..5a4633957b7 100644 --- a/res/cardsfolder/l/leyline_of_anticipation.txt +++ b/res/cardsfolder/l/leyline_of_anticipation.txt @@ -3,8 +3,6 @@ ManaCost:2 U U Types:Enchantment Text:If CARDNAME is in your opening hand, you may begin the game with it on the battlefield. S:Mode$ Continuous | Affected$ Card.nonLand+YouCtrl | AddKeyword$ HIDDEN Flash | AffectedZone$ Hand,Graveyard,Exile | Description$ You may cast nonland cards as though they had flash. (You may cast them any time you could cast an instant.) -K:MayEffectFromOpeningHand:PutOnBattlefield -SVar:PutOnBattlefield:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Hand | Destination$ Battlefield SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/leyline_of_anticipation.jpg diff --git a/res/cardsfolder/l/leyline_of_lifeforce.txt b/res/cardsfolder/l/leyline_of_lifeforce.txt index 2454d0363a0..b650e0177bf 100644 --- a/res/cardsfolder/l/leyline_of_lifeforce.txt +++ b/res/cardsfolder/l/leyline_of_lifeforce.txt @@ -3,8 +3,6 @@ ManaCost:2 G G Types:Enchantment Text:If CARDNAME is in your opening hand, you may begin the game with it on the battlefield. S:Mode$ Continuous | Affected$ Creature | AddKeyword$ HIDDEN CARDNAME can't be countered. | AffectedZone$ Stack | Description$ Creature spells can't be countered. -K:MayEffectFromOpeningHand:PutOnBattlefield -SVar:PutOnBattlefield:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Hand | Destination$ Battlefield SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/leyline_of_lifeforce.jpg diff --git a/res/cardsfolder/l/leyline_of_lightning.txt b/res/cardsfolder/l/leyline_of_lightning.txt index b94526951b8..5ae6a664328 100644 --- a/res/cardsfolder/l/leyline_of_lightning.txt +++ b/res/cardsfolder/l/leyline_of_lightning.txt @@ -4,8 +4,6 @@ Types:Enchantment Text:If Leyline of Lightning is in your opening hand, you may begin the game with it on the battlefield. T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you cast a spell, you may pay 1. If you do, CARDNAME deals 1 damage to target player. SVar:TrigDealDamage:AB$DealDamage | Cost$ 1 | Tgt$ TgtP | NumDmg$ 1 -K:MayEffectFromOpeningHand:PutOnBattlefield -SVar:PutOnBattlefield:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Hand | Destination$ Battlefield SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/leyline_of_lightning.jpg diff --git a/res/cardsfolder/l/leyline_of_punishment.txt b/res/cardsfolder/l/leyline_of_punishment.txt index def85a01ab2..11b15abbeae 100644 --- a/res/cardsfolder/l/leyline_of_punishment.txt +++ b/res/cardsfolder/l/leyline_of_punishment.txt @@ -2,8 +2,6 @@ Name:Leyline of Punishment ManaCost:2 R R Types:Enchantment Text:If Leyline of Punishment is in your opening hand, you may begin the game with it on the battlefield. Players can't gain life. Damage can't be prevented. -K:MayEffectFromOpeningHand:PutOnBattlefield -SVar:PutOnBattlefield:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Hand | Destination$ Battlefield SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/leyline_of_punishment.jpg diff --git a/res/cardsfolder/l/leyline_of_sanctity.txt b/res/cardsfolder/l/leyline_of_sanctity.txt index 1a33845031b..b9e036dced2 100644 --- a/res/cardsfolder/l/leyline_of_sanctity.txt +++ b/res/cardsfolder/l/leyline_of_sanctity.txt @@ -2,8 +2,6 @@ Name:Leyline of Sanctity ManaCost:2 W W Types:Enchantment Text:If CARDNAME is in your opening hand, you may begin the game with it on the battlefield. -K:MayEffectFromOpeningHand:PutOnBattlefield -SVar:PutOnBattlefield:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Hand | Destination$ Battlefield S:Mode$ Continuous | Affected$ You | AddKeyword$ Hexproof | Description$ You have hexproof. (You can't be the target of spells or abilities your opponents control.) SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/leyline_of_sanctity.jpg diff --git a/res/cardsfolder/l/leyline_of_singularity.txt b/res/cardsfolder/l/leyline_of_singularity.txt index 40c56f6bb29..87d66d224f4 100644 --- a/res/cardsfolder/l/leyline_of_singularity.txt +++ b/res/cardsfolder/l/leyline_of_singularity.txt @@ -2,8 +2,6 @@ Name:Leyline of Singularity ManaCost:2 U U Types:Enchantment Text:If Leyline of Singularity is in your opening hand, you may begin the game with it on the battlefield. -K:MayEffectFromOpeningHand:PutOnBattlefield -SVar:PutOnBattlefield:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Hand | Destination$ Battlefield S:Mode$ Continuous | Affected$ Permanent.nonLand | AddType$ Legendary | Description$ All nonland permanents are legendary. SVar:RemRandomDeck:True SVar:Rarity:Rare diff --git a/res/cardsfolder/l/leyline_of_the_meek.txt b/res/cardsfolder/l/leyline_of_the_meek.txt index 129fcfa6325..fd5182fe6ce 100644 --- a/res/cardsfolder/l/leyline_of_the_meek.txt +++ b/res/cardsfolder/l/leyline_of_the_meek.txt @@ -2,8 +2,6 @@ Name:Leyline of the Meek ManaCost:2 W W Types:Enchantment Text:If Leyline of the Meek is in your opening hand, you may begin the game with it on the battlefield. -K:MayEffectFromOpeningHand:PutOnBattlefield -SVar:PutOnBattlefield:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Hand | Destination$ Battlefield S:Mode$ Continuous | Affected$ Creature.token | AddPower$ 1 | AddToughness$ 1 | Description$ Creature tokens get +1/+1. SVar:PlayMain1:TRUE SVar:RemRandomDeck:True diff --git a/res/cardsfolder/l/leyline_of_the_void.txt b/res/cardsfolder/l/leyline_of_the_void.txt index 08f19b62ddf..e7fa87c16da 100644 --- a/res/cardsfolder/l/leyline_of_the_void.txt +++ b/res/cardsfolder/l/leyline_of_the_void.txt @@ -2,8 +2,6 @@ Name:Leyline of the Void ManaCost:2 B B Types:Enchantment Text:If Leyline of the Void is in your opening hand, you may begin the game with it on the battlefield.\r\nIf a card would be put into an opponent's graveyard from anywhere, exile it instead. -K:MayEffectFromOpeningHand:PutOnBattlefield -SVar:PutOnBattlefield:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Hand | Destination$ Battlefield SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/leyline_of_the_void.jpg diff --git a/res/cardsfolder/l/leyline_of_vitality.txt b/res/cardsfolder/l/leyline_of_vitality.txt index 6fc7fb18b73..43ddf260e7f 100644 --- a/res/cardsfolder/l/leyline_of_vitality.txt +++ b/res/cardsfolder/l/leyline_of_vitality.txt @@ -2,8 +2,6 @@ Name:Leyline of Vitality ManaCost:2 G G Types:Enchantment Text:If Leyline of Vitality is in your opening hand, you may begin the game with it on the battlefield. -K:MayEffectFromOpeningHand:PutOnBattlefield -SVar:PutOnBattlefield:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Hand | Destination$ Battlefield S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddToughness$ 1 | Description$ Creatures you control get +0/+1. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature enters the battlefield under your control, you may gain 1 life. SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1 diff --git a/src/main/java/forge/gui/input/Input_Mulligan.java b/src/main/java/forge/gui/input/Input_Mulligan.java index b61342184b2..500fd9d546f 100644 --- a/src/main/java/forge/gui/input/Input_Mulligan.java +++ b/src/main/java/forge/gui/input/Input_Mulligan.java @@ -111,13 +111,16 @@ public class Input_Mulligan extends Input { } } } + if (c.getName().startsWith("Leyline")) { + if (GameActionUtil.showYesNoDialog(c, "Use this card's ability?")) + AllZone.getGameAction().moveToPlay(c); + } } //Computer Leylines & Chancellors CardList aiOpeningHand = AllZoneUtil.getPlayerHand(AllZone.getComputerPlayer()); for (Card c : aiOpeningHand) { - if (!(c.getName().startsWith("Leyline of Singularity") - && AllZoneUtil.getCardsInPlay("Leyline of Singularity").size() > 0)) { + if (!c.getName().startsWith("Leyline")) { ArrayList kws = c.getKeyword(); for(int i = 0;i 0)) { + AllZone.getGameAction().moveToPlay(c); + AllZone.getGameAction().checkStateEffects(); + } } AllZone.getGameAction().checkStateEffects();