From 7f957f27a36b696ac932953a97534769ad6af7f7 Mon Sep 17 00:00:00 2001
From: nicol <nicol@ANTEC>
Date: Thu, 28 Nov 2024 22:21:59 +0100
Subject: [PATCH] deckbox add set id column

---
 src/main/java/org/magic/api/exports/impl/DeckBoxExport.java | 3 ++-
 src/main/resources/data/pluginsAliases.json                 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/magic/api/exports/impl/DeckBoxExport.java b/src/main/java/org/magic/api/exports/impl/DeckBoxExport.java
index 11be5c4b9..a298f85e1 100644
--- a/src/main/java/org/magic/api/exports/impl/DeckBoxExport.java
+++ b/src/main/java/org/magic/api/exports/impl/DeckBoxExport.java
@@ -22,7 +22,7 @@ public class DeckBoxExport extends AbstractFormattedFileCardExport {
 
 
 	private static final String REGEX = "REGEX";
-	private String columns="Count,Tradelist Count,Name,Edition,Card Number,Condition,Language,Foil,Signed,Artist Proof,Altered Art,Misprint,Promo,Textless,My Price\n";
+	private String columns="Count,Tradelist Count,Name,Edition,Edition Code,Card Number,Condition,Language,Foil,Signed,Artist Proof,Altered Art,Misprint,Promo,Textless,My Price\n";
 
 
 
@@ -50,6 +50,7 @@ public void exportStock(List<MTGCardStock> stock, File dest) throws IOException
 			line.append(mc.getQte()).append(getSeparator());
 			line.append(name).append(getSeparator());
 			line.append(mc.getProduct().getEdition().getSet()).append(getSeparator());
+			line.append(mc.getProduct().getEdition().getId()).append(getSeparator());
 			line.append(mc.getProduct().getNumber()).append(getSeparator());
 			line.append(aliases.getConditionFor(this,mc.getCondition())).append(getSeparator());
 			line.append(mc.getLanguage()).append(getSeparator());
diff --git a/src/main/resources/data/pluginsAliases.json b/src/main/resources/data/pluginsAliases.json
index eddaa424e..68c7ac3b8 100644
--- a/src/main/resources/data/pluginsAliases.json
+++ b/src/main/resources/data/pluginsAliases.json
@@ -289,7 +289,7 @@
 	},
 	"DeckBox": {
 		"regex": {
-			"default": "(\\d+),(\\d+),((?=\")\".*?\"|.*?),(.*?),(\\d+)?,(.*?),(.*?),(foil)?,(signed)?,(proof)?,(altered)?,(misprint)?,(promo)?,(textless)?,(.*?),(.*?),\\$(\\d+(\\.\\d{1,2})?)"
+			"default": "(\\d+),(\\d+),((?=\")\".*?\"|.*?),(.*?),(.*?),(\\d+)?,(.*?),(.*?),(foil)?,(signed)?,(proof)?,(altered)?,(misprint)?,(promo)?,(textless)?,(.*?),(.*?),\\$(\\d+(\\.\\d{1,2})?)"
 		},
 		"nameSet": {},
 		"idSet": {},