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

Merge branch 'master' of https://github.com/Sakimori/matteo-the-prestige into strip

Browse source
This commit is contained in:
hillexed 2020-12-26 21:38:14 -05:00
parent 781ded0984 663fc6c3f6
commit a559450482
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
the_prestige.py
View file

@ -162,7 +162,7 @@ async def on_message(msg):
return return
for game in gamesarray: for game in gamesarray:
if game[0].name == msg.author.name: if game.name == msg.author.name:
await msg.channel.send("You've already got a game in progress! Wait a tick, boss.") await msg.channel.send("You've already got a game in progress! Wait a tick, boss.")
return return
try: try:
@ -247,6 +247,9 @@ if you did it correctly, you'll get a team embed with a prompt to confirm. Hit t
text = "Can't find that command, boss; try checking the list with `m;help`." text = "Can't find that command, boss; try checking the list with `m;help`."
await msg.channel.send(text) await msg.channel.send(text)
elif command == "countactivegames" and msg.author.id in config()["owners"]:
await msg.channel.send(f"There's {len(gamesarray)} active games right now, boss.")
@ -342,6 +345,8 @@ Creator, type `{newgame.name} done` to finalize lineups.""")
msg = await client.wait_for('message', timeout=120.0, check=messagecheck) msg = await client.wait_for('message', timeout=120.0, check=messagecheck)
except asyncio.TimeoutError: except asyncio.TimeoutError:
await channel.send("Game timed out. 120 seconds between players is a bit much, see?") await channel.send("Game timed out. 120 seconds between players is a bit much, see?")
del setupmessages[team_join_message]
del newgame
return return
new_player = None new_player = None
@ -409,11 +414,7 @@ async def watch_game(channel, game):
await asyncio.sleep(1) await asyncio.sleep(1)
await embed.pin() await embed.pin()
await asyncio.sleep(1) await asyncio.sleep(1)
use_emoji_names = True gamesarray.append(newgame)
for game in gamesarray:
if game[1]:
use_emoji_names = False
gamesarray.append((newgame,use_emoji_names))
pause = 0 pause = 0
top_of_inning = True top_of_inning = True
victory_lap = False victory_lap = False
@ -497,8 +498,8 @@ async def watch_game(channel, game):
await asyncio.sleep(6) await asyncio.sleep(6)
title_string = f"{newgame.teams['away'].name} at {newgame.teams['home'].name} ended after {newgame.inning} innings" title_string = f"{newgame.teams['away'].name} at {newgame.teams['home'].name} ended after {newgame.inning} innings"
if newgame.inning > (newgame.max_innings - 1): #if extra innings if (newgame.inning - 1) > newgame.max_innings: #if extra innings
title_string += f" with {newgame.inning - (newgame.max_innings-1)} extra innings." title_string += f" with {newgame.inning - (newgame.max_innings+1)} extra innings."
else: else:
title_string += "." title_string += "."
@ -520,7 +521,7 @@ async def watch_game(channel, game):
await embed.edit(content=None, embed=final_embed) await embed.edit(content=None, embed=final_embed)
await embed.unpin() await embed.unpin()
gamesarray.pop(gamesarray.index((newgame,use_emoji_names))) #cleanup is important! gamesarray.pop(gamesarray.index(newgame)) #cleanup is important!
newgame.add_stats() newgame.add_stats()
del newgame del newgame