Merge branch 'master' into pr/518

sumpfork · Jun 12, 2024 · bf18ed0 · bf18ed0
2 parents f53ee36 + 912e169
commit bf18ed0
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 1 deletion.
diff --git a/card_db_src/cards_db.json b/card_db_src/cards_db.json
@@ -7328,6 +7328,16 @@
             "Action"
         ]
     },
+    {
+        "card_tag": "Marchland",
+        "cardset_tags": [
+            "promo"
+        ],
+        "cost": "5",
+        "types": [
+            "Victory"
+        ]
+    },
     {
         "card_tag": "Prince",
         "cardset_tags": [

diff --git a/card_db_src/en_us/cards_en_us.json b/card_db_src/en_us/cards_en_us.json
@@ -1868,6 +1868,11 @@
         "extra": "Normally you cannot look through your discard pile, so you cannot look to see if you want to buy March or not.<n>Once you buy March, you look through your discard pile, and then have the option of playing an Action card from it.<n>This does not use up an Action.",
         "name": "March"
     },
+    "Marchland": {
+        "description": "Worth 1 <VP> per 3 Victory cards you have (round down).<line>When you gain this, +1 Buy and discard any number of cards for +1 Coin each.",
+        "extra": "Marchland counts itself. Round down; if you have 11 Victory cards, each Marchland is worth 3<VP>. Use 8 copies of Marchland for games with 2 players, 12 for games with 3 or more players. \"Any number\" includes zero.",
+        "name": "Marchland"
+    },
     "Margrave": {
         "description": "+3 Cards<br>+1 Buy<br>Each other player draws a card, then discards down to 3 cards in hand.",
         "extra": "You draw 3 cards and get +1 Buy. Each other player draws a card, then discards down to 3 cards in hand. Drawing a card is not optional for them. A player who only has 3 cards or fewer after drawing does not discard.",

diff --git a/src/domdiv/card_db/cards_db.json.gz b/src/domdiv/card_db/cards_db.json.gz
diff --git a/src/domdiv/card_db/cs/cards_cs.json.gz b/src/domdiv/card_db/cs/cards_cs.json.gz
diff --git a/src/domdiv/card_db/de/cards_de.json.gz b/src/domdiv/card_db/de/cards_de.json.gz
diff --git a/src/domdiv/card_db/en_us/cards_en_us.json.gz b/src/domdiv/card_db/en_us/cards_en_us.json.gz
diff --git a/src/domdiv/card_db/es/cards_es.json.gz b/src/domdiv/card_db/es/cards_es.json.gz
diff --git a/src/domdiv/card_db/fr/cards_fr.json.gz b/src/domdiv/card_db/fr/cards_fr.json.gz
diff --git a/src/domdiv/card_db/it/cards_it.json.gz b/src/domdiv/card_db/it/cards_it.json.gz
diff --git a/src/domdiv/card_db/nl_nl/cards_nl_nl.json.gz b/src/domdiv/card_db/nl_nl/cards_nl_nl.json.gz
diff --git a/src/domdiv/card_db/xx/cards_xx.json.gz b/src/domdiv/card_db/xx/cards_xx.json.gz
diff --git a/tests/carddb_tests.py b/tests/carddb_tests.py
@@ -25,7 +25,7 @@ def rmd():
 def test_cardread():
     # we test the number of cards only to make sure it doesn't get changed
     # inadvertently by unrelated changes
-    num_cards_expected = 1017
+    num_cards_expected = 1018
 
     options = config_options.parse_opts([])
     cards = db.read_card_data(options)