diff --git a/.gitattributes b/.gitattributes
index c2786307998..c5e4b269c77 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5444,6 +5444,7 @@ res/cardsfolder/trolls_of_tel_jilad.txt -text svneol=native#text/plain
 res/cardsfolder/tromp_the_domains.txt -text svneol=native#text/plain
 res/cardsfolder/tropical_island.txt -text svneol=native#text/plain
 res/cardsfolder/true_conviction.txt -text svneol=native#text/plain
+res/cardsfolder/trumpet_blast.txt -text svneol=native#text/plain
 res/cardsfolder/trusty_machete.txt -text svneol=native#text/plain
 res/cardsfolder/tsabo_tavoc.txt -text svneol=native#text/plain
 res/cardsfolder/tsunami.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/abyssal_horror.txt b/res/cardsfolder/abyssal_horror.txt
index 34cafd8fc43..b2787b4cbfc 100644
--- a/res/cardsfolder/abyssal_horror.txt
+++ b/res/cardsfolder/abyssal_horror.txt
@@ -4,7 +4,8 @@ Types:Creature Horror
 Text:no text
 PT:2/2
 K:Flying
-K:WheneverKeyword:EntersBattleField:Self:Play:DiscardCards/2:ControllingPlayer_Opponent:ASAP:No_Condition:No Special Condition:When Abyssal Horror enters the battlefield, target player discards two cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, target player discards two cards.
+SVar:TrigDiscard:AB$Discard | Cost$ 0 | Tgt$ TgtP | NumCards$ 2 | Mode$ TgtChoose
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_horror.jpg
 SetInfo:USG|Rare|http://magiccards.info/scans/en/us/115.jpg
diff --git a/res/cardsfolder/abyssal_nightstalker.txt b/res/cardsfolder/abyssal_nightstalker.txt
index d997b9562b4..63a661765c6 100644
--- a/res/cardsfolder/abyssal_nightstalker.txt
+++ b/res/cardsfolder/abyssal_nightstalker.txt
@@ -3,7 +3,8 @@ ManaCost:3 B
 Types:Creature Nightstalker
 Text:no text
 PT:2/2
-K:WheneverKeyword:isUnblocked:Self:Play:DiscardCards/1:ControllingPlayer_Opponent:ASAP:No_Condition:No Special Condition:Whenever Abyssal Nightstalker attacks and isn't blocked, defending player discards a card.
+T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDiscards | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, defending player discards a card.
+SVar:TrigDiscards:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/Portal_Second_Age/abyssal_nightstalker.jpg
 SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/1.jpg
diff --git a/res/cardsfolder/abyssal_nocturnus.txt b/res/cardsfolder/abyssal_nocturnus.txt
index 7e22c83e753..2d1222e4f68 100644
--- a/res/cardsfolder/abyssal_nocturnus.txt
+++ b/res/cardsfolder/abyssal_nocturnus.txt
@@ -3,7 +3,8 @@ ManaCost:1 B B
 Types:Creature Horror
 Text:no text
 PT:2/2
-K:WheneverKeyword:DiscardsCard:ControllingPlayer_Opponent:Play:KeywordPumpEOT/Fear!StatsPumpEOT/2/2:Self!Self:ASAP:No_Condition:No Special Condition:Whenever an opponent discards a card, Abyssal Nocturnus gets +2/+2 and gains fear until end of turn.
+T:Mode$ Discarded | ValidCard$ Card.YouDontCtrl | Execute$ TrigPump | TriggerDescription$ Whenever an opponent discards a card, CARDNAME gets +2/+2 and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | KW$ Fear
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_nocturnus.jpg
 SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/43.jpg
diff --git a/res/cardsfolder/trumpet_blast.txt b/res/cardsfolder/trumpet_blast.txt
new file mode 100644
index 00000000000..818d8b21dd9
--- /dev/null
+++ b/res/cardsfolder/trumpet_blast.txt
@@ -0,0 +1,9 @@
+Name:Trumpet Blast
+ManaCost:2 R
+Types:Instant
+Text:no text
+A:SP$PumpAll | Cost$ 2 R | ValidCards$ Creature.attacking+YouCtrl | NumAtt$ 2 | SpellDescription$ Attacking creatures get +2/+0 until end of turn
+SVar:Rarity:Common
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/trumpet_blast.jpg
+End
\ No newline at end of file
diff --git a/src/forge/Trigger_Discarded.java b/src/forge/Trigger_Discarded.java
index 62b04b50ee7..cea2f38bfb4 100644
--- a/src/forge/Trigger_Discarded.java
+++ b/src/forge/Trigger_Discarded.java
@@ -10,13 +10,6 @@ public class Trigger_Discarded extends Trigger {
 
 	@Override
 	public boolean performTest(HashMap<String, Object> runParams) {
-		if(mapParams.containsKey("ValidPlayer"))
-		{
-			if(!matchesValid(runParams.get("Player"),mapParams.get("ValidPlayer").split(","),hostCard))
-			{
-				return false;
-			}
-		}
 		if(mapParams.containsKey("ValidCard"))
 		{
 			if(!matchesValid(runParams.get("Card"),mapParams.get("ValidCard").split(","),hostCard))