Update app.py

app.py

@@ -8,28 +8,38 @@ app = Flask(__name__, template_folder="templates")
 CORS(app, resources={r"/*": {"origins": "*"}}) 
 socketio = SocketIO(app, cors_allowed_origins="*", async_mode='eventlet')
 
-# --- SPIEL-KONFIGURATION ---
+# --- KONFIGURATION ---
 SUITS = ['Herz', 'Karo', 'Pik', 'Kreuz']
 RANKS = {'7': 7, '8': 8, '9': 9, '10': 10, 'B': 10, 'D': 10, 'K': 10, 'A': 11}
 
 class GameState:
     def __init__(self):
-        self.players = {}
-        self.active_emails = []
-        self.middle = []
-        self.deck = []
-        self.turn_idx = 0
-        self.current_bet = 50 
+        self.players = {}        
+        self.active_emails = []  
+        self.middle = []         
+        self.deck = []           
+        self.turn_idx = 0        
+        self.current_bet = 50    
 
     def calculate_score(self, hand):
-        if not hand: return 0
-        return sum(c['val'] for c in hand)
+        """Offizielle 31-Regeln: Nur gleiche Farben addieren ODER Drillinge = 30.5"""
+        if not hand or len(hand) < 3: return 0
+        
+        # Regel: Drillinge (3 gleiche Ränge) zählen 30.5
+        r = [c['rank'] for c in hand]
+        if r[0] == r[1] == r[2]:
+            return 30.5
+            
+        # Regel: Höchste Summe einer Farbe
+        sums = {'Herz': 0, 'Karo': 0, 'Pik': 0, 'Kreuz': 0}
+        for c in hand:
+            sums[c['suit']] += c['val']
+        return max(sums.values())
 
     def broadcast_state(self):
         for email in self.active_emails:
             if email in self.players:
-                p = self.players[email]
-                p['score'] = self.calculate_score(p.get('hand', []))
+                self.players[email]['score'] = self.calculate_score(self.players[email].get('hand', []))
 
         state = {
             'players': [self.players[e] for e in self.active_emails if e in self.players],
@@ -43,12 +53,10 @@ class GameState:
 game = GameState()
 
 @app.route('/')
-def index():
-    return render_template('index.html')
+def index(): return render_template('index.html')
 
-@app.route('/login', methods=['POST', 'OPTIONS'])
+@app.route('/login', methods=['POST'])
 def login():
-    if request.method == 'OPTIONS': return jsonify({}), 200
     data = request.json
     email = data.get('email')
     if email not in game.players:
@@ -71,12 +79,10 @@ def start_round(data):
     random.shuffle(game.deck)
     game.middle = [game.deck.pop() for _ in range(3)]
     for email in game.active_emails:
-        if email in game.players:
-            p = game.players[email]
-            if p['coins'] >= game.current_bet:
-                p['hand'] = [game.deck.pop() for _ in range(3)]
-                p['score'] = game.calculate_score(p['hand'])
-                p['coins'] -= int(game.current_bet)
+        p = game.players[email]
+        if p['coins'] >= game.current_bet:
+            p['hand'] = [game.deck.pop() for _ in range(3)]
+            p['coins'] -= int(game.current_bet)
     game.turn_idx = 0
     game.broadcast_state()
 
@@ -85,51 +91,29 @@ def handle_action(data):
     email = data.get('email')
     if not game.active_emails or game.active_emails[game.turn_idx] != email: return
     p = game.players.get(email)
-    if not p: return
-
+    
     if data['type'] == 'swap_one':
-        h_idx, m_idx = data['h_idx'], data['m_idx']
-        p['hand'][h_idx], game.middle[m_idx] = game.middle[m_idx], p['hand'][h_idx]
+        p['hand'][data['h_idx']], game.middle[data['m_idx']] = game.middle[data['m_idx']], p['hand'][data['h_idx']]
     elif data['type'] == 'swap_all':
         p['hand'], game.middle = game.middle, p['hand']
     elif data['type'] == 'pass':
         pass 
     elif data['type'] == 'knock':
-        max_score = -1
-        for e in game.active_emails:
-            s = game.calculate_score(game.players[e]['hand'])
-            if s > max_score: max_score = s
-        winners = [e for e in game.active_emails if game.calculate_score(game.players[e]['hand']) == max_score]
-        total_pott = len(game.active_emails) * int(game.current_bet)
-        share = total_pott // len(winners)
-        for w_email in winners:
-            game.players[w_email]['coins'] += share
-        emit('game_over', {'winner': ", ".join(winners), 'score': max_score, 'pott': total_pott, 'is_split': len(winners) > 1}, broadcast=True)
+        # Ermittlung aller Gewinner (Split Pott Support)
+        max_s = max(game.calculate_score(game.players[e]['hand']) for e in game.active_emails)
+        winners = [e for e in game.active_emails if game.calculate_score(game.players[e]['hand']) == max_s]
+        pott = len(game.active_emails) * int(game.current_bet)
+        for w in winners: game.players[w]['coins'] += pott // len(winners)
+        emit('game_over', {'winner': ", ".join(winners), 'score': max_s, 'pott': pott}, broadcast=True)
         return
 
-    p['score'] = game.calculate_score(p['hand'])
     game.turn_idx = (game.turn_idx + 1) % len(game.active_emails)
     game.broadcast_state()
 
 @socketio.on('admin/update_bet')
 def update_bet(data):
     game.current_bet = int(data.get('bet', 50))
-    game.broadcast_state() # Broadcastet sofort den neuen Einsatz an alle
-
-@socketio.on('admin/reshuffle')
-def reshuffle(data):
-    game.deck = [{'suit': s, 'rank': r, 'val': v} for s in SUITS for r, v in RANKS.items()]
-    random.shuffle(game.deck)
-    game.middle = [game.deck.pop() for _ in range(3)]
-    for e in game.active_emails:
-        if e in game.players: game.players[e]['hand'] = []
     game.broadcast_state()
 
-@socketio.on('admin/end_game')
-def end_game(data):
-    game.active_emails = []
-    game.middle = []
-    emit('game_ended_by_admin', broadcast=True)
-
 if __name__ == '__main__':
-    socketio.run(app, host='0.0.0.0', port=7860, debug=False)
+    socketio.run(app, host='0.0.0.0', port=7860)