External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-23 19:59:54 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2018-05-03 01:33:39 +02:00
commit a063889205
4 changed files with 35 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java
View file

@ -35,8 +35,9 @@ import mage.abilities.Ability;
import mage.abilities.common.AsEntersBattlefieldAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
import mage.abilities.keyword.IndestructibleAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -51,6 +52,7 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.targetpointer.FixedTarget;
import mage.util.CardUtil;
/**
@ -85,9 +87,9 @@ public class DauntlessBodyguard extends CardImpl {
}
class DauntlessBodyguardChooseCreatureEffect extends OneShotEffect {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control");
static {
filter.add(new AnotherPredicate());
}
@ -127,12 +129,10 @@ class DauntlessBodyguardChooseCreatureEffect extends OneShotEffect {
}
}
class DauntlessBodyguardGainAbilityEffect extends GainAbilityTargetEffect {
private MageObjectReference mor;
class DauntlessBodyguardGainAbilityEffect extends OneShotEffect {
public DauntlessBodyguardGainAbilityEffect() {
super(IndestructibleAbility.getInstance(), Duration.EndOfTurn);
super(Outcome.AddAbility);
this.staticText = "The chosen creature gains indestructible until end of turn";
}
@ -147,17 +147,17 @@ class DauntlessBodyguardGainAbilityEffect extends GainAbilityTargetEffect {
@Override
public boolean apply(Game game, Ability source) {
if (mor == null) {
Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
if (sourcePermanent != null) {
mor = (MageObjectReference) game.getState().getValue(sourcePermanent.getId() + "_chosenCreature");
}
MageObjectReference mor;
Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
if (sourcePermanent == null) {
return false;
}
if (mor != null) {
Permanent permanent = mor.getPermanent(game);
if (permanent != null) {
permanent.addAbility(ability, source.getSourceId(), game, false);
}
mor = (MageObjectReference) game.getState().getValue(sourcePermanent.getId() + "_chosenCreature");
Permanent chosenPermanent = mor.getPermanent(game);
if (chosenPermanent != null) {
ContinuousEffect effect = new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn);
effect.setTargetPointer(new FixedTarget(chosenPermanent, game));
game.addEffect(effect, source);
}
return true;
}

13
Mage.Sets/src/mage/cards/k/KarplusanHound.java
View file

@ -33,13 +33,14 @@ import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.decorator.ConditionalTriggeredAbility;
import mage.abilities.effects.common.DamageEverythingEffect;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.filter.common.FilterPlaneswalkerPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.target.common.TargetAnyTarget;
/**
*
@ -56,9 +57,13 @@ public class KarplusanHound extends CardImpl {
FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent("a Chandra planeswalker");
filter.add(new SubtypePredicate(SubType.CHANDRA));
// Whenever Karplusan Hound attacks, if you control a Chandra planeswalker, this creature deals 2 damage to any target.
Ability ability = new ConditionalTriggeredAbility(new AttacksTriggeredAbility(new DamageEverythingEffect(2), false), new PermanentsOnTheBattlefieldCondition(filter),
"if you control a Chandra planeswalker, this creature deals 2 damage to any target");
Ability ability = new ConditionalTriggeredAbility(
new AttacksTriggeredAbility(new DamageTargetEffect(2), false),
new PermanentsOnTheBattlefieldCondition(filter),
"if you control a Chandra planeswalker, "
+ "this creature deals 2 damage to any target"
);
ability.addTarget(new TargetAnyTarget());
this.addAbility(ability);
}