github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-29 03:00:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed bugs of Calix, Destiny Hand.

Browse source
This commit is contained in:
LevelX2 2020-01-12 23:08:23 +01:00
parent aff75278fd
commit 079a404d79
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Mage.Sets/src/mage/cards/c/CalixDestinysHand.java
View file

@ -1,5 +1,7 @@
package mage.cards.c; package mage.cards.c;
import java.util.UUID;
import java.util.stream.Collectors;
import mage.MageObject; import mage.MageObject;
import mage.MageObjectReference; import mage.MageObjectReference;
import mage.abilities.Ability; import mage.abilities.Ability;
@ -13,6 +15,7 @@ import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetE
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import static mage.constants.Outcome.Benefit;
import mage.filter.FilterCard; import mage.filter.FilterCard;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.filter.common.FilterControlledEnchantmentPermanent;
@ -26,12 +29,6 @@ import mage.players.Player;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
import static mage.constants.Outcome.Benefit;
/** /**
* @author TheElk801 * @author TheElk801
*/ */
@ -42,8 +39,8 @@ public final class CalixDestinysHand extends CardImpl {
= new FilterPermanent("creature or enchantment you don't control"); = new FilterPermanent("creature or enchantment you don't control");
static { static {
filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter2.add(TargetController.NOT_YOU.getControllerPredicate());
filter.add(Predicates.or( filter2.add(Predicates.or(
CardType.CREATURE.getPredicate(), CardType.CREATURE.getPredicate(),
CardType.ENCHANTMENT.getPredicate() CardType.ENCHANTMENT.getPredicate()
)); ));
@ -63,9 +60,9 @@ public final class CalixDestinysHand extends CardImpl {
StaticValue.get(4), false, StaticValue.get(1), filter, StaticValue.get(4), false, StaticValue.get(1), filter,
Zone.LIBRARY, false, true, false, Zone.LIBRARY, false, true, false,
Zone.HAND, true, false, false Zone.HAND, true, false, false
).setBackInRandomOrder(true).setText("Look at the top four cards of your library. " + ).setBackInRandomOrder(true).setText("Look at the top four cards of your library. "
"You may reveal an enchantment card from among them and put that card into your hand. " + + "You may reveal an enchantment card from among them and put that card into your hand. "
"Put the rest on the bottom of your library in a random order."), 1 + "Put the rest on the bottom of your library in a random order."), 1
)); ));
// −3: Exile target creature or enchantment you don't control until target enchantment you control leaves the battlefield. // −3: Exile target creature or enchantment you don't control until target enchantment you control leaves the battlefield.
@ -92,8 +89,8 @@ class CalixDestinysHandExileEffect extends OneShotEffect {
CalixDestinysHandExileEffect() { CalixDestinysHandExileEffect() {
super(Benefit); super(Benefit);
staticText = "Exile target creature or enchantment you don't control " + staticText = "Exile target creature or enchantment you don't control "
"until target enchantment you control leaves the battlefield."; + "until target enchantment you control leaves the battlefield.";
} }
private CalixDestinysHandExileEffect(final CalixDestinysHandExileEffect effect) { private CalixDestinysHandExileEffect(final CalixDestinysHandExileEffect effect) {
@ -108,9 +105,12 @@ class CalixDestinysHandExileEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId()); Player player = game.getPlayer(source.getControllerId());
List<UUID> targets = this.getTargetPointer().getTargets(game, source); if (source.getTargets().size() > 2) {
Permanent theirPerm = game.getPermanent(targets.get(0)); return false;
Permanent myPerm = game.getPermanent(targets.get(1)); }
source.getTargets();
Permanent theirPerm = game.getPermanent(source.getTargets().get(0).getFirstTarget());
Permanent myPerm = game.getPermanent(source.getTargets().get(1).getFirstTarget());
if (player == null || theirPerm == null || myPerm == null) { if (player == null || theirPerm == null || myPerm == null) {
return false; return false;
} }