diff --git a/.gitattributes b/.gitattributes index 358d441812c..48b25efcab6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7677,6 +7677,7 @@ res/cardsfolder/s/scuttlemutt.txt -text res/cardsfolder/s/scuttling_death.txt svneol=native#text/plain res/cardsfolder/s/scuzzback_marauders.txt svneol=native#text/plain res/cardsfolder/s/scuzzback_scrapper.txt svneol=native#text/plain +res/cardsfolder/s/scythe_of_the_wretched.txt -text res/cardsfolder/s/scythe_tiger.txt -text res/cardsfolder/s/sea_drake.txt svneol=native#text/plain res/cardsfolder/s/sea_eagle.txt svneol=native#text/plain diff --git a/res/cardsfolder/s/scythe_of_the_wretched.txt b/res/cardsfolder/s/scythe_of_the_wretched.txt new file mode 100644 index 00000000000..3b4cf974221 --- /dev/null +++ b/res/cardsfolder/s/scythe_of_the_wretched.txt @@ -0,0 +1,14 @@ +Name:Scythe of the Wretched +ManaCost:2 +Types:Artifact Equipment +Text:Equipped creature gets +2/+2 +K:eqPump 4:+2/+2 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Creature.wasDealtDamageByEquipeeThisTurn | Execute$ ScytheReturn | TriggerDescription$ Whenever a creature dealt damage by equipped creature this turn dies, return that card to the battlefield under your control. Attach CARDNAME to that creature. +SVar:ScytheReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredCard | RememberChanged$ True | SubAbility$ ScytheAttach +SVar:ScytheAttach:DB$ Attach | Defined$ Remembered | SubAbility$ WretchedCleanup +SVar:WretchedCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/scythe_of_the_wretched.jpg +SetInfo:MRD|Rare|http://magiccards.info/scans/mi/en/239.jpg +Oracle:Equipped creature gets +2/+2.\nWhenever a creature dealt damage by equipped creature this turn dies, return that card to the battlefield under your control. Attach Scythe of the Wretched to that creature.\nEquip {4} +End \ No newline at end of file diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index c3178e6e834..4a0c0d076b7 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -7112,6 +7112,11 @@ public class Card extends GameEntity implements Comparable { if (!this.getReceivedDamageFromThisTurn().keySet().contains(source)) { return false; } + } else if (property.equals("wasDealtDamageByEquipeeThisTurn")) { + Card equipee = source.getEquippingCard(); + if (!this.getReceivedDamageFromThisTurn().keySet().contains(equipee)) { + return false; + } } else if (property.startsWith("attackedThisTurn")) { if (!this.getCreatureAttackedThisTurn()) { return false;