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

* Descent into Madness - Fixed handling according the existing rules.

Browse source
This commit is contained in:
LevelX2 2014-07-15 16:58:11 +02:00
parent 60d04e2614
commit 1d8712335f
3 changed files with 133 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
Mage.Sets/src/mage/sets/avacynrestored/DescentIntoMadness.java
View file

@ -27,6 +27,9 @@
*/ */
package mage.sets.avacynrestored; package mage.sets.avacynrestored;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import mage.constants.*; import mage.constants.*;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
@ -44,8 +47,25 @@ import mage.target.TargetCard;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
import java.util.UUID; import java.util.UUID;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardIdPredicate;
import mage.filter.predicate.permanent.PermanentIdPredicate;
import mage.players.PlayerList;
/** /**
* 5/1/2012 For each despair counter on Descent into Madness, you'll exile a permanent
* you control or exile a card from your hand, not both.
* 5/1/2012 First you choose the permanents and/or cards from your hand that will be
* exiled. Then each other player in turn order does the same. Then all the chosen permanents
* and cards are exiled simultaneously. Players who choose after you will know what permanents
* you'll be exiling when they choose. They'll know how many cards you'll be exiling from
* your hand, but they won't see those cards.
* 5/1/2012 If there are more counters on Descent into Madness than the total number of
* permanents you control plus the number of cards in your hand, you'll exile all permanents
* you control (including Descent into Madness) and all cards from your hand.
* 5/1/2012 If Descent into Madness isn't on the battlefield when its ability resolves,
* use the number of counters on it when it left the battlefield to determine how many permanents
* and/or cards from hands to exile.
* *
* @author noxx * @author noxx
*/ */
@ -73,9 +93,6 @@ public class DescentIntoMadness extends CardImpl {
class DescentIntoMadnessEffect extends OneShotEffect { class DescentIntoMadnessEffect extends OneShotEffect {
private static final FilterCard filterInHand = new FilterCard();
private static final FilterControlledPermanent filter = new FilterControlledPermanent();
public DescentIntoMadnessEffect() { public DescentIntoMadnessEffect() {
super(Outcome.Sacrifice); super(Outcome.Sacrifice);
this.staticText = "put a despair counter on {this}, then each player exiles X permanents he or she controls and/or cards from his or her hand, where X is the number of despair counters on {this}"; this.staticText = "put a despair counter on {this}, then each player exiles X permanents he or she controls and/or cards from his or her hand, where X is the number of despair counters on {this}";
@ -92,55 +109,106 @@ class DescentIntoMadnessEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(source.getSourceId()); Player controller = game.getPlayer(source.getControllerId());
if (permanent != null) { Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
permanent.addCounters(CounterType.DESPAIR.createInstance(), game); if (sourcePermanent != null && controller != null) {
int count = permanent.getCounters().getCount(CounterType.DESPAIR); sourcePermanent.addCounters(CounterType.DESPAIR.createInstance(), game);
int count = sourcePermanent.getCounters().getCount(CounterType.DESPAIR);
if (count > 0) { if (count > 0) {
// select the permanents and hand cards in turn order
LinkedList<UUID> selectedObjects = new LinkedList<>();
PlayerList playerList = game.getState().getPlayerList(controller.getId());
Player currentPlayer = controller;
do {
selectCards(currentPlayer, selectedObjects, count, source, game);
currentPlayer = playerList.getNextInRange(controller, game);
} while (!currentPlayer.equals(controller) && controller.isInGame());
Player controller = game.getPlayer(permanent.getControllerId()); // move permanents and hand cards to exile
if (controller != null) { for (UUID objectId : selectedObjects) {
for (UUID playerId : controller.getInRange()) { if (game.getState().getZone(objectId).equals(Zone.BATTLEFIELD)) {
Player player = game.getPlayer(playerId); Permanent permanent = game.getPermanent(objectId);
if (permanent != null) {
Player player = game.getPlayer(permanent.getControllerId());
if (player != null) { if (player != null) {
exileCards(player, count, source, game); player.moveCardToExileWithInfo(permanent, null, "", source.getSourceId(), game, Zone.BATTLEFIELD);
}
}
} else if (game.getState().getZone(objectId).equals(Zone.HAND)) {
Card card = game.getCard(objectId);
if (card != null) {
Player player = game.getPlayer(card.getOwnerId());
if (player != null) {
player.moveCardToExileWithInfo(card, null, "", source.getSourceId(), game, Zone.HAND);
} }
} }
} }
} }
}
return true;
} }
return false; return false;
} }
private void exileCards(Player player, int count, Ability source, Game game) { private void selectCards(Player player, List<UUID> selectedObjects, int count, Ability source, Game game) {
int amount = Math.min(count, player.getHand().size() + game.getBattlefield().getAllActivePermanents(player.getId()).size()); int amount = Math.min(count, player.getHand().size() + game.getBattlefield().getAllActivePermanents(player.getId()).size());
int cardsFromHand = 0;
while (player.isInGame() && amount > 0) { while (player.isInGame() && amount > 0) {
Target target = new TargetControlledPermanent(0, 1, filter, true);
Target target;
do {
FilterControlledPermanent filter = new FilterControlledPermanent();
filter.setMessage("permanent you control (" + amount + " left in total)" );
List<PermanentIdPredicate> uuidPredicates = new ArrayList<>();
for (UUID uuid :selectedObjects) {
uuidPredicates.add(new PermanentIdPredicate(uuid));
}
filter.add(Predicates.not(Predicates.or(uuidPredicates)));
target = new TargetControlledPermanent(0, 1, filter, true);
if (target.canChoose(player.getId(), game) if (target.canChoose(player.getId(), game)
&& player.choose(Outcome.Exile, target, source.getSourceId(), game)) { && player.choose(Outcome.Exile, target, source.getSourceId(), game)) {
for (UUID targetId : target.getTargets()) { for (UUID targetId : target.getTargets()) {
if (!selectedObjects.contains(targetId)) {
Permanent chosen = game.getPermanent(targetId); Permanent chosen = game.getPermanent(targetId);
if (chosen != null) { if (chosen != null) {
chosen.moveToExile(source.getId(), "Descent into Madness", source.getSourceId(), game);
amount--; amount--;
game.informPlayers(player.getName() + " selects " + chosen.getLogName() + " from battlefield");
selectedObjects.add(targetId);
} }
} }
} }
}
} while (amount > 0 && !target.getTargets().isEmpty() && player.isInGame());
if (amount > 0) { if (amount > 0) {
TargetCard targetInHand = new TargetCard(Zone.HAND, filterInHand); TargetCard targetInHand;
do {
FilterCard filterInHand = new FilterCard();
filterInHand.setMessage("card from your hand (" + amount + " left in total)");
targetInHand = new TargetCard(0, 1, Zone.HAND, filterInHand);
List<CardIdPredicate> uuidPredicates = new ArrayList<>();
for (UUID uuid :selectedObjects) {
uuidPredicates.add(new CardIdPredicate(uuid));
}
filterInHand.add(Predicates.not(Predicates.or(uuidPredicates)));
if (targetInHand.canChoose(player.getId(), game) && if (targetInHand.canChoose(player.getId(), game) &&
player.choose(Outcome.Exile, player.getHand(), targetInHand, game)) { player.choose(Outcome.Exile, player.getHand(), targetInHand, game)) {
Card card = player.getHand().get(targetInHand.getFirstTarget(), game); Card card = player.getHand().get(targetInHand.getFirstTarget(), game);
if (card != null) { if (card != null) {
card.moveToExile(source.getId(), "Descent into Madness", source.getSourceId(), game); selectedObjects.add(targetInHand.getFirstTarget());
amount--; amount--;
cardsFromHand++;
} }
} }
} while (amount > 0 && !targetInHand.getTargets().isEmpty() && player.isInGame());
} }
} }
if (cardsFromHand > 0) {
game.informPlayers(player.getName() + " selects " + cardsFromHand + (cardsFromHand == 1?" card":" cards") + " from his or her hand");
}
} }
} }

14
Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java
View file

@ -33,6 +33,7 @@ import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.MageInt; import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
@ -93,23 +94,22 @@ class AuguryAdeptEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Card sourceCard = game.getCard(source.getSourceId()); MageObject sourceObject = game.getObject(source.getSourceId());
Player player = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (player == null || sourceCard == null) { if (controller == null || sourceObject == null) {
return false; return false;
} }
Cards cards = new CardsImpl(); Cards cards = new CardsImpl();
Card card = player.getLibrary().removeFromTop(game); Card card = controller.getLibrary().removeFromTop(game);
if (card != null) { if (card != null) {
card.moveToZone(Zone.HAND, source.getSourceId(), game, true); card.moveToZone(Zone.HAND, source.getSourceId(), game, true);
int cmc = card.getManaCost().convertedManaCost(); int cmc = card.getManaCost().convertedManaCost();
if (cmc > 0) { if (cmc > 0) {
player.gainLife(cmc, game); controller.gainLife(cmc, game);
} }
cards.add(card); cards.add(card);
player.revealCards(sourceCard.getName(), cards, game); controller.revealCards(sourceObject.getName(), cards, game);
game.informPlayers(sourceCard.getName() + ": "+ player.getName() + " revealed " +card.getName() + " and gained " + cmc + " live");
} }
return true; return true;
} }

19
Mage/src/mage/players/PlayerList.java
View file

@ -44,6 +44,25 @@ public class PlayerList extends CircularList<UUID> {
super(list); super(list);
} }
public Player getCurrent(Game game) {
Player player = null;
game.getPlayer(this.get());
return player;
}
public Player getNextInRange(Player basePlayer, Game game) {
UUID currentPlayerBefore = get();
UUID nextPlayerId = super.getNext();
do {
if (basePlayer.getInRange().contains(nextPlayerId)) {
return game.getPlayer(nextPlayerId);
}
nextPlayerId = super.getNext();
}
while (!nextPlayerId.equals(currentPlayerBefore));
return null;
}
public Player getNext(Game game) { public Player getNext(Game game) {
Player player; Player player;
UUID start = this.get(); UUID start = this.get();