From dff2f16ba60d88794f73ecdad81d624e61f8b702 Mon Sep 17 00:00:00 2001 From: Michael Rice Date: Sun, 16 Oct 2016 17:06:15 -0500 Subject: [PATCH 1/5] added intrigue update cards (english only) --- card_db/en_us/cards.json | 82 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/card_db/en_us/cards.json b/card_db/en_us/cards.json index 29f6ba3..e4d76af 100644 --- a/card_db/en_us/cards.json +++ b/card_db/en_us/cards.json @@ -4461,5 +4461,85 @@ "types":[ "Action" ] - } + }, + { + "potcost": 0, + "description": "Reveal a card from your hand. For each type it has (Action, Attack, etc.), choose one: +1 Action; or +1 Buy; or +3 Coin; or gain a Gold. The choices must be different.", + "extra": "First reveal a card from your hand, then count the types.\nThe types are the words on the bottom line \u2013 including Action, Attack, Curse, Reaction, Treasure, and Victory (with more in expansions).\n\nThen choose one different thing per type the card had; if you revealed a card with two types, you pick two things.\n\nFor example you could reveal a Copper and choose \"gain a Gold,\" or reveal a Mill and choose \"+1 Action\" and \"+3 Coin\".\n\nIf you gain a Gold, put the Gold into your discard pile.", + "name": "Courtier", + "cost": 5, + "types": [ + "Action" + ], + "cardset": "intrigue" + }, + { + "potcost": 0, + "cost": 4, + "name": "Diplomat", + "extra": "When playing this, you get +2 Cards, then count your cards in hand, and if you have 5 cards or fewer, you get +2 Actions.\n\nSo, for example if you play this from a hand of 5 cards, you will put it into play, going down to 4 cards, then draw 2 cards, going up to 6 cards, and that is more than 5 cards so you would not get the +2 Actions.\n\nDiplomat can also be used when another player plays an Attack card, if you have at least 5 cards in hand.\n\nBefore the Attack card does anything, you can reveal a Diplomat from your hand; if you do, you draw 2 cards, then discard 3 cards (which can include the Diplomat).\n\nIf you still have at least 5 cards in hand after doing that (such as due to Council Rooms), you can reveal Diplomat again and do it again.\n\nYou reveal Reactions one at a time; you cannot reveal two Diplomats simultaneously.\n\nYou can reveal a Moat from your hand (to be unaffected by an Attack) either before or after revealing and resolving a Diplomat (even if the Moat was not in your hand until after resolving Diplomat).\n\n", + "description": "+ 2 Cards\n\nIf you have 5 or fewer cards in hand (after drawing), +2 Actions.\n\nWhen another player plays an Attack card, you may first reveal this from a hand of 5 or more cards, to draw 2 cards then discard 3.", + "types": [ + "Action", + "Reaction" + ], + "cardset": "intrigue" + }, + { + "potcost": 0, + "cost": 2, + "name": "Lurker", + "extra": "The card trashed or gained has to be an Action card, but can have other types too. For example Lurker can trash Nobles from the Supply and can gain Nobles from the trash.\n\nWhen gaining a card with Lurker, put the gained card into your discard pile.\n\nWhen you trash a card from the supply that has a special effect when trashed, the on-trash effect activates. However, trashing from the supply does not allow you to react with Market Square.\n", + "cardset": "intrigue", + "types": [ + "Action" + ], + "description": "+1 Action\n\nChoose one: Trash an Action card from the Supply; or gain an Action card from the trash.\n\n" + }, + { + "potcost": 0, + "cost": 4, + "name": "Mill", + "extra": "You can choose to discard 2 cards even if you only have one card in hand, but you only get +2 Coin if you actually discarded 2 cards.\n\nUse 8 Mills for games with 2 players, 12 for games with 3 or more players.\n\n", + "description": "+1 Card\n+1 Action\n\nYou may discard 2 cards, for +2 Coin.\n\nWorth 1 VP\n", + "types": [ + "Action", + "Victory" + ], + "cardset": "intrigue" + }, + { + "potcost": 0, + "cost": 5, + "name": "Patrol", + "extra": "First draw 3 cards, then reveal the top 4 cards of your deck.\n\nPut the revealed Victory cards and Curses into your hand; you have to take them all.\n\nPut the rest of the cards back on your deck in any order you choose.\n\n", + "cardset": "intrigue", + "types": [ + "Action" + ], + "description": "+3 Cards\n\nReveal the top 4 cards of your deck. Put the Victory cards and Curses into your hand. Put the rest back in any order.\n" + }, + { + "potcost": 0, + "cost": 5, + "name": "Replace", + "extra": "Like Remodel, you first trash a card from your hand, then gain a card from the Supply costing up to 2 Coin more than the trashed card, putting the gained card into your discard pile.\n\nReplace gives you an additional bonus based on the types of the gained card; if it is an Action or Treasure you move it to the top of your deck, and if it is a Victory card the other players each gain a Curse.\n\nIt is possible to get both bonuses; if you gain Harem, Mill, or Nobles with Replace, it both goes on your deck and causes the other players to each gain a Curse.\n", + "description": "Trash a card from your hand. Gain a card costing up to 2 Coins more than it. If the gained card is an Action or Treasure, put it onto your deck; if it's a Victory card, each other player gains a Curse.\n", + "types": [ + "Action", + "Attack" + ], + "cardset": "intrigue" + }, + { + "potcost": 0, + "name": "Secret Passage", + "extra": "First draw 2 cards and get +1 Action; then put a card from your hand anywhere in your deck.\n\nThe card can be one you just drew or any other card from your hand.\n\nIt can go on top of your deck, on the bottom, or anywhere in-between; you can count out a specific place to put it, e.g. four cards down.\n\nIf there are no cards left in your deck, the card put back becomes the only card in your deck.\n\nWhere you put the card is public knowledge.\n\nYou don't have to put the card into a specific spot, you can just shove it into your deck if you want.\n", + "cost": 4, + "cardset": "intrigue", + "types": [ + "Action" + ], + "description": "+2 Cards\n+1 Action\n\nTake a card from your hand and put it anywhere in your deck.\n" + } ] From 5ce7976d5fe21f66bdf650fbce3811ee4ea72dfe Mon Sep 17 00:00:00 2001 From: Michael Rice Date: Sun, 16 Oct 2016 17:23:14 -0500 Subject: [PATCH 2/5] fixed some minor display issues with newlines in the extra text on intrigue updates --- card_db/en_us/cards.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/card_db/en_us/cards.json b/card_db/en_us/cards.json index e4d76af..2ec571f 100644 --- a/card_db/en_us/cards.json +++ b/card_db/en_us/cards.json @@ -4465,7 +4465,7 @@ { "potcost": 0, "description": "Reveal a card from your hand. For each type it has (Action, Attack, etc.), choose one: +1 Action; or +1 Buy; or +3 Coin; or gain a Gold. The choices must be different.", - "extra": "First reveal a card from your hand, then count the types.\nThe types are the words on the bottom line \u2013 including Action, Attack, Curse, Reaction, Treasure, and Victory (with more in expansions).\n\nThen choose one different thing per type the card had; if you revealed a card with two types, you pick two things.\n\nFor example you could reveal a Copper and choose \"gain a Gold,\" or reveal a Mill and choose \"+1 Action\" and \"+3 Coin\".\n\nIf you gain a Gold, put the Gold into your discard pile.", + "extra": "First reveal a card from your hand, then count the types.

The types are the words on the bottom line \u2013 including Action, Attack, Curse, Reaction, Treasure, and Victory (with more in expansions).



Then choose one different thing per type the card had; if you revealed a card with two types, you pick two things.



For example you could reveal a Copper and choose \"gain a Gold,\" or reveal a Mill and choose \"+1 Action\" and \"+3 Coin\".



If you gain a Gold, put the Gold into your discard pile.", "name": "Courtier", "cost": 5, "types": [ @@ -4477,8 +4477,8 @@ "potcost": 0, "cost": 4, "name": "Diplomat", - "extra": "When playing this, you get +2 Cards, then count your cards in hand, and if you have 5 cards or fewer, you get +2 Actions.\n\nSo, for example if you play this from a hand of 5 cards, you will put it into play, going down to 4 cards, then draw 2 cards, going up to 6 cards, and that is more than 5 cards so you would not get the +2 Actions.\n\nDiplomat can also be used when another player plays an Attack card, if you have at least 5 cards in hand.\n\nBefore the Attack card does anything, you can reveal a Diplomat from your hand; if you do, you draw 2 cards, then discard 3 cards (which can include the Diplomat).\n\nIf you still have at least 5 cards in hand after doing that (such as due to Council Rooms), you can reveal Diplomat again and do it again.\n\nYou reveal Reactions one at a time; you cannot reveal two Diplomats simultaneously.\n\nYou can reveal a Moat from your hand (to be unaffected by an Attack) either before or after revealing and resolving a Diplomat (even if the Moat was not in your hand until after resolving Diplomat).\n\n", - "description": "+ 2 Cards\n\nIf you have 5 or fewer cards in hand (after drawing), +2 Actions.\n\nWhen another player plays an Attack card, you may first reveal this from a hand of 5 or more cards, to draw 2 cards then discard 3.", + "extra": "When playing this, you get +2 Cards, then count your cards in hand, and if you have 5 cards or fewer, you get +2 Actions.



So, for example if you play this from a hand of 5 cards, you will put it into play, going down to 4 cards, then draw 2 cards, going up to 6 cards, and that is more than 5 cards so you would not get the +2 Actions.



Diplomat can also be used when another player plays an Attack card, if you have at least 5 cards in hand.



Before the Attack card does anything, you can reveal a Diplomat from your hand; if you do, you draw 2 cards, then discard 3 cards (which can include the Diplomat).



If you still have at least 5 cards in hand after doing that (such as due to Council Rooms), you can reveal Diplomat again and do it again.



You reveal Reactions one at a time; you cannot reveal two Diplomats simultaneously.



You can reveal a Moat from your hand (to be unaffected by an Attack) either before or after revealing and resolving a Diplomat (even if the Moat was not in your hand until after resolving Diplomat).", + "description": "+ 2 Cards\n\nIf you have 5 or fewer cards in hand (after drawing), +2 Actions.\n\u2013\nWhen another player plays an Attack card, you may first reveal this from a hand of 5 or more cards, to draw 2 cards then discard 3.", "types": [ "Action", "Reaction" @@ -4489,7 +4489,7 @@ "potcost": 0, "cost": 2, "name": "Lurker", - "extra": "The card trashed or gained has to be an Action card, but can have other types too. For example Lurker can trash Nobles from the Supply and can gain Nobles from the trash.\n\nWhen gaining a card with Lurker, put the gained card into your discard pile.\n\nWhen you trash a card from the supply that has a special effect when trashed, the on-trash effect activates. However, trashing from the supply does not allow you to react with Market Square.\n", + "extra": "The card trashed or gained has to be an Action card, but can have other types too. For example Lurker can trash Nobles from the Supply and can gain Nobles from the trash.



When gaining a card with Lurker, put the gained card into your discard pile.



When you trash a card from the supply that has a special effect when trashed, the on-trash effect activates. However, trashing from the supply does not allow you to react with Market Square.", "cardset": "intrigue", "types": [ "Action" @@ -4500,8 +4500,8 @@ "potcost": 0, "cost": 4, "name": "Mill", - "extra": "You can choose to discard 2 cards even if you only have one card in hand, but you only get +2 Coin if you actually discarded 2 cards.\n\nUse 8 Mills for games with 2 players, 12 for games with 3 or more players.\n\n", - "description": "+1 Card\n+1 Action\n\nYou may discard 2 cards, for +2 Coin.\n\nWorth 1 VP\n", + "extra": "You can choose to discard 2 cards even if you only have one card in hand, but you only get +2 Coin if you actually discarded 2 cards.

Use 8 Mills for games with 2 players, 12 for games with 3 or more players.", + "description": "+1 Card\n+1 Action\n\nYou may discard 2 cards, for +2 Coin.\n\u2013\nWorth 1 VP", "types": [ "Action", "Victory" @@ -4512,7 +4512,7 @@ "potcost": 0, "cost": 5, "name": "Patrol", - "extra": "First draw 3 cards, then reveal the top 4 cards of your deck.\n\nPut the revealed Victory cards and Curses into your hand; you have to take them all.\n\nPut the rest of the cards back on your deck in any order you choose.\n\n", + "extra": "First draw 3 cards, then reveal the top 4 cards of your deck.



Put the revealed Victory cards and Curses into your hand; you have to take them all.



Put the rest of the cards back on your deck in any order you choose.", "cardset": "intrigue", "types": [ "Action" @@ -4523,7 +4523,7 @@ "potcost": 0, "cost": 5, "name": "Replace", - "extra": "Like Remodel, you first trash a card from your hand, then gain a card from the Supply costing up to 2 Coin more than the trashed card, putting the gained card into your discard pile.\n\nReplace gives you an additional bonus based on the types of the gained card; if it is an Action or Treasure you move it to the top of your deck, and if it is a Victory card the other players each gain a Curse.\n\nIt is possible to get both bonuses; if you gain Harem, Mill, or Nobles with Replace, it both goes on your deck and causes the other players to each gain a Curse.\n", + "extra": "Like Remodel, you first trash a card from your hand, then gain a card from the Supply costing up to 2 Coin more than the trashed card, putting the gained card into your discard pile.



Replace gives you an additional bonus based on the types of the gained card; if it is an Action or Treasure you move it to the top of your deck, and if it is a Victory card the other players each gain a Curse.



It is possible to get both bonuses; if you gain Harem, Mill, or Nobles with Replace, it both goes on your deck and causes the other players to each gain a Curse.", "description": "Trash a card from your hand. Gain a card costing up to 2 Coins more than it. If the gained card is an Action or Treasure, put it onto your deck; if it's a Victory card, each other player gains a Curse.\n", "types": [ "Action", @@ -4534,7 +4534,7 @@ { "potcost": 0, "name": "Secret Passage", - "extra": "First draw 2 cards and get +1 Action; then put a card from your hand anywhere in your deck.\n\nThe card can be one you just drew or any other card from your hand.\n\nIt can go on top of your deck, on the bottom, or anywhere in-between; you can count out a specific place to put it, e.g. four cards down.\n\nIf there are no cards left in your deck, the card put back becomes the only card in your deck.\n\nWhere you put the card is public knowledge.\n\nYou don't have to put the card into a specific spot, you can just shove it into your deck if you want.\n", + "extra": "First draw 2 cards and get +1 Action; then put a card from your hand anywhere in your deck.



The card can be one you just drew or any other card from your hand.



It can go on top of your deck, on the bottom, or anywhere in-between; you can count out a specific place to put it, e.g. four cards down.



If there are no cards left in your deck, the card put back becomes the only card in your deck.



Where you put the card is public knowledge.



You don't have to put the card into a specific spot, you can just shove it into your deck if you want.", "cost": 4, "cardset": "intrigue", "types": [ From 9cf1750f99a6ae22423c99f755a2304843ec8a66 Mon Sep 17 00:00:00 2001 From: Michael Rice Date: Sun, 16 Oct 2016 17:35:42 -0500 Subject: [PATCH 3/5] remove trailing whitespace, may be added by json.dumps --- card_db/en_us/cards.json | 134 +++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/card_db/en_us/cards.json b/card_db/en_us/cards.json index 2ec571f..8a8f6dc 100644 --- a/card_db/en_us/cards.json +++ b/card_db/en_us/cards.json @@ -287,7 +287,7 @@ "extra": " 60 cards per game.", "name": "Copper", "potcost": 0, - "count": 60, + "count": 60, "types": [ "Treasure" ] @@ -299,7 +299,7 @@ "extra": " 40 cards per game.", "name": "Silver", "potcost": 0, - "count": 40, + "count": 40, "types": [ "Treasure" ] @@ -311,7 +311,7 @@ "extra": " 30 cards per game.", "name": "Gold", "potcost": 0, - "count": 30, + "count": 30, "types": [ "Treasure" ] @@ -323,7 +323,7 @@ "extra": " Curses are an available pile in the Supply regardless of what other cards are in the Supply. With 2 players, place 10 Curses in the Supply. With 3 players, place 20 Curses in the Supply. With 4 players, place 30 Curses in the Supply. With 5 players, place 40 Curses in the Supply. With 6 players, place 50 Curses in the Supply.", "name": "Curse", "potcost": 0, - "count": 30, + "count": 30, "types": [ "Curse" ] @@ -335,7 +335,7 @@ "extra": " Put 8 in the Supply in a game with two players. Put 12 in the Supply in a game with three or more players.", "name": "Estate", "potcost": 0, - "count": 24, + "count": 24, "types": [ "Victory" ] @@ -664,7 +664,7 @@ "extra": " 60 cards per game.", "name": "Copper", "potcost": 0, - "count": 60, + "count": 60, "types": [ "Treasure" ] @@ -688,7 +688,7 @@ "extra": " 30 cards per game.", "name": "Gold", "potcost": 0, - "count": 30, + "count": 30, "types": [ "Treasure" ] @@ -711,7 +711,7 @@ "extra": " Put 8 in the Supply in a game with two players. Put 12 in the Supply in a game with three or more players.", "name": "Estate", "potcost": 0, - "count": 24, + "count": 24, "types": [ "Victory" ] @@ -1201,7 +1201,7 @@ "extra": " This is a basic Treasure card. It costs 4 Coins and produces Potion. It is not a Kingdom card. After you choose 10 Kingdom cards for the Supply, if any of them have Potion in the cost, add the Potion pile to the Supply. Also add the Potion pile if you are using the promotional card Black Market, and the Black Market deck includes at least one card with Potion in the cost. If you don't have any cards with Potion in the cost in the Supply or the Black Market deck, do not use the Potion pile in this game. When you have a Potion pile, put all 16 Potions in it, no matter how many players there are. In games using this pile, if the pile becomes empty, that will count towards the game ending condition.", "name": "Potion", "potcost": 0, - "count": 16, + "count": 16, "types": [ "Treasure" ] @@ -1623,7 +1623,7 @@ "extra": " 60 cards per game.", "name": "Copper", "potcost": 0, - "count": 60, + "count": 60, "types": [ "Treasure" ] @@ -1635,7 +1635,7 @@ "extra": " 40 cards per game.", "name": "Silver", "potcost": 0, - "count": 40, + "count": 40, "types": [ "Treasure" ] @@ -1647,7 +1647,7 @@ "extra": " 30 cards per game.", "name": "Gold", "potcost": 0, - "count": 30, + "count": 30, "types": [ "Treasure" ] @@ -1659,7 +1659,7 @@ "extra": " This is not a Kingdom card. You do not use it every game. It is a Treasure worth 5 coins. If only Kingdom cards from Prosperity are being used this game, then the Platinum and Colony piles are added to the Basic cards in the Supply for the game. If a mix of Kingdom cards from Prosperity and other sets are being used, then the inclusion of Platinum and Colony in the Supply should be determined randomly, based on the proportion of Prosperity and non-Prosperity cards in use. For example, choose a random Kingdom card being used - such as the first card dealt out from the Randomizer deck [this is equivalent to rolling a d10 or choosing a card at random after all 10 have been selected] - and if it is from Prosperity, add Platinum and Colony to the Supply. Platinum and Colony are not Kingdom cards; when those are included, there are 10 Kingdom cards, plus Copper, Silver, Gold, Platinum, Estate, Duchy, Province, Colony, and Curse, in the Supply. Use 8 Colonies for a 2-player game, or 12 Colonies for a game with 3 or more players. [Use all 12 Platinum regardless of the number of players. Platinum and Colony are meant to be used together and both or neither should be used, not one or the other.]", "name": "Platinum", "potcost": 0, - "count": 12, + "count": 12, "types": [ "Treasure" ] @@ -1694,7 +1694,7 @@ "extra": " Put 8 in the Supply in a game with two players. Put 12 in the Supply in a game with three or more players.", "name": "Estate", "potcost": 0, - "count": 24, + "count": 24, "types": [ "Victory" ] @@ -2432,7 +2432,7 @@ "extra": " Follow the instructions in order. First draw a card; then gain a Rats from the Supply, putting it into your discard pile; then trash a card from your hand that is not a Rats card. If there are no Rats cards left, you do not gain one. If you have no cards in your hand other than Rats, reveal your hand and you do not trash a card. If Rats is trashed, you draw a card. This happens whether it is your turn or another player's, and regardless of which player has the card that trashed Rats. There are 20 copies of Rats, rather than the usual 10; the pile starts with all 20, regardless of the number of players.", "name": "Rats", "potcost": 0, - "count": 20, + "count": 20, "types": [ "Action" ] @@ -3311,7 +3311,7 @@ "extra": " Champion stays in play for the rest of the game once played. For the rest of the game, it provides you with an additional +1 Action each time you play an Action, which means you will always be able to play all of your Actions; and it protects you from all further Attacks played (whether you want the protection or not). Champion only protects you from Attacks played after it; for example it does not stop a previously played Swamp Hag from giving you Curses that turn. ", "name": "Champion", "potcost": 0, - "count": 5, + "count": 5, "types": [ "Action", "Duration" @@ -4463,83 +4463,83 @@ ] }, { - "potcost": 0, - "description": "Reveal a card from your hand. For each type it has (Action, Attack, etc.), choose one: +1 Action; or +1 Buy; or +3 Coin; or gain a Gold. The choices must be different.", - "extra": "First reveal a card from your hand, then count the types.

The types are the words on the bottom line \u2013 including Action, Attack, Curse, Reaction, Treasure, and Victory (with more in expansions).



Then choose one different thing per type the card had; if you revealed a card with two types, you pick two things.



For example you could reveal a Copper and choose \"gain a Gold,\" or reveal a Mill and choose \"+1 Action\" and \"+3 Coin\".



If you gain a Gold, put the Gold into your discard pile.", - "name": "Courtier", - "cost": 5, + "potcost": 0, + "description": "Reveal a card from your hand. For each type it has (Action, Attack, etc.), choose one: +1 Action; or +1 Buy; or +3 Coin; or gain a Gold. The choices must be different.", + "extra": "First reveal a card from your hand, then count the types.

The types are the words on the bottom line \u2013 including Action, Attack, Curse, Reaction, Treasure, and Victory (with more in expansions).



Then choose one different thing per type the card had; if you revealed a card with two types, you pick two things.



For example you could reveal a Copper and choose \"gain a Gold,\" or reveal a Mill and choose \"+1 Action\" and \"+3 Coin\".



If you gain a Gold, put the Gold into your discard pile.", + "name": "Courtier", + "cost": 5, "types": [ "Action" - ], + ], "cardset": "intrigue" - }, + }, { - "potcost": 0, - "cost": 4, - "name": "Diplomat", - "extra": "When playing this, you get +2 Cards, then count your cards in hand, and if you have 5 cards or fewer, you get +2 Actions.



So, for example if you play this from a hand of 5 cards, you will put it into play, going down to 4 cards, then draw 2 cards, going up to 6 cards, and that is more than 5 cards so you would not get the +2 Actions.



Diplomat can also be used when another player plays an Attack card, if you have at least 5 cards in hand.



Before the Attack card does anything, you can reveal a Diplomat from your hand; if you do, you draw 2 cards, then discard 3 cards (which can include the Diplomat).



If you still have at least 5 cards in hand after doing that (such as due to Council Rooms), you can reveal Diplomat again and do it again.



You reveal Reactions one at a time; you cannot reveal two Diplomats simultaneously.



You can reveal a Moat from your hand (to be unaffected by an Attack) either before or after revealing and resolving a Diplomat (even if the Moat was not in your hand until after resolving Diplomat).", - "description": "+ 2 Cards\n\nIf you have 5 or fewer cards in hand (after drawing), +2 Actions.\n\u2013\nWhen another player plays an Attack card, you may first reveal this from a hand of 5 or more cards, to draw 2 cards then discard 3.", + "potcost": 0, + "cost": 4, + "name": "Diplomat", + "extra": "When playing this, you get +2 Cards, then count your cards in hand, and if you have 5 cards or fewer, you get +2 Actions.



So, for example if you play this from a hand of 5 cards, you will put it into play, going down to 4 cards, then draw 2 cards, going up to 6 cards, and that is more than 5 cards so you would not get the +2 Actions.



Diplomat can also be used when another player plays an Attack card, if you have at least 5 cards in hand.



Before the Attack card does anything, you can reveal a Diplomat from your hand; if you do, you draw 2 cards, then discard 3 cards (which can include the Diplomat).



If you still have at least 5 cards in hand after doing that (such as due to Council Rooms), you can reveal Diplomat again and do it again.



You reveal Reactions one at a time; you cannot reveal two Diplomats simultaneously.



You can reveal a Moat from your hand (to be unaffected by an Attack) either before or after revealing and resolving a Diplomat (even if the Moat was not in your hand until after resolving Diplomat).", + "description": "+ 2 Cards\n\nIf you have 5 or fewer cards in hand (after drawing), +2 Actions.\n\u2013\nWhen another player plays an Attack card, you may first reveal this from a hand of 5 or more cards, to draw 2 cards then discard 3.", "types": [ - "Action", + "Action", "Reaction" - ], + ], "cardset": "intrigue" - }, + }, { - "potcost": 0, - "cost": 2, - "name": "Lurker", - "extra": "The card trashed or gained has to be an Action card, but can have other types too. For example Lurker can trash Nobles from the Supply and can gain Nobles from the trash.



When gaining a card with Lurker, put the gained card into your discard pile.



When you trash a card from the supply that has a special effect when trashed, the on-trash effect activates. However, trashing from the supply does not allow you to react with Market Square.", - "cardset": "intrigue", + "potcost": 0, + "cost": 2, + "name": "Lurker", + "extra": "The card trashed or gained has to be an Action card, but can have other types too. For example Lurker can trash Nobles from the Supply and can gain Nobles from the trash.



When gaining a card with Lurker, put the gained card into your discard pile.



When you trash a card from the supply that has a special effect when trashed, the on-trash effect activates. However, trashing from the supply does not allow you to react with Market Square.", + "cardset": "intrigue", "types": [ "Action" - ], + ], "description": "+1 Action\n\nChoose one: Trash an Action card from the Supply; or gain an Action card from the trash.\n\n" - }, + }, { - "potcost": 0, - "cost": 4, - "name": "Mill", - "extra": "You can choose to discard 2 cards even if you only have one card in hand, but you only get +2 Coin if you actually discarded 2 cards.

Use 8 Mills for games with 2 players, 12 for games with 3 or more players.", - "description": "+1 Card\n+1 Action\n\nYou may discard 2 cards, for +2 Coin.\n\u2013\nWorth 1 VP", + "potcost": 0, + "cost": 4, + "name": "Mill", + "extra": "You can choose to discard 2 cards even if you only have one card in hand, but you only get +2 Coin if you actually discarded 2 cards.

Use 8 Mills for games with 2 players, 12 for games with 3 or more players.", + "description": "+1 Card\n+1 Action\n\nYou may discard 2 cards, for +2 Coin.\n\u2013\nWorth 1 VP", "types": [ - "Action", + "Action", "Victory" - ], + ], "cardset": "intrigue" - }, + }, { - "potcost": 0, - "cost": 5, - "name": "Patrol", - "extra": "First draw 3 cards, then reveal the top 4 cards of your deck.



Put the revealed Victory cards and Curses into your hand; you have to take them all.



Put the rest of the cards back on your deck in any order you choose.", - "cardset": "intrigue", + "potcost": 0, + "cost": 5, + "name": "Patrol", + "extra": "First draw 3 cards, then reveal the top 4 cards of your deck.



Put the revealed Victory cards and Curses into your hand; you have to take them all.



Put the rest of the cards back on your deck in any order you choose.", + "cardset": "intrigue", "types": [ "Action" - ], + ], "description": "+3 Cards\n\nReveal the top 4 cards of your deck. Put the Victory cards and Curses into your hand. Put the rest back in any order.\n" - }, + }, { - "potcost": 0, - "cost": 5, - "name": "Replace", - "extra": "Like Remodel, you first trash a card from your hand, then gain a card from the Supply costing up to 2 Coin more than the trashed card, putting the gained card into your discard pile.



Replace gives you an additional bonus based on the types of the gained card; if it is an Action or Treasure you move it to the top of your deck, and if it is a Victory card the other players each gain a Curse.



It is possible to get both bonuses; if you gain Harem, Mill, or Nobles with Replace, it both goes on your deck and causes the other players to each gain a Curse.", - "description": "Trash a card from your hand. Gain a card costing up to 2 Coins more than it. If the gained card is an Action or Treasure, put it onto your deck; if it's a Victory card, each other player gains a Curse.\n", + "potcost": 0, + "cost": 5, + "name": "Replace", + "extra": "Like Remodel, you first trash a card from your hand, then gain a card from the Supply costing up to 2 Coin more than the trashed card, putting the gained card into your discard pile.



Replace gives you an additional bonus based on the types of the gained card; if it is an Action or Treasure you move it to the top of your deck, and if it is a Victory card the other players each gain a Curse.



It is possible to get both bonuses; if you gain Harem, Mill, or Nobles with Replace, it both goes on your deck and causes the other players to each gain a Curse.", + "description": "Trash a card from your hand. Gain a card costing up to 2 Coins more than it. If the gained card is an Action or Treasure, put it onto your deck; if it's a Victory card, each other player gains a Curse.\n", "types": [ - "Action", + "Action", "Attack" - ], + ], "cardset": "intrigue" - }, + }, { - "potcost": 0, - "name": "Secret Passage", - "extra": "First draw 2 cards and get +1 Action; then put a card from your hand anywhere in your deck.



The card can be one you just drew or any other card from your hand.



It can go on top of your deck, on the bottom, or anywhere in-between; you can count out a specific place to put it, e.g. four cards down.



If there are no cards left in your deck, the card put back becomes the only card in your deck.



Where you put the card is public knowledge.



You don't have to put the card into a specific spot, you can just shove it into your deck if you want.", - "cost": 4, - "cardset": "intrigue", + "potcost": 0, + "name": "Secret Passage", + "extra": "First draw 2 cards and get +1 Action; then put a card from your hand anywhere in your deck.



The card can be one you just drew or any other card from your hand.



It can go on top of your deck, on the bottom, or anywhere in-between; you can count out a specific place to put it, e.g. four cards down.



If there are no cards left in your deck, the card put back becomes the only card in your deck.



Where you put the card is public knowledge.



You don't have to put the card into a specific spot, you can just shove it into your deck if you want.", + "cost": 4, + "cardset": "intrigue", "types": [ "Action" - ], + ], "description": "+2 Cards\n+1 Action\n\nTake a card from your hand and put it anywhere in your deck.\n" } ] From 9d93714b40b382c8d6c32ce528dabdb235c1fa4a Mon Sep 17 00:00:00 2001 From: Michael Rice Date: Sun, 16 Oct 2016 17:48:16 -0500 Subject: [PATCH 4/5] tweaked putting in a long dash for a rule line between card effects. --- card_db/en_us/cards.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/card_db/en_us/cards.json b/card_db/en_us/cards.json index 8a8f6dc..1acb157 100644 --- a/card_db/en_us/cards.json +++ b/card_db/en_us/cards.json @@ -4500,8 +4500,8 @@ "potcost": 0, "cost": 4, "name": "Mill", - "extra": "You can choose to discard 2 cards even if you only have one card in hand, but you only get +2 Coin if you actually discarded 2 cards.

Use 8 Mills for games with 2 players, 12 for games with 3 or more players.", - "description": "+1 Card\n+1 Action\n\nYou may discard 2 cards, for +2 Coin.\n\u2013\nWorth 1 VP", + "extra": "You can choose to discard 2 cards even if you only have one card in hand, but you only get +2 Coin if you actually discarded 2 cards.

\u2013

Use 8 Mills for games with 2 players, 12 for games with 3 or more players.", + "description": "+1 Card\n+1 Action\n\nYou may discard 2 cards, for +2 Coin.\n\n\u2013\n\nWorth 1 VP", "types": [ "Action", "Victory" @@ -4517,14 +4517,14 @@ "types": [ "Action" ], - "description": "+3 Cards\n\nReveal the top 4 cards of your deck. Put the Victory cards and Curses into your hand. Put the rest back in any order.\n" + "description": "+3 Cards\n\nReveal the top 4 cards of your deck. Put the Victory cards and Curses into your hand. Put the rest back in any order." }, { "potcost": 0, "cost": 5, "name": "Replace", "extra": "Like Remodel, you first trash a card from your hand, then gain a card from the Supply costing up to 2 Coin more than the trashed card, putting the gained card into your discard pile.



Replace gives you an additional bonus based on the types of the gained card; if it is an Action or Treasure you move it to the top of your deck, and if it is a Victory card the other players each gain a Curse.



It is possible to get both bonuses; if you gain Harem, Mill, or Nobles with Replace, it both goes on your deck and causes the other players to each gain a Curse.", - "description": "Trash a card from your hand. Gain a card costing up to 2 Coins more than it. If the gained card is an Action or Treasure, put it onto your deck; if it's a Victory card, each other player gains a Curse.\n", + "description": "Trash a card from your hand. Gain a card costing up to 2 Coins more than it. If the gained card is an Action or Treasure, put it onto your deck; if it's a Victory card, each other player gains a Curse.", "types": [ "Action", "Attack" @@ -4540,6 +4540,6 @@ "types": [ "Action" ], - "description": "+2 Cards\n+1 Action\n\nTake a card from your hand and put it anywhere in your deck.\n" + "description": "+2 Cards\n+1 Action\n\nTake a card from your hand and put it anywhere in your deck." } ] From 51265a029dad3a66989f1f345c8bc633eb6cc54d Mon Sep 17 00:00:00 2001 From: Michael Rice Date: Sun, 16 Oct 2016 18:17:51 -0500 Subject: [PATCH 5/5] adding 14 cards makes 386 cards == 400 cards. test for db size updated --- tests/carddb_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/carddb_tests.py b/tests/carddb_tests.py index 4a64442..2b7ee5b 100644 --- a/tests/carddb_tests.py +++ b/tests/carddb_tests.py @@ -9,7 +9,7 @@ class TestCardDB(unittest.TestCase): options = domdiv.parse_opts([]) options.data_path = '.' cards = domdiv.read_write_card_data(options) - self.assertEquals(len(cards), 386) + self.assertEquals(len(cards), 400) print set(c.cardset for c in cards) valid_cardsets = { u'prosperity',