diff --git a/res/cards.txt b/res/cards.txt index bd8649feab2..818055ee9c3 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,46 @@ +Glimmervoid +no cost +Land +At the beginning of the end step, if you control no artifacts, sacrifice CARDNAME. +tap: add W +tap: add B +tap: add U +tap: add R +tap: add G +SVar:RemAIDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/glimmervoid.jpg + +Mana Drain +U U +Instant +Counter target spell. At the beginning of your next main phase, add X to your mana pool, where X is that spell's converted mana cost. +SVar:RemAIDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_drain.jpg + +Primal Bellow +G +Instant +no text +spPumpTgt:+X/+X:Target creature gets +1/+1 until end of turn for each Forest you control.:Primal Bellow - Target creature gets +X/+X until end of turn +SVar:X:Count$TypeYouCtrl.Forest +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/primal_bellow.jpg + +Thran Quarry +no cost +Land +At the beginning of the end step, if you control no creatures, sacrifice CARDNAME. +tap: add W +tap: add B +tap: add U +tap: add R +tap: add G +SVar:RemAIDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/thran_quarry.jpg + Angel of Despair 3 W W B B Creature Angel @@ -12206,19 +12249,6 @@ abPump U:Shroud SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/glimmering_angel.jpg -Glimmervoid -no cost -Land -At the beginning of the end step, if you control no artifacts, sacrifice CARDNAME -tap: add W -tap: add B -tap: add U -tap: add R -tap: add G -SVar:RemAIDeck:True -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/glimmervoid.jpg - Glimpse the Unthinkable U B Sorcery @@ -18723,14 +18753,6 @@ SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_cylix.jpg -Mana Drain -U U -Instant -Counter target spell. At the beginning of your next main phase, add X to your mana pool, where X is that spell's converted mana cost -SVar:RemAIDeck:True -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_drain.jpg - Mana Leak 1 U Instant @@ -22984,15 +23006,6 @@ SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/priest_of_titania.jpg -Primal Bellow -G -Instant -no text -spPumpTgt:+X/+X:Target creature gets +1/+1 until end of turn for each Forest you control:Primal Bellow - Target creature gets +X/+X until end of turn -SVar:X:Count$TypeYouCtrl.Forest -SVar:Rarity:Uncommon -SVar:Picture:http://www.wizards.com/global/images/magic/general/primal_bellow.jpg - Primal Boost 2 G Instant @@ -31216,19 +31229,6 @@ StaticEffect:Play:Self:PTBonus/2/2!Keyword/Flying!Keyword/First Strike!Keyword/T SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/thran_golem.jpg -Thran Quarry -no cost -Land -At the beginning of the end step, if you control no creatures, sacrifice CARDNAME -tap: add W -tap: add B -tap: add U -tap: add R -tap: add G -SVar:RemAIDeck:True -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/thran_quarry.jpg - Thran War Machine 4 Artifact Creature Construct diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 1eb5e2a9b80..9b18ea3da3b 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -6693,13 +6693,18 @@ public class CardFactory implements NewConstants { @Override public void resolve() { String s = getTargetPlayer(); - setStackDescription("Necrogen Spellbomb - " + s + " discards a card"); + + StringBuilder sb = new StringBuilder(); + sb.append("Necrogen Spellbomb - ").append(s).append(" discards a card"); + setStackDescription(sb.toString()); + // setStackDescription("Necrogen Spellbomb - " + s + " discards a card"); + if(Constant.Player.Computer.equals(getTargetPlayer())) AllZone.GameAction.discardRandom(getTargetPlayer(), this); else AllZone.InputControl.setInput(CardFactoryUtil.input_discard(this)); AllZone.GameAction.sacrifice(getSourceCard()); }//resolve() };//SpellAbility - ability.setDescription("B, Sacrifice Necrogen Spellbomb: Target player discards a card"); + ability.setDescription("B, Sacrifice Necrogen Spellbomb: Target player discards a card."); ability.setBeforePayMana(CardFactoryUtil.input_targetPlayer(ability)); card.addSpellAbility(ability); } //*************** END ************ END ************************** @@ -8132,8 +8137,11 @@ public class CardFactory implements NewConstants { } };//SpellAbility - ability2.setDescription("2, tap: You gain 1 life"); - ability2.setStackDescription(cardName + " - You gain 1 life."); + ability2.setDescription("2, tap: You gain 1 life."); + // ability2.setStackDescription(cardName + " - You gain 1 life."); + StringBuilder sb2 = new StringBuilder(); + sb2.append(cardName).append(" - You gain 1 life."); + ability2.setStackDescription(sb2.toString()); final SpellAbility ability3 = new Ability_Tap(card, "3") { private static final long serialVersionUID = 1125696151526415705L; @@ -8211,7 +8219,10 @@ public class CardFactory implements NewConstants { };//SpellAbility ability5.setDescription("5, tap: Draw a card."); - ability5.setStackDescription(card.getName() + " - draw a card."); + // ability5.setStackDescription(card.getName() + " - draw a card."); + StringBuilder sb5 = new StringBuilder(); + sb5.append(card.getName()).append(" - draw a card."); + ability5.setStackDescription(sb5.toString()); card.addSpellAbility(ability2); card.addSpellAbility(ability3); diff --git a/src/forge/CardFactory_Equipment.java b/src/forge/CardFactory_Equipment.java index a936fa2504f..7112196139c 100644 --- a/src/forge/CardFactory_Equipment.java +++ b/src/forge/CardFactory_Equipment.java @@ -386,7 +386,7 @@ class CardFactory_Equipment { } } };//Input - negBoost.setDescription("Remove a charge counter from Umezawa's Jitte: Target creature gets -1/-1 until end of turn"); + negBoost.setDescription("Remove a charge counter from Umezawa's Jitte: Target creature gets -1/-1 until end of turn."); negBoost.setBeforePayMana(target);