diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/BarrageTyrant.java b/Mage.Sets/src/mage/sets/battleforzendikar/BarrageTyrant.java index d7214310bad..d2c7973283f 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/BarrageTyrant.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/BarrageTyrant.java @@ -34,6 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.SacrificeCostCreaturesPower; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.DevoidAbility; import mage.cards.CardImpl; @@ -70,7 +71,9 @@ public class BarrageTyrant extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {2}{R}, Sacrifice another colorless creature: Barrage Tyrant deals damage equal to the sacrificed creature's power to target creature or player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SacrificeCostCreaturesPower()), new ManaCostsImpl("{2}{R}")); + Effect effect = new DamageTargetEffect(new SacrificeCostCreaturesPower()); + effect.setText("{this} deals damage equal to the sacrificed creature's power to target creature or player"); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter))); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage/src/mage/game/GameState.java b/Mage/src/mage/game/GameState.java index 21824f7a41c..463b91446cc 100644 --- a/Mage/src/mage/game/GameState.java +++ b/Mage/src/mage/game/GameState.java @@ -743,8 +743,9 @@ public class GameState implements Serializable, Copyable { this.triggers.add((TriggeredAbility) ability, sourceId, attachedTo); } for (Watcher watcher : ability.getWatchers()) { - watcher.setControllerId(attachedTo.getOwnerId()); - watcher.setSourceId(attachedTo.getId()); + // TODO: Check that watcher for commanderAbility (where attachedTo = null) also work correctly + watcher.setControllerId(attachedTo == null ? ability.getControllerId() : attachedTo.getOwnerId()); + watcher.setSourceId(attachedTo == null ? ability.getSourceId() : attachedTo.getId()); watchers.add(watcher); } for (Ability sub : ability.getSubAbilities()) { diff --git a/Utils/release/getting_implemented_cards.txt b/Utils/release/getting_implemented_cards.txt index 167b2d493a6..8afd05edc21 100644 --- a/Utils/release/getting_implemented_cards.txt +++ b/Utils/release/getting_implemented_cards.txt @@ -20,8 +20,6 @@ git log 6d8378d5e49629a2fa126baf84340156a28f25db..HEAD --diff-filter=A --name-st since 1.4.3.v3 git log 23039572f2206ade860f5835e9b85e82a9c4b2a1..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt -since 1.4.3.v2 -git log 6d8378d5e49629a2fa126baf84340156a28f25db..23039572f2206ade860f5835e9b85e82a9c4b2a1 --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt since 1.4.4.v0 git log 0a458707ddaaa5e7e82ab06d17633084f67077c1..23039572f2206ade860f5835e9b85e82a9c4b2a1 --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt