Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Improved Emblem handling. Added a MageObjectType to CardView (in progress).

Browse source
This commit is contained in:
LevelX2 2013-07-05 15:29:55 +02:00
parent b586518bef
commit 42dc0d142c
8 changed files with 171 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -390,7 +390,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
commandZone.setObserver(new Command() {
@Override
public void execute() {
btnExileZoneActionPerformed(null);
btnCommandZoneActionPerformed(null);
}
});
commandZone.setBounds(0, 0, 21, 21);
@ -650,7 +650,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
DialogManager.getManager(gameId).showGraveyardDialog(CardsViewUtil.convertSimple(player.getGraveyard()), bigCard, gameId);
}
private void btnExileZoneActionPerformed(java.awt.event.ActionEvent evt) {
private void btnCommandZoneActionPerformed(java.awt.event.ActionEvent evt) {
DialogManager.getManager(gameId).showEmblemsDialog(CardsViewUtil.convertEmblems(player.getEmblemList()), bigCard, gameId);
}

4
Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java
View file

@ -59,9 +59,7 @@ public class CardsViewUtil {
CardsView cards = new CardsView();
for (EmblemView emblem : view) {
CardView cardView = new CardView(emblem.getName());
cardView.overrideRules(emblem.getRules());
cardView.setExpansionSetCode(emblem.getExpansionSetCode());
CardView cardView = new CardView(emblem);
cards.put(emblem.getId(), cardView);
}

20
Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java
View file

@ -14,6 +14,7 @@ import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
import mage.constants.MageObjectType;
/**
* Card info pane for displaying card rules.
@ -63,12 +64,12 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane {
List<String> rules = card.getRules();
List<String> rulings = new ArrayList<String>(rules);
if (card instanceof PermanentView) {
if (card.getMageObjectType().equals(MageObjectType.PERMANENT)) {
if (card.getPairedCard() != null) {
rulings.add("<span color='green'><i>Paired with another creature</i></span>");
}
}
if (!card.isAbility() && (card instanceof PermanentView || card instanceof CardView)) {
if (card.getMageObjectType().canHaveCounters()) {
List<CounterView> counters;
if (card instanceof PermanentView) {
counters = ((PermanentView) card).getCounters();
@ -93,7 +94,7 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane {
rulings.add(sb.toString());
}
}
if (card instanceof PermanentView) {
if (card.getMageObjectType().isPermanent()) {
int damage = ((PermanentView)card).getDamage();
if (damage > 0) {
rulings.add("<span color='red'><b>Damage dealt:</b> " + damage + "</span>");
@ -155,15 +156,10 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane {
pt = card.getLoyalty().toString();
}
if (pt.length() > 0 || card.isToken()) {
buffer.append("<table cellspacing=0 cellpadding=0 border=0 width='100%' valign='bottom'><tr><td><b>");
buffer.append(pt).append("</b></td>");
if (card.isToken()) {
buffer.append("<td align='right'>Token</td>");
}
buffer.append("</tr></table>");
}
buffer.append("<table cellspacing=0 cellpadding=0 border=0 width='100%' valign='bottom'><tr><td><b>");
buffer.append(pt).append("</b></td>");
buffer.append("<td align='right'>").append(card.getMageObjectType().toString()).append("</td>");
buffer.append("</tr></table>");
StringBuilder rule = new StringBuilder("<br/>");
if (card.isSplitCard()) {