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

Some fixes to Prohibit, Aeon Chronicler and Body Double. Some minor changes to framework functions.

Browse source
This commit is contained in:
LevelX2 2014-11-04 00:46:52 +01:00
parent 9b6bc80f34
commit e074eabb08
7 changed files with 69 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/sets/invasion/Prohibit.java
View file

@ -49,7 +49,7 @@ import mage.target.TargetSpell;
public class Prohibit extends CardImpl {
private static final FilterSpell filter2 = new FilterSpell("spell if its converted mana cost is 2 or less");
private static final FilterSpell filter4 = new FilterSpell("spell if its converted mana cost is 5 or less");
private static final FilterSpell filter4 = new FilterSpell("spell if its converted mana cost is 4 or less");
static {
filter2.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 3));
@ -67,15 +67,15 @@ public class Prohibit extends CardImpl {
// Counter target spell if its converted mana cost is 2 or less. If Prohibit was kicked, counter that spell if its converted mana cost is 4 or less instead.
this.getSpellAbility().addEffect(new CounterTargetEffect());
this.getSpellAbility().addTarget(new TargetSpell(filter2));
this.getSpellAbility().addTarget(new TargetSpell(filter4));
}
@Override
public void adjustTargets(Ability ability, Game game) {
if (ability instanceof SpellAbility) {
if (KickedCondition.getInstance().apply(game, ability)) {
if (!KickedCondition.getInstance().apply(game, ability)) {
ability.getTargets().clear();
ability.getTargets().add(new TargetSpell(filter4));
ability.getTargets().add(new TargetSpell(filter2));
}
}
}

50
Mage.Sets/src/mage/sets/jacevsvraska/AeonChronicler.java
View file

@ -33,7 +33,6 @@ import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.dynamicvalue.common.CardsInControllerHandCount;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect;
import mage.abilities.keyword.SuspendAbility;
@ -42,6 +41,7 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
@ -65,7 +65,7 @@ public class AeonChronicler extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInControllerHandCount(), Duration.EndOfGame)));
// Suspend X-{X}{3}{U}. X can't be 0.
this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl("{X}{3}"), this, true));
this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl("{3}{U}"), this, true));
// Whenever a time counter is removed from Aeon Chronicler while it's exiled, draw a card.
this.addAbility(new AeonChroniclerTriggeredAbility());
@ -83,27 +83,27 @@ public class AeonChronicler extends CardImpl {
class AeonChroniclerTriggeredAbility extends TriggeredAbilityImpl {
public AeonChroniclerTriggeredAbility() {
super(Zone.EXILED, new DrawCardSourceControllerEffect(1), false);
}
public AeonChroniclerTriggeredAbility(final AeonChroniclerTriggeredAbility ability) {
super(ability);
}
@Override
public AeonChroniclerTriggeredAbility copy() {
return new AeonChroniclerTriggeredAbility(this);
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
return EventType.COUNTER_REMOVED.equals(event.getType()) && event.getData().equals("time") && event.getTargetId().equals(this.getSourceId());
}
@Override
public String getRule() {
return "Whenever a time counter is removed from {this} while it's exiled, " + super.getRule();
}
public AeonChroniclerTriggeredAbility() {
super(Zone.EXILED, new DrawCardSourceControllerEffect(1), false);
}
public AeonChroniclerTriggeredAbility(final AeonChroniclerTriggeredAbility ability) {
super(ability);
}
@Override
public AeonChroniclerTriggeredAbility copy() {
return new AeonChroniclerTriggeredAbility(this);
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
return EventType.COUNTER_REMOVED.equals(event.getType()) && event.getData().equals(CounterType.TIME.getName()) && event.getTargetId().equals(this.getSourceId());
}
@Override
public String getRule() {
return "Whenever a time counter is removed from {this} while it's exiled, " + super.getRule();
}
}

2
Mage.Sets/src/mage/sets/jacevsvraska/BodyDouble.java
View file

@ -98,7 +98,7 @@ class BodyDoubleCopyEffect extends OneShotEffect {
Player player = game.getPlayer(source.getControllerId());
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
if (player != null && sourcePermanent != null) {
Target target = new TargetCardInGraveyard(new FilterCreatureCard());
Target target = new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard"));
target.setNotTarget(true);
if (target.canChoose(source.getControllerId(), game)) {
player.choose(outcome, target, source.getSourceId(), game);