Skip to content

Commit 645c625

Browse files
committed
Merge branch 'master' of https://github.com/ecm85/dominiontabs
2 parents 03d8a0e + 9cd6662 commit 645c625

5 files changed

Lines changed: 52 additions & 48 deletions

File tree

card_db_src/cards_db.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,8 +1692,8 @@
16921692
"prosperity2ndEdition"
16931693
],
16941694
"count": "0",
1695-
"group_top": true,
16961695
"group_tag": "Colony - Platinum",
1696+
"group_top": true,
16971697
"randomizer": false,
16981698
"types": [
16991699
"Treasure",
@@ -7231,7 +7231,7 @@
72317231
"count": "2",
72327232
"group_tag": "Loot",
72337233
"randomizer": false,
7234-
"types": [
7234+
"types": [
72357235
"Treasure",
72367236
"Duration",
72377237
"Loot"
@@ -7246,7 +7246,7 @@
72467246
"count": "2",
72477247
"group_tag": "Loot",
72487248
"randomizer": false,
7249-
"types": [
7249+
"types": [
72507250
"Treasure",
72517251
"Loot"
72527252
]
@@ -7260,7 +7260,7 @@
72607260
"count": "2",
72617261
"group_tag": "Loot",
72627262
"randomizer": false,
7263-
"types": [
7263+
"types": [
72647264
"Treasure",
72657265
"Duration",
72667266
"Loot"
@@ -7275,7 +7275,7 @@
72757275
"count": "2",
72767276
"group_tag": "Loot",
72777277
"randomizer": false,
7278-
"types": [
7278+
"types": [
72797279
"Treasure",
72807280
"Duration",
72817281
"Loot"
@@ -7290,7 +7290,7 @@
72907290
"count": "2",
72917291
"group_tag": "Loot",
72927292
"randomizer": false,
7293-
"types": [
7293+
"types": [
72947294
"Treasure",
72957295
"Loot"
72967296
]
@@ -7304,7 +7304,7 @@
73047304
"count": "2",
73057305
"group_tag": "Loot",
73067306
"randomizer": false,
7307-
"types": [
7307+
"types": [
73087308
"Treasure",
73097309
"Loot"
73107310
]
@@ -7318,7 +7318,7 @@
73187318
"count": "2",
73197319
"group_tag": "Loot",
73207320
"randomizer": false,
7321-
"types": [
7321+
"types": [
73227322
"Treasure",
73237323
"Duration",
73247324
"Loot"
@@ -7333,7 +7333,7 @@
73337333
"count": "2",
73347334
"group_tag": "Loot",
73357335
"randomizer": false,
7336-
"types": [
7336+
"types": [
73377337
"Treasure",
73387338
"Loot"
73397339
]
@@ -7347,7 +7347,7 @@
73477347
"count": "2",
73487348
"group_tag": "Loot",
73497349
"randomizer": false,
7350-
"types": [
7350+
"types": [
73517351
"Treasure",
73527352
"Loot"
73537353
]
@@ -7361,7 +7361,7 @@
73617361
"count": "2",
73627362
"group_tag": "Loot",
73637363
"randomizer": false,
7364-
"types": [
7364+
"types": [
73657365
"Treasure",
73667366
"Loot"
73677367
]
@@ -7375,7 +7375,7 @@
73757375
"count": "2",
73767376
"group_tag": "Loot",
73777377
"randomizer": false,
7378-
"types": [
7378+
"types": [
73797379
"Treasure",
73807380
"Loot"
73817381
]
@@ -7389,7 +7389,7 @@
73897389
"count": "2",
73907390
"group_tag": "Loot",
73917391
"randomizer": false,
7392-
"types": [
7392+
"types": [
73937393
"Treasure",
73947394
"Reaction",
73957395
"Loot"
@@ -7404,7 +7404,7 @@
74047404
"count": "2",
74057405
"group_tag": "Loot",
74067406
"randomizer": false,
7407-
"types": [
7407+
"types": [
74087408
"Action",
74097409
"Treasure",
74107410
"Loot"
@@ -7419,7 +7419,7 @@
74197419
"count": "2",
74207420
"group_tag": "Loot",
74217421
"randomizer": false,
7422-
"types": [
7422+
"types": [
74237423
"Treasure",
74247424
"Loot"
74257425
]
@@ -7433,7 +7433,7 @@
74337433
"count": "2",
74347434
"group_tag": "Loot",
74357435
"randomizer": false,
7436-
"types": [
7436+
"types": [
74377437
"Treasure",
74387438
"Attack",
74397439
"Loot"

card_db_src/en_us/cards_en_us.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -689,16 +689,16 @@
689689
"extra": "For example with Settlers in play, buying another Settlers gets you 2 <VP> from here.<n>Cards from the same pile are not necessarily copies of each other; for example Bustling Village is not a copy of Settlers.",
690690
"name": "Colonnade"
691691
},
692-
"Colony - Platinum": {
693-
"description": "Colony and Platinum are extra base cards added by Prosperity. They are by default added to the kingdom proportinally to the number of Prosperity cards in the kingdom.",
694-
"extra": "This is not a Kingdom card. You do not use it every game. It is a Victory card worth 10 VP. 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.]",
695-
"name": "Colony / Platinum"
696-
},
697692
"Colony": {
698693
"description": "10 <*VP*>",
699694
"extra": "This is not a Kingdom card. You do not use it every game. It is a Victory card worth 10 VP. 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.]",
700695
"name": "Colony"
701696
},
697+
"Colony - Platinum": {
698+
"description": "Colony and Platinum are extra base cards added by Prosperity. They are by default added to the kingdom proportinally to the number of Prosperity cards in the kingdom.",
699+
"extra": "This is not a Kingdom card. You do not use it every game. It is a Victory card worth 10 VP. 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.]",
700+
"name": "Colony / Platinum"
701+
},
702702
"Commerce": {
703703
"description": "Gain a Gold per differently named card you've gained this turn.",
704704
"extra": "First count how many differently named cards you have gained this turn, then gain that many Golds. For example, if you have gained two Province, a Silver, and a Horse, you would gain three Golds.",

card_db_src/sets_db.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -84,37 +84,37 @@
8484
"short_name": "Cornucopia",
8585
"text_icon": "*"
8686
},
87-
"cornucopia2ndEditionUpgrade": {
87+
"cornucopia2ndEdition": {
8888
"all_images": [
8989
"cornucopia_set.png",
9090
"cornucopia_guilds_set.png"
9191
],
9292
"edition": [
93-
"1",
94-
"upgrade"
93+
"2",
94+
"latest"
9595
],
96-
"has_extras": false,
9796
"image": "cornucopia_guilds_set.png",
98-
"set_name": "*cornucopia2ndEditionUpgrade*",
97+
"set_name": "*cornucopia2ndEdition*",
9998
"set_text": "",
10099
"short_name": "Cornucopia",
101-
"text_icon": "*",
102-
"upgrades": "cornucopia1stEdition"
100+
"text_icon": "*"
103101
},
104-
"cornucopia2ndEdition": {
102+
"cornucopia2ndEditionUpgrade": {
105103
"all_images": [
106104
"cornucopia_set.png",
107105
"cornucopia_guilds_set.png"
108106
],
109107
"edition": [
110-
"2",
111-
"latest"
108+
"1",
109+
"upgrade"
112110
],
111+
"has_extras": false,
113112
"image": "cornucopia_guilds_set.png",
114-
"set_name": "*cornucopia2ndEdition*",
113+
"set_name": "*cornucopia2ndEditionUpgrade*",
115114
"set_text": "",
116115
"short_name": "Cornucopia",
117-
"text_icon": "*"
116+
"text_icon": "*",
117+
"upgrades": "cornucopia1stEdition"
118118
},
119119
"cornucopiaAndGuilds2ndEdition": {
120120
"all_images": [
@@ -266,37 +266,37 @@
266266
"short_name": "Guilds",
267267
"text_icon": "*"
268268
},
269-
"guilds2ndEditionUpgrade": {
269+
"guilds2ndEdition": {
270270
"all_images": [
271271
"guilds_set.png",
272272
"cornucopia_guilds_set.png"
273273
],
274274
"edition": [
275-
"1",
276-
"upgrade"
275+
"2",
276+
"latest"
277277
],
278-
"has_extras": false,
279278
"image": "cornucopia_guilds_set.png",
280-
"set_name": "*guilds2ndEditionUpgrade*",
279+
"set_name": "*guilds2ndEdition*",
281280
"set_text": "",
282281
"short_name": "Guilds",
283-
"text_icon": "*",
284-
"upgrades": "guilds1stEdition"
282+
"text_icon": "*"
285283
},
286-
"guilds2ndEdition": {
284+
"guilds2ndEditionUpgrade": {
287285
"all_images": [
288286
"guilds_set.png",
289287
"cornucopia_guilds_set.png"
290288
],
291289
"edition": [
292-
"2",
293-
"latest"
290+
"1",
291+
"upgrade"
294292
],
293+
"has_extras": false,
295294
"image": "cornucopia_guilds_set.png",
296-
"set_name": "*guilds2ndEdition*",
295+
"set_name": "*guilds2ndEditionUpgrade*",
297296
"set_text": "",
298297
"short_name": "Guilds",
299-
"text_icon": "*"
298+
"text_icon": "*",
299+
"upgrades": "guilds1stEdition"
300300
},
301301
"hinterlands1stEdition": {
302302
"all_images": [

card_db_src/types_db.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"tabCostHeightOffset": -1,
4141
"tabTextHeightOffset": 0
4242
},
43-
{
43+
{
4444
"card_type": [
4545
"Action",
4646
"Attack",

tests/carddb_tests.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,17 @@ def assert_total_card_count(self, cards: list[Card]):
193193
),
194194
ExpectedSetCardCount(
195195
"prosperity1stEdition",
196-
25 + 2 + 1, # 25 kingdom, 2 base (Colony/Platinum), Colony-Platinum group header
196+
25
197+
+ 2
198+
+ 1, # 25 kingdom, 2 base (Colony/Platinum), Colony-Platinum group header
197199
25 + 2 - 1, # Colony + Platinum grouped into Colony-Platinum
198200
300 - 25 - 1, # 300 cards printed, 25 blue kingdom randomizers, 1 blank
199201
),
200202
ExpectedSetCardCount(
201203
"prosperity2ndEdition",
202-
25 + 2 + 1, # 25 kingdom, 2 base (Colony/Platinum), Colony-Platinum group header
204+
25
205+
+ 2
206+
+ 1, # 25 kingdom, 2 base (Colony/Platinum), Colony-Platinum group header
203207
25 + 2 - 1, # Colony + Platinum grouped into Colony-Platinum
204208
300 - 25 - 1, # 300 cards printed, 25 blue kingdom randomizers, 1 blank
205209
),

0 commit comments

Comments
 (0)