From b29852df1920cd8ae871b056ecdd0d57068e909d Mon Sep 17 00:00:00 2001 From: swordshine Date: Sun, 7 Sep 2014 04:40:57 +0000 Subject: [PATCH] - KTK: Added Dragon's Eye Savants, Horde Ambusher, Ruthless Ripper, Watcher of the Roost --- forge-game/src/main/java/forge/game/card/CardFactoryUtil.java | 3 ++- forge-gui/res/cardsfolder/b/bola_warrior.txt | 2 +- forge-gui/res/cardsfolder/g/grixis_battlemage.txt | 2 +- forge-gui/res/cardsfolder/j/jamuraan_lion.txt | 2 +- forge-gui/res/cardsfolder/k/krark_clan_ogre.txt | 2 +- forge-gui/res/cardsfolder/s/stun.txt | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 4f6dc78b432..3d2b0738595 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -38,6 +38,7 @@ import forge.game.ability.AbilityUtils; import forge.game.ability.ApiType; import forge.game.card.CardPredicates.Presets; import forge.game.cost.Cost; +import forge.game.cost.CostPayment; import forge.game.event.GameEventCardStatsChanged; import forge.game.phase.PhaseHandler; import forge.game.player.Player; @@ -137,7 +138,7 @@ public class CardFactoryUtil { @Override public boolean canPlay() { return sourceCard.getController().equals(this.getActivatingPlayer()) && sourceCard.isFaceDown() - && sourceCard.isInPlay(); + && sourceCard.isInPlay() && CostPayment.canPayAdditionalCosts(cost, this); } }; // morph_up diff --git a/forge-gui/res/cardsfolder/b/bola_warrior.txt b/forge-gui/res/cardsfolder/b/bola_warrior.txt index 454087699cf..c553b36c5bf 100644 --- a/forge-gui/res/cardsfolder/b/bola_warrior.txt +++ b/forge-gui/res/cardsfolder/b/bola_warrior.txt @@ -2,7 +2,7 @@ Name:Bola Warrior ManaCost:1 R Types:Creature Human Spellshaper Warrior PT:1/1 -A:AB$ Pump | Cost$ R T Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. +A:AB$ Pump | Cost$ R T Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/bola_warrior.jpg Oracle:{R}, {T}, Discard a card: Target creature can't block this turn. diff --git a/forge-gui/res/cardsfolder/g/grixis_battlemage.txt b/forge-gui/res/cardsfolder/g/grixis_battlemage.txt index e842a8df714..2194064aadf 100644 --- a/forge-gui/res/cardsfolder/g/grixis_battlemage.txt +++ b/forge-gui/res/cardsfolder/g/grixis_battlemage.txt @@ -4,6 +4,6 @@ Types:Creature Human Wizard PT:2/2 A:AB$ Draw | Cost$ U T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose -A:AB$ Pump | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. +A:AB$ Pump | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. SVar:Picture:http://www.wizards.com/global/images/magic/general/grixis_battlemage.jpg Oracle:{U}, {T}: Draw a card, then discard a card.\n{R}, {T}: Target creature can't block this turn. diff --git a/forge-gui/res/cardsfolder/j/jamuraan_lion.txt b/forge-gui/res/cardsfolder/j/jamuraan_lion.txt index 9f433efee25..50fcf8e7ad3 100644 --- a/forge-gui/res/cardsfolder/j/jamuraan_lion.txt +++ b/forge-gui/res/cardsfolder/j/jamuraan_lion.txt @@ -2,7 +2,7 @@ Name:Jamuraan Lion ManaCost:2 W Types:Creature Cat PT:3/1 -A:AB$ Pump | Cost$ W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. +A:AB$ Pump | Cost$ W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/jamuraan_lion.jpg Oracle:{W}, {T}: Target creature can't block this turn. diff --git a/forge-gui/res/cardsfolder/k/krark_clan_ogre.txt b/forge-gui/res/cardsfolder/k/krark_clan_ogre.txt index 05fd99b97c1..cae09465d8d 100644 --- a/forge-gui/res/cardsfolder/k/krark_clan_ogre.txt +++ b/forge-gui/res/cardsfolder/k/krark_clan_ogre.txt @@ -2,7 +2,7 @@ Name:Krark-Clan Ogre ManaCost:3 R R Types:Creature Ogre PT:3/3 -A:AB$ Pump | Cost$ R Sac<1/Artifact> | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsCurse$ True | KW$ CARDNAME can't block. | SpellDescription$ Target creature can't block this turn. +A:AB$ Pump | Cost$ R Sac<1/Artifact> | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsCurse$ True | KW$ HIDDEN CARDNAME can't block. | SpellDescription$ Target creature can't block this turn. SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/krark_clan_ogre.jpg Oracle:{R}, Sacrifice an artifact: Target creature can't block this turn. diff --git a/forge-gui/res/cardsfolder/s/stun.txt b/forge-gui/res/cardsfolder/s/stun.txt index 2a0565bd90f..9292b702606 100644 --- a/forge-gui/res/cardsfolder/s/stun.txt +++ b/forge-gui/res/cardsfolder/s/stun.txt @@ -1,7 +1,7 @@ Name:Stun ManaCost:1 R Types:Instant -A:SP$ Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. | SubAbility$ DBDraw +A:SP$ Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. | SubAbility$ DBDraw SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card. SVar:Picture:http://www.wizards.com/global/images/magic/general/stun.jpg Oracle:Target creature can't block this turn.\nDraw a card.