Update app.py

app.py

@@ -1021,9 +1021,9 @@ def create_ui():
                 return session, f"❌ Error: {str(e)}"
         
         def refresh_game_state(session):
-            empty_return = ("*No game joined*", "", "", {}, "", "", {}, [], [], "*No spectators*", "")
+            empty_return = ("*No game joined*", "", "", {}, 0, 0, 0, 0, 0, 0, "", "", {}, 0, 0, 0, 0, 0, 0, [], [], "*No spectators*", "")
             
-            if not session.get('room_id'):
+            if not session or not session.get('room_id'):
                 return empty_return
             
             state = db.get_room_state(session['room_id'])
@@ -1043,14 +1043,48 @@ def create_ui():
                 winner_name = next((p['name'] for p in players if p['player_id'] == room['winner_id']), "Unknown")
                 status_md += f"\n\n🏆 **GAME OVER!** Winner: **{winner_name}**"
             
-            # Player data
-            p1_data = players[0] if len(players) > 0 else {}
-            p2_data = players[1] if len(players) > 1 else {}
+            # Player data with defaults
+            if len(players) > 0:
+                p1_data = players[0]
+                p1_name_val = p1_data.get('name', '')
+                p1_char = p1_data.get('character_id', '')
+                p1_time_val = p1_data.get('time', 0)
+                p1_money_val = p1_data.get('money', 0)
+                p1_hp_val = p1_data.get('hp', 0)
+                p1_cp_val = p1_data.get('cp', 0)
+                p1_stress_val = p1_data.get('stress', 0)
+                p1_qol_val = p1_data.get('qol', 0)
+            else:
+                p1_data = {}
+                p1_name_val = ""
+                p1_char = ""
+                p1_time_val = 0
+                p1_money_val = 0
+                p1_hp_val = 0
+                p1_cp_val = 0
+                p1_stress_val = 0
+                p1_qol_val = 0
             
-            p1_name_val = p1_data.get('name', '')
-            p1_char = p1_data.get('character_id', '')
-            p2_name_val = p2_data.get('name', '')
-            p2_char = p2_data.get('character_id', '')
+            if len(players) > 1:
+                p2_data = players[1]
+                p2_name_val = p2_data.get('name', '')
+                p2_char = p2_data.get('character_id', '')
+                p2_time_val = p2_data.get('time', 0)
+                p2_money_val = p2_data.get('money', 0)
+                p2_hp_val = p2_data.get('hp', 0)
+                p2_cp_val = p2_data.get('cp', 0)
+                p2_stress_val = p2_data.get('stress', 0)
+                p2_qol_val = p2_data.get('qol', 0)
+            else:
+                p2_data = {}
+                p2_name_val = ""
+                p2_char = ""
+                p2_time_val = 0
+                p2_money_val = 0
+                p2_hp_val = 0
+                p2_cp_val = 0
+                p2_stress_val = 0
+                p2_qol_val = 0
             
             # Tasks with better formatting
             task_rows = []
@@ -1059,7 +1093,7 @@ def create_ui():
                 task = next((t for t in TASKS if t['id'] == task_id), None)
                 if task:
                     solo_req = ', '.join([f"{k}:{v}" for k, v in task['solo'].items()])
-                    coop_req = ', '.join([f"{k}:{v}" for k, v in task['coop'].items()])
+                    coop_req = ', '.join([f"{k}:{v}" for k, v in task['coop'].items()]) if 'coop' in task else "N/A"
                     
                     if 'reward' in task and task['reward'] > 0:
                         reward_str = f"${task['reward']}"
@@ -1089,7 +1123,9 @@ def create_ui():
             else:
                 turn_msg = "⏳ **Partner's turn...** Click Refresh to see updates."
             
-            return (status_md, p1_name_val, p1_char, p1_data, p2_name_val, p2_char, p2_data, 
+            return (status_md, 
+                   p1_name_val, p1_char, p1_data, p1_time_val, p1_money_val, p1_hp_val, p1_cp_val, p1_stress_val, p1_qol_val,
+                   p2_name_val, p2_char, p2_data, p2_time_val, p2_money_val, p2_hp_val, p2_cp_val, p2_stress_val, p2_qol_val,
                    task_rows, task_options, spec_md, turn_msg)
         
         def execute_rest_handler(session, rest_type):
@@ -1182,6 +1218,13 @@ def create_ui():
             inputs=[your_name_input, character_select, session_state],
             outputs=[session_state, join_result],
             show_progress="full"
+        ).then(
+            fn=refresh_game_state,
+            inputs=[session_state],
+            outputs=[status_display, 
+                    p1_name, p1_character, p1_display, p1_time, p1_money, p1_hp, p1_cp, p1_stress, p1_qol,
+                    p2_name, p2_character, p2_display, p2_time, p2_money, p2_hp, p2_cp, p2_stress, p2_qol,
+                    tasks_display, task_select, spectators_display, your_turn_msg]
         )
         
         join_click = join_btn.click(
@@ -1189,14 +1232,22 @@ def create_ui():
             inputs=[room_id_input, your_name_input, character_select, session_state],
             outputs=[session_state, join_result],
             show_progress="full"
+        ).then(
+            fn=refresh_game_state,
+            inputs=[session_state],
+            outputs=[status_display, 
+                    p1_name, p1_character, p1_display, p1_time, p1_money, p1_hp, p1_cp, p1_stress, p1_qol,
+                    p2_name, p2_character, p2_display, p2_time, p2_money, p2_hp, p2_cp, p2_stress, p2_qol,
+                    tasks_display, task_select, spectators_display, your_turn_msg]
         )
         
         refresh_btn.click(
             fn=refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_name, p1_character, p1_display, 
-                    p2_name, p2_character, p2_display, tasks_display, task_select,
-                    spectators_display, your_turn_msg]
+            outputs=[status_display, 
+                    p1_name, p1_character, p1_display, p1_time, p1_money, p1_hp, p1_cp, p1_stress, p1_qol,
+                    p2_name, p2_character, p2_display, p2_time, p2_money, p2_hp, p2_cp, p2_stress, p2_qol,
+                    tasks_display, task_select, spectators_display, your_turn_msg]
         )
         
         quick_nap_btn.click(
@@ -1206,9 +1257,10 @@ def create_ui():
         ).then(
             fn=refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_name, p1_character, p1_display,
-                    p2_name, p2_character, p2_display, tasks_display, task_select,
-                    spectators_display, your_turn_msg]
+            outputs=[status_display, 
+                    p1_name, p1_character, p1_display, p1_time, p1_money, p1_hp, p1_cp, p1_stress, p1_qol,
+                    p2_name, p2_character, p2_display, p2_time, p2_money, p2_hp, p2_cp, p2_stress, p2_qol,
+                    tasks_display, task_select, spectators_display, your_turn_msg]
         )
         
         full_sleep_btn.click(
@@ -1218,9 +1270,10 @@ def create_ui():
         ).then(
             fn=refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_name, p1_character, p1_display,
-                    p2_name, p2_character, p2_display, tasks_display, task_select,
-                    spectators_display, your_turn_msg]
+            outputs=[status_display, 
+                    p1_name, p1_character, p1_display, p1_time, p1_money, p1_hp, p1_cp, p1_stress, p1_qol,
+                    p2_name, p2_character, p2_display, p2_time, p2_money, p2_hp, p2_cp, p2_stress, p2_qol,
+                    tasks_display, task_select, spectators_display, your_turn_msg]
         )
         
         deep_rest_btn.click(
@@ -1230,9 +1283,10 @@ def create_ui():
         ).then(
             fn=refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_name, p1_character, p1_display,
-                    p2_name, p2_character, p2_display, tasks_display, task_select,
-                    spectators_display, your_turn_msg]
+            outputs=[status_display, 
+                    p1_name, p1_character, p1_display, p1_time, p1_money, p1_hp, p1_cp, p1_stress, p1_qol,
+                    p2_name, p2_character, p2_display, p2_time, p2_money, p2_hp, p2_cp, p2_stress, p2_qol,
+                    tasks_display, task_select, spectators_display, your_turn_msg]
         )
         
         solo_task_btn.click(
@@ -1242,9 +1296,10 @@ def create_ui():
         ).then(
             fn=refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_name, p1_character, p1_display,
-                    p2_name, p2_character, p2_display, tasks_display, task_select,
-                    spectators_display, your_turn_msg]
+            outputs=[status_display, 
+                    p1_name, p1_character, p1_display, p1_time, p1_money, p1_hp, p1_cp, p1_stress, p1_qol,
+                    p2_name, p2_character, p2_display, p2_time, p2_money, p2_hp, p2_cp, p2_stress, p2_qol,
+                    tasks_display, task_select, spectators_display, your_turn_msg]
         )
         
         end_turn_btn.click(
@@ -1254,9 +1309,10 @@ def create_ui():
         ).then(
             fn=refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_name, p1_character, p1_display,
-                    p2_name, p2_character, p2_display, tasks_display, task_select,
-                    spectators_display, your_turn_msg]
+            outputs=[status_display, 
+                    p1_name, p1_character, p1_display, p1_time, p1_money, p1_hp, p1_cp, p1_stress, p1_qol,
+                    p2_name, p2_character, p2_display, p2_time, p2_money, p2_hp, p2_cp, p2_stress, p2_qol,
+                    tasks_display, task_select, spectators_display, your_turn_msg]
         )
         
         refresh_rankings_btn.click(