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

Improved previous commit.

Browse source
This commit is contained in:
North 2011-05-15 17:50:47 +03:00
parent 2f56261ccd
commit d9b7e12a51
8 changed files with 68 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java
View file

@ -32,10 +32,9 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.GenericTriggeredAbility;
import mage.abilities.common.BlocksTriggeredAbility;
import mage.abilities.effects.common.GainLifeEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.triggers.common.BlocksTrigger;
import mage.cards.CardImpl;
/**
@ -48,12 +47,13 @@ public class GoldenglowMoth extends CardImpl<GoldenglowMoth> {
super(ownerId, 15, "Goldenglow Moth", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}");
this.expansionSetCode = "M11";
this.subtype.add("Insect");
this.color.setWhite(true);
this.power = new MageInt(0);
this.toughness = new MageInt(1);
this.addAbility(FlyingAbility.getInstance());
this.addAbility(new GenericTriggeredAbility(BlocksTrigger.getInstance(), new GainLifeEffect(4), true));
this.addAbility(new BlocksTriggeredAbility(new GainLifeEffect(4), true));
}

30
Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java
View file

@ -31,14 +31,13 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt;
import mage.abilities.TriggeredAbility;
import mage.abilities.common.GenericTriggeredAbility;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continious.BoostSourceEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.ReachAbility;
import mage.abilities.triggers.Trigger;
import mage.abilities.triggers.common.BecomesBlockedTrigger;
import mage.cards.CardImpl;
import mage.game.Game;
import mage.game.events.GameEvent;
@ -62,7 +61,7 @@ public class EzurisArchers extends CardImpl<EzurisArchers> {
this.addAbility(ReachAbility.getInstance());
// Whenever Ezuri's Archers blocks a creature with flying, Ezuri's Archers gets +3/+0 until end of turn.
this.addAbility(new GenericTriggeredAbility(BlocksCreatureWithFlyingTrigger.getInstance(), new BoostSourceEffect(3, 0, Duration.EndOfTurn), false));
this.addAbility(new BlocksCreatureWithFlyingTriggeredAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn), false));
}
public EzurisArchers(final EzurisArchers card) {
@ -75,17 +74,19 @@ public class EzurisArchers extends CardImpl<EzurisArchers> {
}
}
class BlocksCreatureWithFlyingTrigger implements Trigger {
class BlocksCreatureWithFlyingTriggeredAbility extends TriggeredAbilityImpl<BlocksCreatureWithFlyingTriggeredAbility> {
private static Trigger instance = new BecomesBlockedTrigger();
public BlocksCreatureWithFlyingTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
}
public static Trigger getInstance() {
return instance;
public BlocksCreatureWithFlyingTriggeredAbility(final BlocksCreatureWithFlyingTriggeredAbility ability) {
super(ability);
}
@Override
public boolean checkTrigger(TriggeredAbility ability, GameEvent event, Game game) {
if (event.getType() == EventType.BLOCKER_DECLARED && event.getSourceId().equals(ability.getSourceId())
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.BLOCKER_DECLARED && event.getSourceId().equals(this.getSourceId())
&& game.getPermanent(event.getTargetId()).getAbilities().containsKey(FlyingAbility.getInstance().getId())) {
return true;
}
@ -94,6 +95,11 @@ class BlocksCreatureWithFlyingTrigger implements Trigger {
@Override
public String getRule() {
return "Whenever {this} blocks a creature with flying, ";
return "Whenever {this} blocks a creature with flying, " + super.getRule();
}
@Override
public BlocksCreatureWithFlyingTriggeredAbility copy() {
return new BlocksCreatureWithFlyingTriggeredAbility(this);
}
}

8
Mage.Sets/src/mage/sets/scarsofmirrodin/IchorclawMyr.java
View file

@ -32,10 +32,9 @@ import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.GenericTriggeredAbility;
import mage.abilities.common.BecomesBlockedTriggeredAbility;
import mage.abilities.effects.common.continious.BoostSourceEffect;
import mage.abilities.keyword.InfectAbility;
import mage.abilities.triggers.common.BecomesBlockedTrigger;
import mage.cards.CardImpl;
/**
@ -54,10 +53,7 @@ public class IchorclawMyr extends CardImpl<IchorclawMyr> {
this.addAbility(InfectAbility.getInstance());
// Whenever Ichorclaw Myr becomes blocked, it gets +2/+2 until end of turn.
this.addAbility(new GenericTriggeredAbility(
BecomesBlockedTrigger.getInstance(),
new BoostSourceEffect(2, 2, Duration.EndOfTurn),
false));
this.addAbility(new BecomesBlockedTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false));
}
public IchorclawMyr(final IchorclawMyr card) {

7
Mage.Sets/src/mage/sets/tenth/LoyalSentry.java
View file

@ -35,9 +35,8 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.GenericTriggeredAbility;
import mage.abilities.common.BlocksTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.triggers.common.BlocksTrigger;
import mage.cards.CardImpl;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -58,7 +57,7 @@ public class LoyalSentry extends CardImpl<LoyalSentry> {
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.addAbility(new GenericTriggeredAbility(BlocksTrigger.getInstance(), new LoyalSentryEffect(), false));
this.addAbility(new BlocksTriggeredAbility(new LoyalSentryEffect(), false));
}
public LoyalSentry (final LoyalSentry card) {
@ -100,6 +99,6 @@ class LoyalSentryEffect extends OneShotEffect<LoyalSentryEffect> {
@Override
public String getText(Ability source) {
return "destroy that creature and Loyal Sentry";
return "destroy that creature and {this}";
}
}