Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge pull request #1179 from klayhamn/master

Browse source 
Fix ForiysianTotem
This commit is contained in:
LevelX2 2015-08-04 23:04:03 +02:00
commit d46c76e1f8
2 changed files with 6 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Sets/src/mage/sets/timespiral/ForiysianTotem.java
View file

@ -30,17 +30,19 @@ package mage.sets.timespiral;
import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.SourceIsCreatureCondition;
import mage.abilities.condition.common.SourceMatchesFilterCondition;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.decorator.ConditionalContinuousEffect;
import mage.abilities.effects.common.combat.CanBlockAdditionalCreatureEffect;
import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
import mage.abilities.keyword.TrampleAbility;
import mage.abilities.mana.RedManaAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.permanent.token.Token;
import java.util.UUID;
@ -51,7 +53,7 @@ import java.util.UUID;
*/
public class ForiysianTotem extends CardImpl {
private final static String ruleText = "As long as Foriysian Totem is a creature, it can block an additional creature.";
private final static String ruleText = "As long as {this} is a creature, it can block an additional creature.";
public ForiysianTotem(UUID ownerId) {
super(ownerId, 254, "Foriysian Totem", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}");
@ -64,7 +66,7 @@ public class ForiysianTotem extends CardImpl {
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForiysianTotemToken(), "", Duration.EndOfTurn), new ManaCostsImpl<>("{4}{R}")));
// As long as Foriysian Totem is a creature, it can block an additional creature.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new CanBlockAdditionalCreatureEffect(1), SourceIsCreatureCondition.getInstance() , ruleText)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new CanBlockAdditionalCreatureEffect(1), new SourceMatchesFilterCondition(new FilterCreaturePermanent()), ruleText)));
}
public ForiysianTotem(final ForiysianTotem card) {
@ -88,5 +90,6 @@ class ForiysianTotemToken extends Token {
color.setRed(true);
power = new MageInt(4);
toughness = new MageInt(4);
this.addAbility(TrampleAbility.getInstance());
}
}

25
Mage/src/mage/abilities/condition/common/SourceIsCreatureCondition.java
View file

@ -1,25 +0,0 @@
package mage.abilities.condition.common;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.constants.CardType;
import mage.game.Game;
/**
* @author klayhamn
*/
public class SourceIsCreatureCondition implements Condition {
private static final SourceIsCreatureCondition fInstance = new SourceIsCreatureCondition();
public static Condition getInstance() {
return fInstance;
}
@Override
public boolean apply(Game game, Ability source) {
MageObject object = game.getObject(source.getSourceId());
return object != null && object.getCardType().contains(CardType.CREATURE);
}
}