Merge pull request #4979 from ab9rf/forceequip

reenable `forceequip`
DFHack · Nov 28, 2024 · cf6ed1f · cf6ed1f
2 parents 3aeb7e2 + 7087acd
commit cf6ed1f
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 50 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -52,6 +52,7 @@ Template for new versions:
 # Future
 
 ## New Tools
+- `forceequip`: (reinstated) Forcibly move items into a unit's inventory
 
 ## New Features
 - `tweak`: ``realistic-melting``: change melting return for inorganic armor parts, shields, weapons, trap components and tools to stop smelters from creating metal, bring melt return for adamantine in line with other metals to ~95% of forging cost. wear reduces melt return by 10% per level

diff --git a/docs/plugins/forceequip.rst b/docs/plugins/forceequip.rst
@@ -3,7 +3,7 @@ forceequip
 
 .. dfhack-tool::
     :summary: Move items into a unit's inventory.
-    :tags: unavailable
+    :tags: adventure fort animals items military units
 
 This tool is typically used to equip specific clothing/armor items onto a dwarf,
 but can also be used to put armor onto a war animal or to add unusual items

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -121,7 +121,7 @@ if(BUILD_SUPPORTED)
     #dfhack_plugin(fixveins fixveins.cpp)
     dfhack_plugin(flows flows.cpp)
     #dfhack_plugin(follow follow.cpp)
-    #dfhack_plugin(forceequip forceequip.cpp)
+    dfhack_plugin(forceequip forceequip.cpp)
     #dfhack_plugin(generated-creature-renamer generated-creature-renamer.cpp)
     dfhack_plugin(getplants getplants.cpp)
     dfhack_plugin(hotkeys hotkeys.cpp LINK_LIBRARIES lua)