diff --git a/card_db_src/en_us/bonuses_en_us.json b/card_db_src/en_us/bonuses_en_us.json index d65ea80a..16bb9713 100644 --- a/card_db_src/en_us/bonuses_en_us.json +++ b/card_db_src/en_us/bonuses_en_us.json @@ -18,7 +18,6 @@ "Villagers", "", "Favor", - "Favors", - "Sun" + "Favors" ] } diff --git a/card_db_src/en_us/cards_en_us.json b/card_db_src/en_us/cards_en_us.json index 971c5832..a295b138 100644 --- a/card_db_src/en_us/cards_en_us.json +++ b/card_db_src/en_us/cards_en_us.json @@ -1753,8 +1753,8 @@ "name": "King's Court" }, "Kitsune": { - "description": "+1 Sun

Choose two different options: +2 Actions; +2 Coins; each other player gains a Curse; gain a Silver.", - "extra": "First the +1 Sun happens, which may trigger a Prophecy; then you choose two different options, and do them in the order listed.", + "description": "+1 SunToken

Choose two different options: +2 Actions; +2 Coins; each other player gains a Curse; gain a Silver.", + "extra": "First the +1 SunToken happens, which may trigger a Prophecy; then you choose two different options, and do them in the order listed.", "name": "Kitsune" }, "Knights": { @@ -2083,7 +2083,7 @@ "name": "Mountain Pass" }, "Mountain Shrine": { - "description": "+1 Sun
+2 Coins

You may trash a card from your hand. Then, if there are any Action cards in the trash, +2 Cards.", + "description": "+1 SunToken
+2 Coins

You may trash a card from your hand. Then, if there are any Action cards in the trash, +2 Cards.", "extra": "This costs 5 Debt; see the Debt section. It doesn't matter who trashed an Action or when, just that there is one in the trash. The Action in the trash can be one you just trashed with the same play of Mountain Shrine.", "name": "Mountain Shrine" }, @@ -2401,7 +2401,7 @@ "name": "Poacher" }, "Poet": { - "description": "+1 Sun
+1 Card
+1 Action

Reveal the top card of your deck. If it costs 3 Coins or less, put it into your hand", + "description": "+1 SunToken
+1 Card
+1 Action

Reveal the top card of your deck. If it costs 3 Coins or less, put it into your hand", "extra": "Cards with Debt in their costs do not cost \"3 Coins or less.\" The card goes back on top of your deck if it doesn't get put into your hand.", "name": "Poet" }, @@ -2645,7 +2645,7 @@ "name": "Ritual" }, "River Shrine": { - "description": "+1 Sun

Trash up to 2 cards from your hand. At the start of Clean-up, if you didn't gain any cards in your Buy phase this turn, gain a card costing up to 4 Coin.", + "description": "+1 SunToken

Trash up to 2 cards from your hand. At the start of Clean-up, if you didn't gain any cards in your Buy phase this turn, gain a card costing up to 4 Coin.", "extra": "It doesn't matter if you gained cards in your Action phase, only if you did in your Buy phase. If you play multiple River Shrines, they can all gain a card, provided you don't gain a card in your Buy phase. Trashing cards with this is optional; you can gain a card even if you didn't trash any cards. If you have multiple Buy phases, such as via Continue, River Shrine only gains you a card if you didn't gain a card in any of those Buy phases.", "name": "River Shrine" }, @@ -2734,8 +2734,8 @@ "name": "Rush" }, "Rustic Village": { - "description": "+1 Sun
+1 Cards
+2 Actions

You may discard 2 cards for +1 Card.", - "extra": "First the +1 Sun happens, which may trigger a Prophecy; then you get +1 Card, +2 Actions, and may discard 2 cards (including the one just drawn) for another +1 Card.", + "description": "+1 SunToken
+1 Cards
+2 Actions

You may discard 2 cards for +1 Card.", + "extra": "First the +1 SunToken happens, which may trigger a Prophecy; then you get +1 Card, +2 Actions, and may discard 2 cards (including the one just drawn) for another +1 Card.", "name": "Rustic Village" }, "Saboteur": { @@ -3252,8 +3252,8 @@ "name": "Taxman" }, "Tea House": { - "description": "+1 Sun
+1 Card
+1 Action
+2 Coins", - "extra": "First the +1 Sun happens, which may trigger a Prophecy; then you get +1 Card, +1 Action, and +2 Coins.", + "description": "+1 SunToken
+1 Card
+1 Action
+2 Coins", + "extra": "First the +1 SunToken happens, which may trigger a Prophecy; then you get +1 Card, +1 Action, and +2 Coins.", "name": "Tea House" }, "Teacher": { @@ -4218,7 +4218,7 @@ }, "prophecies": { "description": "Prophecies are rules that will eventually apply to the game.", - "extra": "In every game with one or more Omen cards, deal out one Prophecy for it. Only use one Prophecy no matter how many Omens you have.
• Put 5 Sun tokens on the Prophecy for 2 players, 8 for 3 players, 10 for 4 players, 12 for 5 players, and 13 for 6 players.
• +1 Sun means remove a token from the Prophecy. Then if it was the last token, the rules text on the Prophecy becomes active, right then and for the rest of the game.
• +1 Sun always appears first on Omens, before anything else the card does.
• +1 Sun does nothing else once all the tokens are removed.
• Prophecy text does nothing until the last Sun token is removed.", + "extra": "In every game with one or more Omen cards, deal out one Prophecy for it. Only use one Prophecy no matter how many Omens you have.
• Put 5 Sun tokens on the Prophecy for 2 players, 8 for 3 players, 10 for 4 players, 12 for 5 players, and 13 for 6 players.
• +1 SunToken means remove a token from the Prophecy. Then if it was the last token, the rules text on the Prophecy becomes active, right then and for the rest of the game.
• +1 SunToken always appears first on Omens, before anything else the card does.
• +1 SunToken does nothing else once all the tokens are removed.
• Prophecy text does nothing until the last Sun token is removed.", "name": "Prophecies - All" }, "renaissance projects": { diff --git a/src/domdiv/card_db/cs/cards_cs.json.gz b/src/domdiv/card_db/cs/cards_cs.json.gz index 7dea8483..1b9243a3 100644 Binary files a/src/domdiv/card_db/cs/cards_cs.json.gz and b/src/domdiv/card_db/cs/cards_cs.json.gz differ diff --git a/src/domdiv/card_db/de/cards_de.json.gz b/src/domdiv/card_db/de/cards_de.json.gz index 25055c70..13df5e59 100644 Binary files a/src/domdiv/card_db/de/cards_de.json.gz and b/src/domdiv/card_db/de/cards_de.json.gz differ 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 index d9ff287b..ca48b28f 100644 Binary files a/src/domdiv/card_db/en_us/cards_en_us.json.gz and b/src/domdiv/card_db/en_us/cards_en_us.json.gz differ diff --git a/src/domdiv/card_db/es/cards_es.json.gz b/src/domdiv/card_db/es/cards_es.json.gz index f946332c..a6f0fbf2 100644 Binary files a/src/domdiv/card_db/es/cards_es.json.gz and b/src/domdiv/card_db/es/cards_es.json.gz differ diff --git a/src/domdiv/card_db/fr/cards_fr.json.gz b/src/domdiv/card_db/fr/cards_fr.json.gz index cebb4e72..292713e4 100644 Binary files a/src/domdiv/card_db/fr/cards_fr.json.gz and b/src/domdiv/card_db/fr/cards_fr.json.gz differ diff --git a/src/domdiv/card_db/it/cards_it.json.gz b/src/domdiv/card_db/it/cards_it.json.gz index 8650689a..0266bb1b 100644 Binary files a/src/domdiv/card_db/it/cards_it.json.gz and b/src/domdiv/card_db/it/cards_it.json.gz differ 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 index 2cffdf5e..38f131e2 100644 Binary files a/src/domdiv/card_db/nl_nl/cards_nl_nl.json.gz and b/src/domdiv/card_db/nl_nl/cards_nl_nl.json.gz differ diff --git a/src/domdiv/card_db/xx/cards_xx.json.gz b/src/domdiv/card_db/xx/cards_xx.json.gz index 71fcd3d1..123a3d7d 100644 Binary files a/src/domdiv/card_db/xx/cards_xx.json.gz and b/src/domdiv/card_db/xx/cards_xx.json.gz differ diff --git a/src/domdiv/draw.py b/src/domdiv/draw.py index 601a8c8f..11c769d6 100644 --- a/src/domdiv/draw.py +++ b/src/domdiv/draw.py @@ -1194,7 +1194,7 @@ def replace_image_tag( (r"(\d+)\s*\<\*POTION\*\>", "potion_small.png", 2, 140, 1.5), (r"Potion", "potion_small.png", 1.2, 100), # Sun - (r"Sun", "sun.png", 1.2, 105), + (r"SunToken", "sun.png", 1.2, 105), ] for args in replace_specs: text = replace_image_tag(text, fontsize, *args)