External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 11:32:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Intet, the Dreamer - Improved handling to look at face down cards exiled with Intet. Works now also if Intet has left the battlefield.

Browse source
This commit is contained in:
LevelX2 2015-08-19 00:59:05 +02:00
parent 618033c947
commit 9df993bd3a
11 changed files with 276 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -629,10 +629,11 @@ public class HumanPlayer extends PlayerImpl {
if (object != null) {
Zone zone = game.getState().getZone(object.getId());
if (zone != null) {
if (object instanceof Card && ((Card) object).isFaceDown(game)) {
revealFaceDownCard((Card) object, game);
if (object instanceof Card
&& ((Card) object).isFaceDown(game)
&& lookAtFaceDownCard((Card) object, game)) {
result = true;
}
} else {
Player actingPlayer = null;
if (game.getPriorityPlayerId().equals(playerId)) {
actingPlayer = this;
@ -648,6 +649,7 @@ public class HumanPlayer extends PlayerImpl {
}
}
}
}
return result;
} else if (response.getManaType() != null) {
return false;

60
Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java
View file

@ -30,12 +30,6 @@ package mage.sets.gatecrash;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import mage.constants.AsThoughEffectType;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability;
@ -48,8 +42,12 @@ import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.constants.AsThoughEffectType;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.game.ExileZone;
import mage.game.Game;
@ -62,29 +60,31 @@ import mage.util.CardUtil;
/**
* Gatecrash FAQ (01.2013)
*
* If Bane Alley Broker's first ability resolves when you have no cards in your hand,
* you'll draw a card and then exile it. You won't have the opportunity to cast that
* card (or do anything else with it) before exiling it.
* If Bane Alley Broker's first ability resolves when you have no cards in your
* hand, you'll draw a card and then exile it. You won't have the opportunity to
* cast that card (or do anything else with it) before exiling it.
*
* Due to a recent rules change, once you are allowed to look at a face-down card in
* exile, you are allowed to look at that card as long as it's exiled. If you no longer
* control Bane Alley Broker when its last ability resolves, you can continue to look
* at the relevant cards in exile to choose one to return.
* Due to a recent rules change, once you are allowed to look at a face-down
* card in exile, you are allowed to look at that card as long as it's exiled.
* If you no longer control Bane Alley Broker when its last ability resolves,
* you can continue to look at the relevant cards in exile to choose one to
* return.
*
* Bane Alley Broker's second and third abilities apply to cards exiled with that
* specific Bane Alley Broker, not any other creature named Bane Alley Broker.
* You should keep cards exiled by different Bane Alley Brokers separate.
* Bane Alley Broker's second and third abilities apply to cards exiled with
* that specific Bane Alley Broker, not any other creature named Bane Alley
* Broker. You should keep cards exiled by different Bane Alley Brokers
* separate.
*
* If Bane Alley Broker leaves the battlefield, the cards exiled with it will be
* exiled indefinitely. If it later returns to the battlefield, it will be a new
* object with no connection to the cards exiled with it in its previous existence.
* You won't be able to use the "new" Bane Alley Broker to return cards exiled with
* the "old" one.
* object with no connection to the cards exiled with it in its previous
* existence. You won't be able to use the "new" Bane Alley Broker to return
* cards exiled with the "old" one.
*
* Even if not all players can look at the exiled cards, each card's owner is still
* known. It is advisable to keep cards owned by different players in distinct piles
* in case another player gains control of Bane Alley Broker and exiles one or more
* cards with it.
* Even if not all players can look at the exiled cards, each card's owner is
* still known. It is advisable to keep cards owned by different players in
* distinct piles in case another player gains control of Bane Alley Broker and
* exiles one or more cards with it.
*
* @author LevelX2
*/
@ -223,7 +223,7 @@ class TargetCardInBaneAlleyBrokerExile extends TargetCard {
class BaneAlleyBrokerLookAtCardEffect extends AsThoughEffectImpl {
public BaneAlleyBrokerLookAtCardEffect() {
super(AsThoughEffectType.REVEAL_FACE_DOWN, Duration.EndOfGame, Outcome.Benefit);
super(AsThoughEffectType.LOOK_AT_FACE_DOWN, Duration.EndOfGame, Outcome.Benefit);
staticText = "You may look at cards exiled with {this}";
}
@ -252,13 +252,7 @@ class BaneAlleyBrokerLookAtCardEffect extends AsThoughEffectImpl {
}
UUID exileId = CardUtil.getCardExileZoneId(game, source);
ExileZone exile = game.getExile().getExileZone(exileId);
if (exile != null && exile.contains(objectId)) {
Cards cards = new CardsImpl(card);
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
controller.lookAtCards("Exiled with " + sourceObject.getName(), cards, game);
}
}
return exile != null && exile.contains(objectId);
}
}
return false;

9
Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java
View file

@ -34,8 +34,6 @@ import mage.abilities.effects.AsThoughEffectImpl;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.constants.AsThoughEffectType;
import mage.constants.CardType;
import mage.constants.Duration;
@ -167,7 +165,7 @@ class PraetorsGraspRevealEffect extends AsThoughEffectImpl {
private final UUID cardId;
public PraetorsGraspRevealEffect(UUID cardId) {
super(AsThoughEffectType.REVEAL_FACE_DOWN, Duration.EndOfGame, Outcome.Benefit);
super(AsThoughEffectType.LOOK_AT_FACE_DOWN, Duration.EndOfGame, Outcome.Benefit);
this.cardId = cardId;
staticText = "You may look at and play that card for as long as it remains exiled";
}
@ -198,10 +196,7 @@ class PraetorsGraspRevealEffect extends AsThoughEffectImpl {
Player controller = game.getPlayer(source.getControllerId());
Card card = game.getCard(cardId);
if (controller != null && card != null && game.getState().getZone(cardId) == Zone.EXILED) {
if (controller.chooseUse(outcome, "Reveal exiled card?", source, game)) {
Cards cards = new CardsImpl(card);
controller.lookAtCards("Exiled with " + sourceObject.getIdName(), cards, game);
}
return true;
}
} else {
discard();

104
Mage.Sets/src/mage/sets/planarchaos/IntetTheDreamer.java
View file

@ -27,21 +27,21 @@
*/
package mage.sets.planarchaos;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.AsThoughEffectImpl;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.DoIfCostPaid;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.constants.AsThoughEffectType;
import mage.constants.CardType;
import mage.constants.Duration;
@ -59,6 +59,8 @@ import mage.util.CardUtil;
*/
public class IntetTheDreamer extends CardImpl {
protected static final String VALUE_PREFIX = "ExileZones";
public IntetTheDreamer(UUID ownerId) {
super(ownerId, 158, "Intet, the Dreamer", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}{R}{G}");
this.expansionSetCode = "PLC";
@ -72,9 +74,12 @@ public class IntetTheDreamer extends CardImpl {
// Whenever Intet, the Dreamer deals combat damage to a player, you may pay {2}{U}. If you do, exile the top card of your library face down.
this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(
new DoIfCostPaid(new IntetTheDreamerExileEffect(), new ManaCostsImpl("{2}{U}")), false, true));
// You may look at that card for as long as it remains exiled. You may play that card without paying its mana cost for as long as Intet remains on the battlefield.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IntetTheDreamerEffect()));
// You may look at that card for as long as it remains exiled.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new IntetTheDreamerLookEffect()));
// You may play that card without paying its mana cost for as long as Intet remains on the battlefield.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IntetTheDreamerCastEffect()));
}
public IntetTheDreamer(final IntetTheDreamer card) {
super(card);
}
@ -98,14 +103,21 @@ class IntetTheDreamerExileEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
Card card = player.getLibrary().getFromTop(game);
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
Card card = controller.getLibrary().getFromTop(game);
MageObject sourceObject = source.getSourceObject(game);
if (card != null && sourceObject != null) {
UUID exileZoneId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter());
player.moveCardToExileWithInfo(card, exileZoneId, sourceObject.getIdName(), source.getSourceId(), game, Zone.LIBRARY, false);
card.setFaceDown(true, game);
controller.moveCardsToExile(card, source, game, false, exileZoneId, sourceObject.getIdName());
card.setFaceDown(true, game);
Set<UUID> exileZones = (Set<UUID>) game.getState().getValue(IntetTheDreamer.VALUE_PREFIX + source.getSourceId().toString());
if (exileZones == null) {
exileZones = new HashSet<>();
game.getState().setValue(IntetTheDreamer.VALUE_PREFIX + source.getSourceId().toString(), exileZones);
}
exileZones.add(exileZoneId);
return true;
}
}
@ -118,14 +130,14 @@ class IntetTheDreamerExileEffect extends OneShotEffect {
}
}
class IntetTheDreamerEffect extends AsThoughEffectImpl {
class IntetTheDreamerCastEffect extends AsThoughEffectImpl {
public IntetTheDreamerEffect() {
public IntetTheDreamerCastEffect() {
super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
staticText = "You may play the card from exile without paying its mana cost for as long as {this} remains on the battlefield";
}
public IntetTheDreamerEffect(final IntetTheDreamerEffect effect) {
public IntetTheDreamerCastEffect(final IntetTheDreamerCastEffect effect) {
super(effect);
}
@ -135,30 +147,80 @@ class IntetTheDreamerEffect extends AsThoughEffectImpl {
}
@Override
public IntetTheDreamerEffect copy() {
return new IntetTheDreamerEffect(this);
public IntetTheDreamerCastEffect copy() {
return new IntetTheDreamerCastEffect(this);
}
@Override
public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
if (affectedControllerId.equals(source.getControllerId()) && game.getState().getZone(objectId).equals(Zone.EXILED)) {
Player controller = game.getPlayer(source.getControllerId());
MageObject sourceObject = source.getSourceObject(game);
if (controller != null && sourceObject != null) {
Card card = game.getCard(objectId);
if (affectedControllerId.equals(source.getControllerId()) && card != null && game.getState().getZone(card.getId()) == Zone.EXILED) {
if (card != null && card.isFaceDown(game)) {
ExileZone zone = game.getExile().getExileZone(CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter()));
if (zone != null && zone.contains(card.getId())) {
if (controller.chooseUse(outcome, "Look at the card?", source, game)) {
Cards cards = new CardsImpl();
cards.add(card);
controller.lookAtCards(sourceObject.getName(), cards, game);
return false;
if (zone != null && zone.contains(card.getId())/* && CardUtil.cardCanBePlayedNow(card, controller.getId(), game)*/) {
if (card.getCardType().contains(CardType.LAND)) {
if (game.canPlaySorcery(controller.getId()) && game.getPlayer(controller.getId()).canPlayLand()) {
return controller.chooseUse(outcome, "Play " + card.getName() + "?", source, game);
}
} else {
controller.setCastSourceIdWithAlternateMana(objectId, null);
return true;
}
}
}
}
}
return false;
}
}
class IntetTheDreamerLookEffect extends AsThoughEffectImpl {
public IntetTheDreamerLookEffect() {
super(AsThoughEffectType.LOOK_AT_FACE_DOWN, Duration.EndOfGame, Outcome.Benefit);
staticText = "You may look at that card for as long as it remains exiled";
}
public IntetTheDreamerLookEffect(final IntetTheDreamerLookEffect effect) {
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
return true;
}
@Override
public IntetTheDreamerLookEffect copy() {
return new IntetTheDreamerLookEffect(this);
}
@Override
public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
if (affectedControllerId.equals(source.getControllerId()) && game.getState().getZone(objectId).equals(Zone.EXILED)) {
Player controller = game.getPlayer(source.getControllerId());
MageObject sourceObject = source.getSourceObject(game);
if (controller != null && sourceObject != null) {
Card card = game.getCard(objectId);
if (card != null && card.isFaceDown(game)) {
Set<UUID> exileZones = (Set<UUID>) game.getState().getValue(IntetTheDreamer.VALUE_PREFIX + source.getSourceId().toString());
if (exileZones != null) {
for (ExileZone exileZone : game.getExile().getExileZones()) {
if (exileZone.contains(objectId)) {
if (!exileZones.contains(exileZone.getId())) {
return false;
}
}
}
return true;
}
}
}
}
return false;
}
}

4
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -1613,8 +1613,8 @@ public class TestPlayer implements Player {
}
@Override
public void revealFaceDownCard(Card card, Game game) {
computerPlayer.revealFaceDownCard(card, game);
public boolean lookAtFaceDownCard(Card card, Game game) {
return computerPlayer.lookAtFaceDownCard(card, game);
}
@Override

1
Mage/src/mage/abilities/effects/common/DoIfCostPaid.java
View file

@ -53,6 +53,7 @@ public class DoIfCostPaid extends OneShotEffect {
effectText = effectText.substring(0, effectText.length() - 1);
}
message = getCostText() + " and " + effectText + "?";
message = Character.toUpperCase(message.charAt(0)) + message.substring(1);
} else {
message = chooseUseText;
}

2
Mage/src/mage/abilities/keyword/HideawayAbility.java
View file

@ -139,7 +139,7 @@ class HideawayExileEffect extends OneShotEffect {
class HideawayLookAtFaceDownCardEffect extends AsThoughEffectImpl {
public HideawayLookAtFaceDownCardEffect() {
super(AsThoughEffectType.REVEAL_FACE_DOWN, Duration.EndOfGame, Outcome.Benefit);
super(AsThoughEffectType.LOOK_AT_FACE_DOWN, Duration.EndOfGame, Outcome.Benefit);
staticText = "You may look at cards exiled with {this}";
}

2
Mage/src/mage/constants/AsThoughEffectType.java
View file

@ -17,7 +17,7 @@ public enum AsThoughEffectType {
DAMAGE,
HEXPROOF,
PAY,
REVEAL_FACE_DOWN,
LOOK_AT_FACE_DOWN,
SPEND_ANY_MANA,
TARGET
}

3
Mage/src/mage/players/Player.java
View file

@ -566,8 +566,9 @@ public interface Player extends MageItem, Copyable<Player> {
*
* @param card
* @param game
* @return player looked at the card
*/
void revealFaceDownCard(Card card, Game game);
boolean lookAtFaceDownCard(Card card, Game game);
/**
* Set seconds left to play the game.

10
Mage/src/mage/players/PlayerImpl.java
View file

@ -2830,12 +2830,16 @@ public abstract class PlayerImpl implements Player, Serializable {
}
@Override
public void revealFaceDownCard(Card card, Game game) {
if (game.getContinuousEffects().asThough(card.getId(), AsThoughEffectType.REVEAL_FACE_DOWN, this.getId(), game)) {
public boolean lookAtFaceDownCard(Card card, Game game) {
if (game.getContinuousEffects().asThough(card.getId(), AsThoughEffectType.LOOK_AT_FACE_DOWN, this.getId(), game)) {
if (chooseUse(Outcome.Benefit, "Look at that card?", null, game)) {
Cards cards = new CardsImpl(card);
this.revealCards(getName(), cards, game);
this.lookAtCards(getName(), cards, game);
return true;
}
}
return false;
}
@Override
public void setPriorityTimeLeft(int timeLeft) {

53
Mage/src/mage/util/CardUtil.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.util;
import java.util.Arrays;
@ -58,7 +57,6 @@ import mage.game.permanent.token.Token;
import mage.game.stack.Spell;
import mage.util.functions.CopyTokenFunction;
/**
* @author nantuko
*/
@ -102,6 +100,7 @@ public class CardUtil {
return false;
}
/**
* Checks whether two cards share card subtypes.
*
@ -116,10 +115,10 @@ public class CardUtil {
}
if (card1.getCardType().contains(CardType.CREATURE) && card2.getCardType().contains(CardType.CREATURE)) {
if (card1.getAbilities().contains(ChangelingAbility.getInstance()) ||
card1.getSubtype().contains(ChangelingAbility.ALL_CREATURE_TYPE) ||
card2.getAbilities().contains(ChangelingAbility.getInstance()) ||
card2.getSubtype().contains(ChangelingAbility.ALL_CREATURE_TYPE)) {
if (card1.getAbilities().contains(ChangelingAbility.getInstance())
|| card1.getSubtype().contains(ChangelingAbility.ALL_CREATURE_TYPE)
|| card2.getAbilities().contains(ChangelingAbility.getInstance())
|| card2.getSubtype().contains(ChangelingAbility.ALL_CREATURE_TYPE)) {
return true;
}
}
@ -207,8 +206,6 @@ public class CardUtil {
}
}
/**
* Adjusts ability cost to be paid.
*
@ -279,7 +276,8 @@ public class CardUtil {
*
* @param spellAbility
* @param manaCostsToReduce costs to reduce
* @param convertToGeneric colored mana does reduce generic mana if no appropriate colored mana is in the costs included
* @param convertToGeneric colored mana does reduce generic mana if no
* appropriate colored mana is in the costs included
*/
public static void adjustCost(SpellAbility spellAbility, ManaCosts<ManaCost> manaCostsToReduce, boolean convertToGeneric) {
ManaCosts<ManaCost> previousCost = spellAbility.getManaCostsToPay();
@ -291,7 +289,6 @@ public class CardUtil {
}
}
Mana reduceMana = new Mana();
for (ManaCost manaCost : manaCostsToReduce) {
reduceMana.add(manaCost.getMana());
@ -385,9 +382,9 @@ public class CardUtil {
spellAbility.getManaCostsToPay().addAll(adjustedCost);
}
/**
* Returns function that copies params\abilities from one card to {@link Token}.
* Returns function that copies params\abilities from one card to
* {@link Token}.
*
* @param target
* @return
@ -409,8 +406,8 @@ public class CardUtil {
}
/**
* Converts an integer number to string
* Numbers > 20 will be returned as digits
* Converts an integer number to string Numbers > 20 will be returned as
* digits
*
* @param number
* @return
@ -424,7 +421,8 @@ public class CardUtil {
* Numbers > 20 will be returned as digits
*
* @param number number to convert to text
* @param forOne if the number is 1, this string will be returnedinstead of "one".
* @param forOne if the number is 1, this string will be returnedinstead of
* "one".
* @return
*/
public static String numberToText(int number, String forOne) {
@ -516,9 +514,10 @@ public class CardUtil {
}
/**
* Creates a string from text + cardId and the zoneChangeCounter of the card (from cardId).
* This string can be used to save and get values that must be specific to a permanent instance.
* So they won't match, if a permanent was e.g. exiled and came back immediately.
* Creates a string from text + cardId and the zoneChangeCounter of the card
* (from cardId). This string can be used to save and get values that must
* be specific to a permanent instance. So they won't match, if a permanent
* was e.g. exiled and came back immediately.
*
* @param text short value to describe the value
* @param cardId id of the card
@ -559,8 +558,9 @@ public class CardUtil {
}
/**
* Returns if the ability is used to check which cards
* are playable on hand. (Issue #457)
* Returns if the ability is used to check which cards are playable on hand.
* (Issue #457)
*
* @param ability - ability to check
* @return
*/
@ -572,8 +572,8 @@ public class CardUtil {
}
/**
* Adds tags to mark the additional info of a card
* (e.g. blue font color)
* Adds tags to mark the additional info of a card (e.g. blue font color)
*
* @param text text body
* @return
*/
@ -648,4 +648,13 @@ public class CardUtil {
public static boolean isNonCreatureSubtype(String subtype) {
return NON_CREATURE_SUBTYPES.contains(subtype);
}
public static boolean cardCanBePlayedNow(Card card, UUID playerId, Game game) {
if (card.getCardType().contains(CardType.LAND)) {
return game.canPlaySorcery(playerId) && game.getPlayer(playerId).canPlayLand();
} else {
return card.getSpellAbility() != null && card.getSpellAbility().spellCanBeActivatedRegularlyNow(playerId, game);
}
}
}