diff --git a/cogs/dice.py b/cogs/dice.py index ee0b6d5..3e24afd 100644 --- a/cogs/dice.py +++ b/cogs/dice.py @@ -481,6 +481,7 @@ class Dice(commands.Cog): d_six_one = random.randint(1, 6) d_six_two = random.randint(1, 6) d_six_three = random.randint(1, 6) + d_hundred = random.randint(1, 100) error_dice = d_six_one + d_six_two + d_six_three x_chart = None error_chart = 'https://sombaseball.ddns.net/static/images/season04/error-' @@ -575,7 +576,14 @@ class Dice(commands.Cog): if args[0][:2].upper() == '1B': error_chart += 'first-base.png' - if error_dice == 18: + if d_hundred == 1: + error_note = f'Rare play!\n\n' \ + f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ + f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' + elif error_dice == 18: error_note = '2-base error for e3 -> e12, e19 -> e28\n' \ '1-base error for e1, e2, e30' elif error_dice == 17: @@ -605,12 +613,13 @@ class Dice(commands.Cog): elif error_dice == 6: error_note = '1-base error for e8, e11, e12, e17, e20' elif error_dice == 5: - error_note = f'Rare play!\n\n' \ - f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ - f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ - f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ - f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ - f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' + error_note = 'No error' + # error_note = f'Rare play!\n\n' \ + # f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + # f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ + # f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' elif error_dice == 4: error_note = 'No error' elif error_dice == 3: @@ -619,7 +628,14 @@ class Dice(commands.Cog): if args[0][:2].upper() == '2B': error_chart += 'second-base.png' - if error_dice == 18: + if d_hundred == 1: + error_note = f'Rare play!\n\n' \ + f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ + f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' + elif error_dice == 18: error_note = '2-base error for e4 -> e19, e28 -> e41, e53 -> e65\n' \ '1-base error for e22, e24, e25, e27, e44, e50' elif error_dice == 17: @@ -650,12 +666,13 @@ class Dice(commands.Cog): elif error_dice == 6: error_note = '1-base error for e17, e19, e56 -> 62' elif error_dice == 5: - error_note = f'Rare play!\n\n' \ - f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ - f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ - f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ - f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ - f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' + error_note = 'No error' + # error_note = f'Rare play!\n\n' \ + # f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + # f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ + # f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' elif error_dice == 4: error_note = '1-base error for e10, e21' elif error_dice == 3: @@ -664,7 +681,14 @@ class Dice(commands.Cog): if args[0][:2].upper() == '3B': error_chart += 'third-base.png' - if error_dice == 18: + if d_hundred == 1: + error_note = f'Rare play!\n\n' \ + f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ + f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' + elif error_dice == 18: error_note = '2-base error for e1, e2, e8, e10, e13 -> e16, e21 -> e24, e27, e30 -> e33, e50, ' \ 'e56, e62, e65\n' \ '1-base error for e39' @@ -701,12 +725,13 @@ class Dice(commands.Cog): elif error_dice == 6: error_note = '1-base error for e21, e25, e30, e34, e53' elif error_dice == 5: - error_note = f'Rare play!\n\n' \ - f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ - f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ - f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ - f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ - f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' + error_note = 'No error' + # error_note = f'Rare play!\n\n' \ + # f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + # f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ + # f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' elif error_dice == 4: error_note = '1-base error for e2, e3, e6, e14, e16, e44' elif error_dice == 3: @@ -715,7 +740,14 @@ class Dice(commands.Cog): if args[0][:2].upper() == 'SS': error_chart += 'shortstop.png' - if error_dice == 18: + if d_hundred == 1: + error_note = f'Rare play!\n\n' \ + f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ + f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' + elif error_dice == 18: error_note = '2-base error for e4 -> e12, e22 -> e32, e40 -> e48, e64, e68\n' \ '1-base error for e1, e18, e34, e52, e56' elif error_dice == 17: @@ -747,12 +779,13 @@ class Dice(commands.Cog): elif error_dice == 6: error_note = '1-base error for e21, e22, e24, e28, e31, e48, e64, e72' elif error_dice == 5: - error_note = f'Rare play!\n\n' \ - f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ - f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ - f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ - f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ - f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' + error_note = 'No error' + # error_note = f'Rare play!\n\n' \ + # f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + # f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' \ + # f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' elif error_dice == 4: error_note = '2-base error for e72\n' \ '1-base error for e14, e19, e20, e24, e25, e31, e80' @@ -838,7 +871,16 @@ class Dice(commands.Cog): if args[0][:2].upper() in ['LF', 'RF']: error_chart += 'corner-outfield.png' - if error_dice == 18: + if d_hundred == 1: + error_note = f'Rare play!' + error_note1 = f'**F1**: {OUTFIELD_X_CHART["f1"]["rp"]}\n' \ + f'**F2**: {OUTFIELD_X_CHART["f2"]["rp"]}\n' \ + f'**F3**: {OUTFIELD_X_CHART["f3"]["rp"]}\n' + error_note2 = f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' \ + f'**DO2**: {OUTFIELD_X_CHART["do2"]["rp"]}\n' \ + f'**DO3**: {OUTFIELD_X_CHART["do3"]["rp"]}\n' \ + f'**TR3**: {OUTFIELD_X_CHART["tr3"]["rp"]}\n' + elif error_dice == 18: error_note = '3-base error for e4 -> e12, e19 -> e25\n' \ '2-base error for e18\n' \ '1-base error for e2, e3, e15' @@ -870,14 +912,15 @@ class Dice(commands.Cog): error_note = '2-base error for e7, e8\n' \ '1-base error for e13 -> e18, e22, e24, e25' elif error_dice == 5: - error_note = f'Rare play!' - error_note1 = f'**F1**: {OUTFIELD_X_CHART["f1"]["rp"]}\n' \ - f'**F2**: {OUTFIELD_X_CHART["f2"]["rp"]}\n' \ - f'**F3**: {OUTFIELD_X_CHART["f3"]["rp"]}\n' - error_note2 = f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' \ - f'**DO2**: {OUTFIELD_X_CHART["do2"]["rp"]}\n' \ - f'**DO3**: {OUTFIELD_X_CHART["do3"]["rp"]}\n' \ - f'**TR3**: {OUTFIELD_X_CHART["tr3"]["rp"]}\n' + error_note = 'No error' + # error_note = f'Rare play!' + # error_note1 = f'**F1**: {OUTFIELD_X_CHART["f1"]["rp"]}\n' \ + # f'**F2**: {OUTFIELD_X_CHART["f2"]["rp"]}\n' \ + # f'**F3**: {OUTFIELD_X_CHART["f3"]["rp"]}\n' + # error_note2 = f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' \ + # f'**DO2**: {OUTFIELD_X_CHART["do2"]["rp"]}\n' \ + # f'**DO3**: {OUTFIELD_X_CHART["do3"]["rp"]}\n' \ + # f'**TR3**: {OUTFIELD_X_CHART["tr3"]["rp"]}\n' elif error_dice == 4: error_note = '2-base error for e13, e15, e20, e23 -> e25\n' \ '1-base error for e4 -> e6, e10 -> 12, e16 -> e18' @@ -888,7 +931,16 @@ class Dice(commands.Cog): else: error_chart += 'center-field.png' - if error_dice == 18: + if d_hundred == 1: + error_note = f'Rare play!' + error_note1 = f'**F1**: {OUTFIELD_X_CHART["f1"]["rp"]}\n' \ + f'**F2**: {OUTFIELD_X_CHART["f2"]["rp"]}\n' \ + f'**F3**: {OUTFIELD_X_CHART["f3"]["rp"]}\n' + error_note2 = f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' \ + f'**DO2**: {OUTFIELD_X_CHART["do2"]["rp"]}\n' \ + f'**DO3**: {OUTFIELD_X_CHART["do3"]["rp"]}\n' \ + f'**TR3**: {OUTFIELD_X_CHART["tr3"]["rp"]}\n' + elif error_dice == 18: error_note = '3-base error for e4 -> 19\n' \ '2-base error for e2, e25\n' \ '1-base error for e3, e23' @@ -916,14 +968,15 @@ class Dice(commands.Cog): error_note = '2-base error for e12, e13\n' \ '1-base error for e19 -> e25' elif error_dice == 5: - error_note = f'Rare play!' - error_note1 = f'**F1**: {OUTFIELD_X_CHART["f1"]["rp"]}\n' \ - f'**F2**: {OUTFIELD_X_CHART["f2"]["rp"]}\n' \ - f'**F3**: {OUTFIELD_X_CHART["f3"]["rp"]}\n' - error_note2 = f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' \ - f'**DO2**: {OUTFIELD_X_CHART["do2"]["rp"]}\n' \ - f'**DO3**: {OUTFIELD_X_CHART["do3"]["rp"]}\n' \ - f'**TR3**: {OUTFIELD_X_CHART["tr3"]["rp"]}\n' + error_note = 'No error' + # error_note = f'Rare play!' + # error_note1 = f'**F1**: {OUTFIELD_X_CHART["f1"]["rp"]}\n' \ + # f'**F2**: {OUTFIELD_X_CHART["f2"]["rp"]}\n' \ + # f'**F3**: {OUTFIELD_X_CHART["f3"]["rp"]}\n' + # error_note2 = f'**SI2**: {OUTFIELD_X_CHART["si2"]["rp"]}\n' \ + # f'**DO2**: {OUTFIELD_X_CHART["do2"]["rp"]}\n' \ + # f'**DO3**: {OUTFIELD_X_CHART["do3"]["rp"]}\n' \ + # f'**TR3**: {OUTFIELD_X_CHART["tr3"]["rp"]}\n' elif error_dice == 4: error_note = '2-base error for e10, e12, e13, e20, e22, e23\n' \ '1-base error for e3 -> e9, e15 -> e18' @@ -1028,31 +1081,7 @@ class Dice(commands.Cog): '------G1------- FO\n' \ '```\n' - # Build error note - # error_dice = 5 - if error_dice == 18: - error_note = '2-base error for e4 -> 16\n1-base error for e2, e3' - elif error_dice == 17: - error_note = '1-base error for e1, e2, e4, e5, e12 -> e14, e16' - elif error_dice == 16: - error_note = '1-base error for e3 -> e5, e7, e12 -> e14, e16' - elif error_dice == 15: - error_note = '1-base error for e7, e8, e12, e13, e15' - elif error_dice == 14: - error_note = '1-base error for e6' - elif error_dice == 13: - error_note = '1-base error for e9' - elif error_dice == 12: - error_note = '1-base error for e10, e14' - elif error_dice == 11: - error_note = '1-base error for e11, e15' - elif 8 <= error_dice <= 10: - error_note = 'No error' - elif error_dice == 7: - error_note = '1-base error for e16' - elif error_dice == 6: - error_note = '1-base error for e8, e12, e13' - elif error_dice == 5: + if d_hundred == 1: error_note = 'Rare play! Ignore range chart above and consult ranges below\n\n' error_note1 = '__If Bases Empty__\n' if d_twenty == 1: @@ -1157,6 +1186,134 @@ class Dice(commands.Cog): error_note2 += f'**c-1 -> 2**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ f'**c-3 -> 4**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ f'**c-5**: {INFIELD_X_CHART["g3"]["rp"]}\n\n' + elif error_dice == 18: + error_note = '2-base error for e4 -> 16\n1-base error for e2, e3' + elif error_dice == 17: + error_note = '1-base error for e1, e2, e4, e5, e12 -> e14, e16' + elif error_dice == 16: + error_note = '1-base error for e3 -> e5, e7, e12 -> e14, e16' + elif error_dice == 15: + error_note = '1-base error for e7, e8, e12, e13, e15' + elif error_dice == 14: + error_note = '1-base error for e6' + elif error_dice == 13: + error_note = '1-base error for e9' + elif error_dice == 12: + error_note = '1-base error for e10, e14' + elif error_dice == 11: + error_note = '1-base error for e11, e15' + elif 8 <= error_dice <= 10: + error_note = 'No error' + elif error_dice == 7: + error_note = '1-base error for e16' + elif error_dice == 6: + error_note = '1-base error for e8, e12, e13' + elif error_dice == 5: + error_note = 'No error' + # error_note = 'Rare play! Ignore range chart above and consult ranges below\n\n' + # error_note1 = '__If Bases Empty__\n' + # if d_twenty == 1: + # error_note1 += f'**c-1**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**c-2 -> 5**: {INFIELD_X_CHART["si1"]["rp"]}\n\n' + # elif d_twenty == 2: + # error_note1 += f'**c-1 -> 2**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**c-3 -> 5**: {INFIELD_X_CHART["si1"]["rp"]}\n\n' + # elif d_twenty == 3: + # error_note1 += f'**c-1**: {INFIELD_X_CHART["po"]["rp"]}\n' \ + # f'**c-2 -> 3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**c-4 -> 5**: {INFIELD_X_CHART["si1"]["rp"]}\n\n' + # elif d_twenty == 4: + # error_note1 += f'**c-1 -> 2**: {INFIELD_X_CHART["po"]["rp"]}\n' \ + # f'**c-3 -> 4**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**c-5**: {INFIELD_X_CHART["si1"]["rp"]}\n\n' + # elif d_twenty == 5: + # error_note1 += f'**c-1 -> 3**: {INFIELD_X_CHART["po"]["rp"]}\n' \ + # f'**c-4 -> 5**: {INFIELD_X_CHART["g3"]["rp"]}\n\n' + # elif d_twenty == 6: + # error_note1 += f'**c-1 -> 4**: {INFIELD_X_CHART["po"]["rp"]}\n' \ + # f'**c-5**: {INFIELD_X_CHART["g3"]["rp"]}\n\n' + # elif d_twenty <= 10: + # error_note1 += f'**c-1 -> 5**: {INFIELD_X_CHART["po"]["rp"]}\n\n' + # elif d_twenty == 11: + # error_note1 += f'**c-1**: {INFIELD_X_CHART["fo"]["rp"]}\n' \ + # f'**c-2 -> 5**: {INFIELD_X_CHART["po"]["rp"]}\n\n' + # elif d_twenty == 12: + # error_note1 += f'**c-1 -> 2**: {INFIELD_X_CHART["fo"]["rp"]}\n' \ + # f'**c-3 -> 5**: {INFIELD_X_CHART["po"]["rp"]}\n\n' + # elif d_twenty == 13: + # error_note1 += f'**c-1 -> 3**: {INFIELD_X_CHART["fo"]["rp"]}\n' \ + # f'**c-4 -> 5**: {INFIELD_X_CHART["po"]["rp"]}\n\n' + # elif d_twenty == 14: + # error_note1 += f'**c-1 -> 4**: {INFIELD_X_CHART["fo"]["rp"]}\n' \ + # f'**c-5**: {INFIELD_X_CHART["po"]["rp"]}\n\n' + # elif d_twenty <= 16: + # error_note1 += f'**c-1 -> 5**: {INFIELD_X_CHART["fo"]["rp"]}\n\n' + # elif d_twenty == 17: + # error_note1 += f'**c-1 -> 2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**c-3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**c-4 -> 5**: {INFIELD_X_CHART["fo"]["rp"]}\n\n' + # elif d_twenty == 18: + # error_note1 += f'**c-1 -> 2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**c-3 -> 4**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**c-5**: {INFIELD_X_CHART["fo"]["rp"]}\n\n' + # elif d_twenty == 19: + # error_note1 += f'**c-1 -> 2**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + # f'**c-3**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**c-4 -> 5**: {INFIELD_X_CHART["g3"]["rp"]}\n\n' + # elif d_twenty == 20: + # error_note1 += f'**c-1 -> 2**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + # f'**c-3 -> 4**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**c-5**: {INFIELD_X_CHART["g3"]["rp"]}\n\n' + # + # error_note2 = '__If Runners on Base__\n' + # if d_twenty <= 2: + # error_note2 += f'**c-1 -> 5**: {INFIELD_X_CHART["wp"]["rp"]}\n\n' + # elif d_twenty == 3: + # error_note2 += f'**c-1**: {INFIELD_X_CHART["x"]["rp"]}\n' \ + # f'**c-2 -> 5**: {INFIELD_X_CHART["wp"]["rp"]}\n\n' + # elif d_twenty == 4: + # error_note2 += f'**c-1 -> 2**: {INFIELD_X_CHART["x"]["rp"]}\n' \ + # f'**c-3 -> 5**: {INFIELD_X_CHART["wp"]["rp"]}\n\n' + # elif d_twenty == 5: + # error_note2 += f'**c-1 -> 3**: {INFIELD_X_CHART["x"]["rp"]}\n' \ + # f'**c-4 -> 5**: {INFIELD_X_CHART["wp"]["rp"]}\n\n' + # elif d_twenty == 6: + # error_note2 += f'**c-1 -> 4**: {INFIELD_X_CHART["x"]["rp"]}\n' \ + # f'**c-5**: {INFIELD_X_CHART["wp"]["rp"]}\n\n' + # elif d_twenty <= 9: + # error_note2 += f'**c-1**: {INFIELD_X_CHART["po"]["rp"]}\n' \ + # f'**c-2 -> 5**: {INFIELD_X_CHART["x"]["rp"]}\n\n' + # elif d_twenty <= 12: + # error_note2 += f'**c-1 -> 2**: {INFIELD_X_CHART["po"]["rp"]}\n' \ + # f'**c-3 -> 5**: {INFIELD_X_CHART["x"]["rp"]}\n\n' + # elif d_twenty == 13: + # error_note2 += f'**c-1**: {INFIELD_X_CHART["fo"]["rp"]}\n' \ + # f'**c-2**: {INFIELD_X_CHART["po"]["rp"]}\n' \ + # f'**c-3 -> 5**: {INFIELD_X_CHART["x"]["rp"]}\n\n' + # elif d_twenty == 14: + # error_note2 += f'**c-1 -> 2**: {INFIELD_X_CHART["fo"]["rp"]}\n' \ + # f'**c-3**: {INFIELD_X_CHART["po"]["rp"]}\n' \ + # f'**c-4 -> 5**: {INFIELD_X_CHART["x"]["rp"]}\n\n' + # elif d_twenty <= 16: + # error_note2 += f'**c-1 -> 3**: {INFIELD_X_CHART["fo"]["rp"]}\n' \ + # f'**c-4 -> 5**: {INFIELD_X_CHART["x"]["rp"]}\n\n' + # elif d_twenty == 17: + # error_note2 += f'**c-1 -> 2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**c-3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**c-4**: {INFIELD_X_CHART["po"]["rp"]}\n' \ + # f'**c-5**: {INFIELD_X_CHART["x"]["rp"]}\n\n' + # elif d_twenty == 18: + # error_note2 += f'**c-1 -> 2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**c-3 -> 4**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**c-5**: {INFIELD_X_CHART["x"]["rp"]}\n\n' + # elif d_twenty == 19: + # error_note2 += f'**c-1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + # f'**c-2 -> 3**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**c-4 -> 5**: {INFIELD_X_CHART["g3"]["rp"]}\n\n' + # elif d_twenty == 20: + # error_note2 += f'**c-1 -> 2**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + # f'**c-3 -> 4**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**c-5**: {INFIELD_X_CHART["g3"]["rp"]}\n\n' elif error_dice == 4: error_note = '1-base error for e5, e13' else: @@ -1233,7 +1390,13 @@ class Dice(commands.Cog): '```\n' # Build error note - if error_dice == 18: + if d_hundred == 1: + error_note = f'Rare play!\n\n' \ + f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' + elif error_dice == 18: error_note = '2-base error for e4 -> e12, e19 -> e28, e34 -> e43, e46 -> e48' elif error_dice == 17: error_note = '2-base error for e13 -> e28, e44 -> e50' @@ -1263,11 +1426,12 @@ class Dice(commands.Cog): elif error_dice == 6: error_note = '1-base error for e8, e22, e38, e39, e43 -> e51' elif error_dice == 5: - error_note = f'Rare play!\n\n' \ - f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ - f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ - f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ - f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' + error_note = 'No error' + # error_note = f'Rare play!\n\n' \ + # f'**G3**: {INFIELD_X_CHART["g3"]["rp"]}\n' \ + # f'**G2**: {INFIELD_X_CHART["g2"]["rp"]}\n' \ + # f'**G1**: {INFIELD_X_CHART["g1"]["rp"]}\n' \ + # f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n' elif error_dice == 4: error_note = '1-base error for e15, e16, e40' elif error_dice == 3: diff --git a/cogs/transactions.py b/cogs/transactions.py index e47ccb4..265b31b 100644 --- a/cogs/transactions.py +++ b/cogs/transactions.py @@ -4,7 +4,7 @@ import copy from helpers import * from db_calls import db_get, db_patch, get_team_by_owner, get_team_by_abbrev, get_player_by_name, patch_player, db_post from discord.ext import commands, tasks -OFFSEASON_FLAG = True +OFFSEASON_FLAG = False class SBaTransaction: @@ -328,7 +328,7 @@ class Transactions(commands.Cog): self.bot = bot self.trade_season = False - # self.weekly_loop.start() + self.weekly_loop.start() @tasks.loop(minutes=1) async def weekly_loop(self):