From db7eb398ccd474ca0fdb665a0763d940733e80c1 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 11 Mar 2022 09:25:54 -0500 Subject: [PATCH] fixed multicolored split cards rendering --- .../card/arcane/ModernSplitCardRenderer.java | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ModernSplitCardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/ModernSplitCardRenderer.java index 1d56ecde616..6ef22fdd34a 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/ModernSplitCardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/ModernSplitCardRenderer.java @@ -49,8 +49,8 @@ public class ModernSplitCardRenderer extends ModernCardRenderer { rightHalf.manaCostString = ManaSymbols.getClearManaCost(cardView.getRightSplitCostsStr()); leftHalf.manaCostString = ManaSymbols.getClearManaCost(cardView.getLeftSplitCostsStr()); - rightHalf.color = getColorFromManaCostHack(cardView.getRightSplitCostsStr()); - leftHalf.color = getColorFromManaCostHack(cardView.getLeftSplitCostsStr()); + rightHalf.color = new ObjectColor(cardView.getRightSplitCostsStr()); + leftHalf.color = new ObjectColor(cardView.getLeftSplitCostsStr()); parseRules(view.getRightSplitRules(), rightHalf.keywords, rightHalf.rules); parseRules(view.getLeftSplitRules(), leftHalf.keywords, leftHalf.rules); @@ -123,24 +123,6 @@ public class ModernSplitCardRenderer extends ModernCardRenderer { } } - // Ugly hack used here because the card database doesn't actually store color - // for each half of split cards separately. - private ObjectColor getColorFromManaCostHack(String costs) { - ObjectColor c = new ObjectColor(); - if (costs.contains("W")) { - c.setWhite(true); - } else if (costs.contains("U")) { - c.setBlue(true); - } else if (costs.contains("B")) { - c.setBlack(true); - } else if (costs.contains("R")) { - c.setRed(true); - } else if (costs.contains("G")) { - c.setGreen(true); - } - return c; - } - @Override protected void drawBackground(Graphics2D g) { if (cardView.isFaceDown()) {