From 3c20f384f573d7d34d7d71fdf5b0ec72c6e358ae Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Tue, 25 Jun 2013 08:59:39 +0000
Subject: [PATCH] - Added Joven's Ferrets.

---
 .gitattributes                        |  1 +
 res/cardsfolder/j/jovens_ferrets.txt  | 11 +++++++++++
 res/cardsfolder/v/venomous_breath.txt |  6 +++---
 src/main/java/forge/Card.java         |  2 ++
 4 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 res/cardsfolder/j/jovens_ferrets.txt

diff --git a/.gitattributes b/.gitattributes
index a68f71225b8..2a5f214a7f7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5647,6 +5647,7 @@ res/cardsfolder/j/journey_of_discovery.txt -text
 res/cardsfolder/j/journey_to_nowhere.txt svneol=native#text/plain
 res/cardsfolder/j/journeyers_kite.txt svneol=native#text/plain
 res/cardsfolder/j/joven.txt svneol=native#text/plain
+res/cardsfolder/j/jovens_ferrets.txt -text
 res/cardsfolder/j/jovens_tools.txt svneol=native#text/plain
 res/cardsfolder/j/jovial_evil.txt svneol=native#text/plain
 res/cardsfolder/j/joyous_respite.txt svneol=native#text/plain
diff --git a/res/cardsfolder/j/jovens_ferrets.txt b/res/cardsfolder/j/jovens_ferrets.txt
new file mode 100644
index 00000000000..32040c8d8cf
--- /dev/null
+++ b/res/cardsfolder/j/jovens_ferrets.txt
@@ -0,0 +1,11 @@
+Name:Joven's Ferrets
+ManaCost:G
+Types:Creature Ferret
+PT:1/1
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +0/+2 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumDef$ 2
+T:Mode$ Phase | Phase$ EndCombat | TriggerZones$ Battlefield | Execute$ TrigTapAll | TriggerDescription$ At end of combat, tap all creatures that blocked CARDNAME this turn. They don't untap during their controller's next untap step.
+SVar:TrigTapAll:AB$ TapAll | Cost$ 0 | ValidCards$ Creature.blockedSource | SubAbility$ TrigPump
+SVar:TrigPump:DB$ PumpAll | Cost$ 0 | ValidCards$ Creature.blockedSource | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jovens_ferrets.jpg
+Oracle:Whenever Joven's Ferrets attacks, it gets +0/+2 until end of turn.\nAt end of combat, tap all creatures that blocked Joven's Ferrets this turn. They don't untap during their controller's next untap step.
diff --git a/res/cardsfolder/v/venomous_breath.txt b/res/cardsfolder/v/venomous_breath.txt
index 3808db28dbf..82193d1588f 100644
--- a/res/cardsfolder/v/venomous_breath.txt
+++ b/res/cardsfolder/v/venomous_breath.txt
@@ -1,9 +1,9 @@
 Name:Venomous Breath
 ManaCost:3 G
 Types:Instant
-A:SP$ Effect | Cost$ 3 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | Name$ Venomous Breath Effect | Triggers$ DelTrig | SVars$ TrigDestroy | RememberObjects$ Targeted | SpellDescription$ Choose target creature. At end of combat, destroy all creatures that blocked or were blocked by it this turn.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | TriggerZones$ Battlefield | TriggerZones$ Command | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ At end of combat, destroy all creatures that blocked or were blocked by that creature this turn.
-SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Creature.blockedRemembered,Creature.blockedByRemembered
+A:SP$ Effect | Cost$ 3 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | Name$ Venomous Breath Effect | Triggers$ DelTrig | SVars$ VenomousBreathTrigDestroy | RememberObjects$ Targeted | SpellDescription$ Choose target creature. At end of combat, destroy all creatures that blocked or were blocked by it this turn.
+SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | TriggerZones$ Battlefield | ValidPlayer$ Player | Execute$ VenomousBreathTrigDestroy | TriggerDescription$ At end of combat, destroy all creatures that blocked or were blocked by that creature this turn.
+SVar:VenomousBreathTrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Creature.blockedRemembered,Creature.blockedByRemembered
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/venomous_breath.jpg
 Oracle:Choose target creature. At end of combat, destroy all creatures that blocked or were blocked by it this turn.
\ No newline at end of file
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 333c55ce4fe..335393630fb 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -6523,6 +6523,8 @@ public class Card extends GameEntity implements Comparable<Card> {
             return null != combat && combat.isBlocked(this);
         } else if (property.startsWith("blockedBySource")) {
             return null != combat && combat.isBlocking(source, this);
+        } else if (property.startsWith("blockedSource")) {
+            return null != combat && combat.isBlocking(this, source);
         } else if (property.startsWith("isBlockedByRemembered")) {
             if ( null == combat ) return false;
             for (final Object o : source.getRemembered()) {