diff --git a/res/cardsfolder/o/oracle_of_nectars.txt b/res/cardsfolder/o/oracle_of_nectars.txt index 29f82069759..118e1dd48b7 100644 --- a/res/cardsfolder/o/oracle_of_nectars.txt +++ b/res/cardsfolder/o/oracle_of_nectars.txt @@ -5,7 +5,6 @@ PT:2/2 Text:no text A:AB$ GainLife | LifeAmount$ X | Cost$ T X | SpellDescription$ You gain X life. SVar:X:Count$xPaid -SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/oracle_of_nectars.jpg SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/233.jpg diff --git a/res/cardsfolder/p/pernicious_deed.txt b/res/cardsfolder/p/pernicious_deed.txt index aea2aa0a8dd..ef839300c87 100644 --- a/res/cardsfolder/p/pernicious_deed.txt +++ b/res/cardsfolder/p/pernicious_deed.txt @@ -4,7 +4,7 @@ Types:Enchantment Text:no text A:AB$ DestroyAll | Cost$ X Sac<1/CARDNAME> | ValidCards$ Artifact.cmcLEX,Creature.cmcLEX,Enchantment.cmcLEX | SpellDescription$ Destroy each artifact, creature, and enchantment with converted mana cost X or less. SVar:X:Count$xPaid -SVar:RemRandomDeck:True +SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/pernicious_deed.jpg SetInfo:APC|Rare|http://magiccards.info/scans/en/ap/114.jpg diff --git a/res/cardsfolder/p/primordial_hydra.txt b/res/cardsfolder/p/primordial_hydra.txt index 15c679c28d6..fa7dbee38b5 100644 --- a/res/cardsfolder/p/primordial_hydra.txt +++ b/res/cardsfolder/p/primordial_hydra.txt @@ -9,6 +9,7 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | E SVar:TrigDoubleCounters:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ Double SVar:X:Count$xPaid SVar:Double:Count$CardCounters.P1P1 +SVar:RemAIDeck:True SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/primordial_hydra.jpg SetInfo:M12|Mythic|http://magiccards.info/scans/en/m12/189.jpg diff --git a/res/cardsfolder/p/psychic_drain.txt b/res/cardsfolder/p/psychic_drain.txt index 3286716d41a..d618c5eae2b 100644 --- a/res/cardsfolder/p/psychic_drain.txt +++ b/res/cardsfolder/p/psychic_drain.txt @@ -5,7 +5,6 @@ Text:no text A:SP$ Mill | Cost$ X U B | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ X | SubAbility$ SVar=DBYouGainLife | SpellDescription$ Target player puts the top X cards of his or her library into his or her graveyard and you gain X life. SVar:DBYouGainLife:DB$GainLife | Defined$ You | LifeAmount$ X SVar:X:Count$xPaid -SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/psychic_drain.jpg SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/220.jpg diff --git a/res/cardsfolder/r/rise_of_the_hobgoblins.txt b/res/cardsfolder/r/rise_of_the_hobgoblins.txt index d4b13e3e691..467527204fb 100644 --- a/res/cardsfolder/r/rise_of_the_hobgoblins.txt +++ b/res/cardsfolder/r/rise_of_the_hobgoblins.txt @@ -6,6 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S SVar:TrigToken:AB$Token | Cost$ X | TokenAmount$ X | TokenName$ Goblin Soldier | TokenTypes$ Creature,Goblin,Soldier | TokenOwner$ You | TokenColors$ Red,White | TokenPower$ 1 | TokenToughness$ 1 SVar:X:Count$xPaid A:AB$ PumpAll | Cost$ RW | ValidCards$ Creature.Red+YouCtrl,Creature.White+YouCtrl | KW$ First Strike | SpellDescription$ Red creatures and white creatures you control gain first strike until end of turn. +SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/rise_of_the_hobgoblins.jpg SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/145.jpg diff --git a/res/cardsfolder/r/rolling_earthquake.txt b/res/cardsfolder/r/rolling_earthquake.txt index 2b67fa9128d..8302789b2be 100644 --- a/res/cardsfolder/r/rolling_earthquake.txt +++ b/res/cardsfolder/r/rolling_earthquake.txt @@ -4,7 +4,7 @@ Types:Sorcery Text:no text A:SP$ DamageAll | Cost$ X R | ValidCards$ Creature.withoutHorsemanship | ValidPlayers$ Each | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to each creature without horsemanship and each player. SVar:X:Count$xPaid -SVar:RemRandomDeck:True +SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/rolling_earthquake.jpg SetInfo:PTK|Rare|http://magiccards.info/scans/en/p3k/122.jpg diff --git a/res/cardsfolder/s/starstorm.txt b/res/cardsfolder/s/starstorm.txt index a75c55681d4..9a76b182d31 100644 --- a/res/cardsfolder/s/starstorm.txt +++ b/res/cardsfolder/s/starstorm.txt @@ -5,7 +5,7 @@ Text:no text K:Cycling:3 A:SP$ DamageAll | Cost$ X R R | ValidCards$ Creature | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to each creature. SVar:X:Count$xPaid -SVar:RemRandomDeck:True +SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/starstorm.jpg SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/238.jpg diff --git a/res/cardsfolder/s/stroke_of_genius.txt b/res/cardsfolder/s/stroke_of_genius.txt index 92740149e78..053e6ba6e9f 100644 --- a/res/cardsfolder/s/stroke_of_genius.txt +++ b/res/cardsfolder/s/stroke_of_genius.txt @@ -4,7 +4,6 @@ Types:Instant Text:no text A:SP$ Draw | Cost$ X 2 U | ValidTgts$ Player | TgtPrompt$ Choose a player | NumCards$ X | SpellDescription$ Target player draws X cards. SVar:X:Count$xPaid -SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/stroke_of_genius.jpg SetInfo:USG|Rare|http://magiccards.info/scans/en/us/100.jpg diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java index 3f83217984a..f847017e175 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java @@ -783,6 +783,9 @@ public class AbilityFactoryZoneAffecting { final int cardsToDiscard = Math.min(ComputerUtil.determineLeftoverMana(sa), AllZone.getHumanPlayer() .getCardsIn(Constant.Zone.Library).size()); source.setSVar("PayX", Integer.toString(cardsToDiscard)); + if (cardsToDiscard <= 0) { + return false; + } } return randomReturn;