diff --git a/games.py b/games.py index 858d433..2e1c7f7 100644 --- a/games.py +++ b/games.py @@ -154,7 +154,7 @@ class game(object): else: outcome["text"] = appearance_outcomes.walk - if self.bases[1] is not None and hitnum < -1 and self.outs != 2: + if self.bases[1] is not None and hitnum < -1.3 and self.outs != 2: outcome["text"] = appearance_outcomes.doubleplay outcome["defender"] = "" @@ -377,18 +377,22 @@ class game(object): "home_pitcher" : self.teams["home"].pitcher } + def gamestate_update_full(self): self.last_update = self.batterup() return self.gamestate_display_full() def gamestate_display_full(self): + punc = "" + if self.last_update[0]["defender"] != "": + punc = "." if not self.over: if self.top_of_inning: inningtext = "top" else: inningtext = "bottom" - updatestring = f"{self.last_update[0]['batter']} {self.last_update[0]['text'].value} {self.last_update[0]['defender']}\n" + updatestring = f"{self.last_update[0]['batter']} {self.last_update[0]['text'].value} {self.last_update[0]['defender']}{punc}\n" if self.last_update[1] > 0: updatestring += f"{self.last_update[1]} runs scored!" @@ -403,7 +407,7 @@ Bases: 3: {str(self.bases[3])} 2: {str(self.bases[2])} 1: {str(self.bases[1])} """ else: return f"""Game over! Final score: **{self.teams['away'].score} - {self.teams['home'].score}** -Last update: {updatestring}""" +Last update: {self.last_update[0]['batter']} {self.last_update[0]['text'].value} {self.last_update[0]['defender']}{punc}""" @@ -431,6 +435,7 @@ def debug_game(): max_player = player('{"id" : "max", "name" : "max", "batting_stars" : 5, "pitching_stars" : 5, "defense_stars" : 5, "baserunning_stars" : 5}') min_player = player('{"id" : "min", "name" : "min", "batting_stars" : 1, "pitching_stars" : 1, "defense_stars" : 1, "baserunning_stars" : 1}') team_avg = team() + team_avg.name = "Arizona Aways" team_avg.add_lineup(average_player) team_avg.add_lineup(average_player2) team_avg.add_lineup(average_player3) @@ -438,6 +443,7 @@ def debug_game(): team_avg.set_pitcher(average_player5) team_avg.finalize() team_avg2 = team() + team_avg2.name = "Houston Homes" team_avg2.add_lineup(average_player5) team_avg2.add_lineup(average_player4) team_avg2.add_lineup(average_player3) diff --git a/the_prestige.py b/the_prestige.py index ebf0030..eda5d73 100644 --- a/the_prestige.py +++ b/the_prestige.py @@ -103,7 +103,7 @@ async def on_message(msg): elif command == "startgame" and msg.author.id in config()["owners"]: - game_task = asyncio.create_task(start_game(msg.channel)) + game_task = asyncio.create_task(watch_game(msg.channel)) await game_task @@ -132,10 +132,100 @@ async def start_game(channel): state = newgame.gamestate_update_full() if not state.startswith("Game over"): await msg.edit(content=state) - await asyncio.sleep(10) + await asyncio.sleep(3) await channel.send(state) gamesarray.pop() +async def watch_game(channel): + blank_emoji = discord.utils.get(client.emojis, id = 790899850295509053) + empty_base = discord.utils.get(client.emojis, id = 790899850395779074) + first_base = discord.utils.get(client.emojis, id = 790899850320543745) + second_base = discord.utils.get(client.emojis, id = 790900139656740865) + third_base = discord.utils.get(client.emojis, id = 790900156597403658) + + newgame = games.debug_game() + embed = await channel.send("Play ball!") + msg_top = await channel.send(f"{newgame.teams['away'].name} at ") + msg_bot = await channel.send(f"{newgame.teams['home'].name} starting...") + await asyncio.sleep(4) + use_emoji_names = True + for game in gamesarray: + if game[1]: + use_emoji_names = False + gamesarray.append((newgame,use_emoji_names)) + + + while not newgame.over: + state = newgame.gamestate_update_full() + punc = "" + if newgame.last_update[0]["defender"] != "": + punc = "." + new_embed = discord.Embed(color=discord.Color.purple(), title=f"{newgame.teams['away'].name} at {newgame.teams['home'].name}") + new_embed.add_field(name=newgame.teams['away'].name, value=newgame.teams['away'].score, inline=True) + new_embed.add_field(name=newgame.teams['home'].name, value=newgame.teams['home'].score, inline=True) + if newgame.top_of_inning: + new_embed.add_field(name="Inning:", value=f"🔼 {newgame.inning}", inline=True) + else: + new_embed.add_field(name="Inning:", value=f"🔽 {newgame.inning}", inline=True) + new_embed.add_field(name="Outs:", value=newgame.outs, inline=True) + new_embed.add_field(name="Pitcher:", value=newgame.get_pitcher(), inline=False) + new_embed.add_field(name="Batter:", value=newgame.get_batter(), inline=False) + if use_emoji_names: + new_embed.set_footer(text="This game is using emoji names to indicate baserunners.") + + updatestring = f"{newgame.last_update[0]['batter']} {newgame.last_update[0]['text'].value} {newgame.last_update[0]['defender']}{punc} " + if newgame.last_update[1] > 0: + updatestring += f"{newgame.last_update[1]} runs scored!" + + new_embed.add_field(name="🏏", value=updatestring, inline=False) + + basemessage_t = str(blank_emoji) + if newgame.bases[2] is not None: + if use_emoji_names: + await second_base.edit(name=newgame.bases[2].name) + basemessage_t += str(second_base) + else: + basemessage_t += str(empty_base) + + basemessage_b = "" + if newgame.bases[3] is not None: + if use_emoji_names: + await third_base.edit(name=newgame.bases[3].name) + basemessage_b += str(third_base) + else: + basemessage_b += str(empty_base) + basemessage_b += str(blank_emoji) + + if newgame.bases[1] is not None: + if use_emoji_names: + await first_base.edit(name=newgame.bases[1].name) + basemessage_b += str(first_base) + else: + basemessage_b += str(empty_base) + + await embed.edit(content=None, embed=new_embed) + await msg_top.edit(content=basemessage_t) + await msg_bot.edit(content=basemessage_b) + await asyncio.sleep(3) + + punc = "" + if newgame.last_update[0]["defender"] != "": + punc = "." + final_embed = discord.Embed(color=discord.Color.dark_purple(), title=f"{newgame.teams['away'].name} at {newgame.teams['home'].name}") + final_embed.add_field(name="Final score:", value=f"{newgame.teams['away'].score} to {newgame.teams['home'].score}") + final_embed.add_field(name="Last update:", value=f"{newgame.last_update[0]['batter']} {newgame.last_update[0]['text'].value} {newgame.last_update[0]['defender']}{punc}" ) + await embed.edit(content=None, embed=final_embed) + if newgame.teams['away'].score > newgame.teams['home'].score: + await msg_top.edit(content = f"Game over!\n{newgame.teams['away'].name} wins!") + else: + await msg_top.edit(content = f"Game over!\n{newgame.teams['home'].name} wins!") + + await msg_bot.delete() + gamesarray.pop(gamesarray.index((newgame,use_emoji_names))) #cleanup is important! + del newgame + + + def build_star_embed(player_json): starkeys = {"batting_stars" : "Batting", "pitching_stars" : "Pitching", "baserunning_stars" : "Baserunning", "defense_stars" : "Defense"}