diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 353f743495a..73192aa9796 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -1546,7 +1546,7 @@ public class Card extends GameEntity implements Comparable<Card> {
                     || (keyword.startsWith("Split second") && !sb.toString().contains("Split second"))
                     || keyword.equals("Suspend") // for the ones without amounnt
                     || keyword.equals("Hideaway") || keyword.equals("Ascend")
-                    || keyword.equals("Totem armor")
+                    || keyword.equals("Totem armor") || keyword.equals("Battle cry")
                     || keyword.equals("Devoid")){
                 sbLong.append(keyword + " (" + inst.getReminderText() + ")");
             } else if (keyword.startsWith("Modular") || keyword.startsWith("Bloodthirst")
diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 09cdfdfe561..5c1a576ff06 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -2114,6 +2114,18 @@ public class CardFactoryUtil {
                     sa.setBlessing(true);
                 }
             }
+        } else if (keyword.equals("Battle cry")) {
+            final String trig = "Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Secondary$ True "
+                    + " | TriggerDescription$ " + keyword + " (" + inst.getReminderText() + ")";
+            String pumpStr = "DB$ PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ 1";
+            SpellAbility sa = AbilityFactory.getAbility(pumpStr, card);
+
+            sa.setIntrinsic(intrinsic);
+
+            final Trigger trigger = TriggerHandler.parseTrigger(trig, card, intrinsic);
+            trigger.setOverridingAbility(sa);
+
+            inst.addTrigger(trigger);
         } else if (keyword.startsWith("Bushido")) {
             final String[] k = keyword.split(" ", 2);
             final String n = k[1];
diff --git a/forge-gui/res/cardsfolder/a/accorder_paladin.txt b/forge-gui/res/cardsfolder/a/accorder_paladin.txt
index b09cc8fc82e..b4140e30ff1 100644
--- a/forge-gui/res/cardsfolder/a/accorder_paladin.txt
+++ b/forge-gui/res/cardsfolder/a/accorder_paladin.txt
@@ -2,7 +2,6 @@ Name:Accorder Paladin
 ManaCost:1 W
 Types:Creature Human Knight
 PT:3/1
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
-SVar:TrigBattleCry:DB$ PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ 1
+K:Battle cry
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accorder_paladin.jpg
 Oracle:Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
diff --git a/forge-gui/res/cardsfolder/g/goblin_wardriver.txt b/forge-gui/res/cardsfolder/g/goblin_wardriver.txt
index 58fa35ac1b1..3b0b03341ad 100644
--- a/forge-gui/res/cardsfolder/g/goblin_wardriver.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_wardriver.txt
@@ -2,7 +2,6 @@ Name:Goblin Wardriver
 ManaCost:R R
 Types:Creature Goblin Warrior
 PT:2/2
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
-SVar:TrigBattleCry:DB$PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ 1
+K:Battle cry
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_wardriver.jpg
 Oracle:Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
diff --git a/forge-gui/res/cardsfolder/h/hero_of_bladehold.txt b/forge-gui/res/cardsfolder/h/hero_of_bladehold.txt
index 2a5d070d5b8..3ae17564746 100644
--- a/forge-gui/res/cardsfolder/h/hero_of_bladehold.txt
+++ b/forge-gui/res/cardsfolder/h/hero_of_bladehold.txt
@@ -2,9 +2,8 @@ Name:Hero of Bladehold
 ManaCost:2 W W
 Types:Creature Human Knight
 PT:3/4
+K:Battle cry
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create two 1/1 white Soldier creature tokens that are tapped and attacking.
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
-SVar:TrigBattleCry:DB$ PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ 1
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenTapped$ True | TokenAttacking$ True | TokenImage$ w 1 1 soldier SOM
 SVar:HasAttackEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hero_of_bladehold.jpg
diff --git a/forge-gui/res/cardsfolder/h/hero_of_oxid_ridge.txt b/forge-gui/res/cardsfolder/h/hero_of_oxid_ridge.txt
index 029bc3bb411..6bafae0a380 100644
--- a/forge-gui/res/cardsfolder/h/hero_of_oxid_ridge.txt
+++ b/forge-gui/res/cardsfolder/h/hero_of_oxid_ridge.txt
@@ -3,9 +3,8 @@ ManaCost:2 R R
 Types:Creature Human Knight
 PT:4/2
 K:Haste
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
+K:Battle cry
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigEffect | TriggerDescription$ When CARDNAME attacks, creatures with power 1 or less can't block this turn.
-SVar:TrigBattleCry:DB$ PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ 1
 SVar:TrigEffect:DB$ Effect | Name$ Hero of Oxid Ridge Effect | StaticAbilities$ KWPump
 SVar:KWPump:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.powerLE1 | AddHiddenKeyword$ CARDNAME can't block. | Description$ Creatures with power 1 or less can't block this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hero_of_oxid_ridge.jpg
diff --git a/forge-gui/res/cardsfolder/k/kuldotha_ringleader.txt b/forge-gui/res/cardsfolder/k/kuldotha_ringleader.txt
index 533504e19c2..10310312ab7 100644
--- a/forge-gui/res/cardsfolder/k/kuldotha_ringleader.txt
+++ b/forge-gui/res/cardsfolder/k/kuldotha_ringleader.txt
@@ -2,8 +2,7 @@ Name:Kuldotha Ringleader
 ManaCost:4 R
 Types:Creature Giant Berserker
 PT:4/4
+K:Battle cry
 K:CARDNAME attacks each combat if able.
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
-SVar:TrigBattleCry:DB$PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kuldotha_ringleader.jpg
 Oracle:Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)\nKuldotha Ringleader attacks each combat if able.
diff --git a/forge-gui/res/cardsfolder/l/loxodon_partisan.txt b/forge-gui/res/cardsfolder/l/loxodon_partisan.txt
index 7303a3172b8..0f7102adf01 100644
--- a/forge-gui/res/cardsfolder/l/loxodon_partisan.txt
+++ b/forge-gui/res/cardsfolder/l/loxodon_partisan.txt
@@ -2,7 +2,6 @@ Name:Loxodon Partisan
 ManaCost:4 W
 Types:Creature Elephant Soldier
 PT:3/4
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
-SVar:TrigBattleCry:DB$PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ 1
+K:Battle cry
 SVar:Picture:http://www.wizards.com/global/images/magic/general/loxodon_partisan.jpg
 Oracle:Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
diff --git a/forge-gui/res/cardsfolder/s/signal_pest.txt b/forge-gui/res/cardsfolder/s/signal_pest.txt
index 5f09d6c476c..0cddd3ba6cf 100644
--- a/forge-gui/res/cardsfolder/s/signal_pest.txt
+++ b/forge-gui/res/cardsfolder/s/signal_pest.txt
@@ -2,8 +2,7 @@ Name:Signal Pest
 ManaCost:1
 Types:Artifact Creature Pest
 PT:0/1
+K:Battle cry
 K:CantBeBlockedBy Creature.withoutFlying+withoutReach
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
-SVar:TrigBattleCry:DB$PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/signal_pest.jpg
 Oracle:Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)\nSignal Pest can't be blocked except by creatures with flying or reach.