github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fix JTMS 0 Loyalty ability to use Brain Implementation.

Browse source 
As it is the exact same ability, implementing it twice slightly
differently made no sense. Now there is a single implementation for both
of them.
This commit is contained in:
Nathaniel Brandes 2016-05-11 02:29:06 -07:00
parent 43205b6f46
commit bceda744fd
3 changed files with 58 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Mage.Sets/src/mage/sets/fifthedition/Brainstorm.java
View file

@ -28,17 +28,11 @@
package mage.sets.fifthedition;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.abilities.effects.common.BrainstormEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.players.Player;
import mage.target.common.TargetCardInHand;
/**
*
@ -64,44 +58,3 @@ public class Brainstorm extends CardImpl {
return new Brainstorm(this);
}
}
class BrainstormEffect extends OneShotEffect {
public BrainstormEffect() {
super(Outcome.DrawCard);
staticText = "Draw three cards, then put two cards from your hand on top of your library in any order";
}
public BrainstormEffect(final BrainstormEffect effect) {
super(effect);
}
@Override
public BrainstormEffect copy() {
return new BrainstormEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
player.drawCards(3, game);
putOnLibrary(player, source, game);
putOnLibrary(player, source, game);
return true;
}
return false;
}
private boolean putOnLibrary(Player player, Ability source, Game game) {
TargetCardInHand target = new TargetCardInHand();
if (target.canChoose(source.getSourceId(), player.getId(), game)) {
player.chooseTarget(Outcome.ReturnToHand, target, source, game);
Card card = player.getHand().get(target.getFirstTarget(), game);
if (card != null) {
return player.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.HAND, true, false);
}
}
return false;
}
}

43
Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java
View file

@ -28,10 +28,12 @@
package mage.sets.worldwake;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.LoyaltyAbility;
import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.BrainstormEffect;
import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
@ -41,11 +43,9 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.game.Game;
import mage.players.Player;
import mage.target.TargetPlayer;
import mage.target.common.TargetCardInHand;
import mage.target.common.TargetCreaturePermanent;
/**
@ -66,7 +66,7 @@ public class JaceTheMindSculptor extends CardImpl {
this.addAbility(ability1);
// 0: Draw three cards, then put two cards from your hand on top of your library in any order.
LoyaltyAbility ability2 = new LoyaltyAbility(new JaceTheMindSculptorEffect2(), 0);
LoyaltyAbility ability2 = new LoyaltyAbility(new BrainstormEffect(), 0);
this.addAbility(ability2);
// −1: Return target creature to its owner's hand.
@ -75,7 +75,7 @@ public class JaceTheMindSculptor extends CardImpl {
this.addAbility(ability3);
// −12: Exile all cards from target player's library, then that player shuffles his or her hand into his or her library.
LoyaltyAbility ability4 = new LoyaltyAbility(new JaceTheMindSculptorEffect3(), -12);
LoyaltyAbility ability4 = new LoyaltyAbility(new JaceTheMindSculptorEffect2(), -12);
ability4.addTarget(new TargetPlayer());
this.addAbility(ability4);
@ -135,7 +135,7 @@ class JaceTheMindSculptorEffect2 extends OneShotEffect {
public JaceTheMindSculptorEffect2() {
super(Outcome.DrawCard);
staticText = "Draw three cards, then put two cards from your hand on top of your library in any order";
staticText = "Exile all cards from target player's library, then that player shuffles his or her hand into his or her library";
}
public JaceTheMindSculptorEffect2(final JaceTheMindSculptorEffect2 effect) {
@ -147,39 +147,6 @@ class JaceTheMindSculptorEffect2 extends OneShotEffect {
return new JaceTheMindSculptorEffect2(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
controller.drawCards(3, game);
TargetCardInHand target = new TargetCardInHand(2, 2, new FilterCard());
controller.chooseTarget(Outcome.Detriment, target, source, game);
Cards cardsToLibrary = new CardsImpl(target.getTargets());
if (!cardsToLibrary.isEmpty()) {
controller.putCardsOnTopOfLibrary(cardsToLibrary, game, source, true);
}
return true;
}
return false;
}
}
class JaceTheMindSculptorEffect3 extends OneShotEffect {
public JaceTheMindSculptorEffect3() {
super(Outcome.DrawCard);
staticText = "Exile all cards from target player's library, then that player shuffles his or her hand into his or her library";
}
public JaceTheMindSculptorEffect3(final JaceTheMindSculptorEffect3 effect) {
super(effect);
}
@Override
public JaceTheMindSculptorEffect3 copy() {
return new JaceTheMindSculptorEffect3(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getFirstTarget());

51
Mage/src/main/java/mage/abilities/effects/common/BrainstormEffect.java Normal file
View file

@ -0,0 +1,51 @@
package mage.abilities.effects.common;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
import mage.players.Player;
import mage.target.common.TargetCardInHand;
public class BrainstormEffect extends OneShotEffect {
public BrainstormEffect() {
super(Outcome.DrawCard);
staticText = "Draw three cards, then put two cards from your hand on top of your library in any order";
}
public BrainstormEffect(final BrainstormEffect effect) {
super(effect);
}
@Override
public BrainstormEffect copy() {
return new BrainstormEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
player.drawCards(3, game);
putOnLibrary(player, source, game);
putOnLibrary(player, source, game);
return true;
}
return false;
}
private boolean putOnLibrary(Player player, Ability source, Game game) {
TargetCardInHand target = new TargetCardInHand();
if (target.canChoose(source.getSourceId(), player.getId(), game)) {
player.chooseTarget(Outcome.ReturnToHand, target, source, game);
Card card = player.getHand().get(target.getFirstTarget(), game);
if (card != null) {
return player.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.HAND, true, false);
}
}
return false;
}
}