zhetadelta/sim16
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fixed fielder's choices

Browse source
This commit is contained in:
Sakimori 2021-03-24 22:45:49 -04:00
parent 9d9f816812
commit 75101d70f9
2 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
games.py
View file

@ -620,9 +620,17 @@ class game(object):
self.outs += 1 self.outs += 1
self.get_batter().game_stats["plate_appearances"] += 1 self.get_batter().game_stats["plate_appearances"] += 1
if "add_base" in result: if self.voice.post_format != []:
result["update_text"] = result["update_text"] % base_string(result["base"]) format_list = []
for extra_format in self.voice.post_format:
if extra_format == "base":
format_list.append(base_string(result["base"]))
elif extra_format == "runner":
format_list.append(result["fc_out"][0])
self.voice.post_format = []
result["displaytext"] = result["displaytext"].format(*format_list)
if self.outs < 3: if self.outs < 3:
result["offense_team"].score += scores_to_add #only add points if inning isn't over result["offense_team"].score += scores_to_add #only add points if inning isn't over

47
gametext.py
View file

@ -19,6 +19,8 @@ class game_strings_base(object):
def __init__(self): def __init__(self):
self.intro_counter = 1 self.intro_counter = 1
post_format = []
default_format = ("defender",) default_format = ("defender",)
intro_formats = [] intro_formats = []
@ -68,16 +70,35 @@ class game_strings_base(object):
if gamestring in self.no_formats: if gamestring in self.no_formats:
return gamestring return gamestring
elif gamestring in self.diff_formats: elif gamestring in self.diff_formats:
return gamestring.format(*parse_formats(self.diff_formats[gamestring], update)) return gamestring.format(*self.parse_formats(self.diff_formats[gamestring], update))
else: else:
return gamestring.format(*parse_formats(self.default_format, update)) return gamestring.format(*self.parse_formats(self.default_format, update))
def parse_formats(self, format_tuple, update):
out_list = []
for string in format_tuple:
if string == "defender":
out_list.append(update['defender'].name)
elif string == "base_string":
post_format.append("base")
out_list.append("{}")
elif string == "batter":
out_list.append(update['batter'].name)
elif string == "fc_out" or string == "runner":
post_format.append("runner")
out_list.append("{}")
elif string == "defense_team":
out_list.append(update['defense_team'].name)
elif string == "offense_team":
out_list.append(update['offense_team'].name)
return tuple(out_list)
class TheGoddesses(game_strings_base): class TheGoddesses(game_strings_base):
def __init__(self): def __init__(self):
self.intro_counter = 3 self.intro_counter = 4
intro = [("💜", "This game is now blessed 💜\nI'm Sakimori,"), ("🌺", "and i'm xvi! the sim16 goddesses are live and on-site, bringing you today's game~"), ("🎆", "Play ball!!")] intro = [("💜", "This game is now blessed 💜"), ("🏳️‍⚧️","I'm Sakimori,"), ("🌺", "and i'm xvi! the sim16 goddesses are live and on-site, bringing you today's game."), ("🎆", "Get hyped!!")]
strikeoutlooking = ["watches a slider barely catch the outside corner. Hang up a ꓘ!", strikeoutlooking = ["watches a slider barely catch the outside corner. Hang up a ꓘ!",
"looks at a fastball paint the inside of the plate, and strikes out looking.", "looks at a fastball paint the inside of the plate, and strikes out looking.",
@ -133,23 +154,7 @@ class TheGoddesses(game_strings_base):
twoparts = [groundout[1], groundout[3], flyout[0], flyout[2], flyout[4], walk[2], single[0], sacrifice[0]] twoparts = [groundout[1], groundout[3], flyout[0], flyout[2], flyout[4], walk[2], single[0], sacrifice[0]]
def parse_formats(format_tuple, update):
out_list = []
for string in format_tuple:
if string == "defender":
out_list.append(update['defender'].name)
elif string == "base_string":
update["add_base"] = True
out_list.append("%s")
elif string == "batter":
out_list.append(update['batter'].name)
elif string == "fc_out" or string == "runner":
out_list.append(update['runner'].name)
elif string == "defense_team":
out_list.append(update['defense_team'].name)
elif string == "offense_team":
out_list.append(update['offense_team'].name)
return tuple(out_list)
def base_string(base): def base_string(base):
if base == 1: if base == 1: