Merge branch 'main' into buy-card

Author: stirby

balatrobot.lua

@@ -15,13 +15,15 @@ BALATRO_BOT_CONFIG = {
 
 -- Load minimal required files
 assert(SMODS.load_file("src/lua/utils.lua"))()
-assert(SMODS.load_file("src/lua/log.lua"))()
 assert(SMODS.load_file("src/lua/api.lua"))()
+assert(SMODS.load_file("src/lua/log.lua"))()
+
+-- Initialize API
+API.init()
 
 -- Initialize Logger
 LOG.init()
 
--- Initialize API
-API.init()
+G.SETTINGS.skip_splash = "Yes"
 
 sendInfoMessage("BalatroBot loaded - version " .. SMODS.current_mod.version, "BALATROBOT")

bots/replay.py

@@ -1,8 +1,10 @@
 """Simple bot that replays actions from a run save (JSONL file)."""
 
+import argparse
 import json
 import logging
 import sys
+import time
 from pathlib import Path
 
 from balatrobot.client import BalatroClient
@@ -12,30 +14,66 @@
 logging.basicConfig(level=logging.INFO)
 
 
-def load_steps_from_jsonl() -> list[dict]:
-    """Load replay steps from JSONL file."""
-    if len(sys.argv) != 2:
-        logger.error("Usage: python replay.py <jsonl_file>")
+def get_most_recent_jsonl() -> Path:
+    """Find the most recent JSONL file in the runs directory."""
+    runs_dir = Path("runs")
+    if not runs_dir.exists():
+        logger.error("Runs directory not found")
+        sys.exit(1)
+
+    jsonl_files = list(runs_dir.glob("*.jsonl"))
+    if not jsonl_files:
+        logger.error("No JSONL files found in runs directory")
         sys.exit(1)
 
-    jsonl_file = Path(sys.argv[1])
-    if not jsonl_file.exists():
-        logger.error(f"File not found: {jsonl_file}")
+    # Sort by modification time, most recent first
+    most_recent = max(jsonl_files, key=lambda f: f.stat().st_mtime)
+    return most_recent
+
+
+def load_steps_from_jsonl(jsonl_path: Path) -> list[dict]:
+    """Load replay steps from JSONL file."""
+    if not jsonl_path.exists():
+        logger.error(f"File not found: {jsonl_path}")
         sys.exit(1)
 
     try:
-        with open(jsonl_file) as f:
+        with open(jsonl_path) as f:
             steps = [json.loads(line) for line in f if line.strip()]
-        logger.info(f"Loaded {len(steps)} steps from {jsonl_file}")
+        logger.info(f"Loaded {len(steps)} steps from {jsonl_path}")
         return steps
     except json.JSONDecodeError as e:
-        logger.error(f"Invalid JSON in file {jsonl_file}: {e}")
+        logger.error(f"Invalid JSON in file {jsonl_path}: {e}")
         sys.exit(1)
 
 
 def main():
     """Main replay function."""
-    steps = load_steps_from_jsonl()
+    parser = argparse.ArgumentParser(description="Replay actions from a JSONL run file")
+    parser.add_argument(
+        "--delay",
+        "-d",
+        type=float,
+        default=0.0,
+        help="Delay between played moves in seconds (default: 0.0)",
+    )
+    parser.add_argument(
+        "--path",
+        "-p",
+        type=Path,
+        help="Path to JSONL run file (default: most recent file in runs/)",
+    )
+
+    args = parser.parse_args()
+
+    # Determine the path to use
+    if args.path:
+        jsonl_path = args.path
+    else:
+        jsonl_path = get_most_recent_jsonl()
+        logger.info(f"Using most recent file: {jsonl_path}")
+
+    steps = load_steps_from_jsonl(jsonl_path)
 
     try:
         with BalatroClient() as client:
@@ -46,6 +84,7 @@ def main():
                 function_name = step["function"]["name"]
                 arguments = step["function"]["arguments"]
                 logger.info(f"Step {i + 1}/{len(steps)}: {function_name}({arguments})")
+                time.sleep(args.delay)
 
                 try:
                     response = client.send_message(function_name, arguments)

docs/protocol-api.md

@@ -124,13 +124,13 @@ The BalatroBot API provides core functions that correspond to the main game acti
 
 The following table details the parameters required for each function. Note that `get_game_state` and `go_to_menu` require no parameters:
 
-| Name                   | Parameters                                                                                                                                                                   |
-| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `start_run`            | `deck` (string): Deck name<br>`stake` (number): Difficulty level 1-8<br>`seed` (string, optional): Seed for run generation<br>`challenge` (string, optional): Challenge name |
-| `skip_or_select_blind` | `action` (string): Either "select" or "skip"                                                                                                                                 |
-| `play_hand_or_discard` | `action` (string): Either "play_hand" or "discard"<br>`cards` (array): Card indices (0-indexed, 1-5 cards)                                                                   |
-| `rearrange_hand`       | `cards` (array): Card indices (0-indexed, exactly `hand_size` elements)                                                                                                      |
-| `shop`                 | `action` (string): Shop action to perform ("next_round")                                                                                                                     |
+| Name                   | Parameters                                                                                                                                                                                                                                                                |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `start_run`            | `deck` (string): Deck name<br>`stake` (number): Difficulty level 1-8<br>`seed` (string, optional): Seed for run generation<br>`challenge` (string, optional): Challenge name<br>`log_path` (string, optional): Full file path for run log (must include .jsonl extension) |
+| `skip_or_select_blind` | `action` (string): Either "select" or "skip"                                                                                                                                                                                                                              |
+| `play_hand_or_discard` | `action` (string): Either "play_hand" or "discard"<br>`cards` (array): Card indices (0-indexed, 1-5 cards)                                                                                                                                                                |
+| `rearrange_hand`       | `cards` (array): Card indices (0-indexed, exactly `hand_size` elements)                                                                                                                                                                                                   |
+| `shop`                 | `action` (string): Shop action to perform ("next_round")                                                                                                                                                                                                                  |
 
 ### Errors
 

pyproject.toml

@@ -43,6 +43,7 @@ addopts = "--cov=src/balatrobot --cov-report=term-missing --cov-report=html --co
 [dependency-groups]
 dev = [
   "basedpyright>=1.29.5",
+  "deepdiff>=8.5.0",
   "mdformat-mkdocs>=4.3.0",
   "mdformat-simple-breaks>=0.0.1",
   "mkdocs-llmstxt>=0.3.0",

src/lua/api.lua

@@ -70,6 +70,7 @@ API.pending_requests = {}
 
 ---Updates the API by processing TCP messages and pending requests
 ---@param _ number Delta time (not used)
+---@diagnostic disable-next-line: duplicate-set-field
 function API.update(_)
   -- Create server socket if it doesn't exist
   if not API.server_socket then
@@ -206,8 +207,16 @@ end
 ---Gets the current game state
 ---@param _ table Arguments (not used)
 API.functions["get_game_state"] = function(_)
-  local game_state = utils.get_game_state()
-  API.send_response(game_state)
+  ---@type PendingRequest
+  API.pending_requests["get_game_state"] = {
+    condition = function()
+      return #G.E_MANAGER.queues.base < EVENT_QUEUE_THRESHOLD
+    end,
+    action = function()
+      local game_state = utils.get_game_state()
+      API.send_response(game_state)
+    end,
+  }
 end
 
 ---Navigates to the main menu.
@@ -235,6 +244,7 @@ end
 
 ---Starts a new game run with specified parameters
 ---Call G.FUNCS.start_run() to start a new game run with specified parameters.
+---If log_path is provided, the run log will be saved to the specified full path (must include .jsonl extension), otherwise uses runs/timestamp.jsonl.
 ---@param args StartRunArgs The run configuration
 API.functions["start_run"] = function(args)
   -- Validate required parameters
@@ -279,7 +289,7 @@ API.functions["start_run"] = function(args)
   G.GAME.challenge_name = args.challenge
 
   -- Start the run
-  G.FUNCS.start_run(nil, { stake = args.stake, seed = args.seed, challenge = challenge_obj })
+  G.FUNCS.start_run(nil, { stake = args.stake, seed = args.seed, challenge = challenge_obj, log_path = args.log_path })
 
   -- Defer sending response until the run has started
   ---@type PendingRequest