war tax implemented. propaganda combat check now looks in the command zone as well.

This commit is contained in:
RedDeckWins
2013-05-15 04:49:56 +00:00
parent 37655012ad
commit 1577f9110d
3 changed files with 14 additions and 1 deletions

1
.gitattributes vendored
View File

@@ -12217,6 +12217,7 @@ res/cardsfolder/w/war_mammoth.txt svneol=native#text/plain
res/cardsfolder/w/war_priest_of_thune.txt svneol=native#text/plain
res/cardsfolder/w/war_report.txt svneol=native#text/plain
res/cardsfolder/w/war_spike_changeling.txt svneol=native#text/plain
res/cardsfolder/w/war_tax.txt -text
res/cardsfolder/w/war_torch_goblin.txt svneol=native#text/plain
res/cardsfolder/w/warbreak_trumpeter.txt svneol=native#text/plain
res/cardsfolder/w/warclamp_mastiff.txt -text

View File

@@ -0,0 +1,12 @@
Name:War Tax
ManaCost:2 U
Types:Enchantment
A:AB$ StoreSVar | SVar$ Y | Type$ Count | Expression$ xPaid | Cost$ X U | SubAbility$ DBEffect | SpellDescription$ This turn, creatures can't attack unless their controller pays X for each attacking creature he or she controls.
SVar:DBEffect:DB$ Effect | StaticAbilities$ AttackTax | SVars$ Y | SubAbility$ DBReset | EffectOwner$ SourceController
SVar:AttackTax:Mode$ CantAttackUnless | ValidCard$ Creature | EffectZone$ Command | Cost$ Y | Description$ Creatures can't attack unless their controller pays X for each attacking creature he or she controls.
SVar:DBReset:DB$ StoreSVar | SVar$ Y | Type$ Number | Expression$ 0
SVar:X:Count$xPaid
SVar:Y:Number$0
SVar:Picture:http://www.wizards.com/global/images/magic/general/war_tax.jpg
Oracle:X U:This turn, creatures can't attack unless their controller pays X for each attacking creature he or she controls.
SetInfo:MMQ Uncommon

View File

@@ -1063,7 +1063,7 @@ public class CombatUtil {
public static void checkPropagandaEffects(final GameState game, final Card c) {
Cost attackCost = new Cost(ManaCost.ZERO, true);
// Sort abilities to apply them in proper order
for (Card card : game.getCardsIn(ZoneType.Battlefield)) {
for (Card card : game.getCardsIn(ZoneType.listValueOf("Battlefield,Command"))) {
final ArrayList<StaticAbility> staticAbilities = card.getStaticAbilities();
for (final StaticAbility stAb : staticAbilities) {
Cost additionalCost = stAb.getAttackCost(c, game.getCombat().getDefenderByAttacker(c));