external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed Battalion Triggers check requirements when resolving

Browse Source
This commit is contained in:
swordshine
2013-12-23 02:58:10 +00:00
parent dc16b75c94
commit 77de4abfd1
14 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/res/cardsfolder/b/bomber_corps.txt
View File

@@ -2,7 +2,7 @@ Name:Bomber Corps
ManaCost:1 R ManaCost:1 R
Types:Creature Human Soldier Types:Creature Human Soldier
PT:1/2 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:TrigDmg:AB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1
SVar:BattalionTest:Count$Valid Creature.attacking+Other SVar:BattalionTest:Count$Valid Creature.attacking+Other
SVar:Picture:http://www.wizards.com/global/images/magic/general/bomber_corps.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/bomber_corps.jpg

2
forge-gui/res/cardsfolder/b/boros_elite.txt
View File

@@ -2,7 +2,7 @@ Name:Boros Elite
ManaCost:W ManaCost:W
Types:Creature Human Soldier Types:Creature Human Soldier
PT:1/1 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:TrigBattalionPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2
SVar:BattalionTest:Count$Valid Creature.attacking+Other SVar:BattalionTest:Count$Valid Creature.attacking+Other
SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_elite.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_elite.jpg

2
forge-gui/res/cardsfolder/b/boros_mastiff.txt
View File

@@ -2,7 +2,7 @@ Name:Boros Mastiff
ManaCost:1 W ManaCost:1 W
Types:Creature Hound Types:Creature Hound
PT:2/2 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:TrigBattalionPump:AB$ Pump | Cost$ 0 | KW$ Lifelink
SVar:BattalionTest:Count$Valid Creature.attacking+Other SVar:BattalionTest:Count$Valid Creature.attacking+Other
SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_mastiff.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_mastiff.jpg

2
forge-gui/res/cardsfolder/d/daring_skyjek.txt
View File

@@ -2,7 +2,7 @@ Name:Daring Skyjek
ManaCost:1 W ManaCost:1 W
Types:Creature Human Knight Types:Creature Human Knight
PT:3/1 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:TrigBattalionPump:AB$ Pump | Cost$ 0 | Defined$ Self | KW$ Flying
SVar:BattalionTest:Count$Valid Creature.attacking+Other SVar:BattalionTest:Count$Valid Creature.attacking+Other
SVar:Picture:http://www.wizards.com/global/images/magic/general/daring_skyjek.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/daring_skyjek.jpg

2
forge-gui/res/cardsfolder/f/firefist_striker.txt
View File

@@ -2,7 +2,7 @@ Name:Firefist Striker
ManaCost:1 R ManaCost:1 R
Types:Creature Human Soldier Types:Creature Human Soldier
PT:2/1 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: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:BattalionTest:Count$Valid Creature.attacking+Other
SVar:Picture:http://www.wizards.com/global/images/magic/general/firefist_striker.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/firefist_striker.jpg

2
forge-gui/res/cardsfolder/f/firemane_avenger.txt
View File

@@ -3,7 +3,7 @@ ManaCost:2 R W
Types:Creature Angel Types:Creature Angel
PT:3/3 PT:3/3
K:Flying 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: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:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
SVar:BattalionTest:Count$Valid Creature.attacking+Other SVar:BattalionTest:Count$Valid Creature.attacking+Other

2
forge-gui/res/cardsfolder/f/frontline_medic.txt
View File

@@ -2,7 +2,7 @@ Name:Frontline Medic
ManaCost:2 W ManaCost:2 W
Types:Creature Human Cleric Types:Creature Human Cleric
PT:3/3 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: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: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 SVar:BattalionTest:Count$Valid Creature.attacking+Other

2
forge-gui/res/cardsfolder/l/legion_loyalist.txt
View File

@@ -3,7 +3,7 @@ ManaCost:R
Types:Creature Goblin Soldier Types:Creature Goblin Soldier
PT:1/1 PT:1/1
K:Haste 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:TrigPump:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ First Strike & Trample & CantBeBlockedBy Creature.token
SVar:BattalionTest:Count$Valid Creature.attacking+Other SVar:BattalionTest:Count$Valid Creature.attacking+Other
SVar:Picture:http://www.wizards.com/global/images/magic/general/legion_loyalist.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/legion_loyalist.jpg

2
forge-gui/res/cardsfolder/n/nav_squad_commandos.txt
View File

@@ -2,7 +2,7 @@ Name:Nav Squad Commandos
ManaCost:4 W ManaCost:4 W
Types:Creature Human Soldier Types:Creature Human Soldier
PT:3/5 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:TrigBattalionPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBUntap
SVar:DBUntap:DB$ Untap | Defined$ Self SVar:DBUntap:DB$ Untap | Defined$ Self
SVar:BattalionTest:Count$Valid Creature.attacking+Other SVar:BattalionTest:Count$Valid Creature.attacking+Other

2
forge-gui/res/cardsfolder/o/ordruun_veteran.txt
View File

@@ -2,7 +2,7 @@ Name:Ordruun Veteran
ManaCost:2 R W ManaCost:2 R W
Types:Creature Minotaur Soldier Types:Creature Minotaur Soldier
PT:3/1 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:TrigBattalionPump:AB$ Pump | Cost$ 0 | KW$ Double Strike
SVar:BattalionTest:Count$Valid Creature.attacking+Other SVar:BattalionTest:Count$Valid Creature.attacking+Other
SVar:Picture:http://www.wizards.com/global/images/magic/general/ordruun_veteran.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/ordruun_veteran.jpg

2
forge-gui/res/cardsfolder/t/tajic_blade_of_the_legion.txt
View File

@@ -3,7 +3,7 @@ ManaCost:2 R W
Types:Legendary Creature Human Soldier Types:Legendary Creature Human Soldier
PT:2/2 PT:2/2
K:Indestructible 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:TrigBattalionPump:AB$ Pump | Cost$ 0 | NumAtt$ +5 | NumDef$ +5
SVar:BattalionTest:Count$Valid Creature.attacking+Other SVar:BattalionTest:Count$Valid Creature.attacking+Other
SVar:Picture:http://www.wizards.com/global/images/magic/general/tajic_blade_of_the_legion.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/tajic_blade_of_the_legion.jpg

2
forge-gui/res/cardsfolder/w/warmind_infantry.txt
View File

@@ -2,7 +2,7 @@ Name:Warmind Infantry
ManaCost:2 R ManaCost:2 R
Types:Creature Elemental Soldier Types:Creature Elemental Soldier
PT:2/3 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:TrigBattalionPump:AB$ Pump | Cost$ 0 | NumAtt$ +2
SVar:BattalionTest:Count$Valid Creature.attacking+Other SVar:BattalionTest:Count$Valid Creature.attacking+Other
SVar:Picture:http://www.wizards.com/global/images/magic/general/warmind_infantry.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/warmind_infantry.jpg

2
forge-gui/res/cardsfolder/w/wojek_halberdiers.txt
View File

@@ -2,7 +2,7 @@ Name:Wojek Halberdiers
ManaCost:R W ManaCost:R W
Types:Creature Human Soldier Types:Creature Human Soldier
PT:3/2 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:TrigBattalionPump:AB$ Pump | Cost$ 0 | KW$ First Strike
SVar:BattalionTest:Count$Valid Creature.attacking+Other SVar:BattalionTest:Count$Valid Creature.attacking+Other
SVar:Picture:http://www.wizards.com/global/images/magic/general/wojek_halberdiers.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/wojek_halberdiers.jpg

4
forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java
View File

@@ -344,8 +344,9 @@ public class WrappedAbility extends Ability implements ISpellAbility {
@Override @Override
public void resolve() { public void resolve() {
final Game game = sa.getActivatingPlayer().getGame(); 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" // State triggers don't have "Intervening If"
if (!regtrig.requirementsCheck(game)) { if (!regtrig.requirementsCheck(game)) {
return; return;
@@ -353,7 +354,6 @@ public class WrappedAbility extends Ability implements ISpellAbility {
} }
TriggerHandler th = game.getTriggerHandler(); TriggerHandler th = game.getTriggerHandler();
Map<String, String> triggerParams = regtrig.getMapParams();
if (decider != null && !decider.getController().confirmTrigger(sa, regtrig, triggerParams, this.isMandatory())) { if (decider != null && !decider.getController().confirmTrigger(sa, regtrig, triggerParams, this.isMandatory())) {
return; return;