diff --git a/tools.py b/tools.py index ed24565..3766d43 100644 --- a/tools.py +++ b/tools.py @@ -652,35 +652,25 @@ def fish(): fishmass = [] fishtrade = [] for card in fishrefined: - if card["priority"] == 1: - for deck in colors.decklist: + found = False + for deck in colors.decklist: + if found == False: if deck["name"] == card["name"][:-2]: if deck["mastered"]: fishmastered.append(card) else: - fishhp.append(card) - elif card["priority"] == 2: - if card["mass"]: - for deck in colors.decklist: - if deck["name"] == card["name"][:-2]: - if deck["mass"]: + if deck["priority"] == 1: + fishhp.append(card) + elif deck["priority"] == 2: fishmp.append(card) - else: - fishmass.append(card) - else: - fishmp.append(card) - elif card["priority"] == 3: - if card["mass"]: - for deck in colors.decklist: - if deck["name"] == card["name"][:-2]: - if deck["mass"]: + elif deck["priority"] == 3: fishlp.append(card) else: - fishmass.append(card) - else: - fishlp.append(card) - else: - fishtrade.append(card) + if card["mass"]: + fishmass.append(card) + else: + fishtrade.append(card) + found = True locations = [] if len(fishmastered) > 0: locations.append("mastered")