diff --git a/.gitattributes b/.gitattributes index e36e831fcaf..9622f0fd26e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3705,6 +3705,7 @@ res/cardsfolder/reborn_hope.txt -text svneol=native#text/plain res/cardsfolder/rebuff_the_wicked.txt -text svneol=native#text/plain res/cardsfolder/rebuild.txt -text svneol=native#text/plain res/cardsfolder/recall.txt -text svneol=native#text/plain +res/cardsfolder/reciprocate.txt -text svneol=native#text/plain res/cardsfolder/reckless_abandon.txt -text svneol=native#text/plain res/cardsfolder/reckless_assault.txt -text svneol=native#text/plain res/cardsfolder/reckless_charge.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/giltspire_avenger.txt b/res/cardsfolder/giltspire_avenger.txt index 5b9db25447a..7fe923879f2 100644 --- a/res/cardsfolder/giltspire_avenger.txt +++ b/res/cardsfolder/giltspire_avenger.txt @@ -4,6 +4,7 @@ Types:Creature Human Soldier Text:no text PT:2/2 K:Exalted +A:AB$Destroy | Cost$ T | ValidTgts$ Creature.dealtDamageToYouThisTurn | TgtPrompt$ Select target creature that dealt damage to you this turn | SpellDescription$ Destroy target creature that dealt damage to you this turn. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/giltspire_avenger.jpg SetInfo:CFX|Rare|http://magiccards.info/scans/en/cfx/108.jpg diff --git a/res/cardsfolder/reciprocate.txt b/res/cardsfolder/reciprocate.txt new file mode 100644 index 00000000000..0fd123893d3 --- /dev/null +++ b/res/cardsfolder/reciprocate.txt @@ -0,0 +1,9 @@ +Name:Reciprocate +ManaCost:W +Types:Instant +Text:no text +A:SP$Bounce | Cost$ W | ValidTgts$ Creature.dealtDamageToYouThisTurn | TgtPrompt$ Select target creature that dealt damage to you this turn | Destination$ Exile | SpellDescription$ Exile target creature that dealt damage to you this turn. +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/reciprocate.jpg +End \ No newline at end of file diff --git a/src/forge/Card.java b/src/forge/Card.java index e817dd8094a..4d4bdd849fd 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -2443,6 +2443,8 @@ public class Card extends MyObservable { { if(!isFaceDown()) return false;} else if (Property.startsWith("enteredBattlefieldThisTurn")) { if(!(getTurnInZone() == AllZone.Phase.getTurn())) return false;} + else if (Property.startsWith("dealtDamageToYouThisTurn")) + { if(!(dealtDmgToOppThisTurn && !getController().isPlayer(sourceController))) return false;} else if (Property.startsWith("enchanted")) { if(!isEnchanted()) return false;} diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 96c520d254b..b052179c2fd 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -5818,7 +5818,7 @@ public class CardFactory_Creatures { ability.setStackDescription(sb.toString()); }//*************** END ************ END ************************** - + /*keyworded //*************** START *********** START ************************** else if(cardName.equals("Giltspire Avenger")) { final Ability_Tap ability = new Ability_Tap(card) { @@ -5872,7 +5872,7 @@ public class CardFactory_Creatures { ability.setDescription("tap: Destroy target creature that dealt damage to you this turn."); ability.setBeforePayMana(target); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Vedalken Plotter")) {