diff --git a/res/cards.txt b/res/cards.txt index cd8b93f1678..03f16c98676 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1104,7 +1104,7 @@ VanillaEquipment:0:6:3:none:none:none Cinder Pyromancer 2 R Creature Elemental Shaman -Whenever you cast a red spell, you may untap Cinder Pyromancer. +Whenever you cast a red spell, you may untap Cinder Pyromancer. (NOTE: This card can mistakenly damage either a player or a creature.) 0/1 abDamageCP T:1 @@ -1927,6 +1927,7 @@ Riding the Dilu Horse 2 G Sorcery Target creature gets +2/+2 and gains horsemanship. +spPumpTgt:+2/+2/Horsemanship Magus of the Coffers 4 B @@ -5111,6 +5112,7 @@ Wildsize Instant Target creature gets +2/+2 and gains trample until end of turn. Draw a card. spPumpTgt:+2/+2/Trample +Cantrip Biomantic Mastery 4 UG UG UG @@ -14167,6 +14169,7 @@ Brute Force R Instant Target creature gets +3/+3 until end of turn. +spPumpTgt:+3/+3 Primal Clay 4 @@ -15282,6 +15285,7 @@ Angelic Blessing 2 W Sorcery Target creature gets +3/+3 and gains flying until end of turn. +spPumpTgt:+3/+3/Flying Life Burst 1 W diff --git a/res/main.properties b/res/main.properties index b4307c5a3f9..4bc9fa4f19d 100644 --- a/res/main.properties +++ b/res/main.properties @@ -1,6 +1,6 @@ program/mail=mtgerror@yahoo.com program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26 -program/version=Forge -- official beta: 09/12/14, SVN revision: 248 +program/version=Forge -- official beta: 09/12/14, SVN revision: 249 tokens--file=AllTokens.txt diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 30a1603b3e5..9aa78b00fec 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -4820,7 +4820,7 @@ public class CardFactory implements NewConstants { }//*************** END ************ END ************************** - +/* //*************** START *********** START ************************** else if(cardName.equals("Angelic Blessing")) { @@ -4881,10 +4881,10 @@ public class CardFactory implements NewConstants { spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell)); }//*************** END ************ END ************************** +*/ - -//*************** START *********** START ************************** + //*************** START *********** START ************************** else if (cardName.equals("Molten Rain")) { final SpellAbility spell = new Spell(card) @@ -14047,8 +14047,8 @@ public class CardFactory implements NewConstants { }//*************** END ************ END ************************** - -//*************** START *********** START ************************** +/* + //*************** START *********** START ************************** else if(cardName.equals("Brute Force")) { SpellAbility spell = new Spell(card) @@ -14116,6 +14116,7 @@ public class CardFactory implements NewConstants { card.clearSpellAbility(); card.addSpellAbility(spell); }//*************** END ************ END ************************** +*/ //*************** START *********** START ************************** @@ -14391,7 +14392,9 @@ public class CardFactory implements NewConstants { card.addSpellAbility(spell); //card.addSpellAbility(CardFactoryUtil.ability_cycle(card, "2 G")); }//*************** END ************ END ************************** - + + +/* //*************** START *********** START ************************** else if(cardName.equals("Wildsize")) { @@ -14457,8 +14460,10 @@ public class CardFactory implements NewConstants { card.clearSpellAbility(); card.addSpellAbility(spell); }//*************** END ************ END ************************** - - //*************** START *********** START ************************** +*/ + + + //*************** START *********** START ************************** else if(cardName.equals("Feral Lightning")) { SpellAbility spell = new Spell(card) @@ -16762,6 +16767,8 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase(); card.addSpellAbility(spell); }//*************** END ************ END ************************** + +/* //*************** START *********** START ************************** else if(cardName.equals("Riding the Dilu Horse")) { @@ -16810,8 +16817,10 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase(); card.clearSpellAbility(); card.addSpellAbility(spell); }//*************** END ************ END ************************** +*/ - //*************** START *********** START ************************** + + //*************** START *********** START ************************** else if (cardName.equals("Millstone")) { Ability_Tap ab1 = new Ability_Tap(card, "2")