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

Fix CardSorter use of Base cards (#137)

Browse Source 
* enforce specific base card order
* use base card `cardset_tag` instead of card set name to find base cards
This commit is contained in:
Wendel Voigt 2016-12-20 18:37:58 -06:00 committed by Peter
parent 1d683fac22
commit 1d50eb7376
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
domdiv/main.py
View File

@ -544,13 +544,22 @@ class CardSorter(object):
else: else:
self.sort_key = self.by_expansion_sort_key self.sort_key = self.by_expansion_sort_key
self.baseCards = baseCards baseOrder = ['Copper', 'Silver', 'Gold', 'Platinum', 'Potion',
'Curse', 'Estate', 'Duchy', 'Province', 'Colony',
'Trash']
self.baseCards = []
for tag in baseOrder:
if tag in baseCards:
self.baseCards.append(baseCards[tag])
del baseCards[tag]
# now pick up those that have not been specified
for tag in baseCards:
self.baseCards.append(baseCards[tag])
# When sorting cards, want to always put "base" cards after all # When sorting cards, want to always put "base" cards after all
# kingdom cards, and order the base cards in a set order - the # kingdom cards, and order the base cards in a particular order
# order they are listed in the database (ie, all normal treasures # (ie, all normal treasures by worth, then potion, then all
# by worth, then potion, then all normal VP cards by worth, then # normal VP cards by worth, then Trash)
# trash)
def baseIndex(self, name): def baseIndex(self, name):
try: try:
return self.baseCards.index(name) return self.baseCards.index(name)
@ -558,7 +567,7 @@ class CardSorter(object):
return -1 return -1
def isBaseExpansionCard(self, card): def isBaseExpansionCard(self, card):
return card.cardset.lower() != 'base' and card.name in self.baseCards return card.cardset_tag.lower() != 'base' and card.name in self.baseCards
def by_global_sort_key(self, card): def by_global_sort_key(self, card):
return int(card.isExpansion()), self.baseIndex(card.name), card.name return int(card.isExpansion()), self.baseIndex(card.name), card.name
@ -851,9 +860,9 @@ def filter_sort_cards(cards, options):
# Set up the card sorter # Set up the card sorter
cardSorter = CardSorter( cardSorter = CardSorter(
options.order, options.order,
[card.name for card in cards if card.cardset.lower() == 'base']) {card.card_tag: card.name for card in cards if card.cardset_tag.lower() == 'base'})
if options.base_cards_with_expansion: if options.base_cards_with_expansion:
cards = [card for card in cards if card.cardset.lower() != 'base'] cards = [card for card in cards if card.cardset_tag.lower() != 'base']
else: else:
cards = [card for card in cards cards = [card for card in cards
if not cardSorter.isBaseExpansionCard(card)] if not cardSorter.isBaseExpansionCard(card)]