From e0be0e3da3e631a0f9c209499805a9c1e3a9ba86 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 09:17:48 +0000 Subject: [PATCH] - fixed the nullpointer bug with Tithe. (realized that the card is in no way properly implemented). - Converted to keyword: Sunlance and Nameless Inversion. --- res/cardsfolder/nameless_inversion.txt | 3 ++- res/cardsfolder/sunlance.txt | 3 ++- src/forge/CardFactory_Instants.java | 6 +++--- src/forge/CardFactory_Sorceries.java | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/res/cardsfolder/nameless_inversion.txt b/res/cardsfolder/nameless_inversion.txt index 620e4af5de2..71bcf5f9598 100644 --- a/res/cardsfolder/nameless_inversion.txt +++ b/res/cardsfolder/nameless_inversion.txt @@ -1,7 +1,8 @@ Name:Nameless Inversion ManaCost:1 B Types:Tribal Instant Shapeshifter -Text:Target creature gets +3/-3 until end of turn. +Text:no text +K:spPumpTgtCurse:+3/-3 K:Changeling SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/nameless_inversion.jpg diff --git a/res/cardsfolder/sunlance.txt b/res/cardsfolder/sunlance.txt index bceb09b3c61..95e3243b149 100644 --- a/res/cardsfolder/sunlance.txt +++ b/res/cardsfolder/sunlance.txt @@ -1,7 +1,8 @@ Name:Sunlance ManaCost:W Types:Sorcery -Text:Sunlance deals 3 damage to target nonwhite creature. +Text:no text +A:SP$DealDamage|Cost$W|ValidTgts$Creature.nonWhite|TgtPrompt$Select target nonwhite Creature|NumDmg$3|SpellDescription$Sunlance deals 3 damage to target nonwhite creature. SVar:Rarity:Common SVar:Picture:http://resources.wizards.com/magic/cards/plc/en-us/card122355.jpg End diff --git a/src/forge/CardFactory_Instants.java b/src/forge/CardFactory_Instants.java index 3cc39fa9306..57b0e27804f 100644 --- a/src/forge/CardFactory_Instants.java +++ b/src/forge/CardFactory_Instants.java @@ -3031,7 +3031,7 @@ public class CardFactory_Instants { self = self.getType("Land"); opp = opp.getType("Land"); - return (self.size() < opp.size()) && super.canPlay(); + return (self.size() < opp.size()); // && super.canPlay(); }//oppoMoreLand() @Override @@ -3052,7 +3052,7 @@ public class CardFactory_Instants { card.addSpellAbility(spell); }//*************** END ************ END ************************** - + /* converted to keyword //*************** START *********** START ************************** else if(cardName.equals("Nameless Inversion")) { SpellAbility spell = new Spell(card) { @@ -3100,7 +3100,7 @@ public class CardFactory_Instants { card.setSVar("PlayMain1", "TRUE"); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Primal Boost")) { diff --git a/src/forge/CardFactory_Sorceries.java b/src/forge/CardFactory_Sorceries.java index a17fe669501..3c3f7d1a216 100644 --- a/src/forge/CardFactory_Sorceries.java +++ b/src/forge/CardFactory_Sorceries.java @@ -2116,6 +2116,7 @@ public class CardFactory_Sorceries { spell.setBeforePayMana(target); }//*************** END ************ END ************************** + /* keyworded //*************** START *********** START ************************** else if(cardName.equals("Sunlance")) { final SpellAbility spell = new Spell(card) { @@ -2198,7 +2199,7 @@ public class CardFactory_Sorceries { spell.setBeforePayMana(target); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Firebolt")) {