animals user expansion from BBG user rillaith (#148)

* animals user expansion from BBG user rillaith
* Added fan attribute to animals set
* animals.png - This is not the best image.  But it is the best I could get from the original files. I *think* it is 3 penguins.
* updated main.py for fan based expansions
This includes two items:
1) adds --fan for specifying fan expansions to include
2) adds wild cards in specifying both --expansion as well as --fan.  This also fixes issue #149
* Updated all language files for animals
* Normalize all line endings and add gitattributes file to make git do so in the future
* print the possible expansions when non-matching ones are provided
* Allow for no official expansions to be included
Kept the default behavior.  Not specifying '--expansions' will have the same outcome as '--expansions *' (i.e., will print all of them.)
Specifying '--expansions  ' (without any named expansions) or '--expansions none ' will result in no cards from any Official expansion.

For Fan expansions, the absence of '--fan', '--fan   ' (without any named fan expansion), and '--fan none ' will all prevent any Fan expansions from printing.
* Cleaned up expansion/fan lists
This commit is contained in:
Peter 2017-03-25 21:39:49 -07:00 committed by GitHub
parent 3578804882
commit c5c876f8c5
34 changed files with 20747 additions and 20474 deletions

3
.gitattributes vendored Normal file
View File

@ -0,0 +1,3 @@
* text=auto
*.py text
*.json text

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,96 +1,100 @@
{ {
"adventures": { "adventures": {
"set_name": "Adventures", "set_name": "Adventures",
"text_icon": "Ad" "text_icon": "Ad"
}, },
"adventures extras": { "adventures extras": {
"set_name": "Adventures Extras", "set_name": "Adventures Extras",
"text_icon": "Ad" "text_icon": "Ad"
}, },
"alchemy": { "alchemy": {
"set_name": "Alchemy", "set_name": "Alchemy",
"text_icon": "A" "text_icon": "A"
}, },
"base": { "animals": {
"set_name": "Base", "set_name": "Animals",
"text_icon": "B" "text_icon": "An"
}, },
"cornucopia": { "base": {
"set_name": "Cornucopia", "set_name": "Base",
"text_icon": "C" "text_icon": "B"
}, },
"cornucopia extras": { "cornucopia": {
"set_name": "Cornucopia Extras", "set_name": "Cornucopia",
"text_icon": "C" "text_icon": "C"
}, },
"dark ages": { "cornucopia extras": {
"set_name": "Dark Ages", "set_name": "Cornucopia Extras",
"text_icon": "DA" "text_icon": "C"
}, },
"dark ages extras": { "dark ages": {
"set_name": "Dark Ages Extras", "set_name": "Dark Ages",
"text_icon": "DA" "text_icon": "DA"
}, },
"dominion1stEdition": { "dark ages extras": {
"set_name": "Dominion 1st Edition", "set_name": "Dark Ages Extras",
"short_name": "Dominion", "text_icon": "DA"
"text_icon": "D1" },
}, "dominion1stEdition": {
"dominion2ndEdition": { "set_name": "Dominion 1st Edition",
"set_name": "Dominion 2nd Edition", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D1"
"text_icon": "D2" },
}, "dominion2ndEdition": {
"dominion2ndEditionUpgrade": { "set_name": "Dominion 2nd Edition",
"set_name": "Dominion 2nd Edition Upgrade", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D2"
"text_icon": "D2" },
}, "dominion2ndEditionUpgrade": {
"empires": { "set_name": "Dominion 2nd Edition Upgrade",
"set_name": "Empires", "short_name": "Dominion",
"text_icon": "E" "text_icon": "D2"
}, },
"empires extras": { "empires": {
"set_name": "Empires Extras", "set_name": "Empires",
"text_icon": "E" "text_icon": "E"
}, },
"extras": { "empires extras": {
"set_name": "Extras", "set_name": "Empires Extras",
"text_icon": "X" "text_icon": "E"
}, },
"guilds": { "extras": {
"set_name": "Guilds", "set_name": "Extras",
"text_icon": "G" "text_icon": "X"
}, },
"hinterlands": { "guilds": {
"set_name": "Hinterlands", "set_name": "Guilds",
"text_icon": "H" "text_icon": "G"
}, },
"intrigue1stEdition": { "hinterlands": {
"set_name": "Intrigue 1st Edition", "set_name": "Hinterlands",
"short_name": "Intrigue", "text_icon": "H"
"text_icon": "I1" },
}, "intrigue1stEdition": {
"intrigue2ndEdition": { "set_name": "Intrigue 1st Edition",
"set_name": "Intrigue 2nd Edition", "short_name": "Intrigue",
"short_name": "Intrigue", "text_icon": "I1"
"text_icon": "I2" },
}, "intrigue2ndEdition": {
"intrigue2ndEditionUpgrade": { "set_name": "Intrigue 2nd Edition",
"set_name": "Intrigue 2nd Edition Upgrade", "short_name": "Intrigue",
"short_name": "Intrigue", "text_icon": "I2"
"text_icon": "I2" },
}, "intrigue2ndEditionUpgrade": {
"promo": { "set_name": "Intrigue 2nd Edition Upgrade",
"set_name": "Promo", "short_name": "Intrigue",
"text_icon": "Po" "text_icon": "I2"
}, },
"prosperity": { "promo": {
"set_name": "Prosperity", "set_name": "Promo",
"text_icon": "Py" "text_icon": "Po"
}, },
"seaside": { "prosperity": {
"set_name": "Seaside", "set_name": "Prosperity",
"text_icon": "S" "text_icon": "Py"
} },
} "seaside": {
"set_name": "Seaside",
"text_icon": "S"
}
}

View File

@ -1,26 +1,26 @@
{ {
"Action": "Action", "Action": "Action",
"Attack": "Attack", "Attack": "Attack",
"Blank": "Blank", "Blank": "Blank",
"Castle": "Castle", "Castle": "Castle",
"Curse": "Curse", "Curse": "Curse",
"Duration": "Duration", "Duration": "Duration",
"Event": "Event", "Event": "Event",
"Events": "Events", "Events": "Events",
"Expansion": "Expansion", "Expansion": "Expansion",
"Gathering": "Gathering", "Gathering": "Gathering",
"Landmark": "Landmark", "Landmark": "Landmark",
"Landmarks": "Landmarks", "Landmarks": "Landmarks",
"Looter": "Looter", "Looter": "Looter",
"Prize": "Prize", "Prize": "Prize",
"Prizes": "Prizes", "Prizes": "Prizes",
"Reaction": "Reaction", "Reaction": "Reaction",
"Reserve": "Reserve", "Reserve": "Reserve",
"Ruins": "Ruins", "Ruins": "Ruins",
"Shelter": "Shelter", "Shelter": "Shelter",
"Shelters": "Shelters", "Shelters": "Shelters",
"Trash": "Trash", "Trash": "Trash",
"Traveller": "Traveller", "Traveller": "Traveller",
"Treasure": "Treasure", "Treasure": "Treasure",
"Victory": "Victory" "Victory": "Victory"
} }

View File

@ -1,19 +1,19 @@
{ {
"exclude": [ "exclude": [
"Token", "Token",
"Tokens", "Tokens",
"Marker" "Marker"
], ],
"include": [ "include": [
"Coins", "Coins",
"Coin", "Coin",
"Karten", "Karten",
"Karte", "Karte",
"Käufe", "Käufe",
"Kauf", "Kauf",
"Aktionen", "Aktionen",
"Aktion", "Aktion",
"Punkt", "Punkt",
"Punkte" "Punkte"
] ]
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,96 +1,100 @@
{ {
"adventures": { "adventures": {
"set_name": "Abenteuer", "set_name": "Abenteuer",
"text_icon": "Ab" "text_icon": "Ab"
}, },
"adventures extras": { "adventures extras": {
"set_name": "Adventures Extras", "set_name": "Adventures Extras",
"text_icon": "Ad" "text_icon": "Ad"
}, },
"alchemy": { "alchemy": {
"set_name": "Die Alchemisten", "set_name": "Die Alchemisten",
"text_icon": "Al" "text_icon": "Al"
}, },
"base": { "animals": {
"set_name": "Base", "set_name": "Animals",
"text_icon": "B" "text_icon": "An"
}, },
"cornucopia": { "base": {
"set_name": "Reiche Ernte", "set_name": "Base",
"text_icon": "RE" "text_icon": "B"
}, },
"cornucopia extras": { "cornucopia": {
"set_name": "Cornucopia Extras", "set_name": "Reiche Ernte",
"text_icon": "C" "text_icon": "RE"
}, },
"dark ages": { "cornucopia extras": {
"set_name": "Dark Ages", "set_name": "Cornucopia Extras",
"text_icon": "DA" "text_icon": "C"
}, },
"dark ages extras": { "dark ages": {
"set_name": "Dark Ages Extras", "set_name": "Dark Ages",
"text_icon": "DA" "text_icon": "DA"
}, },
"dominion1stEdition": { "dark ages extras": {
"set_name": "Dominion 1. Ausgabe", "set_name": "Dark Ages Extras",
"short_name": "Dominion", "text_icon": "DA"
"text_icon": "D1" },
}, "dominion1stEdition": {
"dominion2ndEdition": { "set_name": "Dominion 1. Ausgabe",
"set_name": "Dominion 2. Ausgabe", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D1"
"text_icon": "D2" },
}, "dominion2ndEdition": {
"dominion2ndEditionUpgrade": { "set_name": "Dominion 2. Ausgabe",
"set_name": "Dominion 2. Ausgabe Aktualisierung", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D2"
"text_icon": "D2" },
}, "dominion2ndEditionUpgrade": {
"empires": { "set_name": "Dominion 2. Ausgabe Aktualisierung",
"set_name": "Empires", "short_name": "Dominion",
"text_icon": "E" "text_icon": "D2"
}, },
"empires extras": { "empires": {
"set_name": "Empires Extras", "set_name": "Empires",
"text_icon": "E" "text_icon": "E"
}, },
"extras": { "empires extras": {
"set_name": "Extras", "set_name": "Empires Extras",
"text_icon": "Ex" "text_icon": "E"
}, },
"guilds": { "extras": {
"set_name": "Die Gilden", "set_name": "Extras",
"text_icon": "G" "text_icon": "Ex"
}, },
"hinterlands": { "guilds": {
"set_name": "Hinterland", "set_name": "Die Gilden",
"text_icon": "H" "text_icon": "G"
}, },
"intrigue1stEdition": { "hinterlands": {
"set_name": "Intrige 2. Ausgabe", "set_name": "Hinterland",
"short_name": "Intrige", "text_icon": "H"
"text_icon": "I1" },
}, "intrigue1stEdition": {
"intrigue2ndEdition": { "set_name": "Intrige 2. Ausgabe",
"set_name": "Intrige 2. Ausgabe", "short_name": "Intrige",
"short_name": "Intrigue", "text_icon": "I1"
"text_icon": "I2" },
}, "intrigue2ndEdition": {
"intrigue2ndEditionUpgrade": { "set_name": "Intrige 2. Ausgabe",
"set_name": "Intrige 2. Ausgabe Aktualisierung", "short_name": "Intrigue",
"short_name": "Intrigue", "text_icon": "I2"
"text_icon": "I2" },
}, "intrigue2ndEditionUpgrade": {
"promo": { "set_name": "Intrige 2. Ausgabe Aktualisierung",
"set_name": "Promo", "short_name": "Intrigue",
"text_icon": "Pm" "text_icon": "I2"
}, },
"prosperity": { "promo": {
"set_name": "Blütezeit", "set_name": "Promo",
"text_icon": "Bl" "text_icon": "Pm"
}, },
"seaside": { "prosperity": {
"set_name": "Seaside", "set_name": "Blütezeit",
"text_icon": "S" "text_icon": "Bl"
} },
} "seaside": {
"set_name": "Seaside",
"text_icon": "S"
}
}

View File

@ -1,26 +1,26 @@
{ {
"Action": "Aktion", "Action": "Aktion",
"Attack": "Angriff", "Attack": "Angriff",
"Blank": "Blank", "Blank": "Blank",
"Castle": "Schloss", "Castle": "Schloss",
"Curse": "Fluch", "Curse": "Fluch",
"Duration": "Dauer", "Duration": "Dauer",
"Event": "Ereignis", "Event": "Ereignis",
"Events": "Ereignisse", "Events": "Ereignisse",
"Expansion": "Erweiterung", "Expansion": "Erweiterung",
"Gathering": "Sammlung", "Gathering": "Sammlung",
"Landmark": "Wahrzeichen", "Landmark": "Wahrzeichen",
"Landmarks": "Wahrzeichen", "Landmarks": "Wahrzeichen",
"Looter": "Plünderer", "Looter": "Plünderer",
"Prize": "Preis", "Prize": "Preis",
"Prizes": "Preise", "Prizes": "Preise",
"Reaction": "Reaktion", "Reaction": "Reaktion",
"Reserve": "Reserve", "Reserve": "Reserve",
"Ruins": "Ruinen", "Ruins": "Ruinen",
"Shelter": "Unterschlupf", "Shelter": "Unterschlupf",
"Shelters": "Unterschlüpfe", "Shelters": "Unterschlüpfe",
"Trash": "Müll", "Trash": "Müll",
"Traveller": "Reisender", "Traveller": "Reisender",
"Treasure": "Geld", "Treasure": "Geld",
"Victory": "Punkte" "Victory": "Punkte"
} }

View File

@ -1,17 +1,17 @@
{ {
"exclude": [ "exclude": [
"token", "token",
"Tokens" "Tokens"
], ],
"include": [ "include": [
"Coins", "Coins",
"Coin", "Coin",
"Cards", "Cards",
"Card", "Card",
"Buys", "Buys",
"Buy", "Buy",
"Actions", "Actions",
"Action", "Action",
"<VP>" "<VP>"
] ]
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,96 +1,100 @@
{ {
"adventures": { "adventures": {
"set_name": "Adventures", "set_name": "Adventures",
"text_icon": "Ad" "text_icon": "Ad"
}, },
"adventures extras": { "adventures extras": {
"set_name": "Adventures Extras", "set_name": "Adventures Extras",
"text_icon": "Ad" "text_icon": "Ad"
}, },
"alchemy": { "alchemy": {
"set_name": "Alchemy", "set_name": "Alchemy",
"text_icon": "A" "text_icon": "A"
}, },
"base": { "animals": {
"set_name": "Base", "set_name": "Animals",
"text_icon": "B" "text_icon": "An"
}, },
"cornucopia": { "base": {
"set_name": "Cornucopia", "set_name": "Base",
"text_icon": "C" "text_icon": "B"
}, },
"cornucopia extras": { "cornucopia": {
"set_name": "Cornucopia Extras", "set_name": "Cornucopia",
"text_icon": "C" "text_icon": "C"
}, },
"dark ages": { "cornucopia extras": {
"set_name": "Dark Ages", "set_name": "Cornucopia Extras",
"text_icon": "DA" "text_icon": "C"
}, },
"dark ages extras": { "dark ages": {
"set_name": "Dark Ages Extras", "set_name": "Dark Ages",
"text_icon": "DA" "text_icon": "DA"
}, },
"dominion1stEdition": { "dark ages extras": {
"set_name": "Dominion 1st Edition", "set_name": "Dark Ages Extras",
"short_name": "Dominion", "text_icon": "DA"
"text_icon": "D1" },
}, "dominion1stEdition": {
"dominion2ndEdition": { "set_name": "Dominion 1st Edition",
"set_name": "Dominion 2nd Edition", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D1"
"text_icon": "D2" },
}, "dominion2ndEdition": {
"dominion2ndEditionUpgrade": { "set_name": "Dominion 2nd Edition",
"set_name": "Dominion 2nd Edition Upgrade", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D2"
"text_icon": "D2" },
}, "dominion2ndEditionUpgrade": {
"empires": { "set_name": "Dominion 2nd Edition Upgrade",
"set_name": "Empires", "short_name": "Dominion",
"text_icon": "E" "text_icon": "D2"
}, },
"empires extras": { "empires": {
"set_name": "Empires Extras", "set_name": "Empires",
"text_icon": "E" "text_icon": "E"
}, },
"extras": { "empires extras": {
"set_name": "Extras", "set_name": "Empires Extras",
"text_icon": "X" "text_icon": "E"
}, },
"guilds": { "extras": {
"set_name": "Guilds", "set_name": "Extras",
"text_icon": "G" "text_icon": "X"
}, },
"hinterlands": { "guilds": {
"set_name": "Hinterlands", "set_name": "Guilds",
"text_icon": "H" "text_icon": "G"
}, },
"intrigue1stEdition": { "hinterlands": {
"set_name": "Intrigue 1st Edition", "set_name": "Hinterlands",
"short_name": "Intrigue", "text_icon": "H"
"text_icon": "I1" },
}, "intrigue1stEdition": {
"intrigue2ndEdition": { "set_name": "Intrigue 1st Edition",
"set_name": "Intrigue 2nd Edition", "short_name": "Intrigue",
"short_name": "Intrigue", "text_icon": "I1"
"text_icon": "I2" },
}, "intrigue2ndEdition": {
"intrigue2ndEditionUpgrade": { "set_name": "Intrigue 2nd Edition",
"set_name": "Intrigue 2nd Edition Upgrade", "short_name": "Intrigue",
"short_name": "Intrigue", "text_icon": "I2"
"text_icon": "I2" },
}, "intrigue2ndEditionUpgrade": {
"promo": { "set_name": "Intrigue 2nd Edition Upgrade",
"set_name": "Promo", "short_name": "Intrigue",
"text_icon": "Pm" "text_icon": "I2"
}, },
"prosperity": { "promo": {
"set_name": "Prosperity", "set_name": "Promo",
"text_icon": "P" "text_icon": "Pm"
}, },
"seaside": { "prosperity": {
"set_name": "Seaside", "set_name": "Prosperity",
"text_icon": "S" "text_icon": "P"
} },
} "seaside": {
"set_name": "Seaside",
"text_icon": "S"
}
}

View File

@ -1,26 +1,26 @@
{ {
"Action": "Action", "Action": "Action",
"Attack": "Attack", "Attack": "Attack",
"Blank": "Blank", "Blank": "Blank",
"Castle": "Castle", "Castle": "Castle",
"Curse": "Curse", "Curse": "Curse",
"Duration": "Duration", "Duration": "Duration",
"Event": "Event", "Event": "Event",
"Events": "Events", "Events": "Events",
"Expansion": "Expansion", "Expansion": "Expansion",
"Gathering": "Gathering", "Gathering": "Gathering",
"Landmark": "Landmark", "Landmark": "Landmark",
"Landmarks": "Landmarks", "Landmarks": "Landmarks",
"Looter": "Looter", "Looter": "Looter",
"Prize": "Prize", "Prize": "Prize",
"Prizes": "Prizes", "Prizes": "Prizes",
"Reaction": "Reaction", "Reaction": "Reaction",
"Reserve": "Reserve", "Reserve": "Reserve",
"Ruins": "Ruins", "Ruins": "Ruins",
"Shelter": "Shelter", "Shelter": "Shelter",
"Shelters": "Shelters", "Shelters": "Shelters",
"Trash": "Trash", "Trash": "Trash",
"Traveller": "Traveller", "Traveller": "Traveller",
"Treasure": "Treasure", "Treasure": "Treasure",
"Victory": "Victory" "Victory": "Victory"
} }

View File

@ -1,16 +1,16 @@
{ {
"exclude": [ "exclude": [
"token", "token",
"Tokens" "Tokens"
], ],
"include": [ "include": [
"Coins", "Coins",
"Coin", "Coin",
"Cards", "Cards",
"Card", "Card",
"Buys", "Buys",
"Buy", "Buy",
"Actions", "Actions",
"Action" "Action"
] ]
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,96 +1,100 @@
{ {
"adventures": { "adventures": {
"set_name": "Aventures", "set_name": "Aventures",
"text_icon": "Ad" "text_icon": "Ad"
}, },
"adventures extras": { "adventures extras": {
"set_name": "Adventures Extras", "set_name": "Adventures Extras",
"text_icon": "Ad" "text_icon": "Ad"
}, },
"alchemy": { "alchemy": {
"set_name": "Alchimie", "set_name": "Alchimie",
"text_icon": "Al" "text_icon": "Al"
}, },
"base": { "animals": {
"set_name": "Base", "set_name": "Animals",
"text_icon": "B" "text_icon": "An"
}, },
"cornucopia": { "base": {
"set_name": "Abondance", "set_name": "Base",
"text_icon": "Ab" "text_icon": "B"
}, },
"cornucopia extras": { "cornucopia": {
"set_name": "Cornucopia Extras", "set_name": "Abondance",
"text_icon": "C" "text_icon": "Ab"
}, },
"dark ages": { "cornucopia extras": {
"set_name": "Age Des Ténèbres", "set_name": "Cornucopia Extras",
"text_icon": "AT" "text_icon": "C"
}, },
"dark ages extras": { "dark ages": {
"set_name": "Dark Ages Extras", "set_name": "Age Des Ténèbres",
"text_icon": "DA" "text_icon": "AT"
}, },
"dominion1stEdition": { "dark ages extras": {
"set_name": "Dominion 1er Édition", "set_name": "Dark Ages Extras",
"short_name": "Dominion", "text_icon": "DA"
"text_icon": "D1" },
}, "dominion1stEdition": {
"dominion2ndEdition": { "set_name": "Dominion 1er Édition",
"set_name": "Dominion 2e Édition", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D1"
"text_icon": "D2" },
}, "dominion2ndEdition": {
"dominion2ndEditionUpgrade": { "set_name": "Dominion 2e Édition",
"set_name": "Dominion 2e Édition Surclassement", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D2"
"text_icon": "D2" },
}, "dominion2ndEditionUpgrade": {
"empires": { "set_name": "Dominion 2e Édition Surclassement",
"set_name": "Empires", "short_name": "Dominion",
"text_icon": "E" "text_icon": "D2"
}, },
"empires extras": { "empires": {
"set_name": "Empires Extras", "set_name": "Empires",
"text_icon": "E" "text_icon": "E"
}, },
"extras": { "empires extras": {
"set_name": "Supplémentaire", "set_name": "Empires Extras",
"text_icon": "S" "text_icon": "E"
}, },
"guilds": { "extras": {
"set_name": "Guildes", "set_name": "Supplémentaire",
"text_icon": "G" "text_icon": "S"
}, },
"hinterlands": { "guilds": {
"set_name": "L'Arrière-pays", "set_name": "Guildes",
"text_icon": "Ar" "text_icon": "G"
}, },
"intrigue1stEdition": { "hinterlands": {
"set_name": "L'Intrigue 1er Édition", "set_name": "L'Arrière-pays",
"short_name": "L'Intrigue", "text_icon": "Ar"
"text_icon": "I1" },
}, "intrigue1stEdition": {
"intrigue2ndEdition": { "set_name": "L'Intrigue 1er Édition",
"set_name": "L'Intrigue 2e Édition", "short_name": "L'Intrigue",
"short_name": "L'Intrigue", "text_icon": "I1"
"text_icon": "I2" },
}, "intrigue2ndEdition": {
"intrigue2ndEditionUpgrade": { "set_name": "L'Intrigue 2e Édition",
"set_name": "L'Intrigue 2e Édition Surclassement", "short_name": "L'Intrigue",
"short_name": "L'Intrigue", "text_icon": "I2"
"text_icon": "I2" },
}, "intrigue2ndEditionUpgrade": {
"promo": { "set_name": "L'Intrigue 2e Édition Surclassement",
"set_name": "Promo", "short_name": "L'Intrigue",
"text_icon": "Pm" "text_icon": "I2"
}, },
"prosperity": { "promo": {
"set_name": "Prosperité", "set_name": "Promo",
"text_icon": "P" "text_icon": "Pm"
}, },
"seaside": { "prosperity": {
"set_name": "Rivages", "set_name": "Prosperité",
"text_icon": "R" "text_icon": "P"
} },
} "seaside": {
"set_name": "Rivages",
"text_icon": "R"
}
}

View File

@ -1,26 +1,26 @@
{ {
"Action": "Action", "Action": "Action",
"Attack": "Attack", "Attack": "Attack",
"Blank": "Blank", "Blank": "Blank",
"Castle": "Castle", "Castle": "Castle",
"Curse": "Curse", "Curse": "Curse",
"Duration": "Duration", "Duration": "Duration",
"Event": "Event", "Event": "Event",
"Events": "Events", "Events": "Events",
"Expansion": "Expansion", "Expansion": "Expansion",
"Gathering": "Gathering", "Gathering": "Gathering",
"Landmark": "Landmark", "Landmark": "Landmark",
"Landmarks": "Landmarks", "Landmarks": "Landmarks",
"Looter": "Looter", "Looter": "Looter",
"Prize": "Prize", "Prize": "Prize",
"Prizes": "Prizes", "Prizes": "Prizes",
"Reaction": "Reaction", "Reaction": "Reaction",
"Reserve": "Reserve", "Reserve": "Reserve",
"Ruins": "Ruins", "Ruins": "Ruins",
"Shelter": "Shelter", "Shelter": "Shelter",
"Shelters": "Shelters", "Shelters": "Shelters",
"Trash": "Trash", "Trash": "Trash",
"Traveller": "Traveller", "Traveller": "Traveller",
"Treasure": "Treasure", "Treasure": "Treasure",
"Victory": "Victory" "Victory": "Victory"
} }

View File

@ -1,16 +1,16 @@
{ {
"exclude": [ "exclude": [
"token", "token",
"Tokens" "Tokens"
], ],
"include": [ "include": [
"Monete", "Monete",
"Moneta", "Moneta",
"Carte", "Carte",
"Carta", "Carta",
"Acquisti", "Acquisti",
"Acquisto", "Acquisto",
"Azioni", "Azioni",
"Azione" "Azione"
] ]
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,96 +1,100 @@
{ {
"adventures": { "adventures": {
"set_name": "Adventures", "set_name": "Adventures",
"text_icon": "Ad" "text_icon": "Ad"
}, },
"adventures extras": { "adventures extras": {
"set_name": "Adventures Extras", "set_name": "Adventures Extras",
"text_icon": "Ad" "text_icon": "Ad"
}, },
"alchemy": { "alchemy": {
"set_name": "Alchimia", "set_name": "Alchimia",
"text_icon": "Al" "text_icon": "Al"
}, },
"base": { "animals": {
"set_name": "Base", "set_name": "Animals",
"text_icon": "B" "text_icon": "An"
}, },
"cornucopia": { "base": {
"set_name": "Cornucopia", "set_name": "Base",
"text_icon": "C" "text_icon": "B"
}, },
"cornucopia extras": { "cornucopia": {
"set_name": "Cornucopia Extras", "set_name": "Cornucopia",
"text_icon": "C" "text_icon": "C"
}, },
"dark ages": { "cornucopia extras": {
"set_name": "Dark Ages", "set_name": "Cornucopia Extras",
"text_icon": "D" "text_icon": "C"
}, },
"dark ages extras": { "dark ages": {
"set_name": "Dark Ages Extras", "set_name": "Dark Ages",
"text_icon": "DA" "text_icon": "D"
}, },
"dominion1stEdition": { "dark ages extras": {
"set_name": "Dominion 1° Edizione", "set_name": "Dark Ages Extras",
"short_name": "Dominion", "text_icon": "DA"
"text_icon": "D1" },
}, "dominion1stEdition": {
"dominion2ndEdition": { "set_name": "Dominion 1° Edizione",
"set_name": "Dominion 2° Edizione", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D1"
"text_icon": "D2" },
}, "dominion2ndEdition": {
"dominion2ndEditionUpgrade": { "set_name": "Dominion 2° Edizione",
"set_name": "Dominion 2° Edizione di Aggiornamento", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D2"
"text_icon": "D2" },
}, "dominion2ndEditionUpgrade": {
"empires": { "set_name": "Dominion 2° Edizione di Aggiornamento",
"set_name": "Empires", "short_name": "Dominion",
"text_icon": "E" "text_icon": "D2"
}, },
"empires extras": { "empires": {
"set_name": "Empires Extras", "set_name": "Empires",
"text_icon": "E" "text_icon": "E"
}, },
"extras": { "empires extras": {
"set_name": "Extra", "set_name": "Empires Extras",
"text_icon": "Ex" "text_icon": "E"
}, },
"guilds": { "extras": {
"set_name": "Guilds", "set_name": "Extra",
"text_icon": "G" "text_icon": "Ex"
}, },
"hinterlands": { "guilds": {
"set_name": "Nuovi Orizzonti", "set_name": "Guilds",
"text_icon": "NO" "text_icon": "G"
}, },
"intrigue1stEdition": { "hinterlands": {
"set_name": "Intrigo 2° Edizione", "set_name": "Nuovi Orizzonti",
"short_name": "Intrigo", "text_icon": "NO"
"text_icon": "I1" },
}, "intrigue1stEdition": {
"intrigue2ndEdition": { "set_name": "Intrigo 2° Edizione",
"set_name": "Intrigo 2° Edizione", "short_name": "Intrigo",
"short_name": "Intrigo", "text_icon": "I1"
"text_icon": "I2" },
}, "intrigue2ndEdition": {
"intrigue2ndEditionUpgrade": { "set_name": "Intrigo 2° Edizione",
"set_name": "Intrigo 2° Edizione di Aggiornamento", "short_name": "Intrigo",
"short_name": "Intrigo", "text_icon": "I2"
"text_icon": "I2" },
}, "intrigue2ndEditionUpgrade": {
"promo": { "set_name": "Intrigo 2° Edizione di Aggiornamento",
"set_name": "Promo", "short_name": "Intrigo",
"text_icon": "Pm" "text_icon": "I2"
}, },
"prosperity": { "promo": {
"set_name": "Prosperità", "set_name": "Promo",
"text_icon": "P" "text_icon": "Pm"
}, },
"seaside": { "prosperity": {
"set_name": "Seaside", "set_name": "Prosperità",
"text_icon": "S" "text_icon": "P"
} },
} "seaside": {
"set_name": "Seaside",
"text_icon": "S"
}
}

View File

@ -1,26 +1,26 @@
{ {
"Action": "Action", "Action": "Action",
"Attack": "Attack", "Attack": "Attack",
"Blank": "Blank", "Blank": "Blank",
"Castle": "Castle", "Castle": "Castle",
"Curse": "Curse", "Curse": "Curse",
"Duration": "Duration", "Duration": "Duration",
"Event": "Event", "Event": "Event",
"Events": "Events", "Events": "Events",
"Expansion": "Expansion", "Expansion": "Expansion",
"Gathering": "Gathering", "Gathering": "Gathering",
"Landmark": "Landmark", "Landmark": "Landmark",
"Landmarks": "Landmarks", "Landmarks": "Landmarks",
"Looter": "Looter", "Looter": "Looter",
"Prize": "Prize", "Prize": "Prize",
"Prizes": "Prizes", "Prizes": "Prizes",
"Reaction": "Reaction", "Reaction": "Reaction",
"Reserve": "Reserve", "Reserve": "Reserve",
"Ruins": "Ruins", "Ruins": "Ruins",
"Shelter": "Shelter", "Shelter": "Shelter",
"Shelters": "Shelters", "Shelters": "Shelters",
"Trash": "Trash", "Trash": "Trash",
"Traveller": "Traveller", "Traveller": "Traveller",
"Treasure": "Treasure", "Treasure": "Treasure",
"Victory": "Victory" "Victory": "Victory"
} }

View File

@ -1,17 +1,17 @@
{ {
"exclude": [ "exclude": [
"fiche", "fiche",
"Token", "Token",
"Tokens" "Tokens"
], ],
"include": [ "include": [
"Coins", "Coins",
"Coin", "Coin",
"Kaarten", "Kaarten",
"Kaart", "Kaart",
"Aanschaffen", "Aanschaffen",
"Aanschaf", "Aanschaf",
"Acties", "Acties",
"Actie" "Actie"
] ]
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,96 +1,100 @@
{ {
"adventures": { "adventures": {
"set_name": "Avonturen", "set_name": "Avonturen",
"text_icon": "Av" "text_icon": "Av"
}, },
"adventures extras": { "adventures extras": {
"set_name": "Avonturen Extras", "set_name": "Avonturen Extras",
"text_icon": "Av" "text_icon": "Av"
}, },
"alchemy": { "alchemy": {
"set_name": "Alchemisten", "set_name": "Alchemisten",
"text_icon": "A" "text_icon": "A"
}, },
"base": { "animals": {
"set_name": "Basis", "set_name": "Animals",
"text_icon": "B" "text_icon": "An"
}, },
"cornucopia": { "base": {
"set_name": "Overvloed", "set_name": "Basis",
"text_icon": "O" "text_icon": "B"
}, },
"cornucopia extras": { "cornucopia": {
"set_name": "Overvloed Extras", "set_name": "Overvloed",
"text_icon": "O" "text_icon": "O"
}, },
"dark ages": { "cornucopia extras": {
"set_name": "De Donkere Middeleeuwen", "set_name": "Overvloed Extras",
"text_icon": "DM" "text_icon": "O"
}, },
"dark ages extras": { "dark ages": {
"set_name": "De Donkere Middeleeuwen Extras", "set_name": "De Donkere Middeleeuwen",
"text_icon": "DM" "text_icon": "DM"
}, },
"dominion1stEdition": { "dark ages extras": {
"set_name": "Dominion 1st Edition", "set_name": "De Donkere Middeleeuwen Extras",
"short_name": "Dominion", "text_icon": "DM"
"text_icon": "D1" },
}, "dominion1stEdition": {
"dominion2ndEdition": { "set_name": "Dominion 1st Edition",
"set_name": "Dominion 2nd Edition", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D1"
"text_icon": "D2" },
}, "dominion2ndEdition": {
"dominion2ndEditionUpgrade": { "set_name": "Dominion 2nd Edition",
"set_name": "Dominion 2nd Edition Upgrade", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D2"
"text_icon": "D2" },
}, "dominion2ndEditionUpgrade": {
"empires": { "set_name": "Dominion 2nd Edition Upgrade",
"set_name": "Empires", "short_name": "Dominion",
"text_icon": "E" "text_icon": "D2"
}, },
"empires extras": { "empires": {
"set_name": "Empires Extras", "set_name": "Empires",
"text_icon": "E" "text_icon": "E"
}, },
"extras": { "empires extras": {
"set_name": "Extras", "set_name": "Empires Extras",
"text_icon": "X" "text_icon": "E"
}, },
"guilds": { "extras": {
"set_name": "Gilden", "set_name": "Extras",
"text_icon": "G" "text_icon": "X"
}, },
"hinterlands": { "guilds": {
"set_name": "Achterland", "set_name": "Gilden",
"text_icon": "Ac" "text_icon": "G"
}, },
"intrigue1stEdition": { "hinterlands": {
"set_name": "Intrige 1st Edition", "set_name": "Achterland",
"short_name": "Intrige", "text_icon": "Ac"
"text_icon": "I1" },
}, "intrigue1stEdition": {
"intrigue2ndEdition": { "set_name": "Intrige 1st Edition",
"set_name": "Intrige 2nd Edition", "short_name": "Intrige",
"short_name": "Intrige", "text_icon": "I1"
"text_icon": "I2" },
}, "intrigue2ndEdition": {
"intrigue2ndEditionUpgrade": { "set_name": "Intrige 2nd Edition",
"set_name": "Intrige 2nd Edition Upgrade", "short_name": "Intrige",
"short_name": "Intrige", "text_icon": "I2"
"text_icon": "I2" },
}, "intrigue2ndEditionUpgrade": {
"promo": { "set_name": "Intrige 2nd Edition Upgrade",
"set_name": "Promo", "short_name": "Intrige",
"text_icon": "Pm" "text_icon": "I2"
}, },
"prosperity": { "promo": {
"set_name": "Welvaart", "set_name": "Promo",
"text_icon": "W" "text_icon": "Pm"
}, },
"seaside": { "prosperity": {
"set_name": "Hijs De Zeilen", "set_name": "Welvaart",
"text_icon": "HZ" "text_icon": "W"
} },
} "seaside": {
"set_name": "Hijs De Zeilen",
"text_icon": "HZ"
}
}

View File

@ -1,26 +1,26 @@
{ {
"Action": "Actie", "Action": "Actie",
"Attack": "Attack", "Attack": "Attack",
"Blank": "Blank", "Blank": "Blank",
"Castle": "Castle", "Castle": "Castle",
"Curse": "Curse", "Curse": "Curse",
"Duration": "Duration", "Duration": "Duration",
"Event": "Event", "Event": "Event",
"Events": "Events", "Events": "Events",
"Expansion": "Expansion", "Expansion": "Expansion",
"Gathering": "Gathering", "Gathering": "Gathering",
"Landmark": "Landmark", "Landmark": "Landmark",
"Landmarks": "Landmarks", "Landmarks": "Landmarks",
"Looter": "Looter", "Looter": "Looter",
"Prize": "Prijs", "Prize": "Prijs",
"Prizes": "Prijzen", "Prizes": "Prijzen",
"Reaction": "Reaction", "Reaction": "Reaction",
"Reserve": "Reserve", "Reserve": "Reserve",
"Ruins": "Ruïne", "Ruins": "Ruïne",
"Shelter": "Shelter", "Shelter": "Shelter",
"Shelters": "Shelters", "Shelters": "Shelters",
"Trash": "Vernietigde Kaarten", "Trash": "Vernietigde Kaarten",
"Traveller": "Traveller", "Traveller": "Traveller",
"Treasure": "Treasure", "Treasure": "Treasure",
"Victory": "Victory" "Victory": "Victory"
} }

View File

@ -1,206 +1,216 @@
{ {
"adventures": { "adventures": {
"edition": [ "edition": [
"1", "1",
"latest" "latest"
], ],
"image": "adventures_set.png", "image": "adventures_set.png",
"set_name": "*adventures*", "set_name": "*adventures*",
"text_icon": "*" "text_icon": "*"
}, },
"adventures extras": { "adventures extras": {
"edition": [ "edition": [
"1", "1",
"latest" "latest"
], ],
"image": "adventures_set.png", "image": "adventures_set.png",
"no_randomizer": true, "no_randomizer": true,
"set_name": "*adventures extras*", "set_name": "*adventures extras*",
"text_icon": "*" "text_icon": "*"
}, },
"alchemy": { "alchemy": {
"edition": [ "edition": [
"1", "1",
"latest" "latest"
], ],
"image": "alchemy_set.png", "image": "alchemy_set.png",
"set_name": "*alchemy*", "set_name": "*alchemy*",
"text_icon": "*" "text_icon": "*"
}, },
"base": { "animals": {
"edition": [ "edition": [
"1", "1",
"2", "latest"
"latest" ],
], "fan": true,
"image": "", "image": "animals.png",
"set_name": "*base*", "set_name": "*animals*",
"text_icon": "*" "text_icon": "*"
}, },
"cornucopia": { "base": {
"edition": [ "edition": [
"1", "1",
"latest" "2",
], "latest"
"image": "cornucopia_set.png", ],
"set_name": "*cornucopia*", "image": "",
"text_icon": "*" "set_name": "*base*",
}, "text_icon": "*"
"cornucopia extras": { },
"edition": [ "cornucopia": {
"1", "edition": [
"latest" "1",
], "latest"
"image": "cornucopia_set.png", ],
"no_randomizer": true, "image": "cornucopia_set.png",
"set_name": "*cornucopia extras*", "set_name": "*cornucopia*",
"text_icon": "*" "text_icon": "*"
}, },
"dark ages": { "cornucopia extras": {
"edition": [ "edition": [
"1", "1",
"latest" "latest"
], ],
"image": "dark_ages_set.png", "image": "cornucopia_set.png",
"set_name": "*dark ages*", "no_randomizer": true,
"text_icon": "*" "set_name": "*cornucopia extras*",
}, "text_icon": "*"
"dark ages extras": { },
"edition": [ "dark ages": {
"1", "edition": [
"latest" "1",
], "latest"
"image": "dark_ages_set.png", ],
"no_randomizer": true, "image": "dark_ages_set.png",
"set_name": "*dark ages extras*", "set_name": "*dark ages*",
"text_icon": "*" "text_icon": "*"
}, },
"dominion1stEdition": { "dark ages extras": {
"edition": [ "edition": [
"1" "1",
], "latest"
"image": "dominion1stEdition_set.png", ],
"set_name": "*dominion1stEdition*", "image": "dark_ages_set.png",
"short_name": "Dominion", "no_randomizer": true,
"text_icon": "*" "set_name": "*dark ages extras*",
}, "text_icon": "*"
"dominion2ndEdition": { },
"edition": [ "dominion1stEdition": {
"2", "edition": [
"latest" "1"
], ],
"image": "dominion2ndEdition_set.png", "image": "dominion1stEdition_set.png",
"set_name": "*dominion2ndEdition*", "set_name": "*dominion1stEdition*",
"short_name": "Dominion", "short_name": "Dominion",
"text_icon": "*" "text_icon": "*"
}, },
"dominion2ndEditionUpgrade": { "dominion2ndEdition": {
"edition": [ "edition": [
"1" "2",
], "latest"
"image": "dominion2ndEdition_set.png", ],
"set_name": "*dominion2ndEditionUpgrade*", "image": "dominion2ndEdition_set.png",
"text_icon": "*" "set_name": "*dominion2ndEdition*",
}, "short_name": "Dominion",
"empires": { "text_icon": "*"
"edition": [ },
"1", "dominion2ndEditionUpgrade": {
"latest" "edition": [
], "1"
"image": "empires_set.png", ],
"set_name": "*empires*", "image": "dominion2ndEdition_set.png",
"text_icon": "*" "set_name": "*dominion2ndEditionUpgrade*",
}, "text_icon": "*"
"empires extras": { },
"edition": [ "empires": {
"1", "edition": [
"latest" "1",
], "latest"
"image": "empires_set.png", ],
"no_randomizer": true, "image": "empires_set.png",
"set_name": "*empires extras*", "set_name": "*empires*",
"text_icon": "*" "text_icon": "*"
}, },
"extras": { "empires extras": {
"edition": [ "edition": [
"1", "1",
"latest" "latest"
], ],
"image": "", "image": "empires_set.png",
"no_randomizer": true, "no_randomizer": true,
"set_name": "*extras*", "set_name": "*empires extras*",
"text_icon": "*" "text_icon": "*"
}, },
"guilds": { "extras": {
"edition": [ "edition": [
"1", "1",
"latest" "latest"
], ],
"image": "guilds_set.png", "image": "",
"set_name": "*guilds*", "no_randomizer": true,
"text_icon": "*" "set_name": "*extras*",
}, "text_icon": "*"
"hinterlands": { },
"edition": [ "guilds": {
"1", "edition": [
"latest" "1",
], "latest"
"image": "hinterlands_set.png", ],
"set_name": "*hinterlands*", "image": "guilds_set.png",
"text_icon": "*" "set_name": "*guilds*",
}, "text_icon": "*"
"intrigue1stEdition": { },
"edition": [ "hinterlands": {
"1" "edition": [
], "1",
"image": "intrigue1stEdition_set.png", "latest"
"set_name": "*intrigue1stEdition*", ],
"short_name": "Intrigue", "image": "hinterlands_set.png",
"text_icon": "*" "set_name": "*hinterlands*",
}, "text_icon": "*"
"intrigue2ndEdition": { },
"edition": [ "intrigue1stEdition": {
"2", "edition": [
"latest" "1"
], ],
"image": "intrigue2ndEdition_set.png", "image": "intrigue1stEdition_set.png",
"set_name": "*intrigue2ndEdition*", "set_name": "*intrigue1stEdition*",
"short_name": "Intrigue", "short_name": "Intrigue",
"text_icon": "*" "text_icon": "*"
}, },
"intrigue2ndEditionUpgrade": { "intrigue2ndEdition": {
"edition": [ "edition": [
"1" "2",
], "latest"
"image": "intrigue2ndEdition_set.png", ],
"set_name": "*intrigue2ndEditionUpgrade*", "image": "intrigue2ndEdition_set.png",
"text_icon": "*" "set_name": "*intrigue2ndEdition*",
}, "short_name": "Intrigue",
"promo": { "text_icon": "*"
"edition": [ },
"1", "intrigue2ndEditionUpgrade": {
"latest" "edition": [
], "1"
"image": "promo_set.png", ],
"set_name": "*promo*", "image": "intrigue2ndEdition_set.png",
"text_icon": "*" "set_name": "*intrigue2ndEditionUpgrade*",
}, "text_icon": "*"
"prosperity": { },
"edition": [ "promo": {
"1", "edition": [
"latest" "1",
], "latest"
"image": "prosperity_set.png", ],
"set_name": "*prosperity*", "image": "promo_set.png",
"text_icon": "*" "set_name": "*promo*",
}, "text_icon": "*"
"seaside": { },
"edition": [ "prosperity": {
"1", "edition": [
"latest" "1",
], "latest"
"image": "seaside_set.png", ],
"set_name": "*seaside*", "image": "prosperity_set.png",
"text_icon": "*" "set_name": "*prosperity*",
} "text_icon": "*"
} },
"seaside": {
"edition": [
"1",
"latest"
],
"image": "seaside_set.png",
"set_name": "*seaside*",
"text_icon": "*"
}
}

View File

@ -1,371 +1,371 @@
[{ [{
"card_type": [ "card_type": [
"Action" "Action"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Attack" "Attack"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Attack", "Attack",
"Duration" "Duration"
], ],
"card_type_image": "duration.png", "card_type_image": "duration.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Attack", "Attack",
"Looter" "Looter"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Attack", "Attack",
"Prize" "Prize"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 1, "defaultCardCount": 1,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Attack", "Attack",
"Traveller" "Traveller"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 5, "defaultCardCount": 5,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Duration" "Duration"
], ],
"card_type_image": "duration.png", "card_type_image": "duration.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Duration", "Duration",
"Reaction" "Reaction"
], ],
"card_type_image": "duration-reaction.png", "card_type_image": "duration-reaction.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Gathering" "Gathering"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Looter" "Looter"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Prize" "Prize"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 1, "defaultCardCount": 1,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Reaction" "Reaction"
], ],
"card_type_image": "reaction.png", "card_type_image": "reaction.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Reserve" "Reserve"
], ],
"card_type_image": "reserve.png", "card_type_image": "reserve.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Reserve", "Reserve",
"Victory" "Victory"
], ],
"card_type_image": "reserve-victory.png", "card_type_image": "reserve-victory.png",
"defaultCardCount": 12, "defaultCardCount": 12,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Ruins" "Ruins"
], ],
"card_type_image": "ruins.png", "card_type_image": "ruins.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": 1, "tabCostHeightOffset": 1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Shelter" "Shelter"
], ],
"card_type_image": "action-shelter.png", "card_type_image": "action-shelter.png",
"defaultCardCount": 6, "defaultCardCount": 6,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Traveller" "Traveller"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 5, "defaultCardCount": 5,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Treasure" "Treasure"
], ],
"card_type_image": "action-treasure.png", "card_type_image": "action-treasure.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Action", "Action",
"Victory" "Victory"
], ],
"card_type_image": "action-victory.png", "card_type_image": "action-victory.png",
"defaultCardCount": 12, "defaultCardCount": 12,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Blank" "Blank"
], ],
"card_type_image": "", "card_type_image": "",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Curse" "Curse"
], ],
"card_type_image": "curse.png", "card_type_image": "curse.png",
"defaultCardCount": 30, "defaultCardCount": 30,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 3 "tabTextHeightOffset": 3
},{ },{
"card_type": [ "card_type": [
"Event" "Event"
], ],
"card_type_image": "event.png", "card_type_image": "event.png",
"defaultCardCount": 1, "defaultCardCount": 1,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Events" "Events"
], ],
"card_type_image": "event.png", "card_type_image": "event.png",
"defaultCardCount": 0, "defaultCardCount": 0,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Expansion" "Expansion"
], ],
"card_type_image": "expansion.png", "card_type_image": "expansion.png",
"defaultCardCount": 0, "defaultCardCount": 0,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 4 "tabTextHeightOffset": 4
},{ },{
"card_type": [ "card_type": [
"Landmark" "Landmark"
], ],
"card_type_image": "landmark.png", "card_type_image": "landmark.png",
"defaultCardCount": 1, "defaultCardCount": 1,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Landmarks" "Landmarks"
], ],
"card_type_image": "landmark.png", "card_type_image": "landmark.png",
"defaultCardCount": 0, "defaultCardCount": 0,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Prize" "Prize"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 1, "defaultCardCount": 1,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Prizes" "Prizes"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 0, "defaultCardCount": 0,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Reaction" "Reaction"
], ],
"card_type_image": "reaction.png", "card_type_image": "reaction.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Reaction", "Reaction",
"Shelter" "Shelter"
], ],
"card_type_image": "reaction-shelter.png", "card_type_image": "reaction-shelter.png",
"defaultCardCount": 6, "defaultCardCount": 6,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Shelters" "Shelters"
], ],
"card_type_image": "shelter.png", "card_type_image": "shelter.png",
"defaultCardCount": 0, "defaultCardCount": 0,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Trash" "Trash"
], ],
"card_type_image": "action.png", "card_type_image": "action.png",
"defaultCardCount": 1, "defaultCardCount": 1,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Treasure" "Treasure"
], ],
"card_type_image": "treasure.png", "card_type_image": "treasure.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": 0, "tabCostHeightOffset": 0,
"tabTextHeightOffset": 3 "tabTextHeightOffset": 3
},{ },{
"card_type": [ "card_type": [
"Treasure", "Treasure",
"Attack" "Attack"
], ],
"card_type_image": "treasure.png", "card_type_image": "treasure.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Treasure", "Treasure",
"Prize" "Prize"
], ],
"card_type_image": "treasure.png", "card_type_image": "treasure.png",
"defaultCardCount": 1, "defaultCardCount": 1,
"tabCostHeightOffset": 0, "tabCostHeightOffset": 0,
"tabTextHeightOffset": 3 "tabTextHeightOffset": 3
},{ },{
"card_type": [ "card_type": [
"Treasure", "Treasure",
"Reaction" "Reaction"
], ],
"card_type_image": "treasure-reaction.png", "card_type_image": "treasure-reaction.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": 1, "tabCostHeightOffset": 1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Treasure", "Treasure",
"Reserve" "Reserve"
], ],
"card_type_image": "reserve-treasure.png", "card_type_image": "reserve-treasure.png",
"defaultCardCount": 10, "defaultCardCount": 10,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Treasure", "Treasure",
"Victory" "Victory"
], ],
"card_type_image": "treasure-victory.png", "card_type_image": "treasure-victory.png",
"defaultCardCount": 12, "defaultCardCount": 12,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Victory" "Victory"
], ],
"card_type_image": "victory.png", "card_type_image": "victory.png",
"defaultCardCount": 12, "defaultCardCount": 12,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Victory", "Victory",
"Castle" "Castle"
], ],
"card_type_image": "victory.png", "card_type_image": "victory.png",
"defaultCardCount": 12, "defaultCardCount": 12,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Victory", "Victory",
"Reaction" "Reaction"
], ],
"card_type_image": "victory-reaction.png", "card_type_image": "victory-reaction.png",
"defaultCardCount": 12, "defaultCardCount": 12,
"tabCostHeightOffset": 1, "tabCostHeightOffset": 1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
},{ },{
"card_type": [ "card_type": [
"Victory", "Victory",
"Shelter" "Shelter"
], ],
"card_type_image": "victory-shelter.png", "card_type_image": "victory-shelter.png",
"defaultCardCount": 6, "defaultCardCount": 6,
"tabCostHeightOffset": -1, "tabCostHeightOffset": -1,
"tabTextHeightOffset": 0 "tabTextHeightOffset": 0
} }
] ]

View File

@ -1,16 +1,17 @@
{ {
"exclude": [ "exclude": [
"token", "token",
"Tokens" "Tokens"
], ],
"include": [ "include": [
"Coins", "Coins",
"Coin", "Coin",
"Cards", "Cards",
"Card", "Card",
"Buys", "Buys",
"Buy", "Buy",
"Actions", "Actions",
"Action" "Action",
] "<VP>"
]
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,96 +1,100 @@
{ {
"adventures": { "adventures": {
"set_name": "Adventures", "set_name": "Adventures",
"text_icon": "Ad" "text_icon": "Ad"
}, },
"adventures extras": { "adventures extras": {
"set_name": "Adventures Extras", "set_name": "Adventures Extras",
"text_icon": "Ad" "text_icon": "Ad"
}, },
"alchemy": { "alchemy": {
"set_name": "Alchemy", "set_name": "Alchemy",
"text_icon": "A" "text_icon": "A"
}, },
"base": { "animals": {
"set_name": "Base", "set_name": "Animals",
"text_icon": "B" "text_icon": "An"
}, },
"cornucopia": { "base": {
"set_name": "Cornucopia", "set_name": "Base",
"text_icon": "C" "text_icon": "B"
}, },
"cornucopia extras": { "cornucopia": {
"set_name": "Cornucopia Extras", "set_name": "Cornucopia",
"text_icon": "C" "text_icon": "C"
}, },
"dark ages": { "cornucopia extras": {
"set_name": "Dark Ages", "set_name": "Cornucopia Extras",
"text_icon": "DA" "text_icon": "C"
}, },
"dark ages extras": { "dark ages": {
"set_name": "Dark Ages Extras", "set_name": "Dark Ages",
"text_icon": "DA" "text_icon": "DA"
}, },
"dominion1stEdition": { "dark ages extras": {
"set_name": "Dominion 1st Edition", "set_name": "Dark Ages Extras",
"short_name": "Dominion", "text_icon": "DA"
"text_icon": "D1" },
}, "dominion1stEdition": {
"dominion2ndEdition": { "set_name": "Dominion 1st Edition",
"set_name": "Dominion 2nd Edition", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D1"
"text_icon": "D2" },
}, "dominion2ndEdition": {
"dominion2ndEditionUpgrade": { "set_name": "Dominion 2nd Edition",
"set_name": "Dominion 2nd Edition Upgrade", "short_name": "Dominion",
"short_name": "Dominion", "text_icon": "D2"
"text_icon": "D2" },
}, "dominion2ndEditionUpgrade": {
"empires": { "set_name": "Dominion 2nd Edition Upgrade",
"set_name": "Empires", "short_name": "Dominion",
"text_icon": "E" "text_icon": "D2"
}, },
"empires extras": { "empires": {
"set_name": "Empires Extras", "set_name": "Empires",
"text_icon": "E" "text_icon": "E"
}, },
"extras": { "empires extras": {
"set_name": "Extras", "set_name": "Empires Extras",
"text_icon": "X" "text_icon": "E"
}, },
"guilds": { "extras": {
"set_name": "Guilds", "set_name": "Extras",
"text_icon": "G" "text_icon": "X"
}, },
"hinterlands": { "guilds": {
"set_name": "Hinterlands", "set_name": "Guilds",
"text_icon": "H" "text_icon": "G"
}, },
"intrigue1stEdition": { "hinterlands": {
"set_name": "Intrigue 1st Edition", "set_name": "Hinterlands",
"short_name": "Intrigue", "text_icon": "H"
"text_icon": "I1" },
}, "intrigue1stEdition": {
"intrigue2ndEdition": { "set_name": "Intrigue 1st Edition",
"set_name": "Intrigue 2nd Edition", "short_name": "Intrigue",
"short_name": "Intrigue", "text_icon": "I1"
"text_icon": "I2" },
}, "intrigue2ndEdition": {
"intrigue2ndEditionUpgrade": { "set_name": "Intrigue 2nd Edition",
"set_name": "Intrigue 2nd Edition Upgrade", "short_name": "Intrigue",
"short_name": "Intrigue", "text_icon": "I2"
"text_icon": "I2" },
}, "intrigue2ndEditionUpgrade": {
"promo": { "set_name": "Intrigue 2nd Edition Upgrade",
"set_name": "Promo", "short_name": "Intrigue",
"text_icon": "Po" "text_icon": "I2"
}, },
"prosperity": { "promo": {
"set_name": "Prosperity", "set_name": "Promo",
"text_icon": "Py" "text_icon": "Po"
}, },
"seaside": { "prosperity": {
"set_name": "Seaside", "set_name": "Prosperity",
"text_icon": "S" "text_icon": "Py"
} },
} "seaside": {
"set_name": "Seaside",
"text_icon": "S"
}
}

View File

@ -1,26 +1,26 @@
{ {
"Action": "Action", "Action": "Action",
"Attack": "Attack", "Attack": "Attack",
"Blank": "Blank", "Blank": "Blank",
"Castle": "Castle", "Castle": "Castle",
"Curse": "Curse", "Curse": "Curse",
"Duration": "Duration", "Duration": "Duration",
"Event": "Event", "Event": "Event",
"Events": "Events", "Events": "Events",
"Expansion": "Expansion", "Expansion": "Expansion",
"Gathering": "Gathering", "Gathering": "Gathering",
"Landmark": "Landmark", "Landmark": "Landmark",
"Landmarks": "Landmarks", "Landmarks": "Landmarks",
"Looter": "Looter", "Looter": "Looter",
"Prize": "Prize", "Prize": "Prize",
"Prizes": "Prizes", "Prizes": "Prizes",
"Reaction": "Reaction", "Reaction": "Reaction",
"Reserve": "Reserve", "Reserve": "Reserve",
"Ruins": "Ruins", "Ruins": "Ruins",
"Shelter": "Shelter", "Shelter": "Shelter",
"Shelters": "Shelters", "Shelters": "Shelters",
"Trash": "Trash", "Trash": "Trash",
"Traveller": "Traveller", "Traveller": "Traveller",
"Treasure": "Treasure", "Treasure": "Treasure",
"Victory": "Victory" "Victory": "Victory"
} }

BIN
domdiv/images/animals.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

View File

@ -4,7 +4,7 @@ import json
import sys import sys
import argparse import argparse
import copy import copy
import fnmatch
import pkg_resources import pkg_resources
import reportlab.lib.pagesizes as pagesizes import reportlab.lib.pagesizes as pagesizes
@ -26,6 +26,7 @@ EXPANSION_CHOICES = ["adventures", "alchemy", "base", "cornucopia", "dark ages",
"empires", "guilds", "hinterlands", "empires", "guilds", "hinterlands",
"intrigue1stEdition", "intrigue2ndEdition", "intrigue2ndEditionUpgrade", "intrigue1stEdition", "intrigue2ndEdition", "intrigue2ndEditionUpgrade",
"promo", "prosperity", "seaside"] "promo", "prosperity", "seaside"]
FAN_CHOICES = ["animals"]
ORDER_CHOICES = ["expansion", "global", "colour", "cost"] ORDER_CHOICES = ["expansion", "global", "colour", "cost"]
LANGUAGE_DEFAULT = 'en_us' # the primary language used if a language's parts are missing LANGUAGE_DEFAULT = 'en_us' # the primary language used if a language's parts are missing
@ -240,11 +241,28 @@ def parse_opts(cmdline_args=None):
"If no limits are set, then all expansions are included. " "If no limits are set, then all expansions are included. "
"Expansion names can also be given in the language specified by " "Expansion names can also be given in the language specified by "
"the --language parameter. Any expansion with a space in the name must " "the --language parameter. Any expansion with a space in the name must "
"be enclosed in quotes. This may be called multiple times. " "be enclosed in double quotes. This may be called multiple times. "
"Values are not case sensitive and can also match the starting characters " "Values are not case sensitive. Wildcards may be used: "
"of an expansion name. For example, 'dominion' will match all expansions " "'*' any number of characters, '?' matches any single character, "
"that start with that name; Choices available in all languages include: %s" % "'[seq]' matches any character in seq, and '[!seq]' matches any character not in seq. "
"For example, 'dominion*' will match all expansions that start with 'dominion'. "
"Choices available in all languages include: %s" %
", ".join("%s" % x for x in EXPANSION_CHOICES)) ", ".join("%s" % x for x in EXPANSION_CHOICES))
group_select.add_argument(
"--fan",
nargs="*",
action="append",
dest="fan",
help="Add dividers from the specified fan made expansions. "
"If this option is not used, no fan expansions will be included. "
"Fan made expansion names can also be given in the language specified by "
"the --language parameter. Any fan expansion with a space in the name must "
"be enclosed in double quotes. This may be called multiple times. "
"Values are not case sensitive. Wildcards may be used: "
"'*' any number of characters, '?' matches any single character, "
"'[seq]' matches any character in seq, and '[!seq]' matches any character not in seq. "
"Choices available in all languages include: %s" %
", ".join("%s" % x for x in FAN_CHOICES))
group_select.add_argument( group_select.add_argument(
"--edition", "--edition",
choices=EDITION_CHOICES, choices=EDITION_CHOICES,
@ -410,9 +428,25 @@ def parse_opts(cmdline_args=None):
if options.notch: if options.notch:
options.notch_length = 1.5 options.notch_length = 1.5
if options.expansions: if options.expansions is None:
# options.expansions is a list of lists. Reduce to single list # No instance given, so default to all Official expansions
options.expansions = [item for sublist in options.expansions for item in sublist] options.expansions = ['*']
else:
# options.expansions is a list of lists. Reduce to single lowercase list
options.expansions = [item.lower() for sublist in options.expansions for item in sublist]
if 'none' in options.expansions:
# keyword to indicate no options. Same as --expansions without any expansions given.
options.expansions = []
if options.fan is None:
# No instance given, so default to no Fan expansions
options.fan = []
else:
# options.fan is a list of lists. Reduce to single lowercase list
options.fan = [item.lower() for sublist in options.fan for item in sublist]
if 'none' in options.fan:
# keyword to indicate no options. Same as --fan without any expansions given
options.fan = []
return options return options
@ -507,8 +541,9 @@ def read_card_data(options):
Card.sets = json.load(setfile) Card.sets = json.load(setfile)
assert Card.sets, "Could not load any sets from database" assert Card.sets, "Could not load any sets from database"
for s in Card.sets: for s in Card.sets:
if 'no_randomizer' not in Card.sets[s]: # Make sure these are set either True or False
Card.sets[s]['no_randomizer'] = False Card.sets[s]['no_randomizer'] = Card.sets[s].get('no_randomizer', False)
Card.sets[s]['fan'] = Card.sets[s].get('fan', False)
# Set cardset_tag and expand cards that are used in multiple sets # Set cardset_tag and expand cards that are used in multiple sets
new_cards = [] new_cards = []
@ -812,37 +847,81 @@ def filter_sort_cards(cards, options):
if options.language != LANGUAGE_DEFAULT: if options.language != LANGUAGE_DEFAULT:
Card.sets = add_set_text(options, Card.sets, options.language) Card.sets = add_set_text(options, Card.sets, options.language)
for card in cards: # Split out Official and Fan set information
if card.cardset_tag in Card.sets: Official_sets = set() # Will hold official sets
if 'set_name' in Card.sets[card.cardset_tag].keys(): Official_search = [] # Will hold official sets for searching, both set key and set_name
card.cardset = Card.sets[card.cardset_tag]['set_name'] Fan_sets = set() # Will hold fan sets
Fan_search = [] # Will hold fan sets for searching, both set key and set_name
wantedSets = set() # Will hold all the sets requested for printing
for s in Card.sets:
if Card.sets[s].get("fan", False):
# Fan Expansion
Fan_sets.add(s)
Fan_search.extend([s.lower(), Card.sets[s].get('set_name', None).lower()])
else:
# Official Expansion
Official_sets.add(s)
Official_search.extend([s.lower(), Card.sets[s].get('set_name', None).lower()])
# If expansion names given, then remove any cards not in those expansions # If expansion names given, then find out which expansions are requested
# Expansion names can be the names from the language or the cardset_tag # Expansion names can be the names from the language or the cardset_tag
if options.expansions: if options.expansions:
options.expansions = set([e.lower() for e in options.expansions]) # Expand out any wildcards, matching set key or set name in the given language
wantedExpansions = set() expanded_expansions = []
knownExpansions = set()
# Match sets that either start with the expansion set key (used by cardset_tag)
# or the actual name of the set/expansion in the specified language.
for e in options.expansions: for e in options.expansions:
for s in Card.sets: matches = fnmatch.filter(Official_search, e)
if (s.lower().startswith(e) or if matches:
Card.sets[s].get('set_name', "").lower().startswith(e)): expanded_expansions.extend(matches)
wantedExpansions.add(s) else:
knownExpansions.add(e) expanded_expansions.append(e)
# Now get the actual sets that are matched above
options.expansions = set([e for e in expanded_expansions]) # Remove duplicates
knownExpansions = set()
for e in options.expansions:
for s in Official_sets:
if (s.lower() == e or Card.sets[s].get('set_name', "").lower() == e):
wantedSets.add(s)
knownExpansions.add(e)
# Give indication if an imput did not match anything # Give indication if an imput did not match anything
unknownExpansions = options.expansions - knownExpansions unknownExpansions = options.expansions - knownExpansions
if unknownExpansions: if unknownExpansions:
print "Error - unknown expansion(s): %s" % ", ".join(unknownExpansions) print "Error - unknown expansion(s): %s" % ", ".join(unknownExpansions)
# Now keep only the cards that were in the expansions requested # Take care of fan expansions. Fan expansions must be explicitly named to be added.
filteredCards = [] # If no --fan is given, then no fan cards are added.
for c in cards: # Fan expansion names can be the names from the language or the cardset_tag
if c.cardset_tag in wantedExpansions: if options.fan:
filteredCards.append(c) # Expand out any wildcards, matching set key or set name in the given language
cards = filteredCards expanded_expansions = []
for e in options.fan:
matches = fnmatch.filter(Fan_search, e)
if matches:
expanded_expansions.extend(matches)
else:
expanded_expansions.append(e)
# Now get the actual sets that are matched above
options.fan = set([e for e in expanded_expansions]) # Remove duplicates
knownExpansions = set()
for e in options.fan:
for s in Fan_sets:
if (s.lower() == e or Card.sets[s].get('set_name', "").lower() == e):
wantedSets.add(s)
knownExpansions.add(e)
# Give indication if an imput did not match anything
unknownExpansions = options.fan - knownExpansions
if unknownExpansions:
print "Error - unknown fan expansion(s): %s" % ", ".join(unknownExpansions)
# Now keep only the cards that are in the sets that have been requested
keep_cards = []
for c in cards:
if c.cardset_tag in wantedSets:
# Add the cardset informaiton to the card and add it to the list of cards to use
c.cardset = Card.sets[c.cardset_tag].get('set_name', c.cardset_tag)
keep_cards.append(c)
cards = keep_cards
# Now add text to the cards. Waited as long as possible to catch all groupings # Now add text to the cards. Waited as long as possible to catch all groupings
cards = add_card_text(options, cards, LANGUAGE_DEFAULT) cards = add_card_text(options, cards, LANGUAGE_DEFAULT)

View File

@ -9,7 +9,7 @@ class TestCardDB(unittest.TestCase):
options = main.parse_opts([]) options = main.parse_opts([])
options.data_path = '.' options.data_path = '.'
cards = main.read_card_data(options) cards = main.read_card_data(options)
self.assertEquals(len(cards), 445) self.assertEquals(len(cards), 448)
valid_cardsets = { valid_cardsets = {
u'base', u'base',
u'dominion1stEdition', u'dominion1stEdition',
@ -32,7 +32,8 @@ class TestCardDB(unittest.TestCase):
u'empires', u'empires',
u'empires extras', u'empires extras',
u'promo', u'promo',
u'extras' u'extras',
u'animals'
} }
for c in cards: for c in cards:
self.assertIsInstance(c, domdiv_cards.Card) self.assertIsInstance(c, domdiv_cards.Card)