Update gamestate.py

gamestate.py

@@ -1,64 +1,56 @@
 # gamestate.py
 import threading
-import time
 import os
 import json
-import pandas as pd
+import time
 
 class GameState:
-    def __init__(self, save_dir="saved_worlds", csv_filename="world_state.csv"):
-        # Ensure the save directory exists
-        os.makedirs(save_dir, exist_ok=True)
-        self.csv_path = os.path.join(save_dir, csv_filename)
+    def __init__(self, state_file="global_state.json"):
+        self.state_file = state_file
         self.lock = threading.Lock()
-        self.world_state = []  # List of dicts representing game objects
-        self.last_update_time = time.time()
-        self.load_state()  # Optionally load state from CSV on startup
+        # The state dictionary holds all game objects.
+        # You could later add other keys (for example, player positions per session).
+        self.state = {"objects": []}
+        self.load_state()
 
     def load_state(self):
-        """Load world state from CSV if available."""
-        if os.path.exists(self.csv_path):
+        """Load the global state from a JSON file if it exists."""
+        if os.path.exists(self.state_file):
             try:
-                df = pd.read_csv(self.csv_path)
-                # Convert DataFrame rows to a list of dictionaries
-                self.world_state = df.to_dict(orient='records')
+                with open(self.state_file, "r", encoding="utf-8") as f:
+                    self.state = json.load(f)
             except Exception as e:
-                print(f"Error loading state from {self.csv_path}: {e}")
+                print(f"Error loading global state: {e}")
         else:
-            self.world_state = []
+            self.state = {"objects": []}
 
     def save_state(self):
-        """Persist the current world state to CSV."""
+        """Persist the global state to a JSON file."""
         with self.lock:
             try:
-                df = pd.DataFrame(self.world_state)
-                df.to_csv(self.csv_path, index=False)
+                with open(self.state_file, "w", encoding="utf-8") as f:
+                    json.dump(self.state, f, indent=2)
             except Exception as e:
-                print(f"Error saving state to {self.csv_path}: {e}")
+                print(f"Error saving global state: {e}")
 
     def get_state(self):
-        """Return a deep copy of the current world state."""
+        """Return a copy of the current state."""
         with self.lock:
-            # Use JSON serialization to create a deep copy.
-            return json.loads(json.dumps(self.world_state))
+            return self.state.copy()
 
     def update_state(self, new_objects):
         """
-        Merge new or updated objects into the world state.
-        Each object must have a unique 'obj_id'.
+        Merge a list of new object records into the state.
+        Uniqueness is determined by the 'obj_id' field.
         """
         with self.lock:
+            # Create a dict of existing objects by obj_id.
+            existing = {obj["obj_id"]: obj for obj in self.state.get("objects", []) if "obj_id" in obj}
             for obj in new_objects:
-                found = False
-                for existing in self.world_state:
-                    if existing.get('obj_id') == obj.get('obj_id'):
-                        # Update the existing object's properties
-                        existing.update(obj)
-                        found = True
-                        break
-                if not found:
-                    # Add new object if it doesn't exist already
-                    self.world_state.append(obj)
-            self.last_update_time = time.time()
-        # Optionally, persist the state to CSV after each update.
-        self.save_state()
+                # If no obj_id, generate one.
+                if "obj_id" not in obj or not obj["obj_id"]:
+                    obj["obj_id"] = str(time.time()) + "_" + str(len(existing))
+                existing[obj["obj_id"]] = obj
+            self.state["objects"] = list(existing.values())
+            self.state["last_updated"] = time.strftime("%Y-%m-%d %H:%M:%S")
+            self.save_state()