From 93878d4868cf97f07b824ae59a1694b50a318748 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Sat, 29 Jan 2011 10:45:05 +0300 Subject: [PATCH] Displaying player's poison counters. Displaying alls counters info in tooltips. --- Mage.Client/plugins/mage-card-plugin.jar | Bin 308082 -> 308483 bytes .../java/mage/client/game/PlayerPanelExt.java | 1 + Mage.Common/src/mage/view/CardView.java | 2 -- Mage.Common/src/mage/view/PlayerView.java | 7 +++++ .../plugins/card/info/CardInfoPaneImpl.java | 26 +++++++++++++++++- 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/Mage.Client/plugins/mage-card-plugin.jar b/Mage.Client/plugins/mage-card-plugin.jar index 5d1141f2db3fc323f0872f272bb21c988e32ea43..65ec83b86a59a1fa2fafb6f5bc9edb2849f5d21a 100644 GIT binary patch delta 9811 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 D9c2n? delta 9404 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 diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java index 5add0f773a3..42a778d65d5 100644 --- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java +++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java @@ -107,6 +107,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { public void update(PlayerView player) { this.player = player; lifeLabel.setText(Integer.toString(player.getLife())); + poisonLabel.setText(Integer.toString(player.getPoison())); handLabel.setText(Integer.toString(player.getHandCount())); libraryLabel.setText(Integer.toString(player.getLibraryCount())); graveLabel.setText(Integer.toString(player.getGraveyard().size())); diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java index 79489a61b51..3d16d7c820f 100644 --- a/Mage.Common/src/mage/view/CardView.java +++ b/Mage.Common/src/mage/view/CardView.java @@ -70,7 +70,6 @@ public class CardView implements Serializable { protected int cardNumber; protected boolean isAbility; protected CardView ability; - protected Counters counters; public List targets; @@ -82,7 +81,6 @@ public class CardView implements Serializable { this.power = Integer.toString(card.getPower().getValue()); this.toughness = Integer.toString(card.getToughness().getValue()); this.loyalty = Integer.toString(card.getLoyalty().getValue()); - this.counters = ((Permanent) card).getCounters().copy(); } else { this.power = card.getPower().toString(); this.toughness = card.getToughness().toString(); diff --git a/Mage.Common/src/mage/view/PlayerView.java b/Mage.Common/src/mage/view/PlayerView.java index 8107a94841d..d0715544b19 100644 --- a/Mage.Common/src/mage/view/PlayerView.java +++ b/Mage.Common/src/mage/view/PlayerView.java @@ -33,6 +33,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import mage.cards.Card; +import mage.counters.CounterType; import mage.game.Game; import mage.game.GameState; import mage.game.permanent.Permanent; @@ -48,6 +49,7 @@ public class PlayerView implements Serializable { private UUID playerId; private String name; private int life; + private int poison; private int libraryCount; private int handCount; private boolean isActive; @@ -60,6 +62,7 @@ public class PlayerView implements Serializable { this.playerId = player.getId(); this.name = player.getName(); this.life = player.getLife(); + this.poison = player.getCounters().getCount(CounterType.POISON); this.libraryCount = player.getLibrary().size(); this.handCount = player.getHand().size(); this.manaPool = new ManaPoolView(player.getManaPool()); @@ -94,6 +97,10 @@ public class PlayerView implements Serializable { return this.life; } + public int getPoison() { + return this.poison; + } + public int getLibraryCount() { return this.libraryCount; } diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java index 7c702dd5c8c..444a1c73052 100644 --- a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java +++ b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java @@ -2,14 +2,18 @@ package org.mage.plugins.card.info; import mage.Constants; import mage.components.CardInfoPane; +import mage.game.permanent.Permanent; import mage.utils.CardUtil; import mage.utils.ThreadUtils; import mage.view.CardView; +import mage.view.CounterView; +import mage.view.PermanentView; import org.mage.card.arcane.ManaSymbols; import org.mage.card.arcane.UI; import javax.swing.*; import java.awt.*; +import java.util.ArrayList; import java.util.List; /** @@ -49,7 +53,27 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { while ((offset = castingCost.indexOf(" rulings = card.getRules(); + List rules = card.getRules(); + List rulings = new ArrayList(rules); + if (card instanceof PermanentView) { + int count = ((PermanentView)card).getCounters().size(); + if (count > 0) { + StringBuilder sb = new StringBuilder(); + int index = 0; + for (CounterView counter: ((PermanentView)card).getCounters()) { + if (counter.getCount() > 0) { + if (index == 0) { + sb.append("Counters: "); + } else { + sb.append(", "); + } + sb.append(counter.getCount() + "x" + counter.getName() + ""); + index++; + } + } + rulings.add(sb.toString()); + } + } boolean smallImages = true; int fontSize = 11;