changes

formatters.py

@@ -31,14 +31,19 @@ def crossword(grid: List[List[Optional[str]]], clues: List[Clue]):
     return output
 
 
-def clue_riddle(clue):
+def clue_riddle(clue: Clue):
     if clue is None:
         return "..."
-
-    time_remaining = GUESS_TIMEOUT - (time.time() - clue.create_time)
+    
+    if clue.solved:
+        end_line = clue.answer + " - " + clue.solver
+    elif clue.timed_out:
+        end_line = clue.answer
+    else:
+        time_remaining = GUESS_TIMEOUT - (time.time() - clue.create_time)
+        end_line = str(round(max(0, time_remaining))) + "s"
     return (
         "\n".join(line for line in clue.riddle.splitlines() if line.strip() != "")
         + " - "
-        + str(round(max(0, time_remaining)))
-        + "s"
+        + end_line
     )

game_manager.py

@@ -17,7 +17,7 @@ MAX_WORD_SIZE = 10
 WORD_LIMIT = 7500
 COMPLETE_GAME_TIMEOUT = 60 * 60
 INCOMPLETE_GAME_TIMEOUT = 60 * 60 * 24
-GUESS_TIMEOUT = 30
+GUESS_TIMEOUT = 10
 
 
 with open("words.json", "r") as f:
@@ -55,6 +55,8 @@ class Clue:
         self.solved: bool = solved
         self.riddle: str = ""
         self.create_time: int
+        self.solver: str = None
+        self.timed_out: bool = False
 
     def __repr__(self):
         return f"{self.answer}: {self.location}, {'Across' if self.across else 'Down'}, {'Solved' if self.solved else 'Unsolved'}"
@@ -122,12 +124,10 @@ class Game:
                 return False
             for clue in matched_clues:
                 clue.solved = True
+                clue.solver = player_name
                 place_on_grid(self.grid, clue.answer, clue.location, clue.across)
                 self.player_scores[player_name] += 1
         
-    def time_left(self):
-        return INCOMPLETE_GAME_TIMEOUT - (time.time() - self.last_update_time)
-
 
 def place_on_grid(grid, word, location, across):
     x, y = location
@@ -249,7 +249,10 @@ def game_thread():
                 del games[room_name]
                 continue
             for i, clue in enumerate(game.clues):
-                if clue is None or clue.solved or now - clue.create_time > GUESS_TIMEOUT:
+                timed_out = now - clue.create_time > GUESS_TIMEOUT if clue is not None else None
+                if timed_out:
+                    game.clues[i].timed_out = True
+                if clue is None or clue.solved or timed_out:
                     game.replace_clue(i)
 
         time.sleep(0.1)

run.py

@@ -43,9 +43,6 @@ with gr.Blocks(css="style.css") as app:
                     elem_id="guess",
                 )
                 guess_btn = gr.Button("Guess")
-                prev_answers = gr.DataFrame(
-                    headers=None, row_count=1, col_count=3, label="Previous Answers"
-                )
 
     def start_game(data):
         game = new_game(data[room_name])
@@ -92,18 +89,16 @@ with gr.Blocks(css="style.css") as app:
         no_up = data[last_update] == game.last_update_index
         return {
             grid: gr.skip() if no_up else formatters.crossword(game.grid, game.clues),
-            prev_answers: gr.skip() if no_up else [[clue.answer for clue in game.previous_clues[-3:]]],
             score_table: [[k, v] for k, v in game.player_scores.items()],
             clue1: formatters.clue_riddle(game.clues[0]),
             clue2: formatters.clue_riddle(game.clues[1]),
             clue3: formatters.clue_riddle(game.clues[2]),
-            
         }
 
     start_btn.click(
         update_game,
         {room_name, last_update},
-        [grid, prev_answers, clue1, clue2, clue3, score_table],
+        [grid, clue1, clue2, clue3, score_table],
         every=1,
     )