code-battles 1.5.4 → 1.5.6

package/dist/cjs/index.js

@@ -462,7 +462,10 @@ const useLocalStorage = ({ key, defaultValue, }) => {
         }
         if (newValue) {
             localStorage.setItem(key, JSON.stringify(newValue));
-            window.dispatchEvent(new StorageEvent("storage", { key, newValue: JSON.stringify(newValue) }));
+            window.dispatchEvent(new StorageEvent("storage", {
+                key,
+                newValue: JSON.stringify(newValue),
+            }));
         }
     };
     return [value, userSetValue];

package/dist/code_battles/battles.py

@@ -466,8 +466,6 @@ class CodeBattles(
         if step_element is not None:
             step_element.onclick = create_proxy(lambda _: self._step())
 
-        self._initialized = True
-
     def _initialize_simulation(
         self, player_codes: List[str], seed: Optional[int] = None
     ):
@@ -530,13 +528,15 @@ class CodeBattles(
 
     def _run_local_simulation(self):
         command = sys.argv[1]
+        output_file = None
         decisions = []
         if command == "simulate":
             seed = None if sys.argv[2] == "None" else int(sys.argv[2])
-            self.map = sys.argv[3]
-            self.player_names = sys.argv[4].split("-")
+            output_file = None if sys.argv[3] == "None" else sys.argv[3]
+            self.map = sys.argv[4]
+            self.player_names = sys.argv[5].split("-")
             player_codes = []
-            for filename in sys.argv[5:]:
+            for filename in sys.argv[6:]:
                 with open(filename, "r") as f:
                     player_codes.append(f.read())
         elif command == "simulate-from-file":
@@ -556,15 +556,23 @@ class CodeBattles(
         self.verbose = False
         self._initialize_simulation(player_codes, seed)
 
+        all_logs = []
         while not self.over:
             print("__CODE_BATTLES_ADVANCE_STEP")
             if len(decisions) != 0:
                 self.apply_decisions(decisions.pop(0))
             else:
-                self.apply_decisions(self.make_decisions())
+                self._logs = []
+                _decisions = self.make_decisions()
+                all_logs.append(self._logs)
+                self._logs = []
+                if output_file is not None:
+                    self._decisions.append(_decisions)
+                self.apply_decisions(_decisions)
 
             if not self.over:
                 self.step += 1
+        self._logs = all_logs
 
         print("--- SIMULATION FINISHED ---")
         print(
@@ -577,11 +585,16 @@ class CodeBattles(
                     if len(self.active_players) > 0
                     else None,
                     "steps": self.step,
-                    "logs": self._logs,
+                    "logs": [log for logs in self._logs for log in logs],
                 }
             )
         )
 
+        if output_file is not None:
+            simulation_str = self._get_simulation().dump()
+            with open(output_file, "w") as f:
+                f.write(simulation_str)
+
     def _start_simulation(self, *args, **kwargs):
         loop = asyncio.get_event_loop()
         loop.run_until_complete(self._start_simulation_async(*args, **kwargs))
@@ -596,7 +609,7 @@ class CodeBattles(
         try:
             simulation = Simulation.load(str(contents))
             navigate(
-                f"/simulation/{simulation.map}/{'-'.join(simulation.player_names)}"
+                f"/simulation/{simulation.map}/{'-'.join(simulation.player_names)}?seed={simulation.seed}"
             )
             show_alert(
                 "Loaded simulation file!",
@@ -623,8 +636,7 @@ class CodeBattles(
                 )
             while document.getElementById("loader") is None:
                 await asyncio.sleep(0.01)
-            if not hasattr(self, "_initialized"):
-                self._initialize()
+            self._initialize()
             self.map = simulation.map
             self.map_image = await download_image(
                 self.configure_map_image_url(simulation.map)
@@ -701,8 +713,7 @@ class CodeBattles(
             await self.setup()
 
             if not self.background:
-                if not hasattr(self, "_initialized"):
-                    self._initialize()
+                self._initialize()
 
                 # Show that loading finished
                 document.getElementById("loader").style.display = "none"
@@ -719,6 +730,18 @@ class CodeBattles(
         except Exception:
             traceback.print_exc()
 
+    def _get_simulation(self):
+        return Simulation(
+            self.map,
+            self.player_names,
+            self.__class__.__name__,
+            self.configure_version(),
+            datetime.datetime.now(),
+            self._logs,
+            self._decisions,
+            self._seed,
+        )
+
     def _update_step(self, decisions_str: str, logs_str: str, is_over_str: str):
         from js import window, document
 
@@ -732,16 +755,7 @@ class CodeBattles(
 
         if is_over:
             try:
-                simulation = Simulation(
-                    self.map,
-                    self.player_names,
-                    self.__class__.__name__,
-                    self.configure_version(),
-                    datetime.datetime.now(),
-                    self._logs,
-                    self._decisions,
-                    self._seed,
-                )
+                simulation = self._get_simulation()
                 window.simulationToDownload = simulation.dump()
                 show_download()
             except Exception as e:
@@ -954,5 +968,3 @@ class CodeBattles(
                         0,
                     )
                 )
-            else:
-                await asyncio.sleep(0.01)

package/dist/esm/index.js

@@ -460,7 +460,10 @@ const useLocalStorage = ({ key, defaultValue, }) => {
         }
         if (newValue) {
             localStorage.setItem(key, JSON.stringify(newValue));
-            window.dispatchEvent(new StorageEvent("storage", { key, newValue: JSON.stringify(newValue) }));
+            window.dispatchEvent(new StorageEvent("storage", {
+                key,
+                newValue: JSON.stringify(newValue),
+            }));
         }
     };
     return [value, userSetValue];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-battles",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "description": "A library for building interactive competitive coding battles",
   "repository": "https://github.com/noamzaks/code-battles",
   "homepage": "https://code-battles.readthedocs.org",