From 0d0fccc1052a6119756457d68abc6d306488805f Mon Sep 17 00:00:00 2001 From: spjspj Date: Sun, 30 Apr 2017 11:14:24 +1000 Subject: [PATCH] spjspj - Remove Tokens from Card Viewer - need to reorg the tokens first. --- .../collection/viewer/CollectionViewerPanel.java | 4 ++-- Mage.Client/src/main/resources/card-pictures-tok.txt | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java index b90b11026e..f3f6548dfc 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java @@ -146,13 +146,13 @@ public final class CollectionViewerPanel extends JPanel { JLabel label4 = new JLabel("Show cards or tokens:"); label3.setAlignmentX(Component.LEFT_ALIGNMENT); label3.setForeground(Color.white); - jPanel1.add(label4); + // spjspj - put back in after reorg of tokens -- jPanel1.add(label4); JCheckBox cardsOrTokens = new JCheckBox("Display Cards"); cardsOrTokens.setSelected(true); cardsOrTokens.setToolTipText("Select to show Cards or Tokens(and emblems) for the chosen set"); cardsOrTokens.addActionListener(e -> mageBook.cardsOrTokens(cardsOrTokens.isSelected())); - jPanel1.add(cardsOrTokens); + // spjspj - put back in after reorg of tokens -- jPanel1.add(cardsOrTokens); formats.addActionListener(e -> { if (mageBook != null) { diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index 68c2d0e5d2..5a05b4347e 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -525,16 +525,12 @@ |Generate|TOK:M13|Wurm|| |Generate|EMBLEM:AVR|Tamiyo, the Moon Sage||Emblem Tamiyo| -|Generate|TOK:AVR|Angel|1| -|Generate|TOK:AVR|Angel|2| -|Generate|TOK:AVR|Angel|3| +|Generate|TOK:AVR|Angel|| +|Generate|TOK:AVR|Demon|| |Generate|TOK:AVR|Human|1| |Generate|TOK:AVR|Human|2| |Generate|TOK:AVR|Spirit|1| |Generate|TOK:AVR|Spirit|2| -|Generate|TOK:AVR|Demon|1| -|Generate|TOK:AVR|Demon|2| -|Generate|TOK:AVR|Demon|3| |Generate|TOK:AVR|Zombie|| |Generate|EMBLEM:DDI|Venser, the Sojourner||Emblem Venser|