master #13

Merged
cal merged 2 commits from master into main 2026-02-11 21:37:52 +00:00
2 changed files with 10 additions and 10 deletions

View File

@ -1 +1 @@
1.9.1
1.9.2

18
dice.py
View File

@ -2659,43 +2659,43 @@ def sa_fielding_roll(this_team: Team, this_play: Play, pos_code: str, def_rating
elif error_dice == 13:
error_note = '1-base error for e6, e13, e14, e21, e22, e26, e27, e30 -> 34, e38 -> e51'
if def_rating.error in [6, 13, 14, 21, 22, 26, 27, range(30, 35), range(38, 52)]:
if def_rating.error in [6, 13, 14, 21, 22, 26, 27, *range(30, 35), *range(38, 52)]:
this_roll.error_result = 1
elif error_dice == 12:
error_note = '1-base error for e7, e11, e12, e15 -> e19, e22 -> e51'
if def_rating.error in [7, 11, 12, range(15, 19), range(22, 51)]:
if def_rating.error in [7, 11, 12, *range(15, 20), *range(22, 52)]:
this_roll.error_result = 1
elif error_dice == 11:
error_note = '1-base error for e10, e13, e15, e17, e18, e20, e21, e23, e24, e27 -> 38, e40, e42, ' \
'e44 -> e51'
if def_rating.error in [10, 13, 15, 17, 18, 20, 21, 23, 24, range(27, 39), 40, 42, range(44, 52)]:
if def_rating.error in [10, 13, 15, 17, 18, 20, 21, 23, 24, *range(27, 39), 40, 42, *range(44, 52)]:
this_roll.error_result = 1
elif error_dice == 10:
error_note = '1-base error for e20, e23, e24, e27 -> e51'
if def_rating.error in [20, 23, 24, range(27, 52)]:
if def_rating.error in [20, 23, 24, *range(27, 52)]:
this_roll.error_result = 1
elif error_dice == 9:
error_note = '1-base error for e16, e19, e26, e28, e34 -> e36, e39 -> e51'
if def_rating.error in [16, 19, 26, 28, range(34, 37), range(39, 52)]:
if def_rating.error in [16, 19, 26, 28, *range(34, 37), *range(39, 52)]:
this_roll.error_result = 1
elif error_dice == 8:
error_note = '1-base error for e22, e33, e38, e39, e43 -> e51'
if def_rating.error in [22, 33, 38, 39, range(43, 52)]:
if def_rating.error in [22, 33, 38, 39, *range(43, 52)]:
this_roll.error_result = 1
elif error_dice == 7:
error_note = '1-base error for e14, e21, e36, e39, e42 -> e44, e47 -> e51'
if def_rating.error in [14, 21, 36, 39, range(42, 45), range(47, 52)]:
if def_rating.error in [14, 21, 36, 39, *range(42, 45), *range(47, 52)]:
this_roll.error_result = 1
elif error_dice == 6:
error_note = '1-base error for e8, e22, e38, e39, e43 -> e51'
if def_rating.error in [8, 22, 38, 39, range(42, 52)]:
if def_rating.error in [8, 22, 38, 39, *range(43, 52)]:
this_roll.error_result = 1
elif error_dice == 5:
@ -2714,7 +2714,7 @@ def sa_fielding_roll(this_team: Team, this_play: Play, pos_code: str, def_rating
elif error_dice == 3:
error_note = '2-base error for e8 -> e12, e26 -> e28, e39 -> e43\n' \
'1-base error for e6, e7, e17, e30, e33, e44'
if def_rating.error in [range(8, 13), range(26, 29), range(39, 44)]:
if def_rating.error in [*range(8, 13), *range(26, 29), *range(39, 44)]:
this_roll.error_result = 2
elif def_rating.error in [6, 7, 17, 30, 33, 44]:
this_roll.error_result = 1