From 891be8172c91dfcd010e9f4f56b5bca1fb21061e Mon Sep 17 00:00:00 2001
From: ToB213 <niimicomputergraphics@gmail.com>
Date: Thu, 17 Sep 2026 02:00:24 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=A8=20flake=E3=81=AB=E3=82=88?=
 =?UTF-8?q?=E3=82=8B=E9=96=8B=E7=99=BA=E7=92=B0=E5=A2=83=E3=81=AE=E5=AE=9A?=
 =?UTF-8?q?=E7=BE=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flake.lock | 27 +++++++++++++++++++++++++++
 flake.nix  | 28 ++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..56bca1f
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1789370336,
+        "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c7def046b9a883d46974757852106483d741586f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..107ac38
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,28 @@
+{
+  description = "Development environment for adf-core-python";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+
+  outputs = { nixpkgs, ... }:
+    let
+      system = "aarch64-darwin";
+      pkgs = import nixpkgs { inherit system; };
+      nativeLibraries = with pkgs; [
+        geos
+        libspatialindex
+      ];
+    in
+    {
+      devShells.${system}.default = pkgs.mkShell {
+        packages = with pkgs; [
+          python313
+          uv
+          pkg-config
+        ] ++ nativeLibraries;
+
+        UV_PYTHON = "${pkgs.python313}/bin/python3.13";
+        UV_PYTHON_DOWNLOADS = "never";
+        DYLD_LIBRARY_PATH = pkgs.lib.makeLibraryPath nativeLibraries;
+      };
+    };
+}

From 6f7261425842a2cfa58f70aa689a7357c644a637 Mon Sep 17 00:00:00 2001
From: ToB213 <niimicomputergraphics@gmail.com>
Date: Fri, 23 Oct 2026 15:48:18 +0900
Subject: [PATCH 2/2] fix: correct move and scout config keys in
 DefaultTacticsFireBrigade

---
 .../implement/tactics/default_tactics_fire_brigade.py         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/adf_core_python/implement/tactics/default_tactics_fire_brigade.py b/src/adf_core_python/implement/tactics/default_tactics_fire_brigade.py
index 5b9b8db..617f8e6 100644
--- a/src/adf_core_python/implement/tactics/default_tactics_fire_brigade.py
+++ b/src/adf_core_python/implement/tactics/default_tactics_fire_brigade.py
@@ -68,7 +68,7 @@ def initialize(
       "adf_core_python.implement.action.default_extend_action_rescue.DefaultExtendActionRescue",
     )
     self._action_ext_move = module_manager.get_extend_action(
-      "DefaultTacticsAmbulanceTeam.ExtendActionMove",
+      "DefaultTacticsFireBrigade.ExtendActionMove",
       "adf_core_python.implement.action.default_extend_action_move.DefaultExtendActionMove",
     )
     self._command_executor_fire = module_manager.get_command_executor(
@@ -76,7 +76,7 @@ def initialize(
       "adf_core_python.implement.centralized.default_command_executor_fire.DefaultCommandExecutorFire",
     )
     self._command_executor_scout = module_manager.get_command_executor(
-      "DefaultTacticsAmbulanceTeam.CommandExecutorScout",
+      "DefaultTacticsFireBrigade.CommandExecutorScout",
       "adf_core_python.implement.centralized.default_command_executor_scout.DefaultCommandExecutorScout",
     )