Remove high priority collecting, fix statistics function
This commit is contained in:
parent
fd47368d5a
commit
07e850e612
4 changed files with 28 additions and 39 deletions
17
colors.py
17
colors.py
|
@ -152,9 +152,7 @@ for event in log.log:
|
|||
thecard["priority"] = 1
|
||||
else:
|
||||
if thecard["priority"] == 0:
|
||||
if thedeck in variables.highpriority:
|
||||
thecard["priority"] = 1
|
||||
elif len(thecard["mass"]) > 0 or thedeck in variables.lowpriority:
|
||||
if len(thecard["mass"]) > 0 or thedeck in variables.lowpriority:
|
||||
thecard["priority"] = 3
|
||||
else:
|
||||
thecard["priority"] = 4
|
||||
|
@ -499,7 +497,7 @@ for deck in decklist:
|
|||
deck["mastered"] = dates[-1]
|
||||
else:
|
||||
deck["mastered"] = False
|
||||
if deck["name"] in variables.highpriority or deck["count"] >= variables.highthreshold or deck["name"] in portdecks or deck["colour"] == "limited":
|
||||
if deck["count"] >= variables.highthreshold or deck["name"] in portdecks or deck["colour"] == "limited":
|
||||
deck["priority"] = 1
|
||||
elif len(deck["mass"]) > 0 or deck["name"] in variables.lowpriority:
|
||||
if deck["count"] >= variables.collectingmediumthreshold:
|
||||
|
@ -554,6 +552,7 @@ for deck in decklist:
|
|||
wantedcard["colour"] = deck["colour"]
|
||||
wantedcard["series"] = deck["series"]
|
||||
wantedcard["priority"] = deck["priority"]
|
||||
wantedcard["mass"] = deck["mass"]
|
||||
wantedlist.append(wantedcard)
|
||||
|
||||
decknames = []
|
||||
|
@ -564,16 +563,6 @@ cardnames = []
|
|||
for card in cardlist:
|
||||
cardnames.append(card["name"])
|
||||
|
||||
for deck in variables.highpriority:
|
||||
if deck not in decknames:
|
||||
for number in numbers:
|
||||
wantedcard = {}
|
||||
wantedcard["name"] = deck + number
|
||||
wantedcard["colour"] = deckkey[deck]["type"]
|
||||
wantedcard["series"] = deckkey[deck]["series"]
|
||||
wantedcard["priority"] = 1
|
||||
wantedlist.append(wantedcard)
|
||||
|
||||
for deck in variables.lowpriority:
|
||||
if deck not in decknames:
|
||||
for number in numbers:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue