From 230d24346221b225044517afee949e956af91d43 Mon Sep 17 00:00:00 2001 From: Peter Gorniak Date: Sun, 22 Mar 2020 17:21:57 -0700 Subject: [PATCH] revert erroneous travis commit --- src/domdiv/card_db/cz/sets_cz.json | 19 ----------- src/domdiv/card_db/cz/types_cz.json | 4 +-- src/domdiv/card_db/de/sets_de.json | 19 ----------- src/domdiv/card_db/de/types_de.json | 4 +-- src/domdiv/card_db/en_us/sets_en_us.json | 20 ------------ src/domdiv/card_db/en_us/types_en_us.json | 8 ----- src/domdiv/card_db/fr/sets_fr.json | 19 ----------- src/domdiv/card_db/fr/types_fr.json | 4 +-- src/domdiv/card_db/it/sets_it.json | 19 ----------- src/domdiv/card_db/it/types_it.json | 4 +-- src/domdiv/card_db/labels_db.json | 17 ---------- src/domdiv/card_db/nl_du/sets_nl_du.json | 19 ----------- src/domdiv/card_db/nl_du/types_nl_du.json | 4 +-- src/domdiv/card_db/sets_db.json | 21 ------------ src/domdiv/card_db/types_db.json | 40 ----------------------- src/domdiv/card_db/xx/sets_xx.json | 19 ----------- src/domdiv/card_db/xx/types_xx.json | 4 +-- 17 files changed, 6 insertions(+), 238 deletions(-) diff --git a/src/domdiv/card_db/cz/sets_cz.json b/src/domdiv/card_db/cz/sets_cz.json index 7408fa9..09cd264 100644 --- a/src/domdiv/card_db/cz/sets_cz.json +++ b/src/domdiv/card_db/cz/sets_cz.json @@ -135,24 +135,5 @@ "set_name": "Seaside", "set_text": "All you ask is a tall ship and a star to steer her by. And someone who knows how to steer ships using stars. You finally got some of those rivers you'd wanted, and they led to the sea. These are dangerous, pirate-infested waters, and you cautiously send rat-infested ships across them, to establish lucrative trade at far-off merchant-infested ports. First, you will take over some islands, as a foothold. The natives seem friendly enough, crying their peace cries, and giving you spears and poison darts before you are even close enough to accept them properly. When you finally reach those ports you will conquer them, and from there you will look for more rivers. One day, all the rivers will be yours.\nThis is the 2nd addition to Dominion. It adds 26 new Kingdom cards to Dominion. Its central theme is your next turn; there are cards that do something this turn and next, cards that set up your next turn, and other ways to step outside of the bounds of a normal turn.", "text_icon": "S" - }, - "menagerie": { - "set_name": "Menagerie", -<<<<<<< Updated upstream - "text_icon": "*", - "set_text": "" - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "*", -======= - "text_icon": "M", - "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to Dominion. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return." - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "M", ->>>>>>> Stashed changes - "set_text": "" } } diff --git a/src/domdiv/card_db/cz/types_cz.json b/src/domdiv/card_db/cz/types_cz.json index 772f18e..b770ab4 100644 --- a/src/domdiv/card_db/cz/types_cz.json +++ b/src/domdiv/card_db/cz/types_cz.json @@ -35,7 +35,5 @@ "Treasure": "Treasure", "Victory": "Victory", "Zombie": "Zombie", - "Projects": "Projects", - "Way": "Way", - "Ways": "Ways" + "Projects": "Projects" } diff --git a/src/domdiv/card_db/de/sets_de.json b/src/domdiv/card_db/de/sets_de.json index 5862c77..54e4145 100644 --- a/src/domdiv/card_db/de/sets_de.json +++ b/src/domdiv/card_db/de/sets_de.json @@ -135,24 +135,5 @@ "set_name": "Seaside", "set_text": "Gebt mir ein Schiff und einen Stern, der mich leitet … und jemanden der weiß, wie man sich von den Sternen leiten lässt. Endlich kannst du dich auf den Weg machen. Hinaus auf die hohe See, die von Piraten übersät ist, schickst du Schiffe, die von Ratten übersät sind, um fernab von Häfen, die von Händlern übersät sind, neue Handelsrouten aufzubauen. Zuerst wirst du Stützpunkte auf fernen Inseln errichten. Die Eingeborenen scheinen freundlich gesonnen, du kannst ihre Friedensrufe von Weitem hören und schon aus der Ferne werfen sie dir Speere und giftige Pfeile als Willkommensgeschenke zu. Eines Tages wird all das dir gehören.\nThis is the 2nd addition to Dominion. It adds 26 new Kingdom cards to Dominion. Its central theme is your next turn; there are cards that do something this turn and next, cards that set up your next turn, and other ways to step outside of the bounds of a normal turn.", "text_icon": "S" - }, - "menagerie": { - "set_name": "Menagerie", -<<<<<<< Updated upstream - "text_icon": "*", - "set_text": "" - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "*", -======= - "text_icon": "M", - "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to Dominion. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return." - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "M", ->>>>>>> Stashed changes - "set_text": "" } } diff --git a/src/domdiv/card_db/de/types_de.json b/src/domdiv/card_db/de/types_de.json index 9e01835..1ac090e 100644 --- a/src/domdiv/card_db/de/types_de.json +++ b/src/domdiv/card_db/de/types_de.json @@ -35,7 +35,5 @@ "Traveller": "Reisender", "Treasure": "Geld", "Victory": "Punkt", - "Zombie": "Zombie", - "Way": "Way", - "Ways": "Ways" + "Zombie": "Zombie" } diff --git a/src/domdiv/card_db/en_us/sets_en_us.json b/src/domdiv/card_db/en_us/sets_en_us.json index 3b096eb..7b1fe7b 100644 --- a/src/domdiv/card_db/en_us/sets_en_us.json +++ b/src/domdiv/card_db/en_us/sets_en_us.json @@ -105,16 +105,6 @@ "short_name": "Intrigue", "text_icon": "I2" }, - "menagerie": { - "set_name": "Menagerie", - "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to Dominion. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return.", - "text_icon": "M" - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "set_text": "", - "text_icon": "M" - }, "nocturne": { "set_name": "Nocturne", "set_text": "You've always been a night person; lately you've even considered becoming a vampire. There are a lot of advantages: you don't age; you don't have to see yourself in mirrors anymore; if someone asks you to do something, you can just turn into a bat, and then say, sorry, I'm a bat. There are probably some downsides though. You always think of the statue in the town square that came to life and now works as the tavern barmaid. The pedestal came to life too, so she has to hop around. The village blacksmith turns into a wolf whenever there's a full moon; when there's a crescent moon, he turns into a chihuahua. That's how this stuff goes sometimes. Still, when you breathe in the night air, you feel ready for anything.\nDominion: Nocturne, the 11th expansion to Dominion, has 500 cards, with 33 new Kingdom cards. There are Night cards, which are played after the Buy phase; Heirlooms that replace starting Coppers; Fate and Doom cards that give out Boons and Hexes; and a variety of extra cards that other cards can provide.", @@ -145,15 +135,5 @@ "set_name": "Seaside", "set_text": "All you ask is a tall ship and a star to steer her by. And someone who knows how to steer ships using stars. You finally got some of those rivers you'd wanted, and they led to the sea. These are dangerous, pirate-infested waters, and you cautiously send rat-infested ships across them, to establish lucrative trade at far-off merchant-infested ports. First, you will take over some islands, as a foothold. The natives seem friendly enough, crying their peace cries, and giving you spears and poison darts before you are even close enough to accept them properly. When you finally reach those ports you will conquer them, and from there you will look for more rivers. One day, all the rivers will be yours.\nThis is the 2nd addition to Dominion. It adds 26 new Kingdom cards to Dominion. Its central theme is your next turn; there are cards that do something this turn and next, cards that set up your next turn, and other ways to step outside of the bounds of a normal turn.", "text_icon": "S" - }, - "menagerie": { - "set_name": "Menagerie", - "text_icon": "*", - "set_text": "" - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "*", - "set_text": "" } } diff --git a/src/domdiv/card_db/en_us/types_en_us.json b/src/domdiv/card_db/en_us/types_en_us.json index 49f56c2..2a31d6c 100644 --- a/src/domdiv/card_db/en_us/types_en_us.json +++ b/src/domdiv/card_db/en_us/types_en_us.json @@ -35,13 +35,5 @@ "Traveller": "Traveller", "Treasure": "Treasure", "Victory": "Victory", -<<<<<<< Updated upstream - "Zombie": "Zombie", - "Way": "Way", - "Ways": "Ways" -======= - "Way": "Way", - "Ways": "Ways", "Zombie": "Zombie" ->>>>>>> Stashed changes } diff --git a/src/domdiv/card_db/fr/sets_fr.json b/src/domdiv/card_db/fr/sets_fr.json index 70a01b9..aa8ee9a 100644 --- a/src/domdiv/card_db/fr/sets_fr.json +++ b/src/domdiv/card_db/fr/sets_fr.json @@ -135,24 +135,5 @@ "set_name": "Rivages", "set_text": "All you ask is a tall ship and a star to steer her by. And someone who knows how to steer ships using stars. You finally got some of those rivers you'd wanted, and they led to the sea. These are dangerous, pirate-infested waters, and you cautiously send rat-infested ships across them, to establish lucrative trade at far-off merchant-infested ports. First, you will take over some islands, as a foothold. The natives seem friendly enough, crying their peace cries, and giving you spears and poison darts before you are even close enough to accept them properly. When you finally reach those ports you will conquer them, and from there you will look for more rivers. One day, all the rivers will be yours.\nThis is the 2nd addition to Dominion. It adds 26 new Kingdom cards to Dominion. Its central theme is your next turn; there are cards that do something this turn and next, cards that set up your next turn, and other ways to step outside of the bounds of a normal turn.", "text_icon": "R" - }, - "menagerie": { - "set_name": "Menagerie", -<<<<<<< Updated upstream - "text_icon": "*", - "set_text": "" - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "*", -======= - "text_icon": "M", - "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to Dominion. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return." - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "M", ->>>>>>> Stashed changes - "set_text": "" } } diff --git a/src/domdiv/card_db/fr/types_fr.json b/src/domdiv/card_db/fr/types_fr.json index c7810e5..fca12f9 100644 --- a/src/domdiv/card_db/fr/types_fr.json +++ b/src/domdiv/card_db/fr/types_fr.json @@ -35,7 +35,5 @@ "Treasure": "Trésor", "Victory": "Victoire", "Zombie": "Zombie", - "Projects": "Projects", - "Way": "Way", - "Ways": "Ways" + "Projects": "Projects" } diff --git a/src/domdiv/card_db/it/sets_it.json b/src/domdiv/card_db/it/sets_it.json index 48a5ba4..cc157f5 100644 --- a/src/domdiv/card_db/it/sets_it.json +++ b/src/domdiv/card_db/it/sets_it.json @@ -135,24 +135,5 @@ "set_name": "Seaside", "set_text": "All you ask is a tall ship and a star to steer her by. And someone who knows how to steer ships using stars. You finally got some of those rivers you'd wanted, and they led to the sea. These are dangerous, pirate-infested waters, and you cautiously send rat-infested ships across them, to establish lucrative trade at far-off merchant-infested ports. First, you will take over some islands, as a foothold. The natives seem friendly enough, crying their peace cries, and giving you spears and poison darts before you are even close enough to accept them properly. When you finally reach those ports you will conquer them, and from there you will look for more rivers. One day, all the rivers will be yours.\nThis is the 2nd addition to Dominion. It adds 26 new Kingdom cards to Dominion. Its central theme is your next turn; there are cards that do something this turn and next, cards that set up your next turn, and other ways to step outside of the bounds of a normal turn.", "text_icon": "S" - }, - "menagerie": { - "set_name": "Menagerie", -<<<<<<< Updated upstream - "text_icon": "*", - "set_text": "" - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "*", -======= - "text_icon": "M", - "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to Dominion. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return." - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "M", ->>>>>>> Stashed changes - "set_text": "" } } diff --git a/src/domdiv/card_db/it/types_it.json b/src/domdiv/card_db/it/types_it.json index 772f18e..b770ab4 100644 --- a/src/domdiv/card_db/it/types_it.json +++ b/src/domdiv/card_db/it/types_it.json @@ -35,7 +35,5 @@ "Treasure": "Treasure", "Victory": "Victory", "Zombie": "Zombie", - "Projects": "Projects", - "Way": "Way", - "Ways": "Ways" + "Projects": "Projects" } diff --git a/src/domdiv/card_db/labels_db.json b/src/domdiv/card_db/labels_db.json index e42ff29..7d22a91 100644 --- a/src/domdiv/card_db/labels_db.json +++ b/src/domdiv/card_db/labels_db.json @@ -83,22 +83,5 @@ "tab-height": 0.9, "tab-only": false, "width": 8.57 - }, - { - "gap-horizontal": 0.254, - "gap-vertical": 0.0, - "height": 1.693, - "margin-left": 0.975, - "margin-top": 1.306, - "name": "Label Herma 4201 A4", - "names": [ - "H4201" - ], - "pad-horizontal": 0.2, - "pad-vertical": 0.2, - "paper": "A4", - "tab-height": 1.5, - "tab-only": true, - "width": 4.572 } ] diff --git a/src/domdiv/card_db/nl_du/sets_nl_du.json b/src/domdiv/card_db/nl_du/sets_nl_du.json index 77d6b82..73cd59b 100644 --- a/src/domdiv/card_db/nl_du/sets_nl_du.json +++ b/src/domdiv/card_db/nl_du/sets_nl_du.json @@ -135,24 +135,5 @@ "set_name": "Hijs De Zeilen", "set_text": "All you ask is a tall ship and a star to steer her by. And someone who knows how to steer ships using stars. You finally got some of those rivers you'd wanted, and they led to the sea. These are dangerous, pirate-infested waters, and you cautiously send rat-infested ships across them, to establish lucrative trade at far-off merchant-infested ports. First, you will take over some islands, as a foothold. The natives seem friendly enough, crying their peace cries, and giving you spears and poison darts before you are even close enough to accept them properly. When you finally reach those ports you will conquer them, and from there you will look for more rivers. One day, all the rivers will be yours.\nThis is the 2nd addition to Dominion. It adds 26 new Kingdom cards to Dominion. Its central theme is your next turn; there are cards that do something this turn and next, cards that set up your next turn, and other ways to step outside of the bounds of a normal turn.", "text_icon": "HZ" - }, - "menagerie": { - "set_name": "Menagerie", -<<<<<<< Updated upstream - "text_icon": "*", - "set_text": "" - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "*", -======= - "text_icon": "M", - "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to Dominion. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return." - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "M", ->>>>>>> Stashed changes - "set_text": "" } } diff --git a/src/domdiv/card_db/nl_du/types_nl_du.json b/src/domdiv/card_db/nl_du/types_nl_du.json index 53984ce..dc96f22 100644 --- a/src/domdiv/card_db/nl_du/types_nl_du.json +++ b/src/domdiv/card_db/nl_du/types_nl_du.json @@ -35,7 +35,5 @@ "Treasure": "Geld", "Victory": "Overwinning", "Zombie": "Zombie", - "Projects": "Projects", - "Way": "Way", - "Ways": "Ways" + "Projects": "Projects" } diff --git a/src/domdiv/card_db/sets_db.json b/src/domdiv/card_db/sets_db.json index a39e20f..e2fbaf1 100644 --- a/src/domdiv/card_db/sets_db.json +++ b/src/domdiv/card_db/sets_db.json @@ -207,27 +207,6 @@ "set_text": "", "text_icon": "*" }, - "menagerie": { - "edition": [ - "1", - "latest" - ], - "image": "menagerie_set.png", - "set_name": "*menagerie*", - "set_text": "", - "text_icon": "*" - }, - "menagerie extras": { - "edition": [ - "1", - "latest" - ], - "image": "menagerie_set.png", - "no_randomizer": true, - "set_name": "*menagerie extras*", - "set_text": "", - "text_icon": "*" - }, "nocturne": { "edition": [ "1", diff --git a/src/domdiv/card_db/types_db.json b/src/domdiv/card_db/types_db.json index 4d22cf7..de27d78 100644 --- a/src/domdiv/card_db/types_db.json +++ b/src/domdiv/card_db/types_db.json @@ -74,17 +74,6 @@ "tabCostHeightOffset": -1, "tabTextHeightOffset": 0 }, - { - "card_type": [ - "Action", - "Attack", - "Reaction" - ], - "card_type_image": "reaction.png", - "defaultCardCount": 10, - "tabCostHeightOffset": -1, - "tabTextHeightOffset": 0 - }, { "card_type": [ "Action", @@ -116,17 +105,6 @@ "tabCostHeightOffset": -1, "tabTextHeightOffset": 0 }, - { - "card_type": [ - "Action", - "Duration", - "Attack" - ], - "card_type_image": "duration.png", - "defaultCardCount": 10, - "tabCostHeightOffset": -1, - "tabTextHeightOffset": 0 - }, { "card_type": [ "Action", @@ -641,23 +619,5 @@ "defaultCardCount": 6, "tabCostHeightOffset": -1, "tabTextHeightOffset": 0 - }, - { - "card_type": [ - "Way" - ], - "card_type_image": "way.png", - "defaultCardCount": 1, - "tabCostHeightOffset": -1, - "tabTextHeightOffset": 0 - }, - { - "card_type": [ - "Ways" - ], - "card_type_image": "way.png", - "defaultCardCount": 0, - "tabCostHeightOffset": -1, - "tabTextHeightOffset": 0 } ] diff --git a/src/domdiv/card_db/xx/sets_xx.json b/src/domdiv/card_db/xx/sets_xx.json index 7408fa9..09cd264 100644 --- a/src/domdiv/card_db/xx/sets_xx.json +++ b/src/domdiv/card_db/xx/sets_xx.json @@ -135,24 +135,5 @@ "set_name": "Seaside", "set_text": "All you ask is a tall ship and a star to steer her by. And someone who knows how to steer ships using stars. You finally got some of those rivers you'd wanted, and they led to the sea. These are dangerous, pirate-infested waters, and you cautiously send rat-infested ships across them, to establish lucrative trade at far-off merchant-infested ports. First, you will take over some islands, as a foothold. The natives seem friendly enough, crying their peace cries, and giving you spears and poison darts before you are even close enough to accept them properly. When you finally reach those ports you will conquer them, and from there you will look for more rivers. One day, all the rivers will be yours.\nThis is the 2nd addition to Dominion. It adds 26 new Kingdom cards to Dominion. Its central theme is your next turn; there are cards that do something this turn and next, cards that set up your next turn, and other ways to step outside of the bounds of a normal turn.", "text_icon": "S" - }, - "menagerie": { - "set_name": "Menagerie", -<<<<<<< Updated upstream - "text_icon": "*", - "set_text": "" - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "*", -======= - "text_icon": "M", - "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to Dominion. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return." - }, - "menagerie extras": { - "set_name": "Menagerie Extras", - "text_icon": "M", ->>>>>>> Stashed changes - "set_text": "" } } diff --git a/src/domdiv/card_db/xx/types_xx.json b/src/domdiv/card_db/xx/types_xx.json index 772f18e..b770ab4 100644 --- a/src/domdiv/card_db/xx/types_xx.json +++ b/src/domdiv/card_db/xx/types_xx.json @@ -35,7 +35,5 @@ "Treasure": "Treasure", "Victory": "Victory", "Zombie": "Zombie", - "Projects": "Projects", - "Way": "Way", - "Ways": "Ways" + "Projects": "Projects" }