From bba44e4b97147620fca5c1ea113560bb9fdd0b66 Mon Sep 17 00:00:00 2001
From: Christian Daniel Jensen <cdjensen94@gmail.com>
Date: Mon, 2 Nov 2026 05:49:22 -0700
Subject: [PATCH] Add native Essence card database properties with legacy XML
 fallback

---
 .../libcockatrice/card/game_specific_terms.h  | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/libcockatrice_card/libcockatrice/card/game_specific_terms.h b/libcockatrice_card/libcockatrice/card/game_specific_terms.h
index e9160e514..58eab30ef 100644
--- a/libcockatrice_card/libcockatrice/card/game_specific_terms.h
+++ b/libcockatrice_card/libcockatrice/card/game_specific_terms.h
@@ -16,6 +16,14 @@
  * Note: Mtg = "Maybe that game"
  */
 
+// These remain only for reading older Cockatrice XML. New cards use Essence.
+namespace EssenceProperties
+{
+inline const QString Cost = QStringLiteral("essencecost");
+inline const QString Types = QStringLiteral("essence");
+inline const QString Value = QStringLiteral("essencevalue");
+}
+
 namespace Mtg
 {
 QString const CardType("type");
@@ -31,24 +39,24 @@ QString const ColorIdentity("coloridentity");
 
 inline static const QString getNicePropertyName(QString key)
 {
+    if (key == EssenceProperties::Cost || key == ManaCost) {
+        return QCoreApplication::translate("Essence", "Essence Cost");
+    }
+    if (key == EssenceProperties::Types || key == Colors || key == ColorIdentity) {
+        return QCoreApplication::translate("Essence", "Essence");
+    }
+    if (key == EssenceProperties::Value || key == ConvertedManaCost) {
+        return QCoreApplication::translate("Essence", "Essence Value");
+    }
     if (key == CardType) {
         return QCoreApplication::translate("Mtg", "Card Type");
     }
-    if (key == ConvertedManaCost) {
-        return QCoreApplication::translate("Mtg", "Mana Value");
-    }
-    if (key == Colors) {
-        return QCoreApplication::translate("Mtg", "Color(s)");
-    }
     if (key == Loyalty) {
         return QCoreApplication::translate("Mtg", "Loyalty");
     }
     if (key == MainCardType) {
         return QCoreApplication::translate("Mtg", "Main Card Type");
     }
-    if (key == ManaCost) {
-        return QCoreApplication::translate("Mtg", "Mana Cost");
-    }
     if (key == PowTough) {
         return QCoreApplication::translate("Mtg", "P/T");
     }
@@ -58,9 +66,6 @@ inline static const QString getNicePropertyName(QString key)
     if (key == Layout) {
         return QCoreApplication::translate("Mtg", "Layout");
     }
-    if (key == ColorIdentity) {
-        return QCoreApplication::translate("Mtg", "Color Identity");
-    }
     return key;
 }
 } // namespace Mtg