github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Cleansing Beam - Fixed that the target creature was damaged twice.

Browse source
This commit is contained in:
LevelX2 2016-06-17 14:50:30 +02:00
parent 089996edce
commit f6c1538bda
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage.Sets/src/mage/sets/ravnica/CleansingBeam.java
View file

@ -32,6 +32,7 @@ import mage.ObjectColor;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.AbilityWord;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
@ -54,6 +55,7 @@ public class CleansingBeam extends CardImpl {
// Radiance — Cleansing Beam deals 2 damage to target creature and each other creature that shares a color with it. // Radiance — Cleansing Beam deals 2 damage to target creature and each other creature that shares a color with it.
this.getSpellAbility().addEffect(new CleansingBeamEffect()); this.getSpellAbility().addEffect(new CleansingBeamEffect());
this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().setAbilityWord(AbilityWord.RADIANCE);
} }
public CleansingBeam(final CleansingBeam card) { public CleansingBeam(final CleansingBeam card) {
@ -67,6 +69,7 @@ public class CleansingBeam extends CardImpl {
} }
class CleansingBeamEffect extends OneShotEffect { class CleansingBeamEffect extends OneShotEffect {
static final FilterPermanent filter = new FilterPermanent("creature"); static final FilterPermanent filter = new FilterPermanent("creature");
static { static {
@ -75,7 +78,7 @@ class CleansingBeamEffect extends OneShotEffect {
CleansingBeamEffect() { CleansingBeamEffect() {
super(Outcome.Damage); super(Outcome.Damage);
staticText = "Radiance - Cleansing Beam deals 2 damage to target creature and each other creature that shares a color with it"; staticText = "{this} deals 2 damage to target creature and each other creature that shares a color with it";
} }
CleansingBeamEffect(final CleansingBeamEffect effect) { CleansingBeamEffect(final CleansingBeamEffect effect) {
@ -89,7 +92,7 @@ class CleansingBeamEffect extends OneShotEffect {
ObjectColor color = target.getColor(game); ObjectColor color = target.getColor(game);
target.damage(2, source.getSourceId(), game, false, true); target.damage(2, source.getSourceId(), game, false, true);
for (Permanent p : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) { for (Permanent p : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) {
if (p.getColor(game).shares(color)) { if (!target.getId().equals(p.getId()) && p.getColor(game).shares(color)) {
p.damage(2, source.getSourceId(), game, false, true); p.damage(2, source.getSourceId(), game, false, true);
} }
} }