github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clear Shot fix - damage source is the creature

Browse source
This commit is contained in:
drmDev 2016-07-21 09:07:09 -04:00
parent b8091cc3a8
commit 5ac81a4fdc
3 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Mage.Sets/src/mage/sets/eldritchmoon/ClearShot.java
View file

@ -28,17 +28,22 @@
package mage.sets.eldritchmoon;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.common.TargetPermanentPowerCount;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.effects.common.continuous.BoostTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.Target;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreaturePermanent;
@ -66,7 +71,7 @@ public class ClearShot extends CardImpl {
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
this.getSpellAbility().addEffect(effect);
effect = new DamageTargetEffect(new TargetPermanentPowerCount(), true, "target creature you don't control", true);
effect = new ClearShotDamageEffect();
effect.setText("It deals damage equal to its power to target creature you don't control");
effect.setTargetPointer(new SecondTargetPointer());
this.getSpellAbility().addEffect(effect);
@ -83,3 +88,34 @@ public class ClearShot extends CardImpl {
return new ClearShot(this);
}
}
class ClearShotDamageEffect extends OneShotEffect {
public ClearShotDamageEffect() {
super(Outcome.Damage);
this.staticText = "It deals damage equal to its power to target creature you don't control";
}
public ClearShotDamageEffect(final ClearShotDamageEffect effect) {
super(effect);
}
@Override
public ClearShotDamageEffect copy() {
return new ClearShotDamageEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Permanent ownCreature = game.getPermanent(source.getFirstTarget());
if (ownCreature != null) {
int damage = ownCreature.getPower().getValue();
Permanent targetCreature = game.getPermanent(source.getTargets().get(1).getFirstTarget());
if (targetCreature != null) {
targetCreature.damage(damage, ownCreature.getId(), game, false, true);
return true;
}
}
return false;
}
}

2
Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java
View file

@ -59,6 +59,8 @@ public class CyclopsGladiator extends CardImpl {
this.power = new MageInt(4);
this.toughness = new MageInt(4);
// Whenever Cyclops Gladiator attacks, you may have it deal damage equal to its power to target creature defending player controls.
// If you do, that creature deals damage equal to its power to Cyclops Gladiator.
Ability ability = new AttacksTriggeredAbility(new CyclopsGladiatorEffect(), true);
this.addAbility(ability);
}

2
Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java
View file

@ -59,7 +59,7 @@ public class WingPuncture extends CardImpl {
super(ownerId, 133, "Wing Puncture", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}");
this.expansionSetCode = "SOM";
// Target creature you control deals damage equal to its power to target creature with flying.
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
this.getSpellAbility().addEffect(new WingPunctureEffect());