Update app.py

app.py

@@ -7,37 +7,34 @@ MAX_DICE = 5
 MAX_PLAYERS = 4
 DICE_SIDES = 6
 
-# Predefined list of rhyming names with emojis for players
-player_names = [
-    ("Mick 🎤", "Rick 🚀", "Nick 🧊", "Vick 🌿")
-]
+# Player names and emojis
+player_names = ["Mick 🎤", "Rick 🚀", "Nick 🧊", "Vick 🌿"]
 
 # Game functions
 def roll_dice(n):
     return np.random.randint(1, DICE_SIDES + 1, n)
 
 def display_dice(dice_rolls):
-    # Display emojis based on the number rolled
-    emoji_str = ""
-    for roll in dice_rolls:
-        emoji_str += emojize(":game_die:") + " " * roll + " "  # Adjust this line for a more accurate representation
-    return emoji_str.strip()
+    # Display the correct number of emojis for each dice roll
+    return " ".join(emojize(":game_die:") * roll for roll in dice_rolls)
 
-def update_scores(scores, dice):
-    for i, score in enumerate(scores):
-        if dice[i] == DICE_SIDES:
-            scores[i] += 1
-        else:
-            scores[i] = 0
+def display_total(total):
+    # Display the total of dice rolls with an emoji
+    return f"Total: {total} " + emojize(":trophy:")
+
+def update_scores(scores, dice_rolls):
+    for i in range(len(scores)):
+        scores[i] = sum(dice_rolls[i])
     return scores
 
-# Streamlit app setup
-st.set_page_config(
-    page_title="Multiplayer Emoji Dice Game",
-    page_icon="🎲",
-    layout="centered",
-)
+def determine_winner(scores):
+    # Determine the player with the highest score
+    max_score = max(scores)
+    winners = [i for i, score in enumerate(scores) if score == max_score]
+    return winners
 
+# Streamlit app setup
+st.set_page_config(page_title="Multiplayer Emoji Dice Game", page_icon="🎲", layout="centered")
 st.title("Multiplayer Emoji Dice Game")
 st.write("Roll the dice and try to get as many sixes as possible!")
 
@@ -47,26 +44,37 @@ dice_count = st.slider("Number of dice per player", 1, MAX_DICE, 2, step=1)
 
 # Game logic
 scores = [0 for _ in range(players)]
-rolled_dice = roll_dice(players * dice_count)
-scores = update_scores(scores, rolled_dice)
+dice_rolls = [roll_dice(dice_count) for _ in range(players)]
+scores = update_scores(scores, dice_rolls)
+winners = determine_winner(scores)
 
-# Display game board for all players with rhyming names
+# Display game board for all players with names, rolls, and totals
 for player in range(players):
-    start_index = player * dice_count
-    end_index = start_index + dice_count
-    player_name = player_names[player % len(player_names)]  # Loop through player_names if players > len(player_names)
-    st.write(f"{player_name} rolled: {display_dice(rolled_dice[start_index:end_index])}")
+    player_rolls = dice_rolls[player]
+    player_total = scores[player]
+    st.write(f"{player_names[player]} rolled: {display_dice(player_rolls)}")
+    st.write(display_total(player_total))
 
-st.write(f"Scores: {scores}")
+# Display winner(s)
+if len(winners) > 1:
+    st.write("It's a tie between: " + " and ".join(player_names[winner] for winner in winners))
+else:
+    st.write(f"Winner: {player_names[winners[0]]} 🏆")
 
 # Update game state
 if st.button("Roll again"):
     scores = [0 for _ in range(players)]
-    rolled_dice = roll_dice(players * dice_count)
-    scores = update_scores(scores, rolled_dice)
+    dice_rolls = [roll_dice(dice_count) for _ in range(players)]
+    scores = update_scores(scores, dice_rolls)
+    winners = determine_winner(scores)
+    
     for player in range(players):
-        start_index = player * dice_count
-        end_index = start_index + dice_count
-        player_name = player_names[player % len(player_names)]
-        st.write(f"{player_name} rolled: {display_dice(rolled_dice[start_index:end_index])}")
-    st.write(f"Scores: {scores}")
+        player_rolls = dice_rolls[player]
+        player_total = scores[player]
+        st.write(f"{player_names[player]} rolled: {display_dice(player_rolls)}")
+        st.write(display_total(player_total))
+    
+    if len(winners) > 1:
+        st.write("It's a tie between: " + " and ".join(player_names[winner] for winner in winners))
+    else:
+        st.write(f"Winner: {player_names[winners[0]]} 🏆")