github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed some problems of Amplify keyword (not tested yet).

Browse source
This commit is contained in:
LevelX2 2015-04-04 09:58:09 +02:00
parent 72b4849488
commit 44e58a9a35
1 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Mage/src/mage/abilities/effects/common/AmplifyEffect.java
View file

@ -5,7 +5,8 @@
*/ */
package mage.abilities.effects.common; package mage.abilities.effects.common;
import java.util.UUID; import java.util.ArrayList;
import java.util.List;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.Mode; import mage.abilities.Mode;
import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.ReplacementEffectImpl;
@ -15,6 +16,8 @@ import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
@ -40,8 +43,6 @@ import mage.target.common.TargetCardInHand;
*/ */
public class AmplifyEffect extends ReplacementEffectImpl { public class AmplifyEffect extends ReplacementEffectImpl {
private static final FilterCreatureCard filter = new FilterCreatureCard("creatures cards to reveal");
private final AmplifyFactor amplifyFactor; private final AmplifyFactor amplifyFactor;
public enum AmplifyFactor { public enum AmplifyFactor {
@ -74,7 +75,7 @@ public class AmplifyEffect extends ReplacementEffectImpl {
} }
public AmplifyEffect(AmplifyFactor amplifyFactor) { public AmplifyEffect(AmplifyFactor amplifyFactor) {
super(Duration.EndOfGame, Outcome.Benefit); super(Duration.EndOfGame, Outcome.BoostCreature);
this.amplifyFactor = amplifyFactor; this.amplifyFactor = amplifyFactor;
} }
@ -90,38 +91,29 @@ public class AmplifyEffect extends ReplacementEffectImpl {
@Override @Override
public boolean applies(GameEvent event, Ability source, Game game) { public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getTargetId().equals(source.getSourceId())) { return event.getTargetId().equals(source.getSourceId());
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
game.getState().setValue(sourcePermanent.getId().toString() + "revealed", null);
return true;
}
return false;
}
@Override
public boolean apply(Game game, Ability source) {
return false;
} }
@Override @Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) { public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Permanent creature = game.getPermanent(event.getTargetId()); Permanent sourceCreature = game.getPermanent(event.getTargetId());
Player controller = game.getPlayer(creature.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (controller != null) { if (controller != null && sourceCreature != null) {
for (String subtype : creature.getSubtype()) { FilterCreatureCard filter = new FilterCreatureCard("creatures cards to reveal");
filter.add(new SubtypePredicate((subtype))); List<SubtypePredicate> filterSubtypes = new ArrayList<>();
for (String subtype : sourceCreature.getSubtype()) {
filterSubtypes.add(new SubtypePredicate((subtype)));
} }
filter.add(Predicates.or(filterSubtypes));
if (controller.getHand().count(filter, source.getSourceId(), source.getControllerId(), game) > 0){ if (controller.getHand().count(filter, source.getSourceId(), source.getControllerId(), game) > 0){
if (controller.chooseUse(Outcome.Benefit, "Reveal cards?", game)) { if (controller.chooseUse(outcome, "Reveal cards to Amplify?", game)) {
TargetCardInHand target = new TargetCardInHand(0, Integer.MAX_VALUE, filter); TargetCardInHand target = new TargetCardInHand(0, Integer.MAX_VALUE, filter);
if (controller.choose(Outcome.Benefit, target, source.getSourceId(), game)) { if (controller.choose(outcome, target, source.getSourceId(), game) && !target.getTargets().isEmpty()) {
Cards cards = new CardsImpl(); Cards cards = new CardsImpl();
for (UUID uuid : target.getTargets()) { cards.addAll(target.getTargets());
cards.add(controller.getHand().get(uuid, game));
}
int amountCounters = cards.size() * amplifyFactor.getFactor(); int amountCounters = cards.size() * amplifyFactor.getFactor();
creature.addCounters(CounterType.P1P1.createInstance(amountCounters), game); sourceCreature.addCounters(CounterType.P1P1.createInstance(amountCounters), game);
controller.revealCards("cards", cards, game); controller.revealCards(sourceCreature.getLogName(), cards, game);
} }
} }
} }