diff --git a/forge-gui/res/cardsfolder/b/bomber_corps.txt b/forge-gui/res/cardsfolder/b/bomber_corps.txt
index 0719e95a096..3e987bcbe90 100644
--- a/forge-gui/res/cardsfolder/b/bomber_corps.txt
+++ b/forge-gui/res/cardsfolder/b/bomber_corps.txt
@@ -2,7 +2,7 @@ Name:Bomber Corps
 ManaCost:1 R
 Types:Creature Human Soldier
 PT:1/2
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDmg | CheckSVar$ BattalionTest | SVarCompare$ GE2 | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME deals 1 damage to target creature or player.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDmg | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME deals 1 damage to target creature or player.
 SVar:TrigDmg:AB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bomber_corps.jpg
diff --git a/forge-gui/res/cardsfolder/b/boros_elite.txt b/forge-gui/res/cardsfolder/b/boros_elite.txt
index 38de1bea80f..ec0b0be899b 100644
--- a/forge-gui/res/cardsfolder/b/boros_elite.txt
+++ b/forge-gui/res/cardsfolder/b/boros_elite.txt
@@ -2,7 +2,7 @@ Name:Boros Elite
 ManaCost:W
 Types:Creature Human Soldier
 PT:1/1
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +2/+2 until end of turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +2/+2 until end of turn.
 SVar:TrigBattalionPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_elite.jpg
diff --git a/forge-gui/res/cardsfolder/b/boros_mastiff.txt b/forge-gui/res/cardsfolder/b/boros_mastiff.txt
index cf08eff1eb0..86a7d1afb16 100644
--- a/forge-gui/res/cardsfolder/b/boros_mastiff.txt
+++ b/forge-gui/res/cardsfolder/b/boros_mastiff.txt
@@ -2,7 +2,7 @@ Name:Boros Mastiff
 ManaCost:1 W
 Types:Creature Hound
 PT:2/2
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gets lifelink until end of turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gets lifelink until end of turn.
 SVar:TrigBattalionPump:AB$ Pump | Cost$ 0 | KW$ Lifelink
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_mastiff.jpg
diff --git a/forge-gui/res/cardsfolder/d/daring_skyjek.txt b/forge-gui/res/cardsfolder/d/daring_skyjek.txt
index cbc7940c139..c9a70d6b8c2 100644
--- a/forge-gui/res/cardsfolder/d/daring_skyjek.txt
+++ b/forge-gui/res/cardsfolder/d/daring_skyjek.txt
@@ -2,7 +2,7 @@ Name:Daring Skyjek
 ManaCost:1 W
 Types:Creature Human Knight
 PT:3/1
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gains flying until end of turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gains flying until end of turn.
 SVar:TrigBattalionPump:AB$ Pump | Cost$ 0 | Defined$ Self | KW$ Flying
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/daring_skyjek.jpg
diff --git a/forge-gui/res/cardsfolder/f/firefist_striker.txt b/forge-gui/res/cardsfolder/f/firefist_striker.txt
index 632604a3f52..429c259e93a 100644
--- a/forge-gui/res/cardsfolder/f/firefist_striker.txt
+++ b/forge-gui/res/cardsfolder/f/firefist_striker.txt
@@ -2,7 +2,7 @@ Name:Firefist Striker
 ManaCost:1 R
 Types:Creature Human Soldier
 PT:2/1
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | CheckSVar$ BattalionTest | SVarCompare$ GE2 | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, target creature can't block this turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, target creature can't block this turn.
 SVar:TrigPump:AB$ Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn.
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/firefist_striker.jpg
diff --git a/forge-gui/res/cardsfolder/f/firemane_avenger.txt b/forge-gui/res/cardsfolder/f/firemane_avenger.txt
index 416f95d882b..87f9d80a191 100644
--- a/forge-gui/res/cardsfolder/f/firemane_avenger.txt
+++ b/forge-gui/res/cardsfolder/f/firemane_avenger.txt
@@ -3,7 +3,7 @@ ManaCost:2 R W
 Types:Creature Angel
 PT:3/3
 K:Flying
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | SVarCompare$ GE2 | Execute$ TrigBattalionDmg | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME deals 3 damage to target creature or player and you gain 3 life.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionDmg | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME deals 3 damage to target creature or player and you gain 3 life.
 SVar:TrigBattalionDmg:AB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
diff --git a/forge-gui/res/cardsfolder/f/frontline_medic.txt b/forge-gui/res/cardsfolder/f/frontline_medic.txt
index b3884e4a634..bb5debc7319 100644
--- a/forge-gui/res/cardsfolder/f/frontline_medic.txt
+++ b/forge-gui/res/cardsfolder/f/frontline_medic.txt
@@ -2,7 +2,7 @@ Name:Frontline Medic
 ManaCost:2 W
 Types:Creature Human Cleric
 PT:3/3
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | SVarCompare$ GE2 | Execute$ TrigBattalionEffect | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, creatures you control are indestructible this turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionEffect | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, creatures you control are indestructible this turn.
 SVar:TrigBattalionEffect:AB$ Effect | Cost$ 0 | Name$ Frontline Medic Effect | StaticAbilities$ KWPump
 SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddKeyword$ Indestructible | Description$ Creatures you control are indestructible this turn.
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
diff --git a/forge-gui/res/cardsfolder/l/legion_loyalist.txt b/forge-gui/res/cardsfolder/l/legion_loyalist.txt
index a1889cb42d9..1a49974a086 100644
--- a/forge-gui/res/cardsfolder/l/legion_loyalist.txt
+++ b/forge-gui/res/cardsfolder/l/legion_loyalist.txt
@@ -3,7 +3,7 @@ ManaCost:R
 Types:Creature Goblin Soldier
 PT:1/1
 K:Haste
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | CheckSVar$ BattalionTest | SVarCompare$ GE2 | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, creatures you control gain first strike and trample until end of turn and can't be blocked by creature tokens this turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, creatures you control gain first strike and trample until end of turn and can't be blocked by creature tokens this turn.
 SVar:TrigPump:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ First Strike & Trample & CantBeBlockedBy Creature.token
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/legion_loyalist.jpg
diff --git a/forge-gui/res/cardsfolder/n/nav_squad_commandos.txt b/forge-gui/res/cardsfolder/n/nav_squad_commandos.txt
index 41e00f017bd..8f04198f618 100644
--- a/forge-gui/res/cardsfolder/n/nav_squad_commandos.txt
+++ b/forge-gui/res/cardsfolder/n/nav_squad_commandos.txt
@@ -2,7 +2,7 @@ Name:Nav Squad Commandos
 ManaCost:4 W
 Types:Creature Human Soldier
 PT:3/5
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +1/+1 until end of turn. Untap it.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +1/+1 until end of turn. Untap it.
 SVar:TrigBattalionPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBUntap
 SVar:DBUntap:DB$ Untap | Defined$ Self
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
diff --git a/forge-gui/res/cardsfolder/o/ordruun_veteran.txt b/forge-gui/res/cardsfolder/o/ordruun_veteran.txt
index 34bd3766593..984572370a4 100644
--- a/forge-gui/res/cardsfolder/o/ordruun_veteran.txt
+++ b/forge-gui/res/cardsfolder/o/ordruun_veteran.txt
@@ -2,7 +2,7 @@ Name:Ordruun Veteran
 ManaCost:2 R W
 Types:Creature Minotaur Soldier
 PT:3/1
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gains double strike until end of turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gains double strike until end of turn.
 SVar:TrigBattalionPump:AB$ Pump | Cost$ 0 | KW$ Double Strike
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ordruun_veteran.jpg
diff --git a/forge-gui/res/cardsfolder/t/tajic_blade_of_the_legion.txt b/forge-gui/res/cardsfolder/t/tajic_blade_of_the_legion.txt
index a1ca0c3703e..9d51f0f3534 100644
--- a/forge-gui/res/cardsfolder/t/tajic_blade_of_the_legion.txt
+++ b/forge-gui/res/cardsfolder/t/tajic_blade_of_the_legion.txt
@@ -3,7 +3,7 @@ ManaCost:2 R W
 Types:Legendary Creature Human Soldier
 PT:2/2
 K:Indestructible
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +5/+5 until end of turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +5/+5 until end of turn.
 SVar:TrigBattalionPump:AB$ Pump | Cost$ 0 | NumAtt$ +5 | NumDef$ +5
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tajic_blade_of_the_legion.jpg
diff --git a/forge-gui/res/cardsfolder/w/warmind_infantry.txt b/forge-gui/res/cardsfolder/w/warmind_infantry.txt
index 8859a5c7309..a5d59614e4d 100644
--- a/forge-gui/res/cardsfolder/w/warmind_infantry.txt
+++ b/forge-gui/res/cardsfolder/w/warmind_infantry.txt
@@ -2,7 +2,7 @@ Name:Warmind Infantry
 ManaCost:2 R
 Types:Creature Elemental Soldier
 PT:2/3
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +2/+0 until end of turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +2/+0 until end of turn.
 SVar:TrigBattalionPump:AB$ Pump | Cost$ 0 | NumAtt$ +2
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warmind_infantry.jpg
diff --git a/forge-gui/res/cardsfolder/w/wojek_halberdiers.txt b/forge-gui/res/cardsfolder/w/wojek_halberdiers.txt
index fb0fa34c5d1..a813dac3eea 100644
--- a/forge-gui/res/cardsfolder/w/wojek_halberdiers.txt
+++ b/forge-gui/res/cardsfolder/w/wojek_halberdiers.txt
@@ -2,7 +2,7 @@ Name:Wojek Halberdiers
 ManaCost:R W
 Types:Creature Human Soldier
 PT:3/2
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gains first strike until end of turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gains first strike until end of turn.
 SVar:TrigBattalionPump:AB$ Pump | Cost$ 0 | KW$ First Strike
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wojek_halberdiers.jpg
diff --git a/forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java b/forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java
index d7b19254a92..a05957a03d0 100644
--- a/forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java
+++ b/forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java
@@ -344,8 +344,9 @@ public class WrappedAbility extends Ability implements ISpellAbility {
     @Override
     public void resolve() {
         final Game game = sa.getActivatingPlayer().getGame();
+        Map<String, String> triggerParams = regtrig.getMapParams();
 
-        if (!(regtrig instanceof TriggerAlways)) {
+        if (!(regtrig instanceof TriggerAlways) && !triggerParams.containsKey("NoResolvingCheck")) {
             // State triggers don't have "Intervening If"
             if (!regtrig.requirementsCheck(game)) {
                 return;
@@ -353,7 +354,6 @@ public class WrappedAbility extends Ability implements ISpellAbility {
         }
 
         TriggerHandler th = game.getTriggerHandler();
-        Map<String, String> triggerParams = regtrig.getMapParams();
 
         if (decider != null && !decider.getController().confirmTrigger(sa, regtrig, triggerParams, this.isMandatory())) {
             return;