Update app.py

app.py

@@ -215,13 +215,17 @@ class GameDatabase:
                 conn.commit()
                 return True, None, f"Room full. Joined as spectator."
             
+            # Apply character starting bonuses
+            character = next((c for c in CHARACTERS if c['id'] == character_id), {})
+            hp_max = INITIAL_HP + character.get('hp_max_bonus', 0)
+            
             # Join as player
             slot = 0 if len(players) == 0 else 1
             conn.execute("""
                 INSERT INTO players (
-                    room_id, player_id, name, character_id, player_slot
-                ) VALUES (?, ?, ?, ?, ?)
-            """, (room_id, player_id, name, character_id, slot))
+                    room_id, player_id, name, character_id, player_slot, hp_max
+                ) VALUES (?, ?, ?, ?, ?, ?)
+            """, (room_id, player_id, name, character_id, slot, hp_max))
             
             # If 2 players, start game
             if slot == 1:
@@ -364,12 +368,35 @@ class GameDatabase:
             # Game over
             self._end_game(room_id, conn)
         else:
-            # Reset for next round
-            conn.execute("""
-                UPDATE players SET 
-                    time = ?, has_ended_turn = 0, completed_tasks = '[]'
-                WHERE room_id = ?
-            """, (INITIAL_TIME, room_id))
+            # Get players for character effects
+            players = conn.execute("""
+                SELECT * FROM players WHERE room_id = ?
+            """, (room_id,)).fetchall()
+            
+            # Reset for next round and apply turn-start character effects
+            for player in players:
+                character = next((c for c in CHARACTERS if c['id'] == player['character_id']), {})
+                
+                new_stress = player['stress']
+                # Workaholic: +1 stress per turn
+                if character.get('turn_stress'):
+                    new_stress += character['turn_stress']
+                
+                # Neat Freak: Check if did any domestic task
+                if character.get('no_domestic_stress'):
+                    completed = json.loads(player.get('completed_tasks', '[]'))
+                    did_domestic = any(t.startswith('D') for t in completed)
+                    if not did_domestic:
+                        new_stress += character['no_domestic_stress']
+                
+                conn.execute("""
+                    UPDATE players SET 
+                        time = ?, 
+                        has_ended_turn = 0, 
+                        completed_tasks = '[]',
+                        stress = ?
+                    WHERE room_id = ? AND player_slot = ?
+                """, (INITIAL_TIME, new_stress, room_id, player['player_slot']))
             
             # Draw new tasks
             task_ids = random.sample([t['id'] for t in TASKS], 3)
@@ -465,27 +492,106 @@ class GameDatabase:
 
 # ===== GAME DATA =====
 CHARACTERS = [
-    {"id": "P1", "name": "Workaholic", "desc": "Work +2 VP, but +1 stress/turn"},
-    {"id": "P4", "name": "Hedonist", "desc": "QoL +1, but domestic +2 time"},
-    {"id": "R3", "name": "Planner", "desc": "Can force round-up in negotiation"},
-    {"id": "H3", "name": "Fitness Buff", "desc": "Rest +1 HP, HP max +2"},
+    {"id": "P1", "name": "Workaholic", "desc": "Work +2 VP, but +1 stress/turn", 
+     "work_bonus": 2, "turn_stress": 1},
+    {"id": "P2", "name": "Freelancer", "desc": "Work time -2, but coop +1 CP cost",
+     "work_time_reduction": 2, "coop_cp_penalty": 1},
+    {"id": "P3", "name": "Frugal", "desc": "QoL tasks -2 VP cost", 
+     "qol_cost_reduction": 2},
+    {"id": "P4", "name": "Hedonist", "desc": "QoL +1, but domestic +2 time",
+     "qol_bonus": 1, "domestic_time_penalty": 2},
+    {"id": "H1", "name": "Neat Freak", "desc": "Domestic success +2 CP, no domestic +2 stress",
+     "domestic_cp_bonus": 2, "no_domestic_stress": 2},
+    {"id": "H2", "name": "Night Owl", "desc": "Rest HP halved, late work -1 CP",
+     "rest_halved": True},
+    {"id": "H3", "name": "Fitness Buff", "desc": "Rest +1 HP, HP max +2",
+     "rest_hp_bonus": 1, "hp_max_bonus": 2},
+    {"id": "H4", "name": "Procrastinator", "desc": "Long tasks +1 time, failure +1 stress",
+     "long_task_penalty": 1, "failure_stress": 1},
+    {"id": "R1", "name": "Anxious", "desc": "Coop min 3 CP, success -1 stress, failure +2 stress",
+     "coop_min_cp": 3, "coop_success_stress": -1, "coop_failure_stress": 2},
+    {"id": "R2", "name": "Supporter", "desc": "Partner +1 HP/CP on coop success",
+     "support_bonus": True},
+    {"id": "R3", "name": "Planner", "desc": "Can force round-up in negotiation",
+     "force_roundup": True},
+    {"id": "R4", "name": "Social Butterfly", "desc": "Social -1 time, +1 reputation",
+     "social_time_reduction": 1, "social_rep_bonus": 1},
 ]
 
 TASKS = [
-    {"id": "W1", "name": "Core Project", "type": "W", "time": 8, 
+    # Work Tasks (W1-W10)
+    {"id": "W1", "name": "Core Project", "type": "W", "time": 8,
      "solo": {"CP": 7, "HP": 3}, "coop": {"CP": 10}, "reward": 12},
     {"id": "W2", "name": "Annual Report", "type": "W", "time": 6,
      "solo": {"CP": 6}, "coop": {"CP": 8}, "reward": 8},
+    {"id": "W3", "name": "Client Dispute", "type": "W", "time": 5,
+     "solo": {"CP": 5}, "coop": {"CP": 7}, "reward": 6},
+    {"id": "W4", "name": "Promotion Prep", "type": "W", "time": 7,
+     "solo": {"CP": 5, "HP": 4}, "coop": {"CP": 9}, "reward": 10},
+    {"id": "W5", "name": "Side Gig", "type": "W", "time": 4,
+     "solo": {"CP": 4}, "coop": {"CP": 6}, "reward": 5},
+    {"id": "W6", "name": "Learn New Skill", "type": "W", "time": 5,
+     "solo": {"CP": 5}, "coop": {"CP": 7}, "reward": 3, "effect": "cp_max:+1"},
+    {"id": "W7", "name": "Emergency Emails", "type": "W", "time": 3,
+     "solo": {"CP": 3}, "coop": {"CP": 4}, "reward": 4},
+    {"id": "W8", "name": "Industry Conference", "type": "W", "time": 6,
+     "solo": {"CP": 5, "HP": 3}, "coop": {"CP": 8}, "reward": 7},
+    {"id": "W9", "name": "Business Plan", "type": "W", "time": 9,
+     "solo": {"CP": 8}, "coop": {"CP": 11}, "reward": 15},
+    {"id": "W10", "name": "Expense Reports", "type": "W", "time": 2,
+     "solo": {"CP": 2}, "coop": {"CP": 3}, "reward": 2},
+    
+    # Domestic Tasks (D1-D8)
     {"id": "D1", "name": "Deep Clean Kitchen", "type": "D", "time": 5,
      "solo": {"HP": 5}, "coop": {"HP": 7}, "reward": 0, "effect": "stress:-2"},
     {"id": "D2", "name": "Laundry & Organize", "type": "D", "time": 3,
      "solo": {"HP": 3}, "coop": {"HP": 4}, "reward": 0, "effect": "hp:+2"},
+    {"id": "D3", "name": "Pay Bills", "type": "D", "time": 2,
+     "solo": {"CP": 2}, "coop": {"CP": 3}, "reward": 0, "effect": "cp:+1"},
+    {"id": "D4", "name": "Grocery Shopping", "type": "D", "time": 4,
+     "solo": {"HP": 3}, "coop": {"HP": 5}, "reward": 0, "effect": "hp:+1"},
+    {"id": "D5", "name": "Take Out Trash", "type": "D", "time": 3,
+     "solo": {"HP": 3}, "coop": {"HP": 4}, "reward": 0, "effect": "stress:-1"},
+    {"id": "D6", "name": "Fix Appliance", "type": "D", "time": 5,
+     "solo": {"HP": 4}, "coop": {"HP": 6}, "reward": 1},
+    {"id": "D7", "name": "Tidy Common Area", "type": "D", "time": 4,
+     "solo": {"HP": 4}, "coop": {"HP": 5}, "reward": 0, "effect": "stress:-1"},
+    {"id": "D8", "name": "Cook Healthy Meal", "type": "D", "time": 3,
+     "solo": {"HP": 3}, "coop": {"HP": 4}, "reward": 0, "effect": "hp:+1"},
+    
+    # Health Tasks (H1-H6)
     {"id": "H1", "name": "Fitness Training", "type": "H", "time": 5,
      "solo": {"HP": 6}, "coop": {"HP": 8}, "reward": 1, "effect": "hp_max:+1"},
+    {"id": "H2", "name": "Deep Meditation", "type": "H", "time": 4,
+     "solo": {"CP": 4}, "coop": {"CP": 5}, "reward": 0, "effect": "cp:+3"},
+    {"id": "H3", "name": "Annual Checkup", "type": "H", "time": 6,
+     "solo": {"HP": 5}, "coop": {"HP": 7}, "reward": 2, "effect": "stress:-2"},
+    {"id": "H4", "name": "Emotion Regulation Class", "type": "H", "time": 5,
+     "solo": {"CP": 4}, "coop": {"CP": 6}, "reward": 1, "effect": "cp_max:+1"},
+    {"id": "H5", "name": "Sleep Schedule Reset", "type": "H", "time": 3,
+     "solo": {"HP": 3}, "coop": {"HP": 4}, "reward": 0, "effect": "hp:+4"},
+    {"id": "H6", "name": "Personal Alone Time", "type": "H", "time": 2,
+     "solo": {"CP": 2}, "coop": {"CP": 3}, "reward": 0, "effect": "stress:-2"},
+    
+    # Relationship & Social Tasks (R1-R2, S1-S2)
     {"id": "R1", "name": "Romantic Date", "type": "R", "time": 5,
      "solo": {"CP": 5}, "coop": {"CP": 7}, "cost": 5, "qol": 3, "effect": "stress:-3"},
+    {"id": "R2", "name": "Future Planning", "type": "R", "time": 6,
+     "solo": {"CP": 6}, "coop": {"CP": 8}, "cost": 3, "qol": 2, "effect": "cp:+1"},
+    {"id": "S1", "name": "Host Friends", "type": "S", "time": 4,
+     "solo": {"CP": 4}, "coop": {"CP": 6}, "cost": 4, "qol": 1},
+    {"id": "S2", "name": "Community Event", "type": "S", "time": 3,
+     "solo": {"HP": 3}, "coop": {"HP": 4}, "reward": 0},
+    
+    # QoL Investment Tasks (Q1-Q4)
+    {"id": "Q1", "name": "Buy Furniture", "type": "Q", "time": 2,
+     "solo": {"HP": 2}, "coop": {"HP": 3}, "cost": 10, "qol": 5},
     {"id": "Q2", "name": "Weekend Trip", "type": "Q", "time": 7,
      "solo": {"HP": 5, "CP": 4}, "coop": {"HP": 9}, "cost": 15, "qol": 7, "effect": "recover_all"},
+    {"id": "Q3", "name": "Home Upgrade", "type": "Q", "time": 4,
+     "solo": {"HP": 3}, "coop": {"HP": 5}, "cost": 8, "qol": 4},
+    {"id": "Q4", "name": "Spa Day", "type": "Q", "time": 5,
+     "solo": {"HP": 4}, "coop": {"HP": 6}, "cost": 12, "qol": 6, "effect": "stress:-3"},
 ]
 
 # ===== GLOBAL STATE =====
@@ -715,7 +821,6 @@ def create_ui():
                     gr.Markdown("### Player 1")
                     p1_name = gr.Textbox(label="Name", interactive=False)
                     p1_character = gr.Textbox(label="Character", interactive=False)
-                    p1_display = gr.JSON(label="Status")
                     with gr.Row():
                         p1_time = gr.Number(label="⏰ Time", interactive=False)
                         p1_money = gr.Number(label="💰 Money", interactive=False)
@@ -777,7 +882,6 @@ def create_ui():
                     gr.Markdown("### Player 2")
                     p2_name = gr.Textbox(label="Name", interactive=False)
                     p2_character = gr.Textbox(label="Character", interactive=False)
-                    p2_display = gr.JSON(label="Status")
                     with gr.Row():
                         p2_time = gr.Number(label="⏰ Time", interactive=False)
                         p2_money = gr.Number(label="💰 Money", interactive=False)
@@ -835,56 +939,76 @@ def create_ui():
             return {}, f"❌ {msg}"
         
         def refresh_game_state(session):
+            empty_return = ("*No game joined*", "", "", {}, {}, [], gr.Dropdown(choices=[]), "*No spectators*", "")
+            
             if not session.get('room_id'):
-                return ("*No game joined*", {}, {}, [], "*No spectators*", "")
+                return empty_return
             
             state = db.get_room_state(session['room_id'])
             if not state:
-                return ("*Room not found*", {}, {}, [], "*No spectators*", "")
+                return empty_return
             
             room = state['room']
             players = state['players']
             
             # Status
             status_md = f"""
-            **Room:** {session['room_id']} | **Round:** {room['current_round']}/{room['total_rounds']}
+            **Room:** {session['room_id']} | **Round:** {room['current_round']}/{room['total_rounds']}  
             **Status:** {room['status'].upper()} | **Current Turn:** Player {room['current_turn'] + 1}
             """
             
             if room['status'] == 'finished':
-                status_md += f"\n\n🏆 **GAME OVER!** Winner: {room['winner_id']}"
+                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}**"
             
-            # Players
+            # Player data
             p1_data = players[0] if len(players) > 0 else {}
             p2_data = players[1] if len(players) > 1 else {}
             
-            # Tasks
+            p1_name = p1_data.get('name', '')
+            p1_char = p1_data.get('character_id', '')
+            p2_name = p2_data.get('name', '')
+            p2_char = p2_data.get('character_id', '')
+            
+            # Tasks with better formatting
             task_rows = []
+            task_options = []
             for task_id in state['task_ids']:
                 task = next((t for t in TASKS if t['id'] == task_id), None)
                 if task:
-                    req_str = ', '.join([f"{k}:{v}" for k, v in task['solo'].items()])
-                    reward_str = f"${task.get('reward', 0)}" if 'reward' in task else f"{task.get('qol', 0)} QoL"
+                    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()])
+                    
+                    if 'reward' in task and task['reward'] > 0:
+                        reward_str = f"${task['reward']}"
+                    elif 'qol' in task:
+                        reward_str = f"{task['qol']} QoL"
+                    else:
+                        reward_str = "Utility"
+                    
                     task_rows.append([
                         task['id'], task['name'], task['type'],
-                        f"{task['time']}h", req_str, reward_str
+                        f"{task['time']}h", solo_req, coop_req, reward_str
                     ])
-            
-            # Task dropdown options
-            task_options = [(f"{t['id']} - {t['name']}", t['id']) for t in TASKS if t['id'] in state['task_ids']]
+                    task_options.append((f"{task['id']} - {task['name']}", task['id']))
             
             # Spectators
             spec_md = f"👥 {len(state['spectators'])} watching: {', '.join(state['spectators'])}" if state['spectators'] else "*No spectators*"
             
             # Turn indicator
             if session.get('is_spectator'):
-                turn_msg = "👁️ You are spectating"
+                turn_msg = "👁️ **You are spectating** - Refresh to see updates"
+            elif room['status'] == 'waiting':
+                turn_msg = "⏳ **Waiting for Player 2 to join...**"
+            elif room['status'] == 'finished':
+                turn_msg = "🏁 **Game Finished!** Check Rankings tab."
             elif session.get('player_slot') == room['current_turn']:
                 turn_msg = "✅ **YOUR TURN!** Take an action below."
             else:
-                turn_msg = "⏳ Waiting for partner's turn..."
+                turn_msg = "⏳ **Partner's turn...** Click Refresh to see updates."
             
-            return (status_md, p1_data, p2_data, task_rows, spec_md, turn_msg)
+            return (status_md, p1_name, p1_char, p1_data, p2_name, p2_char, p2_data, 
+                   task_rows, gr.Dropdown(choices=task_options, value=None), spec_md, turn_msg)
         
         def execute_rest_handler(session, rest_type):
             if not session.get('room_id') or session.get('is_spectator'):
@@ -986,7 +1110,8 @@ def create_ui():
         refresh_btn.click(
             refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_display, p2_display, tasks_display, 
+            outputs=[status_display, p1_name, p1_character, p1_display, 
+                    p2_name, p2_character, p2_display, tasks_display, task_select,
                     spectators_display, your_turn_msg]
         )
         
@@ -997,7 +1122,8 @@ def create_ui():
         ).then(
             refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_display, p2_display, tasks_display,
+            outputs=[status_display, p1_name, p1_character, p1_display,
+                    p2_name, p2_character, p2_display, tasks_display, task_select,
                     spectators_display, your_turn_msg]
         )
         
@@ -1008,7 +1134,8 @@ def create_ui():
         ).then(
             refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_display, p2_display, tasks_display,
+            outputs=[status_display, p1_name, p1_character, p1_display,
+                    p2_name, p2_character, p2_display, tasks_display, task_select,
                     spectators_display, your_turn_msg]
         )
         
@@ -1019,7 +1146,8 @@ def create_ui():
         ).then(
             refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_display, p2_display, tasks_display,
+            outputs=[status_display, p1_name, p1_character, p1_display,
+                    p2_name, p2_character, p2_display, tasks_display, task_select,
                     spectators_display, your_turn_msg]
         )
         
@@ -1030,7 +1158,8 @@ def create_ui():
         ).then(
             refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_display, p2_display, tasks_display,
+            outputs=[status_display, p1_name, p1_character, p1_display,
+                    p2_name, p2_character, p2_display, tasks_display, task_select,
                     spectators_display, your_turn_msg]
         )
         
@@ -1041,7 +1170,8 @@ def create_ui():
         ).then(
             refresh_game_state,
             inputs=[session_state],
-            outputs=[status_display, p1_display, p2_display, tasks_display,
+            outputs=[status_display, p1_name, p1_character, p1_display,
+                    p2_name, p2_character, p2_display, tasks_display, task_select,
                     spectators_display, your_turn_msg]
         )