From 537002a1eed51fe4c02b3ab092617e1ba3b31854 Mon Sep 17 00:00:00 2001
From: Christian Daniel Jensen <cdjensen94@gmail.com>
Date: Mon, 2 Nov 2026 05:53:14 -0700
Subject: [PATCH] Use chart-only Essence palettes and canonical Essence
 ordering

---
 .../general/display/charts/pies/color_pie.cpp | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
index 82542a663..7b59ee3fa 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
@@ -1,6 +1,6 @@
 #include "color_pie.h"
 
-#include "libcockatrice/utility/color.h"
+#include "../../../../../essence_chart_colors.h"
 
 #include <QBrush>
 #include <QFontMetrics>
@@ -20,14 +20,14 @@
 #include <utility>
 
 ColorPie::ColorPie(const QMap<QString, int> &_colors, QWidget *parent)
-    : QWidget(parent), colors(GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors))
+    : QWidget(parent), colors(EssenceCharts::ordered(_colors))
 {
     setMouseTracking(true);
 }
 
 void ColorPie::setColors(const QMap<QString, int> &_colors)
 {
-    colors = GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors);
+    colors = EssenceCharts::ordered(_colors);
     update();
 }
 
@@ -184,19 +184,5 @@ QString ColorPie::tooltipForPoint(const QPoint &pt) const
 
 QColor ColorPie::colorFromName(const QString &name) const
 {
-    static QMap<QString, QColor> map = {
-        {"R", QColor(220, 30, 30)},   {"G", QColor(40, 170, 40)}, {"U", QColor(40, 90, 200)},
-        {"W", QColor(235, 235, 230)}, {"B", QColor(30, 30, 30)},
-    };
-
-    if (map.contains(name)) {
-        return map[name];
-    }
-
-    QColor c(name);
-    if (!c.isValid()) {
-        c = Qt::gray;
-    }
-
-    return c;
-}
\ No newline at end of file
+    return EssenceCharts::colorFor(name);
+}