diff --git a/.gitattributes b/.gitattributes index 9c7fa918696..eb5044d2bf4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5797,6 +5797,7 @@ res/cardsfolder/k/kuldotha_rebirth.txt svneol=native#text/plain res/cardsfolder/k/kuldotha_ringleader.txt svneol=native#text/plain res/cardsfolder/k/kulrath_knight.txt svneol=native#text/plain res/cardsfolder/k/kumano_master_yamabushi.txt -text +res/cardsfolder/k/kumanos_blessing.txt -text res/cardsfolder/k/kumanos_pupils.txt -text res/cardsfolder/k/kuon_ogre_ascendant_kuons_essence.txt -text res/cardsfolder/k/kurgadon.txt svneol=native#text/plain @@ -12074,6 +12075,7 @@ res/cardsfolder/w/wingrattle_scarecrow.txt svneol=native#text/plain res/cardsfolder/w/wings_of_aesthir.txt svneol=native#text/plain res/cardsfolder/w/wings_of_hope.txt svneol=native#text/plain res/cardsfolder/w/wings_of_velis_vel.txt svneol=native#text/plain +res/cardsfolder/w/winnow.txt -text res/cardsfolder/w/winnower_patrol.txt svneol=native#text/plain res/cardsfolder/w/winter_blast.txt -text res/cardsfolder/w/winter_orb.txt svneol=native#text/plain diff --git a/res/cardsfolder/k/kumanos_blessing.txt b/res/cardsfolder/k/kumanos_blessing.txt new file mode 100644 index 00000000000..a6d888022dc --- /dev/null +++ b/res/cardsfolder/k/kumanos_blessing.txt @@ -0,0 +1,10 @@ +Name:Kumano's Blessing +ManaCost:2 R +Types:Enchantment Aura +K:Flash +K:Enchant creature +A:SP$ Attach | Cost$ 2 R | ValidTgts$ Creature | AILogic$ Pump +S:Mode$ Continuous | Affected$ Creature.wasDealtDamageByEnchantedThisTurn | AddHiddenKeyword$ If CARDNAME would be put into a graveyard, exile it instead. | Description$ If a creature dealt damage by enchanted creature this turn would die, exile it instead. +SVar:Picture:http://www.wizards.com/global/images/magic/general/kumanos_blessing.jpg +SetInfo:BOK|Common|http://magiccards.info/scans/en/bok/111.jpg +Oracle:Flash\nEnchant creature\nIf a creature dealt damage by enchanted creature this turn would die, exile it instead. diff --git a/res/cardsfolder/m/master_of_the_wild_hunt_avatar.txt b/res/cardsfolder/m/master_of_the_wild_hunt_avatar.txt index 94c3af6cbaa..5466f901ad1 100644 --- a/res/cardsfolder/m/master_of_the_wild_hunt_avatar.txt +++ b/res/cardsfolder/m/master_of_the_wild_hunt_avatar.txt @@ -9,4 +9,5 @@ SVar:Antelope:DB$ Token | TokenAmount$ 1 | TokenName$ Antelope | TokenTypes$ Cre SVar:Cat:DB$ Token | TokenAmount$ 1 | TokenName$ Cat | TokenTypes$ Creature,Cat | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 2 | TokenKeywords$ Shroud | ChoiceDescription$ Cat SVar:Rhino:DB$ Token | TokenAmount$ 1 | TokenName$ Rhino | TokenTypes$ Creature,Rhino | TokenOwner$ You | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Trample | ChoiceDescription$ Rhino SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/master_of_the_wild_hunt_avatar.jpg -SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo-2/master-of-the-wild-hunt.jpg \ No newline at end of file +SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo-2/master-of-the-wild-hunt.jpg +Oracle:Hand +1, life +3\n{2}{G}: Put a green creature token onto the battlefield that's a 2/2 Wolf, a 2/3 Antelope with forestwalk, a 3/2 Cat with shroud, or a 4/4 Rhino with trample, chosen at random. diff --git a/res/cardsfolder/w/winnow.txt b/res/cardsfolder/w/winnow.txt new file mode 100644 index 00000000000..5129bec61da --- /dev/null +++ b/res/cardsfolder/w/winnow.txt @@ -0,0 +1,12 @@ +Name:Winnow +ManaCost:1 W +Types:Instant +A:SP$ Destroy | Cost$ 1 W | ValidTgts$ Permanent.nonLand | RememberTargets$ True | ConditionCheckSVar$ WinnowCheck | ConditionSVarCompare$ GE2 | SubAbility$ DBDraw | SpellDescription$ Destroy target nonland permanent if another permanent with the same name is on the battlefield. Draw a card. +SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:WinnowCheck:Count$Valid Permanent.sharesNameWith Remembered +SVar:RemAIDeck:True +SVar:RemRandomDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/winnow.jpg +SetInfo:INV|Rare|http://magiccards.info/scans/en/in/45.jpg +Oracle:Destroy target nonland permanent if another permanent with the same name is on the battlefield.\nDraw a card. diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index da9c5799804..8fd257079fd 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -6981,6 +6981,12 @@ public class Card extends GameEntity implements Comparable { || !this.getReceivedDamageFromThisTurn().keySet().contains(equipee)) { return false; } + } else if (property.equals("wasDealtDamageByEnchantedThisTurn")) { + Card enchanted = source.getEnchantingCard(); + if (this.getReceivedDamageFromThisTurn().keySet().isEmpty() + || !this.getReceivedDamageFromThisTurn().keySet().contains(enchanted)) { + return false; + } } else if (property.startsWith("dealtDamageThisTurn")) { if (this.getTotalDamageDoneBy() == 0) { return false;