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

- Fixed #6813

Browse source
This commit is contained in:
jeffwadsworth 2020-07-10 10:39:02 -05:00
parent 90987372b7
commit bb453de525
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Mage.Sets/src/mage/cards/b/BiomancersFamiliar.java
View file

@ -11,7 +11,6 @@ import mage.abilities.effects.ReplacementEffectImpl;
import mage.abilities.effects.common.cost.CostModificationEffectImpl;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.choices.ChoiceImpl;
import mage.constants.*;
import mage.game.Game;
import mage.game.events.GameEvent;
@ -20,8 +19,6 @@ import mage.players.Player;
import mage.target.common.TargetCreaturePermanent;
import mage.util.CardUtil;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
/**
@ -36,7 +33,8 @@ public final class BiomancersFamiliar extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(2);
// Activated abilities of creatures you control cost {2} less to activate. This effect can't reduce the amount of mana an ability costs to activate to less than one mana.
// Activated abilities of creatures you control cost {2} less to activate.
// This effect can't reduce the amount of mana an ability costs to activate to less than one mana.
this.addAbility(new SimpleStaticAbility(new BiomancersFamiliarCostReductionEffect()));
// {T}: The next time target creature adapts this turn, it adapts as though it had no +1/+1 counters on it.
@ -57,8 +55,9 @@ public final class BiomancersFamiliar extends CardImpl {
class BiomancersFamiliarCostReductionEffect extends CostModificationEffectImpl {
private static final String effectText = "Activated abilities of creatures you control cost {2} less to activate. " +
"This effect can't reduce the mana in that cost to less than one mana";
private static final String effectText = "Activated abilities of creatures "
+ "you control cost {2} less to activate. "
+ "This effect can't reduce the mana in that cost to less than one mana";
BiomancersFamiliarCostReductionEffect() {
super(Duration.Custom, Outcome.Benefit, CostModificationType.REDUCE_COST);
@ -99,8 +98,9 @@ class BiomancersFamiliarCostReductionEffect extends CostModificationEffectImpl {
return false;
}
//Activated abilities of creatures you control
Permanent permanent = game.getPermanent(abilityToModify.getSourceId());
return permanent != null && permanent.isCreature()
Permanent permanent = game.getPermanentOrLKIBattlefield(abilityToModify.getSourceId());
return permanent != null
&& permanent.isCreature()
&& permanent.isControlledBy(source.getControllerId());
}
@ -114,8 +114,8 @@ class BiomancersFamiliarReplacementEffect extends ReplacementEffectImpl {
BiomancersFamiliarReplacementEffect() {
super(Duration.EndOfTurn, Outcome.Benefit);
staticText = "The next time target creature adapts this turn, " +
"it adapts as though it had no +1/+1 counters on it.";
staticText = "The next time target creature adapts this turn, "
+ "it adapts as though it had no +1/+1 counters on it.";
}
private BiomancersFamiliarReplacementEffect(final BiomancersFamiliarReplacementEffect effect) {

12
Mage.Sets/src/mage/cards/p/PowerArtifact.java
View file

@ -54,8 +54,8 @@ class PowerArtifactCostModificationEffect extends CostModificationEffectImpl {
PowerArtifactCostModificationEffect() {
super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.REDUCE_COST);
staticText = "Enchanted artifact's activated abilities cost {2} less to activate. " +
"This effect can't reduce the amount of mana an ability costs to activate to less than one mana.";
staticText = "Enchanted artifact's activated abilities cost {2} less to activate. "
+ "This effect can't reduce the amount of mana an ability costs to activate to less than one mana.";
}
@ -82,10 +82,12 @@ class PowerArtifactCostModificationEffect extends CostModificationEffectImpl {
@Override
public boolean applies(Ability abilityToModify, Ability source, Game game) {
Permanent artifact = game.getPermanent(abilityToModify.getSourceId());
if (artifact != null && artifact.getAttachments().contains(source.getSourceId())) {
Permanent artifact = game.getPermanentOrLKIBattlefield(abilityToModify.getSourceId());
if (artifact != null
&& artifact.getAttachments().contains(source.getSourceId())) {
if (abilityToModify.getAbilityType() == AbilityType.ACTIVATED
|| (abilityToModify.getAbilityType() == AbilityType.MANA && (abilityToModify instanceof ActivatedAbility))) {
|| (abilityToModify.getAbilityType() == AbilityType.MANA
&& (abilityToModify instanceof ActivatedAbility))) {
return true;
}
}