mirror of
https://github.com/correl/mage.git
synced 2024-12-25 11:11:16 +00:00
- Little fixes to some cards.
This commit is contained in:
parent
aa67d4fb79
commit
d5c1f35aca
4 changed files with 6 additions and 3 deletions
|
@ -109,7 +109,7 @@ class AtarkaWorldRenderEffect extends TriggeredAbilityImpl {
|
||||||
if (event.getType() == EventType.ATTACKER_DECLARED) {
|
if (event.getType() == EventType.ATTACKER_DECLARED) {
|
||||||
Permanent attacker = game.getPermanent(event.getSourceId());
|
Permanent attacker = game.getPermanent(event.getSourceId());
|
||||||
if (attacker != null
|
if (attacker != null
|
||||||
&& filter.match(attacker, game)) {
|
&& filter.match(attacker, sourceId, controllerId, game)) {
|
||||||
for (Effect effect : this.getEffects()) {
|
for (Effect effect : this.getEffects()) {
|
||||||
effect.setTargetPointer(new FixedTarget(attacker.getId()));
|
effect.setTargetPointer(new FixedTarget(attacker.getId()));
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,7 @@ public class MonasteryMentor extends CardImpl {
|
||||||
MonasteryMentorToken() {
|
MonasteryMentorToken() {
|
||||||
super("Monk", "1/1 white Monk creature token with prowess");
|
super("Monk", "1/1 white Monk creature token with prowess");
|
||||||
cardType.add(CardType.CREATURE);
|
cardType.add(CardType.CREATURE);
|
||||||
color.setBlack(true);
|
color.setWhite(true);
|
||||||
subtype.add("Monk");
|
subtype.add("Monk");
|
||||||
power = new MageInt(1);
|
power = new MageInt(1);
|
||||||
toughness = new MageInt(1);
|
toughness = new MageInt(1);
|
||||||
|
|
|
@ -46,6 +46,7 @@ import mage.constants.Rarity;
|
||||||
import mage.constants.TargetController;
|
import mage.constants.TargetController;
|
||||||
import mage.constants.Zone;
|
import mage.constants.Zone;
|
||||||
import mage.filter.common.FilterCreaturePermanent;
|
import mage.filter.common.FilterCreaturePermanent;
|
||||||
|
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||||
import mage.filter.predicate.permanent.AnotherPredicate;
|
import mage.filter.predicate.permanent.AnotherPredicate;
|
||||||
import mage.filter.predicate.permanent.AttackingPredicate;
|
import mage.filter.predicate.permanent.AttackingPredicate;
|
||||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||||
|
@ -63,9 +64,11 @@ public class GoblinRabblemaster extends CardImpl {
|
||||||
static {
|
static {
|
||||||
otherGoblinFilter.add(new AnotherPredicate());
|
otherGoblinFilter.add(new AnotherPredicate());
|
||||||
otherGoblinFilter.add(new ControllerPredicate(TargetController.YOU));
|
otherGoblinFilter.add(new ControllerPredicate(TargetController.YOU));
|
||||||
|
otherGoblinFilter.add(new SubtypePredicate("Goblin"));
|
||||||
|
|
||||||
attackingFilter.add(new AttackingPredicate());
|
attackingFilter.add(new AttackingPredicate());
|
||||||
attackingFilter.add(new AnotherPredicate());
|
attackingFilter.add(new AnotherPredicate());
|
||||||
|
attackingFilter.add(new SubtypePredicate("Goblin"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public GoblinRabblemaster(UUID ownerId) {
|
public GoblinRabblemaster(UUID ownerId) {
|
||||||
|
|
|
@ -113,7 +113,7 @@ class DinOfTheFireherdEffect extends OneShotEffect {
|
||||||
effect.apply(game, source);
|
effect.apply(game, source);
|
||||||
|
|
||||||
Effect effect2 = new SacrificeEffect(new FilterControlledLandPermanent(), redCreaturesControllerControls, "Target Opponent");
|
Effect effect2 = new SacrificeEffect(new FilterControlledLandPermanent(), redCreaturesControllerControls, "Target Opponent");
|
||||||
effect.setTargetPointer(new FixedTarget(targetOpponent.getId()));
|
effect2.setTargetPointer(new FixedTarget(targetOpponent.getId()));
|
||||||
effect2.apply(game, source);
|
effect2.apply(game, source);
|
||||||
applied = true;
|
applied = true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue