Update app.py

app.py

@@ -37,7 +37,6 @@ def load_latest_global_save():
     json_files = [f for f in os.listdir(GLOBAL_SAVES_DIR) if f.endswith(".json")]
     if not json_files:
         return None
-    # Assuming filenames contain timestamp info, sort them in reverse order.
     json_files.sort(reverse=True)
     latest_file = json_files[0]
     with open(os.path.join(GLOBAL_SAVES_DIR, latest_file), "r", encoding="utf-8") as f:
@@ -53,7 +52,6 @@ def consolidate_global_saves():
     if not json_files:
         return None
     merged_state = {"timestamp": "", "game_state": [], "player_position": {"x": 0, "y": 0, "z": 0}}
-    # Use a dictionary keyed by obj_id to union objects.
     obj_dict = {}
     latest_timestamp = None
     latest_player_position = {"x": 0, "y": 0, "z": 0}
@@ -71,7 +69,6 @@ def consolidate_global_saves():
     merged_state["timestamp"] = latest_timestamp if latest_timestamp else time.strftime("%Y-%m-%d %H:%M:%S")
     merged_state["game_state"] = list(obj_dict.values())
     merged_state["player_position"] = latest_player_position
-    # Write the consolidated state with current timestamp.
     consolidated_filename = f"consolidated_{datetime.now().strftime('%Y%m%d_%H%M%S')}.json"
     consolidated_path = os.path.join(GLOBAL_SAVES_DIR, consolidated_filename)
     with open(consolidated_path, "w", encoding="utf-8") as f:
@@ -84,6 +81,39 @@ def consolidate_global_saves():
             st.error(f"Error deleting old global save {f}: {e}")
     return merged_state
 
+def perform_global_save():
+    """
+    Immediately save the current game state (with player position) to a new JSON file,
+    then consolidate all global saves and update session state.
+    """
+    global_save_data = {
+         "timestamp": time.strftime("%Y-%m-%d %H:%M:%S"),
+         "game_state": game_state.get_state(),
+         "player_position": st.session_state.get("player_position", {"x": 0, "y": 0, "z": 0})
+    }
+    default_save_name = f"save_{time.strftime('%Y%m%d_%H%M%S')}.json"
+    save_file_path = os.path.join(GLOBAL_SAVES_DIR, default_save_name)
+    with open(save_file_path, "w", encoding="utf-8") as f:
+         json.dump(global_save_data, f, indent=2)
+    # Consolidate all global saves into one file and update session state.
+    consolidated_state = consolidate_global_saves()
+    if consolidated_state is not None:
+         st.session_state.loaded_global_state = consolidated_state
+
+def reload_global_state():
+    """
+    Reload all global save files, consolidate them, and update the game state.
+    """
+    consolidated_state = consolidate_global_saves()
+    if consolidated_state is not None:
+         with game_state.lock:
+             game_state.world_state = consolidated_state.get("game_state", [])
+         st.session_state.player_position = consolidated_state.get("player_position", {"x": 0, "y": 0, "z": 0})
+         st.session_state.loaded_global_state = consolidated_state
+         st.success("Global state reloaded!")
+    else:
+         st.warning("No global save found to reload.")
+
 @st.cache_data(ttl=3600)
 def load_plot_metadata():
     """Scans SAVE_DIR for plot files and returns metadata."""
@@ -221,7 +251,7 @@ all_initial_objects = []
 for plot in plots_metadata:
     all_initial_objects.extend(load_plot_objects(plot['filename'], plot['x_offset'], plot['z_offset']))
 
-# If GameState is still empty, update it with initial objects.
+# If GameState is empty, update it with initial objects.
 if not game_state.get_state():
     game_state.update_state(all_initial_objects)
 
@@ -257,7 +287,7 @@ with st.sidebar:
 
     st.markdown("---")
     st.header("Save Work (Per Plot)")
-    st.caption("Saves newly placed objects to the current plot. A new plot file is created for new areas.")
+    st.caption("Saves newly placed objects to the current plot.")
     if st.button("💾 Save Current Work", key="save_button"):
         from streamlit_js_eval import streamlit_js_eval
         js_get_data_code = "getSaveDataAndPosition();"
@@ -266,7 +296,6 @@ with st.sidebar:
 
     st.markdown("---")
     st.header("Global Save & Load")
-    # Global Save: Persists the entire game state plus current player position.
     if st.button("💾 Global Save"):
         global_save_data = {
              "timestamp": time.strftime("%Y-%m-%d %H:%M:%S"),
@@ -279,10 +308,10 @@ with st.sidebar:
              json.dump(global_save_data, f, indent=2)
         st.success(f"Global state saved to {default_save_name}")
         st.session_state.loaded_global_state = global_save_data
-        # Consolidate all global saves into one file and delete older ones.
-        consolidated_state = consolidate_global_saves()
-        if consolidated_state is not None:
-            st.session_state.loaded_global_state = consolidated_state
+        perform_global_save()
+
+    if st.button("🔄 Reload Global State"):
+        reload_global_state()
 
     st.subheader("📂 Global Saves")
     save_files = sorted([f for f in os.listdir(GLOBAL_SAVES_DIR) if f.endswith(".json")])
@@ -350,6 +379,7 @@ if save_data_from_js is not None:
                         st.success(f"Updated existing plot: {target_filename}")
                     game_state.update_state(objects_to_save)
                     save_processed_successfully = True
+                    perform_global_save()
                 else:
                     st.error(f"Failed to save plot data to file: {target_filename}")
             else: