From acdc160ab0a051aff3bee716c682bc5a8748a5b2 Mon Sep 17 00:00:00 2001
From: Sakimori <sakimorihalley@gmail.com>
Date: Fri, 1 Jan 2021 12:08:11 -0500
Subject: [PATCH] fixed outs not displaying, fixed game end notification in
 discord

---
 main_controller.py  |  4 +++-
 templates/game.html |  2 +-
 the-prestige.pyproj |  1 +
 the_prestige.py     | 11 +++++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/main_controller.py b/main_controller.py
index 28959d5..cf1d1cd 100644
--- a/main_controller.py
+++ b/main_controller.py
@@ -111,7 +111,9 @@ def update_loop():
                     state["update_pause"] = 2
                     if state["end_delay"] < 0:
                         master_games_dic.pop(game_time)
-                    state["end_delay"] -= 1
+                    else:
+                        state["end_delay"] -= 1
+                        master_games_dic[game_time][1]["end_delay"] -= 1
                 else:
                     this_game.gamestate_update_full()
 
diff --git a/templates/game.html b/templates/game.html
index d0ed41d..17e0176 100644
--- a/templates/game.html
+++ b/templates/game.html
@@ -2,7 +2,7 @@
 {% if state.bases[number] %}{{base_filled}}{% else %}{{base_empty}}{% endif %}
 {%- endmacro %}
 {% macro out(number) -%}
-{% if number <= state.outs %}{{out_filled}}{% else %}{{out_empty}}{% endif %}
+{% if number <= state.outs %}{{out_out}}{% else %}{{out_in}}{% endif %}
 {%- endmacro %}
 
 <div class="header">
diff --git a/the-prestige.pyproj b/the-prestige.pyproj
index 9567763..c9f6968 100644
--- a/the-prestige.pyproj
+++ b/the-prestige.pyproj
@@ -62,6 +62,7 @@
     <Content Include="static\games_page.css" />
     <Content Include="static\loader.js" />
     <Content Include="static\prism.png" />
+    <Content Include="templates\game.html" />
     <Content Include="templates\index.html" />
   </ItemGroup>
   <ItemGroup>
diff --git a/the_prestige.py b/the_prestige.py
index f28f59a..dbc679e 100644
--- a/the_prestige.py
+++ b/the_prestige.py
@@ -614,9 +614,12 @@ async def watch_game(channel, newgame, user = None, league = None):
         state_init["is_league"] = False
 
     await channel.send(f"{newgame.teams['away'].name} vs. {newgame.teams['home'].name}, starting at {config()['simmadome_url']}")
-    gamesarray.append((newgame, channel, user))
+    timestamp = str(time.time() * 1000.0)
+    gamesarray.append((newgame, channel, user, timestamp))
+    
 
-    main_controller.master_games_dic[str(time.time() * 1000.0)] = (newgame, state_init, discrim_string)
+
+    main_controller.master_games_dic[timestamp] = (newgame, state_init, discrim_string)
 
 async def play_from_queue(channel, game, user_mention):
     await channel.send(f"{user_mention}, your game's ready.")
@@ -791,8 +794,8 @@ async def game_watcher():
     while True:
         this_array = gamesarray.copy()
         for i in range(0,len(this_array)):
-            game, channel, user = this_array[i]
-            if game.over:
+            game, channel, user, key = this_array[i]
+            if game.over and main_controller.master_games_dic[key][1]["end_delay"] <= 2:
                 title_string = f"{game.teams['away'].name} at {game.teams['home'].name} ended after {game.inning-1} innings"
                 if (game.inning - 1) > game.max_innings: #if extra innings
                     title_string += f" with {game.inning - (game.max_innings+1)} extra innings."