Catcher RP fix; other error fixes
This commit is contained in:
parent
b10543e09f
commit
d87ae98272
118
dice.py
118
dice.py
@ -132,7 +132,7 @@ def sa_fielding_roll(pos_code: str, team: dict) -> [discord.Embed]:
|
||||
error_note = '2-base error for e29, e30\n' \
|
||||
'1-base error for e2, e8, e16, e19, e23'
|
||||
elif error_dice == 15:
|
||||
error_note = '1-base error for e3, e8, e10 -> e12, e20, e26, e30'
|
||||
error_note = '1-base error for e3, e8, e10 -> e12, e19, e20, e26, e30'
|
||||
elif error_dice == 14:
|
||||
error_note = '1-base error for e4, e5, e9, e15, e18, e22, e24 -> e28'
|
||||
elif error_dice == 13:
|
||||
@ -478,11 +478,11 @@ def sa_fielding_roll(pos_code: str, team: dict) -> [discord.Embed]:
|
||||
'1-base error for e3 -> e9, e15 -> e18'
|
||||
elif error_dice == 3:
|
||||
error_note = '3-base error for e12 -> e19\n' \
|
||||
'2-base error for e10, e11\n' \
|
||||
'2-base error for e6, e10, e11\n' \
|
||||
'1-base error for e2, e3, e7 -> e9, e21 -> e23'
|
||||
|
||||
elif pos_code == 'C':
|
||||
x_chart = 'https://sombaseball.ddns.net/static/images/season04/range-catcher.png'
|
||||
x_chart = 'https://sombaseball.ddns.net/static/images/season07/range-catcher.png'
|
||||
error_chart += 'catcher.png'
|
||||
|
||||
# Build range note
|
||||
@ -602,110 +602,14 @@ def sa_fielding_roll(pos_code: str, team: dict) -> [discord.Embed]:
|
||||
elif error_dice == 6:
|
||||
error_note = '1-base error for e8, e12, e13'
|
||||
elif error_dice == 5:
|
||||
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'
|
||||
error_note = f'Rare play! Ignore range chart above and consult ranges below\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'**PO**: {INFIELD_X_CHART["po"]["rp"]}\n' \
|
||||
f'**FO**: {INFIELD_X_CHART["fo"]["rp"]}\n' \
|
||||
f'**SPD**: {INFIELD_X_CHART["spd"]["rp"]}\n' \
|
||||
f'**SI1**: {INFIELD_X_CHART["si1"]["rp"]}\n'
|
||||
elif error_dice == 4:
|
||||
error_note = '1-base error for e5, e13'
|
||||
else:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user