From 4a563a131b393107f59bcbdbd1a8bdcdc6c78fa2 Mon Sep 17 00:00:00 2001
From: olegshtch <olegshtch@yandex.ru>
Date: Sat, 22 Aug 2020 01:18:53 +0300
Subject: [PATCH] Update test card database to v4 (#4064)

---
 tests/carddatabase/data/cards.xml    | 34 +++++++++++++++++-----------
 tests/carddatabase/data/spoilers.xml | 18 +++++++++------
 tests/carddatabase/data/tokens.xml   | 34 +++++++++++++++++-----------
 3 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/tests/carddatabase/data/cards.xml b/tests/carddatabase/data/cards.xml
index c0dc7dd2..24ede9df 100644
--- a/tests/carddatabase/data/cards.xml
+++ b/tests/carddatabase/data/cards.xml
@@ -1,27 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cockatrice_carddatabase version="3">
+<cockatrice_carddatabase version="4">
     <cards>
         <card>
             <name>Cat</name>
-            <set muId="111">CAT</set>
-            <color>G</color>
-            <manacost>2G</manacost>
-            <cmc>2</cmc>
-            <type>Creature</type>
-            <pt>3/3</pt>
+            <set>CAT</set>
             <tablerow>0</tablerow>
             <text>Meow!</text>
+            <prop>
+                <muid>111</muid>
+                <colors>G</colors>
+                <manacost>2G</manacost>
+                <cmc>2</cmc>
+                <type>Creature</type>
+                <maintype>Creature</maintype>
+                <pt>3/3</pt>
+            </prop>
         </card>
         <card>
             <name>Dog</name>
-            <set muId="222">DOG</set>
-            <color>R</color>
-            <manacost>2RR</manacost>
-            <cmc>4</cmc>
-            <type>Creature</type>
-            <pt>4/4</pt>
+            <set>DOG</set>
             <tablerow>0</tablerow>
             <text>Woof!</text>
+            <prop>
+                <muid>222</muid>
+                <colors>R</colors>
+                <manacost>2RR</manacost>
+                <cmc>4</cmc>
+                <type>Creature</type>
+                <maintype>Creature</maintype>
+                <pt>4/4</pt>
+            </prop>
         </card>
     </cards>
 </cockatrice_carddatabase>
diff --git a/tests/carddatabase/data/spoilers.xml b/tests/carddatabase/data/spoilers.xml
index 1777a803..dacd358b 100644
--- a/tests/carddatabase/data/spoilers.xml
+++ b/tests/carddatabase/data/spoilers.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cockatrice_carddatabase version="3">
+<cockatrice_carddatabase version="4">
     <cards>
         <card>
             <name>Fluffy</name>
-            <set muId="311">CAT</set>
-            <color>G</color>
-            <manacost></manacost>
-            <cmc></cmc>
-            <type>Token</type>
-            <pt>0/1</pt>
+            <set>CAT</set>
             <tablerow>0</tablerow>
             <text></text>
             <token>1</token>
+            <prop>
+                <muid>311</muid>
+                <colors>G</colors>
+                <manacost></manacost>
+                <cmc></cmc>
+                <type>Token</type>
+                <maintype>Token</maintype>
+                <pt>0/1</pt>
+            </prop>
         </card>
     </cards>
 </cockatrice_carddatabase>
diff --git a/tests/carddatabase/data/tokens.xml b/tests/carddatabase/data/tokens.xml
index 03b539a5..41b37615 100644
--- a/tests/carddatabase/data/tokens.xml
+++ b/tests/carddatabase/data/tokens.xml
@@ -1,29 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cockatrice_carddatabase version="3">
+<cockatrice_carddatabase version="4">
     <cards>
         <card>
             <name>Kitten</name>
-            <set muId="112">CAT</set>
-            <color>G</color>
-            <manacost></manacost>
-            <cmc></cmc>
-            <type>Token</type>
-            <pt>1/1</pt>
+            <set>CAT</set>
             <tablerow>0</tablerow>
             <text></text>
             <token>1</token>
+            <prop>
+                <muid>112</muid>
+                <colors>G</colors>
+                <manacost></manacost>
+                <cmc></cmc>
+                <type>Token</type>
+                <maintype>Token</maintype>
+                <pt>1/1</pt>
+            </prop>
         </card>
         <card>
             <name>Puppy</name>
-            <set muId="223">DOG</set>
-            <color>R</color>
-            <manacost></manacost>
-            <cmc></cmc>
-            <type>Token</type>
-            <pt>1/1</pt>
+            <set>DOG</set>
             <tablerow>0</tablerow>
             <text></text>
             <token>1</token>
+            <prop>
+                <muid>223</muid>
+                <colors>R</colors>
+                <manacost></manacost>
+                <cmc></cmc>
+                <type>Token</type>
+                <maintype>Token</maintype>
+                <pt>1/1</pt>
+            </prop>
         </card>
     </cards>
 </cockatrice_carddatabase>