From de6fae8c00ce3406ee8b05039f5de3852ce64547 Mon Sep 17 00:00:00 2001 From: spjspj Date: Mon, 30 Jan 2017 23:57:59 +1100 Subject: [PATCH] Add Canadian Highlander format --- Mage.Client/src/main/java/mage/client/table/TablesPanel.java | 2 +- .../Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index 4081bcdc2b..a165d13a7c 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -599,7 +599,7 @@ public class TablesPanel extends javax.swing.JPanel { formatFilterList.add(RowFilter.regexFilter("^Limited", TableTableModel.COLUMN_DECK_TYPE)); } if (btnFormatOther.isSelected()) { - formatFilterList.add(RowFilter.regexFilter("^Momir Basic|^Constructed - Pauper|^Constructed - Frontier|^Constructed - Extended|^Constructed - Eternal|^Constructed - Historical|^Constructed - Super|^Constructed - Freeform|^Australian Highlander", TableTableModel.COLUMN_DECK_TYPE)); + formatFilterList.add(RowFilter.regexFilter("^Momir Basic|^Constructed - Pauper|^Constructed - Frontier|^Constructed - Extended|^Constructed - Eternal|^Constructed - Historical|^Constructed - Super|^Constructed - Freeform|^Australian Highlander|^Canadian Highlander", TableTableModel.COLUMN_DECK_TYPE)); } List> skillFilterList = new ArrayList<>(); diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java index 4dda4a9710..893eb639fa 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java @@ -86,7 +86,7 @@ public class CanadianHighlander extends Constructed { } } - int allowedPoints = 10 * (int) Math.ceil(deck.getCards().size()/100.0); + int allowedPoints = 10 * (int) Math.floor(deck.getCards().size()/100.0); int totalPoints = 0; for (Map.Entry entry : counts.entrySet()) { String cn = entry.getKey();