From ed03f95e6439e7d14ed6e53f8681fdb8d56088d7 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 21:49:09 +0000 Subject: [PATCH] - Added Knight of Dusk. --- .gitattributes | 1 + res/cardsfolder/knight_of_dusk.txt | 9 +++++++++ res/cardsfolder/royal_assassin.txt | 2 +- src/forge/Card.java | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 res/cardsfolder/knight_of_dusk.txt diff --git a/.gitattributes b/.gitattributes index 4b43d3bee20..061f8ac86bc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3553,6 +3553,7 @@ res/cardsfolder/knight_errant.txt -text svneol=native#text/plain res/cardsfolder/knight_exemplar.txt -text svneol=native#text/plain res/cardsfolder/knight_of_cliffhaven.txt -text svneol=native#text/plain res/cardsfolder/knight_of_dawn.txt -text svneol=native#text/plain +res/cardsfolder/knight_of_dusk.txt -text svneol=native#text/plain res/cardsfolder/knight_of_meadowgrain.txt -text svneol=native#text/plain res/cardsfolder/knight_of_new_alara.txt -text svneol=native#text/plain res/cardsfolder/knight_of_stromgald.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/knight_of_dusk.txt b/res/cardsfolder/knight_of_dusk.txt new file mode 100644 index 00000000000..9174081a05c --- /dev/null +++ b/res/cardsfolder/knight_of_dusk.txt @@ -0,0 +1,9 @@ +Name:Knight of Dusk +ManaCost:1 B B +Types:Creature Human Knight +Text:no text +PT:2/2 +A:AB$ Destroy | Cost$ B B | ValidTgts$ Creature.blockingSource | TgtPrompt$ Select target creature blocking Knight of Dusk | SpellDescription$ Destroy target creature blocking CARDNAME. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/knight_of_dusk.jpg +End diff --git a/res/cardsfolder/royal_assassin.txt b/res/cardsfolder/royal_assassin.txt index 99bc76acabd..73233a3040b 100644 --- a/res/cardsfolder/royal_assassin.txt +++ b/res/cardsfolder/royal_assassin.txt @@ -3,7 +3,7 @@ ManaCost:1 B B Types:Creature Human Assassin Text:no text PT:1/1 -A:AB$Destroy | Cost$ T | ValidTgts$ Creature.tapped | TgtPrompt$ Select target tapped creature | SpellDescription$ Destroy target tapped creature. +A:AB$ Destroy | Cost$ T | ValidTgts$ Creature.tapped | TgtPrompt$ Select target tapped creature | SpellDescription$ Destroy target tapped creature. SVar:Rarity:Rare SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83235.jpg SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/159.jpg diff --git a/src/forge/Card.java b/src/forge/Card.java index bf1a3827927..42a5af59ef8 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -2797,7 +2797,7 @@ public class Card extends MyObservable { else if (Property.startsWith("notattacking")) { if(isAttacking()) return false;} - else if (Property.startsWith("blocking")) { if(!isBlocking()) return false;} + else if (Property.equals("blocking")) { if(!isBlocking()) return false;} else if (Property.startsWith("blockingSource")) { if(!isBlocking(source)) return false;}