Update app.py

app.py

@@ -336,7 +336,6 @@ async def websocket_handler(websocket, path):
         st.session_state.active_connections[room_id] = {}
     st.session_state.active_connections[room_id][client_id] = websocket
     username = st.session_state.username
-
     game_state = load_game_state(st.session_state.game_state_timestamp)
     if "prairie" in path:
         char = next(c for c in EDGE_TTS_VOICES if c["name"] == username)
@@ -355,7 +354,6 @@ async def websocket_handler(websocket, path):
             update_game_state(game_state)
         st.session_state.players[client_id] = game_state["players"][username]
         await broadcast_message(f"System|{username} joins the quest!", room_id)
-
     try:
         async for message in websocket:
             if '|' in message:
@@ -400,17 +398,14 @@ async def periodic_update():
             for username in game_state["players"]:
                 game_state["players"][username]["score"] += int((current_time - game_state["players"][username]["last_active"]) * 60)
             update_game_state(game_state)
-
             player_list = ", ".join([p for p in game_state["players"].keys()]) or "No adventurers yet!"
             message = f"📢 Quest Update: Active Adventurers - {player_list}"
             player_data = json.dumps(list(game_state["players"].values()))
             await broadcast_message(f"MAP_UPDATE:{player_data}", "quest")
-            
             prairie_list = ", ".join([f"{p['username']} ({p['animal']})" for p in st.session_state.prairie_players.values()]) or "No animals yet!"
             prairie_message = f"🌾 Prairie Update: {prairie_list}"
             prairie_data = json.dumps(list(st.session_state.prairie_players.values()))
             await broadcast_message(f"PRAIRIE_UPDATE:{prairie_data}", "quest")
-            
             chat_content = await load_chat()
             await broadcast_message(f"CHAT_UPDATE:{json.dumps(chat_content[-10:])}", "quest")
             await broadcast_message(f"GAME_STATE:{json.dumps(game_state)}", "quest")
@@ -486,7 +481,7 @@ def log_performance_metrics():
 # -----------------------------------------------------------
 # Enhanced 3D Game HTML (With dynamic insertion of username and fluid movement)
 # -----------------------------------------------------------
-# Precompute the player's color and shape to simplify f-string expressions.
+# Precompute player color and shape for use in the HTML.
 player_color = next(c["color"] for c in EDGE_TTS_VOICES if c["name"] == st.session_state.username)
 player_shape = next(c["shape"] for c in EDGE_TTS_VOICES if c["name"] == st.session_state.username)
 
@@ -758,6 +753,7 @@ rocky_map_html = f"""
 # -----------------------------------------------------------
 def main():
     st.markdown(f"<h2 style='text-align: center;'>Welcome, {st.session_state.username}!</h2>", unsafe_allow_html=True)
+    # Chat Input Area
     message = st.text_input(f"🗨️ Chat as {st.session_state.username}:", placeholder="Type to chat or add world features! 🌲", key="chat_input")
     if st.button("🌟 Send"):
         if message:
@@ -793,9 +789,11 @@ def main():
 
     left_col, right_col = st.columns([2, 1])
     with left_col:
-        components.html(rocky_map_html, width=800, height=600)
+        # Display the Quest Log as a code block with Python syntax and line numbers (if supported)
         chat_content = asyncio.run(load_chat())
-        st.text_area("📜 Quest Log", "\n".join(chat_content[-10:]), height=200, disabled=True)
+        st.code("\n".join(chat_content[-10:]), language="python")
+        # Then display the 3D world
+        components.html(rocky_map_html, width=800, height=600)
         uploaded_file = st.file_uploader("Upload a File 📤", type=["txt", "md", "mp3"])
         if uploaded_file:
             with open(uploaded_file.name, "wb") as f:
@@ -807,24 +805,27 @@ def main():
             update_game_state(game_state)
             st.session_state.last_activity = time.time()
             st.success(f"File uploaded! +20 points! New Score: ${st.session_state.score}")
-        mycomponent = components.declare_component("speech_component", path="./speech_component")
-        val = mycomponent(my_input_value="", key=f"speech_{st.session_state.get('speech_processed', False)}")
-        if val and val != st.session_state.last_transcript:
-            val_stripped = val.strip().replace('\n', ' ')
-            if val_stripped:
-                voice = next(c["voice"] for c in EDGE_TTS_VOICES if c["name"] == st.session_state.username)
-                st.session_state['speech_processed'] = True
-                md_file, audio_file = asyncio.run(save_chat_entry(st.session_state.username, val_stripped, voice))
-                if audio_file:
-                    play_and_download_audio(audio_file)
-                st.session_state.last_activity = time.time()
-                st.rerun()
+            # Speech component integration remains as before.
+            mycomponent = components.declare_component("speech_component", path="./speech_component")
+            val = mycomponent(my_input_value="", key=f"speech_{st.session_state.get('speech_processed', False)}")
+            if val and val != st.session_state.last_transcript:
+                val_stripped = val.strip().replace('\n', ' ')
+                if val_stripped:
+                    voice = next(c["voice"] for c in EDGE_TTS_VOICES if c["name"] == st.session_state.username)
+                    st.session_state['speech_processed'] = True
+                    md_file, audio_file = asyncio.run(save_chat_entry(st.session_state.username, val_stripped, voice))
+                    if audio_file:
+                        play_and_download_audio(audio_file)
+                    st.session_state.last_activity = time.time()
+                    st.rerun()
     with right_col:
         st.subheader("🌾 Prairie Map")
         prairie_map = folium.Map(location=[44.0, -103.0], zoom_start=8, tiles="CartoDB Positron")
+        # Add base locations
         for loc, (lat, lon) in PRAIRIE_LOCATIONS.items():
             folium.Marker([lat, lon], popup=loc).add_to(prairie_map)
         game_state = load_game_state(st.session_state.game_state_timestamp)
+        # Mark players
         for username, player in game_state["players"].items():
             folium.CircleMarker(
                 location=[44.0 + player["x"] * 0.01, -103.0 + player["z"] * 0.01],
@@ -834,6 +835,7 @@ def main():
                 fill_opacity=0.7,
                 popup=f"{username} (Score: ${player['score']}, Treasures: {player['treasures']})"
             ).add_to(prairie_map)
+        # Mark prairie players (animals)
         for client_id, player in st.session_state.prairie_players.items():
             folium.CircleMarker(
                 location=player['location'],
@@ -843,7 +845,15 @@ def main():
                 fill_opacity=0.7,
                 popup=f"{player['username']} ({player['animal']})"
             ).add_to(prairie_map)
-        # Updated to use st_folium instead of folium_static
+        # Mark world objects (plants, trees, etc.) with emojis and pins
+        for obj in game_state["world_objects"]:
+            lat = 44.0 + obj["x"] * 0.01
+            lon = -103.0 + obj["z"] * 0.01
+            folium.Marker(
+                location=[lat, lon],
+                popup=f"{obj['emoji']} {obj['type']}",
+                icon=folium.DivIcon(html=f"<div style='font-size: 24px;'>{obj['emoji']}</div>")
+            ).add_to(prairie_map)
         st_folium(prairie_map, width=600, height=400)
         animal = st.selectbox("Choose Animal 🐾", ["prairie_dog", "deer", "sheep", "groundhog"])
         location = st.selectbox("Move to 📍", list(PRAIRIE_LOCATIONS.keys()))