diff --git a/res/cardsfolder/conquerors_pledge.txt b/res/cardsfolder/conquerors_pledge.txt index f6d7827c70e..9457d74f969 100644 --- a/res/cardsfolder/conquerors_pledge.txt +++ b/res/cardsfolder/conquerors_pledge.txt @@ -2,7 +2,8 @@ Name:Conqueror's Pledge ManaCost:2 W W W Types:Sorcery Text:no text +A:SP$ Token | Cost$ 2 W W W | TokenAmount$ 6 | TokenName$ Kor Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put six 1/1 white Kor Soldier creature tokens onto the battlefield. If CARDNAME was kicked, put twelve of those tokens onto the battlefield instead. +A:SP$ Token | Cost$ 8 W W W | TokenAmount$ 12 | TokenName$ Kor Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Kicker 6 (You may pay an additional 6 as you cast this spell.) SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/conquerors_pledge.jpg -SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/8.jpg -End \ No newline at end of file +End diff --git a/src/forge/card/cardFactory/CardFactory_Sorceries.java b/src/forge/card/cardFactory/CardFactory_Sorceries.java index 8e4527749c5..73b25da09b6 100644 --- a/src/forge/card/cardFactory/CardFactory_Sorceries.java +++ b/src/forge/card/cardFactory/CardFactory_Sorceries.java @@ -2127,57 +2127,7 @@ public class CardFactory_Sorceries { card.addSpellAbility(kicker); spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell)); }//*************** END ************ END ************************** - - - //*************** START *********** START ************************** - else if(cardName.equals("Conqueror's Pledge")) { - SpellAbility spell = new Spell(card) { - private static final long serialVersionUID = -2902179434079334177L; - @Override - public void resolve() { - for(int i = 0; i < 6; i++) { - CardFactoryUtil.makeToken("Kor Soldier", "W 1 1 Kor Soldier", card.getController(), "W", new String[] { - "Creature", "Kor", "Soldier"}, 1, 1, new String[] {""}); - }//for - }//resolve() - }; - - spell.setDescription("Put six 1/1 white Kor Soldier creature tokens onto the battlefield."); - - StringBuilder sb = new StringBuilder(); - sb.append(card.getName()).append(" - ").append(card.getController()); - sb.append(" puts six 1/1 white Kor Soldier creature tokens onto the battlefield."); - spell.setStackDescription(sb.toString()); - - SpellAbility kicker = new Spell(card) { - private static final long serialVersionUID = 1376255732058673590L; - - @Override - public void resolve() { - card.setKicked(true); - for(int i = 0; i < 12; i++) { - CardFactoryUtil.makeToken("Kor Soldier", "W 1 1 Kor Soldier", card.getController(), "W", new String[] { - "Creature", "Kor", "Soldier"}, 1, 1, new String[] {""}); - }//for - }//resolve() - }; - kicker.setKickerAbility(true); - kicker.setManaCost("8 W W W"); - kicker.setAdditionalManaCost("6"); - kicker.setDescription("Kicker 6: If Conqueror's Pledge was kicked, put twelve of those tokens onto the battlefield instead."); - - StringBuilder sbkick = new StringBuilder(); - sbkick.append(card.getName()).append(" - ").append(card.getController()); - sbkick.append(" puts twelve 1/1 white Kor Soldier creature tokens onto the battlefield."); - kicker.setStackDescription(sbkick.toString()); - - // Do not remove SpellAbilities created by AbilityFactory or Keywords. - card.clearFirstSpellAbility(); - card.addSpellAbility(spell); - card.addSpellAbility(kicker); - }//*************** END ************ END ************************** - //*************** START *********** START ************************** else if(cardName.equals("Traumatize")) {