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

* Scroll Rack - Fixed that the cards were shown face down if setting the order they go to library.

Browse source
This commit is contained in:
LevelX2 2015-10-31 10:33:37 +01:00
parent 2e49a74aab
commit e88c60eb85
4 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Common/src/mage/remote/SessionImpl.java
View file

@ -468,9 +468,7 @@ public class SessionImpl implements Session {
@Override @Override
public void handleConnectionException(Throwable throwable, Client client) { public void handleConnectionException(Throwable throwable, Client client) {
logger.info("connection to server lost - " + throwable.getMessage()); logger.info("connection to server lost - " + throwable.getMessage(), throwable);
throwable.printStackTrace();
reconnect(throwable); reconnect(throwable);
} }
} }

2
Mage.Common/src/mage/view/CardView.java
View file

@ -153,7 +153,7 @@ public class CardView extends SimpleCardView {
* for morph / face down cards to know which player may see information for * for morph / face down cards to know which player may see information for
* the card * the card
* @param showFaceDownCard if true and the card is not on the battelfield, * @param showFaceDownCard if true and the card is not on the battelfield,
* also a face down card is shown in the view down cards will be shown * also a face down card is shown in the view, face down cards will be shown
*/ */
public CardView(Card card, Game game, boolean controlled, boolean showFaceDownCard) { public CardView(Card card, Game game, boolean controlled, boolean showFaceDownCard) {
super(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode(), game != null); super(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode(), game != null);

7
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -825,8 +825,11 @@ public class GameController implements GameCallback {
@Override @Override
public void execute(UUID playerId) { public void execute(UUID playerId) {
if (cards != null) { if (cards != null) {
Zone targetZone = (Zone) options.get("targetZone"); // Zone targetZone = (Zone) options.get("targetZone");
boolean showFaceDown = targetZone != null && targetZone.equals(Zone.PICK); // Are there really situations where a player selects from a list of face down cards?
// So always show face up for selection
// boolean showFaceDown = targetZone != null && targetZone.equals(Zone.PICK);
boolean showFaceDown = true;
getGameSession(playerId).target(question, new CardsView(game, cards.getCards(game), showFaceDown), targets, required, options); getGameSession(playerId).target(question, new CardsView(game, cards.getCards(game), showFaceDown), targets, required, options);
} else if (perms != null) { } else if (perms != null) {
CardsView permsView = new CardsView(); CardsView permsView = new CardsView();

7
Mage.Sets/src/mage/sets/tempest/ScrollRack.java
View file

@ -27,7 +27,6 @@
*/ */
package mage.sets.tempest; package mage.sets.tempest;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageObject; import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
@ -111,11 +110,7 @@ class ScrollRackEffect extends OneShotEffect {
} }
// Put that many cards from the top of your library into your hand. // Put that many cards from the top of your library into your hand.
if (amountExiled > 0) { if (amountExiled > 0) {
Set<Card> cards = controller.getLibrary().getTopCards(game, amountExiled); controller.moveCards(controller.getLibrary().getTopCards(game, amountExiled), Zone.HAND, source, game);
for (Card card : cards) {
card.setFaceDown(true, game);
}
controller.moveCards(cards, null, Zone.HAND, source, game);
} }
// Then look at the exiled cards and put them on top of your library in any order // Then look at the exiled cards and put them on top of your library in any order
controller.putCardsOnTopOfLibrary(game.getExile().getExileZone(source.getSourceId()), game, source, true); controller.putCardsOnTopOfLibrary(game.getExile().getExileZone(source.getSourceId()), game, source, true);