From cb12682867c48f24730c1212e77507bb668235d4 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Tue, 1 Sep 2026 11:26:17 -0500
Subject: [PATCH 1/2] switch `coord` and `coord2d` to use templates

---
 df.dfhack.xml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/df.dfhack.xml b/df.dfhack.xml
index 198234021..20babb74a 100644
--- a/df.dfhack.xml
+++ b/df.dfhack.xml
@@ -576,15 +576,13 @@
     </enum-type>
 
     <struct-type type-name='coord2d' custom-methods='true' comment='not a real structure'>
+        <!-- these are not actually used by codegen and are here only for reference -->
         <int16_t name='x' init-value='-30000'/>
         <int16_t name='y' init-value='-30000'/>
 
-        <custom-methods>
-            <cmethod name='isValid'/>
-            <cmethod name='clear'/>
-        </custom-methods>
-
+        <extra-include filename="CoordTemplate.h"/>
         <code-helper name='describe'>(fmt "(~A,~A)" $.x $.y)</code-helper>
+        <codegen-override template="DFHack::Coord2d" using="int16_t" no-constructor="true" no-identity="true"/>
     </struct-type>
 
     <struct-type type-name='coord2d_path' custom-methods='true' comment='not a real structure'>
@@ -605,17 +603,14 @@
     </struct-type>
 
     <struct-type type-name='coord' custom-methods='true' comment='not a real structure'>
+        <!-- these are not actually used by codegen and are here only for reference -->
         <int16_t name='x' init-value='-30000'/>
         <int16_t name='y' init-value='-30000'/>
         <int16_t name='z' init-value='-30000'/>
 
-        <extra-include type-name='coord2d'/>
-        <custom-methods>
-            <cmethod name='isValid'/>
-            <cmethod name='clear'/>
-        </custom-methods>
-
+        <extra-include filename="CoordTemplate.h"/>
         <code-helper name='describe'>(fmt "(~A,~A,~A)" $.x $.y $.z)</code-helper>
+        <codegen-override template="DFHack::Coord3d" using="int16_t" no-constructor="true" no-identity="true"/>
     </struct-type>
 
     <struct-type type-name='coord_path' custom-methods='true' comment='not a real structure'>

From f9f9a7839d13735a6bdb58bd46d9758a34f01335 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Tue, 1 Sep 2026 11:32:32 -0500
Subject: [PATCH 2/2] add lua dependency

(required for now, too hard to untangle)
---
 tools/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 4d4880d4a..a984d33cf 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -27,7 +27,7 @@ if(BUILD_XMLDUMP)
     add_executable(xml-dump-type-sizes dump-type-sizes.cpp)
     add_dependencies(xml-dump-type-sizes generate_headers)
     target_include_directories(xml-dump-type-sizes PRIVATE ${dfapi_SOURCE_DIR}/include)
-    target_link_libraries(xml-dump-type-sizes PRIVATE ${FMTLIB})
+    target_link_libraries(xml-dump-type-sizes PRIVATE lua ${FMTLIB})
     if(INSTALL_XMLDUMP)
         install(TARGETS xml-dump-type-sizes DESTINATION .)
     endif()