finn/dominiontabs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Expansion Randomizer Count Fix (#196)

Browse Source 
* Program changes for Randomizer correction
* Card DB changes for Randomizer fix
* Better expansion divider card listing
* Base cards now sorted in preferred order.
* Added randomizer field
This commit is contained in:
Wendel Voigt 2018-04-28 12:29:27 -05:00 committed by Peter
parent 152c705cbf
commit a33ec8f6d7
3 changed files with 174 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
domdiv/card_db/cards_db.json
View File

@ -5,6 +5,7 @@
], ],
"cost": "0", "cost": "0",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -34,6 +35,7 @@
], ],
"cost": "5", "cost": "5",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -44,6 +46,7 @@
], ],
"cost": "3", "cost": "3",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -54,6 +57,7 @@
], ],
"cost": "0", "cost": "0",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -87,6 +91,7 @@
"cost": "6*", "cost": "6*",
"count": "5", "count": "5",
"group_tag": "Page -> Champion", "group_tag": "Page -> Champion",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Duration" "Duration"
@ -108,6 +113,7 @@
], ],
"cost": "5*", "cost": "5*",
"group_tag": "Peasant -> Teacher", "group_tag": "Peasant -> Teacher",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Traveller" "Traveller"
@ -150,6 +156,7 @@
], ],
"cost": "3", "cost": "3",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -160,6 +167,7 @@
], ],
"cost": "3", "cost": "3",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -170,6 +178,7 @@
], ],
"cost": "4*", "cost": "4*",
"group_tag": "Peasant -> Teacher", "group_tag": "Peasant -> Teacher",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Traveller" "Traveller"
@ -222,6 +231,7 @@
], ],
"cost": "5*", "cost": "5*",
"group_tag": "Page -> Champion", "group_tag": "Page -> Champion",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Traveller" "Traveller"
@ -243,6 +253,7 @@
], ],
"cost": "7", "cost": "7",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -253,6 +264,7 @@
], ],
"cost": "6", "cost": "6",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -299,6 +311,7 @@
], ],
"cost": "4", "cost": "4",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -322,6 +335,7 @@
], ],
"cost": "8", "cost": "8",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -345,6 +359,7 @@
], ],
"cost": "4", "cost": "4",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -355,6 +370,7 @@
], ],
"cost": "3", "cost": "3",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -375,6 +391,7 @@
], ],
"cost": "0", "cost": "0",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -385,6 +402,7 @@
], ],
"cost": "5", "cost": "5",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -443,6 +461,7 @@
], ],
"cost": "1", "cost": "1",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -453,6 +472,7 @@
], ],
"cost": "2", "cost": "2",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -463,6 +483,7 @@
], ],
"cost": "5", "cost": "5",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -473,6 +494,7 @@
], ],
"cost": "3*", "cost": "3*",
"group_tag": "Peasant -> Teacher", "group_tag": "Peasant -> Teacher",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Attack", "Attack",
@ -506,6 +528,7 @@
"cost": "6*", "cost": "6*",
"count": "5", "count": "5",
"group_tag": "Peasant -> Teacher", "group_tag": "Peasant -> Teacher",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Reserve" "Reserve"
@ -517,6 +540,7 @@
], ],
"cost": "5", "cost": "5",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -527,6 +551,7 @@
], ],
"cost": "6", "cost": "6",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -547,6 +572,7 @@
], ],
"cost": "2", "cost": "2",
"group_tag": "adventures events", "group_tag": "adventures events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -557,6 +583,7 @@
], ],
"cost": "3*", "cost": "3*",
"group_tag": "Page -> Champion", "group_tag": "Page -> Champion",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Traveller" "Traveller"
@ -577,6 +604,7 @@
], ],
"cost": "4*", "cost": "4*",
"group_tag": "Page -> Champion", "group_tag": "Page -> Champion",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Attack", "Attack",
@ -750,6 +778,7 @@
], ],
"cost": "4", "cost": "4",
"count": "16", "count": "16",
"randomizer": false,
"types": [ "types": [
"Treasure" "Treasure"
] ]
@ -763,6 +792,7 @@
], ],
"cost": "0", "cost": "0",
"count": "60", "count": "60",
"randomizer": false,
"types": [ "types": [
"Treasure" "Treasure"
] ]
@ -776,6 +806,7 @@
], ],
"cost": "0", "cost": "0",
"count": "30", "count": "30",
"randomizer": false,
"types": [ "types": [
"Curse" "Curse"
] ]
@ -788,6 +819,7 @@
"intrigue1stEdition" "intrigue1stEdition"
], ],
"cost": "5", "cost": "5",
"randomizer": false,
"types": [ "types": [
"Victory" "Victory"
] ]
@ -801,6 +833,7 @@
], ],
"cost": "2", "cost": "2",
"count": "24", "count": "24",
"randomizer": false,
"types": [ "types": [
"Victory" "Victory"
] ]
@ -814,6 +847,7 @@
], ],
"cost": "6", "cost": "6",
"count": "30", "count": "30",
"randomizer": false,
"types": [ "types": [
"Treasure" "Treasure"
] ]
@ -826,6 +860,7 @@
"intrigue1stEdition" "intrigue1stEdition"
], ],
"cost": "8", "cost": "8",
"randomizer": false,
"types": [ "types": [
"Victory" "Victory"
] ]
@ -839,6 +874,7 @@
], ],
"cost": "3", "cost": "3",
"count": "40", "count": "40",
"randomizer": false,
"types": [ "types": [
"Treasure" "Treasure"
] ]
@ -851,6 +887,7 @@
], ],
"cost": "", "cost": "",
"count": "1", "count": "1",
"randomizer": false,
"types": [ "types": [
"Trash" "Trash"
] ]
@ -861,6 +898,7 @@
"prosperity" "prosperity"
], ],
"cost": "11", "cost": "11",
"randomizer": false,
"types": [ "types": [
"Victory" "Victory"
] ]
@ -872,6 +910,7 @@
], ],
"cost": "9", "cost": "9",
"count": "12", "count": "12",
"randomizer": false,
"types": [ "types": [
"Treasure" "Treasure"
] ]
@ -882,6 +921,7 @@
], ],
"cost": "0*", "cost": "0*",
"group_tag": "Tournament and Prizes", "group_tag": "Tournament and Prizes",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Prize" "Prize"
@ -893,6 +933,7 @@
], ],
"cost": "0*", "cost": "0*",
"group_tag": "Tournament and Prizes", "group_tag": "Tournament and Prizes",
"randomizer": false,
"types": [ "types": [
"Treasure", "Treasure",
"Prize" "Prize"
@ -922,6 +963,7 @@
], ],
"cost": "0*", "cost": "0*",
"group_tag": "Tournament and Prizes", "group_tag": "Tournament and Prizes",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Attack", "Attack",
@ -1009,6 +1051,7 @@
], ],
"cost": "0*", "cost": "0*",
"group_tag": "Tournament and Prizes", "group_tag": "Tournament and Prizes",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Prize" "Prize"
@ -1040,6 +1083,7 @@
], ],
"cost": "0*", "cost": "0*",
"group_tag": "Tournament and Prizes", "group_tag": "Tournament and Prizes",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Prize" "Prize"
@ -1203,6 +1247,7 @@
"cost": "1", "cost": "1",
"group_tag": "Shelters", "group_tag": "Shelters",
"group_top": true, "group_top": true,
"randomizer": false,
"types": [ "types": [
"Reaction", "Reaction",
"Shelter" "Shelter"
@ -1250,6 +1295,7 @@
], ],
"cost": "0*", "cost": "0*",
"group_tag": "Hermit - Madman", "group_tag": "Hermit - Madman",
"randomizer": false,
"types": [ "types": [
"Action" "Action"
] ]
@ -1279,6 +1325,7 @@
], ],
"cost": "0*", "cost": "0*",
"group_tag": "Urchin - Mercenary", "group_tag": "Urchin - Mercenary",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Attack" "Attack"
@ -1299,6 +1346,7 @@
], ],
"cost": "1", "cost": "1",
"group_tag": "Shelters", "group_tag": "Shelters",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Shelter" "Shelter"
@ -1310,6 +1358,7 @@
], ],
"cost": "1", "cost": "1",
"group_tag": "Shelters", "group_tag": "Shelters",
"randomizer": false,
"types": [ "types": [
"Victory", "Victory",
"Shelter" "Shelter"
@ -1378,6 +1427,7 @@
], ],
"cost": "0", "cost": "0",
"count": "50", "count": "50",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Ruins" "Ruins"
@ -1407,6 +1457,7 @@
], ],
"cost": "0*", "cost": "0*",
"count": "15", "count": "15",
"randomizer": false,
"types": [ "types": [
"Treasure" "Treasure"
] ]
@ -1787,6 +1838,7 @@
], ],
"cost": "0", "cost": "0",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -1798,6 +1850,7 @@
"cost": "0", "cost": "0",
"debtcost": "8", "debtcost": "8",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -1808,6 +1861,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -1828,6 +1882,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -1838,6 +1893,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -1848,6 +1904,7 @@
], ],
"cost": "3", "cost": "3",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -1858,6 +1915,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -1868,6 +1926,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -1878,6 +1937,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -1889,6 +1949,7 @@
"cost": "5", "cost": "5",
"count": "5", "count": "5",
"group_tag": "Settlers - Bustling Village", "group_tag": "Settlers - Bustling Village",
"randomizer": false,
"types": [ "types": [
"Action" "Action"
] ]
@ -1960,6 +2021,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -1970,6 +2032,7 @@
], ],
"cost": "6", "cost": "6",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -1990,6 +2053,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2000,6 +2064,7 @@
], ],
"cost": "2", "cost": "2",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -2010,6 +2075,7 @@
], ],
"cost": "14", "cost": "14",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -2021,6 +2087,7 @@
"cost": "0", "cost": "0",
"debtcost": "8", "debtcost": "8",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -2032,6 +2099,7 @@
"cost": "5", "cost": "5",
"count": "5", "count": "5",
"group_tag": "Patrician - Emporium", "group_tag": "Patrician - Emporium",
"randomizer": false,
"types": [ "types": [
"Action" "Action"
] ]
@ -2087,6 +2155,7 @@
"count": "5", "count": "5",
"debtcost": "8", "debtcost": "8",
"group_tag": "Gladiator - Fortune", "group_tag": "Gladiator - Fortune",
"randomizer": false,
"types": [ "types": [
"Treasure" "Treasure"
] ]
@ -2106,6 +2175,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2137,6 +2207,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2147,6 +2218,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2167,6 +2239,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2177,6 +2250,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2187,6 +2261,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2197,6 +2272,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2217,6 +2293,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2240,6 +2317,7 @@
"cost": "5", "cost": "5",
"count": "5", "count": "5",
"group_tag": "Encampment - Plunder", "group_tag": "Encampment - Plunder",
"randomizer": false,
"types": [ "types": [
"Treasure" "Treasure"
] ]
@ -2250,6 +2328,7 @@
], ],
"cost": "4", "cost": "4",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -2261,6 +2340,7 @@
"cost": "4", "cost": "4",
"count": "5", "count": "5",
"group_tag": "Catapult - Rocks", "group_tag": "Catapult - Rocks",
"randomizer": false,
"types": [ "types": [
"Treasure" "Treasure"
] ]
@ -2290,6 +2370,7 @@
], ],
"cost": "4", "cost": "4",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -2312,6 +2393,7 @@
], ],
"cost": "2", "cost": "2",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -2332,6 +2414,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2342,6 +2425,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2353,6 +2437,7 @@
"cost": "0", "cost": "0",
"debtcost": "5", "debtcost": "5",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -2363,6 +2448,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2382,6 +2468,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -2393,6 +2480,7 @@
"cost": "4", "cost": "4",
"debtcost": "3", "debtcost": "3",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -2413,6 +2501,7 @@
], ],
"cost": "5", "cost": "5",
"group_tag": "empires events", "group_tag": "empires events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]
@ -2423,6 +2512,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "empires landmarks", "group_tag": "empires landmarks",
"randomizer": false,
"types": [ "types": [
"Landmark" "Landmark"
] ]
@ -3117,6 +3207,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3137,6 +3228,7 @@
], ],
"cost": "2*", "cost": "2*",
"group_tag": "Vampire - Bat", "group_tag": "Vampire - Bat",
"randomizer": false,
"types": [ "types": [
"Night" "Night"
] ]
@ -3206,6 +3298,7 @@
], ],
"cost": "4", "cost": "4",
"group_tag": "Pooka - Cursed Gold", "group_tag": "Pooka - Cursed Gold",
"randomizer": false,
"types": [ "types": [
"Treasure", "Treasure",
"Heirloom" "Heirloom"
@ -3227,6 +3320,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3268,6 +3362,7 @@
"cost": "", "cost": "",
"count": "6", "count": "6",
"group_tag": "nocturne states", "group_tag": "nocturne states",
"randomizer": false,
"types": [ "types": [
"State" "State"
] ]
@ -3278,6 +3373,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3307,6 +3403,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3317,6 +3414,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3339,6 +3437,7 @@
], ],
"cost": "4*", "cost": "4*",
"count": "6", "count": "6",
"randomizer": false,
"types": [ "types": [
"Night", "Night",
"Duration", "Duration",
@ -3361,6 +3460,7 @@
], ],
"cost": "2", "cost": "2",
"group_tag": "Pixie - Goat", "group_tag": "Pixie - Goat",
"randomizer": false,
"types": [ "types": [
"Treasure", "Treasure",
"Heirloom" "Heirloom"
@ -3372,6 +3472,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3392,6 +3493,7 @@
], ],
"cost": "0", "cost": "0",
"group_tag": "Cemetery - Haunted Mirror", "group_tag": "Cemetery - Haunted Mirror",
"randomizer": false,
"types": [ "types": [
"Treasure", "Treasure",
"Heirloom" "Heirloom"
@ -3403,6 +3505,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3424,6 +3527,7 @@
], ],
"cost": "2*", "cost": "2*",
"count": "13", "count": "13",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Spirit" "Spirit"
@ -3445,6 +3549,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3456,6 +3561,7 @@
"cost": "", "cost": "",
"count": "1", "count": "1",
"group_tag": "nocturne states", "group_tag": "nocturne states",
"randomizer": false,
"types": [ "types": [
"State" "State"
] ]
@ -3466,6 +3572,7 @@
], ],
"cost": "4", "cost": "4",
"group_tag": "Fool - Lucky Coin", "group_tag": "Fool - Lucky Coin",
"randomizer": false,
"types": [ "types": [
"Treasure", "Treasure",
"Heirloom" "Heirloom"
@ -3477,6 +3584,7 @@
], ],
"cost": "0", "cost": "0",
"group_tag": "Secret Cave - Magic Lamp", "group_tag": "Secret Cave - Magic Lamp",
"randomizer": false,
"types": [ "types": [
"Treasure", "Treasure",
"Heirloom" "Heirloom"
@ -3489,6 +3597,7 @@
"cost": "", "cost": "",
"count": "6", "count": "6",
"group_tag": "nocturne states", "group_tag": "nocturne states",
"randomizer": false,
"types": [ "types": [
"State" "State"
] ]
@ -3499,6 +3608,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3538,6 +3648,7 @@
], ],
"cost": "2", "cost": "2",
"group_tag": "Shepherd - Pasture", "group_tag": "Shepherd - Pasture",
"randomizer": false,
"types": [ "types": [
"Treasure", "Treasure",
"Victory", "Victory",
@ -3562,6 +3673,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3583,6 +3695,7 @@
], ],
"cost": "2", "cost": "2",
"group_tag": "Tracker - Pouch", "group_tag": "Tracker - Pouch",
"randomizer": false,
"types": [ "types": [
"Treasure", "Treasure",
"Heirloom" "Heirloom"
@ -3594,6 +3707,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3659,6 +3773,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3669,6 +3784,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3679,6 +3795,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3689,6 +3806,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3699,6 +3817,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3709,6 +3828,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3719,6 +3839,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3729,6 +3850,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3739,6 +3861,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3749,6 +3872,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3759,6 +3883,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3769,6 +3894,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne boons", "group_tag": "nocturne boons",
"randomizer": false,
"types": [ "types": [
"Boon" "Boon"
] ]
@ -3824,6 +3950,7 @@
], ],
"cost": "", "cost": "",
"group_tag": "nocturne hexes", "group_tag": "nocturne hexes",
"randomizer": false,
"types": [ "types": [
"Hex" "Hex"
] ]
@ -3846,6 +3973,7 @@
], ],
"cost": "0*", "cost": "0*",
"count": "12", "count": "12",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Spirit" "Spirit"
@ -3857,6 +3985,7 @@
], ],
"cost": "0*", "cost": "0*",
"count": "12", "count": "12",
"randomizer": false,
"types": [ "types": [
"Action" "Action"
] ]
@ -3868,6 +3997,7 @@
"cost": "3", "cost": "3",
"count": "1", "count": "1",
"group_tag": "Necromancer - Zombies", "group_tag": "Necromancer - Zombies",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Zombie" "Zombie"
@ -3880,6 +4010,7 @@
"cost": "3", "cost": "3",
"count": "1", "count": "1",
"group_tag": "Necromancer - Zombies", "group_tag": "Necromancer - Zombies",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Zombie" "Zombie"
@ -3892,6 +4023,7 @@
"cost": "3", "cost": "3",
"count": "1", "count": "1",
"group_tag": "Necromancer - Zombies", "group_tag": "Necromancer - Zombies",
"randomizer": false,
"types": [ "types": [
"Action", "Action",
"Zombie" "Zombie"
@ -3904,6 +4036,7 @@
"cost": "5", "cost": "5",
"count": "5", "count": "5",
"group_tag": "Sauna - Avanto", "group_tag": "Sauna - Avanto",
"randomizer": false,
"types": [ "types": [
"Action" "Action"
] ]
@ -3986,6 +4119,7 @@
], ],
"cost": "5", "cost": "5",
"group_tag": "promo events", "group_tag": "promo events",
"randomizer": false,
"types": [ "types": [
"Event" "Event"
] ]

3
domdiv/cards.py
View File

@ -25,7 +25,7 @@ class Card(object):
def __init__(self, name=None, cardset='', types=None, cost='', description='', def __init__(self, name=None, cardset='', types=None, cost='', description='',
potcost=0, debtcost=0, extra='', count=-1, card_tag='missing card_tag', potcost=0, debtcost=0, extra='', count=-1, card_tag='missing card_tag',
cardset_tags=None, group_tag='', group_top=False, image=None, cardset_tags=None, group_tag='', group_top=False, image=None,
text_icon=None, cardset_tag=''): text_icon=None, randomizer=True, cardset_tag=''):
if types is None: if types is None:
types = [] # make sure types is a list types = [] # make sure types is a list
@ -56,6 +56,7 @@ class Card(object):
self.count = [] self.count = []
else: else:
self.count = [int(count)] self.count = [int(count)]
self.randomizer = randomizer
def getCardCount(self): def getCardCount(self):
return sum(i for i in self.count) return sum(i for i in self.count)

43
domdiv/main.py
View File

@ -7,6 +7,7 @@ import copy
import fnmatch import fnmatch
import pkg_resources import pkg_resources
import unicodedata import unicodedata
from collections import Counter, defaultdict
import reportlab.lib.pagesizes as pagesizes import reportlab.lib.pagesizes as pagesizes
from reportlab.lib.units import cm from reportlab.lib.units import cm
@ -143,7 +144,8 @@ def parse_opts(cmdline_args=None):
"--count", "--count",
action="store_true", action="store_true",
dest="count", dest="count",
help="Display card count on body of the divider.") help="Display the card count on the body of card dividers "
"and the randomizer count on the body of expansion dividers.")
group_body.add_argument( group_body.add_argument(
"--types", "--types",
action="store_true", action="store_true",
@ -609,11 +611,11 @@ class CardSorter(object):
else: else:
self.sort_key = self.by_expansion_sort_key self.sort_key = self.by_expansion_sort_key
baseOrder = ['Copper', 'Silver', 'Gold', 'Platinum', 'Potion', self.baseOrder = ['Copper', 'Silver', 'Gold', 'Platinum', 'Potion',
'Curse', 'Estate', 'Duchy', 'Province', 'Colony', 'Curse', 'Estate', 'Duchy', 'Province', 'Colony',
'Trash'] 'Trash']
self.baseCards = [] self.baseCards = []
for tag in baseOrder: for tag in self.baseOrder:
if tag in baseCards: if tag in baseCards:
self.baseCards.append(baseCards[tag]) self.baseCards.append(baseCards[tag])
del baseCards[tag] del baseCards[tag]
@ -843,6 +845,7 @@ def filter_sort_cards(cards, options):
group_cards[card.group_tag].potcost = card.potcost group_cards[card.group_tag].potcost = card.potcost
group_cards[card.group_tag].debtcost = card.debtcost group_cards[card.group_tag].debtcost = card.debtcost
group_cards[card.group_tag].types = card.types group_cards[card.group_tag].types = card.types
group_cards[card.group_tag].randomizer = card.randomizer
group_cards[card.group_tag].image = card.image group_cards[card.group_tag].image = card.image
group_cards[card.group_tag].addCardCount(card.count) # increase the count group_cards[card.group_tag].addCardCount(card.count) # increase the count
@ -984,18 +987,34 @@ def filter_sort_cards(cards, options):
# Add expansion divider # Add expansion divider
if options.expansion_dividers: if options.expansion_dividers:
cardnamesByExpansion = {} cardnamesByExpansion = defaultdict(dict)
randomizerCountByExpansion = Counter()
for c in cards: for c in cards:
if cardSorter.isBaseExpansionCard(c): if cardSorter.isBaseExpansionCard(c):
continue continue
cardnamesByExpansion.setdefault(c.cardset, []).append(c.name.strip().replace(' ', ' ')) if c.randomizer:
randomizerCountByExpansion[c.cardset] += 1
if c.card_tag in cardnamesByExpansion[c.cardset]:
# Already have one, so just update the count (for extra Curses, Start Decks, etc)
cardnamesByExpansion[c.cardset][c.card_tag]['count'] += 1
else:
# New, so save off information about the card to be used on the expansion divider
order = 0
if c.card_tag in cardSorter.baseOrder:
# Use the base card ordering
order = 100 + cardSorter.baseOrder.index(c.card_tag)
cardnamesByExpansion[c.cardset][c.card_tag] = {'name': c.name.strip().replace(' ', ' '),
'randomizer': c.randomizer,
'count': 1,
'sort': "%03d%s" % (order, c.name.strip(),)}
for set_tag, set_values in Card.sets.iteritems(): for set_tag, set_values in Card.sets.iteritems():
exp = set_values["set_name"] exp = set_values["set_name"]
if exp in cardnamesByExpansion: if exp in cardnamesByExpansion:
exp_name = exp exp_name = exp
count = len(cardnamesByExpansion[exp]) count = randomizerCountByExpansion[exp]
if 'no_randomizer' in set_values: if 'no_randomizer' in set_values:
if set_values['no_randomizer']: if set_values['no_randomizer']:
count = 0 count = 0
@ -1004,12 +1023,22 @@ def filter_sort_cards(cards, options):
if 'short_name' in set_values: if 'short_name' in set_values:
exp_name = set_values['short_name'] exp_name = set_values['short_name']
card_names = []
for key, n in sorted(cardnamesByExpansion[exp].items(), key=lambda (k, x): x['sort']):
if not n['randomizer']:
# Highlight cards without Randomizers
n['name'] = '<i>' + n['name'] + '</i>'
if n['count'] > 1:
# Add number of copies
n['name'] = u"{}&nbsp;\u00d7&nbsp;".format(n['count']) + n['name']
card_names.append(n['name'])
c = Card(name=exp_name, c = Card(name=exp_name,
cardset=exp, cardset=exp,
cardset_tag=set_tag, cardset_tag=set_tag,
types=("Expansion", ), types=("Expansion", ),
cost=None, cost=None,
description=' | '.join(sorted(cardnamesByExpansion[exp])), description=' | '.join(card_names),
extra=set_values.get("set_text", ""), extra=set_values.get("set_text", ""),
count=count, count=count,
card_tag=set_tag) card_tag=set_tag)