Update app.py

app.py

@@ -1,84 +1,71 @@
 import eventlet
 eventlet.monkey_patch()
 
-import random
-import logging
-from flask import Flask, render_template, request, jsonify
+import flask
+from flask import Flask, request, jsonify
 from flask_socketio import SocketIO, emit
-
-# Logging für Hugging Face Logs
-logging.basicConfig(level=logging.INFO)
+from flask_cors import CORS
+import random
 
 app = Flask(__name__)
-app.config['SECRET_KEY'] = 'poker-31-secret-key'
+CORS(app)
 socketio = SocketIO(app, cors_allowed_origins="*", async_mode='eventlet')
 
-# --- SPIELZUSTAND ---
+# Spiel-Datenstruktur
 game_state = {
     "players": [],
     "middle": [],
     "deck": [],
     "turn_idx": 0,
-    "current_bet": 50,
-    "game_active": False
+    "knocked_by": None,  # Speichert, wer geklopft hat
+    "active": False
 }
 
 def create_deck():
     suits = ['Herz', 'Karo', 'Pik', 'Kreuz']
-    ranks = ['7', '8', '9', '10', 'B', 'D', 'K', 'A']
-    return [{"suit": s, "rank": r} for s in suits for r in ranks]
+    ranks = {'7':7, '8':8, '9':9, '10':10, 'B':10, 'D':10, 'K':10, 'A':11}
+    return [{'suit': s, 'rank': r, 'val': v} for s in suits for r, v in ranks.items()]
 
-def calculate_31_score(hand):
-    if not hand or len(hand) < 3: return 0
-    values = {'7':7, '8':8, '9':9, '10':10, 'B':10, 'D':10, 'K':10, 'A':11}
-    # Drei Gleiche (z.B. drei 7er) = 30.5
-    if hand[0]['rank'] == hand[1]['rank'] == hand[2]['rank']:
-        return 30.5
-    # Summe pro Farbe
+def calc_score(hand):
     scores = {'Herz': 0, 'Karo': 0, 'Pik': 0, 'Kreuz': 0}
-    for card in hand:
-        scores[card['suit']] += values[card['rank']]
+    for c in hand:
+        scores[c['suit']] += c['val']
+    
+    # Spezialregel: Drei Gleiche (z.B. drei 7er) = 30.5 Punkte
+    ranks = [c['rank'] for c in hand]
+    if len(set(ranks)) == 1: return 30.5
+    
     return max(scores.values())
 
-@app.route('/')
-def index():
-    return render_template('index.html')
-
 @app.route('/login', methods=['POST'])
 def login():
     data = request.json
-    email = data.get('email', '').strip()
-    if not email: return jsonify({"error": "No email"}), 400
-    
-    # Erster User ist Admin
-    is_admin = len(game_state["players"]) == 0 or email.startswith('admin')
-    
-    player = next((p for p in game_state["players"] if p["email"] == email), None)
-    if not player:
-        player = {"email": email, "coins": 1000, "hand": [], "score": 0, "is_admin": is_admin}
-        game_state["players"].append(player)
-    
-    return jsonify({"status": "ok", "stats": {"is_admin": is_admin}})
+    email = data.get('email')
+    # Einfache User-Verwaltung
+    user = next((p for p in game_state['players'] if p['email'] == email), None)
+    if not user:
+        user = {"email": email, "coins": 1000, "hand": [], "score": 0, "is_admin": len(game_state['players']) == 0}
+        game_state['players'].append(user)
+    return jsonify({"stats": user})
 
 @socketio.on('join_game')
 def on_join(data):
     emit('update_table', game_state, broadcast=True)
 
-@socketio.on('admin/set_bet')
-def on_set_bet(data):
-    game_state["current_bet"] = int(data.get('bet', 50))
-
 @socketio.on('start_round')
-def on_start(data):
+def start_round(data):
     deck = create_deck()
     random.shuffle(deck)
-    for p in game_state["players"]:
-        p["hand"] = [deck.pop() for _ in range(3)]
-        p["score"] = calculate_31_score(p["hand"])
-    game_state["middle"] = [deck.pop() for _ in range(3)]
-    game_state["deck"] = deck
-    game_state["turn_idx"] = 0
-    game_state["game_active"] = True
+    
+    for p in game_state['players']:
+        p['hand'] = [deck.pop(), deck.pop(), deck.pop()]
+        p['score'] = calc_score(p['hand'])
+    
+    game_state['middle'] = [deck.pop(), deck.pop(), deck.pop()]
+    game_state['deck'] = deck
+    game_state['turn_idx'] = 0
+    game_state['knocked_by'] = None
+    game_state['active'] = True
     emit('update_table', game_state, broadcast=True)
 
 @socketio.on('player_action')
@@ -86,23 +73,41 @@ def on_action(data):
     email = data.get('email')
     action_type = data.get('type')
     
-    if len(game_state["players"]) == 0: return
-    current_player = game_state["players"][game_state["turn_idx"]]
-    
-    if current_player["email"] != email: return
+    current_player = game_state['players'][game_state['turn_idx']]
+    if current_player['email'] != email: return
 
-    if action_type == 'swap_one':
-        h_idx, m_idx = int(data.get('h_idx')), int(data.get('m_idx'))
-        current_player["hand"][h_idx], game_state["middle"][m_idx] = \
-            game_state["middle"][m_idx], current_player["hand"][h_idx]
+    # AKTION: KLOPFEN
+    if action_type == 'knock' and game_state['knocked_by'] is None:
+        game_state['knocked_by'] = email
+    
+    # AKTION: TAUSCHEN (EINE)
+    elif action_type == 'swap_one':
+        h_idx, m_idx = data['h_idx'], data['m_idx']
+        current_player['hand'][h_idx], game_state['middle'][m_idx] = \
+            game_state['middle'][m_idx], current_player['hand'][h_idx]
+    
+    # AKTION: ALLE TAUSCHEN
     elif action_type == 'swap_all':
-        current_player["hand"], game_state["middle"] = \
-            game_state["middle"], current_player["hand"]
+        current_player['hand'], game_state['middle'] = game_state['middle'], current_player['hand']
+
+    # Score aktualisieren
+    current_player['score'] = calc_score(current_player['hand'])
+    
+    # Nächster Spieler
+    game_state['turn_idx'] = (game_state['turn_idx'] + 1) % len(game_state['players'])
+    
+    # PRÜFEN OB SPIEL ENDE (Wenn der nächste Spieler derjenige ist, der geklopft hat)
+    next_player = game_state['players'][game_state['turn_idx']]
+    if next_player['email'] == game_state['knocked_by']:
+        finish_game()
+    else:
+        emit('update_table', game_state, broadcast=True)
 
-    current_player["score"] = calculate_31_score(current_player["hand"])
-    game_state["turn_idx"] = (game_state["turn_idx"] + 1) % len(game_state["players"])
+def finish_game():
+    game_state['active'] = False
+    winner = max(game_state['players'], key=lambda p: p['score'])
+    emit('game_over', {'winner': winner['email'], 'score': winner['score']}, broadcast=True)
     emit('update_table', game_state, broadcast=True)
 
 if __name__ == '__main__':
-    print("Server startet auf Port 7860...")
-    socketio.run(app, host='0.0.0.0', port=7860, debug=False)
+    socketio.run(app, host="0.0.0.0", port=7860)