diff --git a/tools.py b/tools.py index 15fa2e4..ec54788 100644 --- a/tools.py +++ b/tools.py @@ -451,6 +451,8 @@ def switchit(): wantreds.append(card) if len(wantreds) > 5: wantreds = wantreds[:5] + if len(wantreds) > len(redtrade): + wantreds = wantreds[:len(redtrade)] if len(wantreds) > 0: wantall.extend(wantreds) traderedscount = len(wantreds) @@ -464,6 +466,8 @@ def switchit(): wantoranges.append(card) if len(wantoranges) > 5: wantoranges = wantoranges[:5] + if len(wantoranges) > len(orangetrade): + wantoranges = wantoranges[:len(orangetrade)] if len(wantoranges) > 0: wantall.extend(wantoranges) tradeorangescount = len(wantoranges) @@ -477,6 +481,8 @@ def switchit(): wantyellows.append(card) if len(wantyellows) > 5: wantyellows = wantyellows[:5] + if len(wantyellows) > len(yellowtrade): + wantyellows = wantyellows[:len(yellowtrade)] if len(wantyellows) > 0: wantall.extend(wantyellows) tradeyellowscount = len(wantyellows) @@ -490,6 +496,8 @@ def switchit(): wantgreens.append(card) if len(wantgreens) > 5: wantgreens = wantgreens[:5] + if len(wantgreens) > len(greentrade): + wantgreens = wantgreens[:len(greentrade)] if len(wantgreens) > 0: wantall.extend(wantgreens) tradegreenscount = len(wantgreens) @@ -503,6 +511,8 @@ def switchit(): wantblues.append(card) if len(wantblues) > 5: wantblues = wantblues[:5] + if len(wantblues) > len(bluetrade): + wantblues = wantblues[:len(bluetrade)] if len(wantblues) > 0: wantall.extend(wantblues) tradebluescount = len(wantblues) @@ -516,6 +526,8 @@ def switchit(): wantpurples.append(card) if len(wantpurples) > 5: wantpurples = wantpurples[:5] + if len(wantpurples) > len(purpletrade): + wantpurples = wantpurples[:len(purpletrade)] if len(wantpurples) > 0: wantall.extend(wantpurples) tradepurplescount = len(wantpurples) @@ -529,6 +541,8 @@ def switchit(): wantbrowns.append(card) if len(wantbrowns) > 5: wantbrowns = wantbrowns[:5] + if len(wantbrowns) > len(browntrade): + wantbrowns = wantbrowns[:len(browntrade)] if len(wantbrowns) > 0: wantall.extend(wantbrowns) tradebrownscount = len(wantbrowns) @@ -542,6 +556,8 @@ def switchit(): wantgreys.append(card) if len(wantgreys) > 5: wantgreys = wantgreys[:5] + if len(wantgreys) > len(greytrade): + wantgreys = wantgreys[:len(greytrade)] if len(wantgreys) > 0: wantall.extend(wantgreys) tradegreyscount = len(wantgreys)