github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-04 01:06:04 -09:00
Code Issues Projects Releases Packages Wiki Activity

Identifier are shown for Looked at and revealed cards view

Browse source
This commit is contained in:
LevelX2 2015-06-03 17:05:59 +02:00
parent cb666a87ca
commit bafd27f5b3
20 changed files with 58 additions and 56 deletions

4
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -801,7 +801,7 @@ public final class GamePanel extends javax.swing.JPanel {
ShowCardsDialog newReveal = new ShowCardsDialog(); ShowCardsDialog newReveal = new ShowCardsDialog();
revealed.put(reveal.getName(), newReveal); revealed.put(reveal.getName(), newReveal);
} }
revealed.get(reveal.getName()).loadCards("Revealed " + reveal.getName(), CardsViewUtil.convertSimple(reveal.getCards(), loadedCards), bigCard, Config.dimensions, gameId, false); revealed.get(reveal.getName()).loadCards("Revealed " + reveal.getName(), reveal.getCards(), bigCard, Config.dimensions, gameId, false);
} }
} }
@ -814,7 +814,7 @@ public final class GamePanel extends javax.swing.JPanel {
ShowCardsDialog newLookedAt = new ShowCardsDialog(); ShowCardsDialog newLookedAt = new ShowCardsDialog();
lookedAt.put(looked.getName(), newLookedAt); lookedAt.put(looked.getName(), newLookedAt);
} }
lookedAt.get(looked.getName()).loadCards("Looked at by " + looked.getName(), CardsViewUtil.convertSimple(looked.getCards(), loadedCards), bigCard, Config.dimensions, gameId, false); lookedAt.get(looked.getName()).loadCards("Looked at by " + looked.getName(), looked.getCards(), bigCard, Config.dimensions, gameId, false);
} }
} }

1
Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java
View file

@ -13,7 +13,6 @@ import org.mage.card.arcane.UI;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.util.ArrayList; import java.util.ArrayList;
import mage.client.dialog.MageDialog;
import mage.constants.Rarity; import mage.constants.Rarity;
public class GuiDisplayUtil { public class GuiDisplayUtil {

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

@ -114,20 +114,19 @@ public class CardView extends SimpleCardView {
protected boolean isPlayable; protected boolean isPlayable;
protected boolean isChoosable; protected boolean isChoosable;
protected boolean selected; protected boolean selected;
protected boolean canAttack; protected boolean canAttack;
protected boolean gameObject;
public CardView(Card card) { public CardView(Card card) {
this(card, null, null, false); this(card, null, false);
} }
public CardView(Card card, UUID cardId) { public CardView(Card card, UUID cardId) {
this(card, null, null, false); this(card, null, false);
this.id = cardId; this.id = cardId;
} }
public CardView(Card card, Game game, UUID cardId) { public CardView(Card card, Game game, UUID cardId) {
this(card, game, null, false); this(card, game, false);
this.id = cardId; this.id = cardId;
} }
@ -135,15 +134,12 @@ public class CardView extends SimpleCardView {
* *
* @param card * @param card
* @param game * @param game
* @param cardId not used?
* @param controlled is the card view created for the card controller - used for morph / face down cards to know which player may see information for the card * @param controlled is the card view created for the card controller - used for morph / face down cards to know which player may see information for the card
*/ */
public CardView(Card card, Game game, UUID cardId, boolean controlled) { public CardView(Card card, Game game, boolean controlled) {
super(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode()); super(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode(), game != null);
// no information available for face down cards as long it's not a controlled face down morph card // no information available for face down cards as long it's not a controlled face down morph card
// TODO: Better handle this in Framework (but currently I'm not sure how to do it there) LevelX2 // TODO: Better handle this in Framework (but currently I'm not sure how to do it there) LevelX2
this.gameObject = game != null;
if (game != null && card.isFaceDown(game)) { if (game != null && card.isFaceDown(game)) {
this.fillEmpty(card, controlled); this.fillEmpty(card, controlled);
if (card instanceof Spell) { if (card instanceof Spell) {
@ -301,7 +297,7 @@ public class CardView extends SimpleCardView {
} }
public CardView(MageObject object) { public CardView(MageObject object) {
super(object.getId(), "", 0, false, ""); super(object.getId(), "", 0, false, "", true);
this.name = object.getName(); this.name = object.getName();
this.displayName = object.getName(); this.displayName = object.getName();
if (object instanceof Permanent) { if (object instanceof Permanent) {
@ -345,11 +341,12 @@ public class CardView extends SimpleCardView {
} }
protected CardView() { protected CardView() {
super(null, "", 0, false, ""); super(null, "", 0, false, "", true);
} }
public CardView(EmblemView emblem) { public CardView(EmblemView emblem) {
this(true); this(true);
this.gameObject = true;
this.id = emblem.getId(); this.id = emblem.getId();
this.mageObjectType = MageObjectType.EMBLEM; this.mageObjectType = MageObjectType.EMBLEM;
this.name = emblem.getName(); this.name = emblem.getName();
@ -368,13 +365,6 @@ public class CardView extends SimpleCardView {
fillEmpty(null, false); fillEmpty(null, false);
} }
public CardView(String name) {
this(true);
this.name = name;
this.displayName = name;
}
private void fillEmpty(Card card, boolean controlled) { private void fillEmpty(Card card, boolean controlled) {
this.name = "Face Down"; this.name = "Face Down";
this.displayName = name; this.displayName = name;
@ -736,8 +726,5 @@ public class CardView extends SimpleCardView {
public void setCanAttack(boolean canAttack) { public void setCanAttack(boolean canAttack) {
this.canAttack = canAttack; this.canAttack = canAttack;
} }
public boolean isGameObject() {
return gameObject;
}
} }

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

@ -66,7 +66,7 @@ public class CardsView extends LinkedHashMap<UUID, CardView> {
public CardsView(Game game, Collection<? extends Card> cards) { public CardsView(Game game, Collection<? extends Card> cards) {
for (Card card: cards) { for (Card card: cards) {
this.put(card.getId(), new CardView(card, game, null, false)); this.put(card.getId(), new CardView(card, game, false));
} }
} }

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

@ -40,7 +40,7 @@ import mage.game.command.Commander;
public class CommanderView extends CardView implements CommandObjectView, Serializable{ public class CommanderView extends CardView implements CommandObjectView, Serializable{
public CommanderView(Commander commander, Card sourceCard, Game game) { public CommanderView(Commander commander, Card sourceCard, Game game) {
super(sourceCard, game, null, false); super(sourceCard, game, false);
this.mageObjectType = MageObjectType.COMMANDER; this.mageObjectType = MageObjectType.COMMANDER;
} }
} }

4
Mage.Common/src/mage/view/DeckView.java
View file

@ -41,8 +41,8 @@ public class DeckView implements Serializable {
public DeckView(Deck deck) { public DeckView(Deck deck) {
name = deck.getName(); name = deck.getName();
cards = new SimpleCardsView(deck.getCards()); cards = new SimpleCardsView(deck.getCards(), false);
sideboard = new SimpleCardsView(deck.getSideboard()); sideboard = new SimpleCardsView(deck.getSideboard(), false);
} }
public String getName() { public String getName() {

4
Mage.Common/src/mage/view/DraftPickView.java
View file

@ -44,8 +44,8 @@ public class DraftPickView implements Serializable {
protected int timeout; protected int timeout;
public DraftPickView(DraftPlayer player, int timeout) { public DraftPickView(DraftPlayer player, int timeout) {
this.booster = new SimpleCardsView(player.getBooster()); this.booster = new SimpleCardsView(player.getBooster(), false);
this.picks = new SimpleCardsView(player.getDeck().getSideboard()); this.picks = new SimpleCardsView(player.getDeck().getSideboard(), false);
this.picking = player.isPicking(); this.picking = player.isPicking();
this.timeout = timeout; this.timeout = timeout;
} }

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

@ -47,7 +47,7 @@ public class ExileView extends CardsView {
this.name = exileZone.getName(); this.name = exileZone.getName();
this.id = exileZone.getId(); this.id = exileZone.getId();
for (Card card: exileZone.getCards(game)) { for (Card card: exileZone.getCards(game)) {
this.put(card.getId(), new CardView(card, game, card.getId(), false)); this.put(card.getId(), new CardView(card, game, false));
} }
} }

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

@ -136,7 +136,7 @@ public class GameView implements Serializable {
} }
else { else {
// Spell // Spell
stack.put(stackObject.getId(), new CardView((Spell)stackObject, game, null, stackObject.getControllerId().equals(createdForPlayerId))); stack.put(stackObject.getId(), new CardView((Spell)stackObject, game, stackObject.getControllerId().equals(createdForPlayerId)));
checkPaid(stackObject.getId(), (Spell)stackObject); checkPaid(stackObject.getId(), (Spell)stackObject);
} }
//stackOrder.add(stackObject.getId()); //stackOrder.add(stackObject.getId());

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

@ -46,7 +46,7 @@ public class LookedAtView implements Serializable {
public LookedAtView(String name, Cards cards, Game game) { public LookedAtView(String name, Cards cards, Game game) {
this.name = name; this.name = name;
for (Card card: cards.getCards(game)) { for (Card card: cards.getCards(game)) {
this.cards.put(card.getId(), new SimpleCardView(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode())); this.cards.put(card.getId(), new CardView(card, game, card.getId()));
} }
} }

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

@ -62,7 +62,7 @@ public class PermanentView extends CardView {
private final boolean attachedToPermanent; private final boolean attachedToPermanent;
public PermanentView(Permanent permanent, Card card, UUID createdForPlayerId, Game game) { public PermanentView(Permanent permanent, Card card, UUID createdForPlayerId, Game game) {
super(permanent, game, null, permanent.getControllerId().equals(createdForPlayerId)); super(permanent, game, permanent.getControllerId().equals(createdForPlayerId));
this.controlled = permanent.getControllerId().equals(createdForPlayerId); this.controlled = permanent.getControllerId().equals(createdForPlayerId);
this.rules = permanent.getRules(game); this.rules = permanent.getRules(game);
this.tapped = permanent.isTapped(); this.tapped = permanent.isTapped();

4
Mage.Common/src/mage/view/PlayerView.java
View file

@ -95,12 +95,12 @@ public class PlayerView implements Serializable {
this.hasLeft = player.hasLeft(); this.hasLeft = player.hasLeft();
for (Card card: player.getGraveyard().getCards(game)) { for (Card card: player.getGraveyard().getCards(game)) {
graveyard.put(card.getId(), new CardView(card, game, card.getId(), false)); graveyard.put(card.getId(), new CardView(card, game, false));
} }
for (ExileZone exileZone : game.getExile().getExileZones()) { for (ExileZone exileZone : game.getExile().getExileZones()) {
for (Card card : exileZone.getCards(game)) { for (Card card : exileZone.getCards(game)) {
if (player.getId().equals(card.getOwnerId())) { if (player.getId().equals(card.getOwnerId())) {
exile.put(card.getId(), new CardView(card, game, card.getId(), false)); // unnown if it's allowed to look under a face down card exile.put(card.getId(), new CardView(card, game, false)); // unnown if it's allowed to look under a face down card
} }
} }
} }

6
Mage.Common/src/mage/view/RevealedView.java
View file

@ -40,12 +40,12 @@ import mage.game.Game;
public class RevealedView implements Serializable { public class RevealedView implements Serializable {
private final String name; private final String name;
private final SimpleCardsView cards = new SimpleCardsView(); private final CardsView cards = new CardsView();
public RevealedView(String name, Cards cards, Game game) { public RevealedView(String name, Cards cards, Game game) {
this.name = name; this.name = name;
for (Card card: cards.getCards(game)) { for (Card card: cards.getCards(game)) {
this.cards.put(card.getId(), new SimpleCardView(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode())); this.cards.put(card.getId(), new CardView(card, game, card.getId()));
} }
} }
@ -53,7 +53,7 @@ public class RevealedView implements Serializable {
return name; return name;
} }
public SimpleCardsView getCards() { public CardsView getCards() {
return cards; return cards;
} }
} }

10
Mage.Common/src/mage/view/SimpleCardView.java
View file

@ -41,13 +41,18 @@ public class SimpleCardView implements Serializable {
protected String tokenSetCode; protected String tokenSetCode;
protected int cardNumber; protected int cardNumber;
protected boolean usesVariousArt; protected boolean usesVariousArt;
protected boolean gameObject;
public SimpleCardView(UUID id, String expansionSetCode, int cardNumber, boolean usesVariousArt, String tokenSetCode) { public SimpleCardView(UUID id, String expansionSetCode, int cardNumber, boolean usesVariousArt, String tokenSetCode) {
this(id, expansionSetCode, cardNumber, usesVariousArt, tokenSetCode, false);
}
public SimpleCardView(UUID id, String expansionSetCode, int cardNumber, boolean usesVariousArt, String tokenSetCode, boolean isGameObject) {
this.id = id; this.id = id;
this.expansionSetCode = expansionSetCode; this.expansionSetCode = expansionSetCode;
this.cardNumber = cardNumber; this.cardNumber = cardNumber;
this.usesVariousArt = usesVariousArt; this.usesVariousArt = usesVariousArt;
this.tokenSetCode = tokenSetCode; this.tokenSetCode = tokenSetCode;
this.gameObject = isGameObject;
} }
public UUID getId() { public UUID getId() {
@ -69,5 +74,8 @@ public class SimpleCardView implements Serializable {
public String getTokenSetCode() { public String getTokenSetCode() {
return tokenSetCode; return tokenSetCode;
} }
public boolean isGameObject() {
return gameObject;
}
} }

4
Mage.Common/src/mage/view/SimpleCardsView.java
View file

@ -42,9 +42,9 @@ public class SimpleCardsView extends LinkedHashMap<UUID, SimpleCardView> {
public SimpleCardsView() {} public SimpleCardsView() {}
public SimpleCardsView(Collection<Card> cards) { public SimpleCardsView(Collection<Card> cards, boolean isGameObject) {
for (Card card: cards) { for (Card card: cards) {
this.put(card.getId(), new SimpleCardView(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode())); this.put(card.getId(), new SimpleCardView(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode(), isGameObject));
} }
} }

2
Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
View file

@ -237,7 +237,7 @@ public class GameSessionPlayer extends GameSessionWatcher {
Map<String, SimpleCardsView> handCards = new HashMap<>(); Map<String, SimpleCardsView> handCards = new HashMap<>();
for (UUID controlledPlayerId : player.getPlayersUnderYourControl()) { for (UUID controlledPlayerId : player.getPlayersUnderYourControl()) {
Player opponent = game.getPlayer(controlledPlayerId); Player opponent = game.getPlayer(controlledPlayerId);
handCards.put(opponent.getName(), new SimpleCardsView(opponent.getHand().getCards(game))); handCards.put(opponent.getName(), new SimpleCardsView(opponent.getHand().getCards(game), true));
} }
gameView.setOpponentHands(handCards); gameView.setOpponentHands(handCards);
} }

2
Mage.Server/src/main/java/mage/server/game/GameSessionWatcher.java
View file

@ -142,7 +142,7 @@ public class GameSessionWatcher {
Map<String, SimpleCardsView> handCards = new HashMap<>(); Map<String, SimpleCardsView> handCards = new HashMap<>();
for (Player player: game.getPlayers().values()) { for (Player player: game.getPlayers().values()) {
if (player.hasUserPermissionToSeeHand(userId)) { if (player.hasUserPermissionToSeeHand(userId)) {
handCards.put(player.getName(), new SimpleCardsView(player.getHand().getCards(game))); handCards.put(player.getName(), new SimpleCardsView(player.getHand().getCards(game), true));
gameView.setWatchedHands(handCards); gameView.setWatchedHands(handCards);
} }
} }

10
Mage.Sets/src/mage/sets/tenthedition/Peek.java
View file

@ -28,6 +28,7 @@
package mage.sets.tenthedition; package mage.sets.tenthedition;
import java.util.UUID; import java.util.UUID;
import mage.MageObject;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
@ -50,10 +51,10 @@ public class Peek extends CardImpl {
super(ownerId, 94, "Peek", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); super(ownerId, 94, "Peek", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}");
this.expansionSetCode = "10E"; this.expansionSetCode = "10E";
// Look at target player's hand. // Look at target player's hand.
this.getSpellAbility().addEffect(new PeekEffect()); this.getSpellAbility().addEffect(new PeekEffect());
this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addTarget(new TargetPlayer());
// Draw a card. // Draw a card.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
} }
@ -71,7 +72,7 @@ public class Peek extends CardImpl {
class PeekEffect extends OneShotEffect { class PeekEffect extends OneShotEffect {
PeekEffect() { PeekEffect() {
super(Outcome.Detriment); super(Outcome.Detriment);
staticText = "Look at target player's hand"; staticText = "look at target player's hand";
} }
PeekEffect(final PeekEffect effect) { PeekEffect(final PeekEffect effect) {
@ -82,8 +83,9 @@ class PeekEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
Player player = game.getPlayer(targetPointer.getFirst(game, source)); Player player = game.getPlayer(targetPointer.getFirst(game, source));
if (player != null && controller != null) { MageObject sourceObject = source.getSourceObject(game);
controller.lookAtCards("Peek", player.getHand(), game); if (player != null && controller != null && sourceObject != null) {
controller.lookAtCards(sourceObject.getIdName(), player.getHand(), game);
} }
return true; return true;
} }

8
Mage/src/mage/abilities/keyword/AffinityForLandTypeAbility.java
View file

@ -32,10 +32,8 @@ import mage.abilities.SpellAbility;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.AdjustingSourceCosts; import mage.abilities.costs.AdjustingSourceCosts;
import mage.abilities.effects.common.AffinityEffect; import mage.abilities.effects.common.AffinityEffect;
import mage.constants.CardType;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game; import mage.game.Game;
import mage.util.CardUtil; import mage.util.CardUtil;
@ -50,12 +48,14 @@ public class AffinityForLandTypeAbility extends SimpleStaticAbility implements A
private final FilterControlledPermanent filter; private final FilterControlledPermanent filter;
String text; String text;
String landType;
public AffinityForLandTypeAbility(String landType, String text) { public AffinityForLandTypeAbility(String landType, String text) {
super(Zone.OUTSIDE, new AffinityEffect(getFilter(landType))); super(Zone.OUTSIDE, new AffinityEffect(getFilter(landType)));
this.filter = getFilter(landType); this.filter = getFilter(landType);
setRuleAtTheTop(true); setRuleAtTheTop(true);
this.text = text; this.text = text;
this.landType = landType;
} }
private static FilterControlledPermanent getFilter(String landType) { private static FilterControlledPermanent getFilter(String landType) {
@ -78,7 +78,7 @@ public class AffinityForLandTypeAbility extends SimpleStaticAbility implements A
@Override @Override
public String getRule() { public String getRule() {
return "Affinity for " + text; return "Affinity for " + text + " <i>(This spell costs 1 less to cast for each " + landType + " you control.)</i>";
} }
@Override @Override
@ -90,4 +90,4 @@ public class AffinityForLandTypeAbility extends SimpleStaticAbility implements A
} }
} }
} }
} }

8
Mage/src/mage/game/stack/Spell.java
View file

@ -343,7 +343,13 @@ public class Spell extends StackObjImpl implements Card {
@Override @Override
public String getIdName() { public String getIdName() {
return getName() + " ["+getId().toString().substring(0,3) +"]"; String idName;
if (card != null) {
idName = card.getId().toString().substring(0,3);
} else {
idName = getId().toString().substring(0,3);
}
return getName() + " ["+idName+"]";
} }
@Override @Override