From cb2db50a649ee737ea0f79c4e355cb2ec6e7c5bf Mon Sep 17 00:00:00 2001 From: lethosor Date: Tue, 9 May 2023 22:13:49 -0400 Subject: [PATCH 1/4] Re-enable build of several plugins Likely to still work, and were probably just disabled due to v50 changes: - changeitem - createitem - deramp - flows - lair and a couple that don't access DF data at all: - luasocket - title-folder --- plugins/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 1967c370a..43b949d60 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -90,7 +90,7 @@ dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua) #dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua) #dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua) add_subdirectory(buildingplan) -#dfhack_plugin(changeitem changeitem.cpp) +dfhack_plugin(changeitem changeitem.cpp) dfhack_plugin(changelayer changelayer.cpp) dfhack_plugin(changevein changevein.cpp) add_subdirectory(channel-safely) @@ -98,10 +98,10 @@ dfhack_plugin(cleanconst cleanconst.cpp) dfhack_plugin(cleaners cleaners.cpp) dfhack_plugin(cleanowned cleanowned.cpp) dfhack_plugin(confirm confirm.cpp LINK_LIBRARIES lua) -#dfhack_plugin(createitem createitem.cpp) +dfhack_plugin(createitem createitem.cpp) dfhack_plugin(cursecheck cursecheck.cpp) dfhack_plugin(cxxrandom cxxrandom.cpp LINK_LIBRARIES lua) -#dfhack_plugin(deramp deramp.cpp) +dfhack_plugin(deramp deramp.cpp) dfhack_plugin(debug debug.cpp LINK_LIBRARIES jsoncpp_static) dfhack_plugin(dig dig.cpp) dfhack_plugin(dig-now dig-now.cpp LINK_LIBRARIES lua) @@ -117,7 +117,7 @@ dfhack_plugin(faststart faststart.cpp) dfhack_plugin(filltraffic filltraffic.cpp) #dfhack_plugin(fix-unit-occupancy fix-unit-occupancy.cpp) #dfhack_plugin(fixveins fixveins.cpp) -#dfhack_plugin(flows flows.cpp) +dfhack_plugin(flows flows.cpp) #dfhack_plugin(follow follow.cpp) #dfhack_plugin(forceequip forceequip.cpp) #dfhack_plugin(generated-creature-renamer generated-creature-renamer.cpp) @@ -126,9 +126,9 @@ dfhack_plugin(hotkeys hotkeys.cpp LINK_LIBRARIES lua) #dfhack_plugin(infiniteSky infiniteSky.cpp) #dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote) #dfhack_plugin(jobutils jobutils.cpp) -#dfhack_plugin(lair lair.cpp) +dfhack_plugin(lair lair.cpp) dfhack_plugin(liquids liquids.cpp Brushes.h LINK_LIBRARIES lua) -#dfhack_plugin(luasocket luasocket.cpp LINK_LIBRARIES clsocket lua dfhack-tinythread) +dfhack_plugin(luasocket luasocket.cpp LINK_LIBRARIES clsocket lua dfhack-tinythread) #dfhack_plugin(manipulator manipulator.cpp) #dfhack_plugin(map-render map-render.cpp LINK_LIBRARIES lua) dfhack_plugin(misery misery.cpp LINK_LIBRARIES lua) @@ -162,7 +162,7 @@ add_subdirectory(stockpiles) dfhack_plugin(strangemood strangemood.cpp) dfhack_plugin(tailor tailor.cpp LINK_LIBRARIES lua) dfhack_plugin(tiletypes tiletypes.cpp Brushes.h LINK_LIBRARIES lua) -#dfhack_plugin(title-folder title-folder.cpp) +dfhack_plugin(title-folder title-folder.cpp) #dfhack_plugin(trackstop trackstop.cpp) #dfhack_plugin(tubefill tubefill.cpp) #add_subdirectory(tweak) From f9a946190d56ac5f64c8d740b53367b95fbca8ca Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 10 May 2023 23:31:00 -0400 Subject: [PATCH 2/4] Disable building title-folder again Hangs when enabled in dfhack.init, at least under wine --- plugins/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 43b949d60..3ae78d320 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -162,7 +162,7 @@ add_subdirectory(stockpiles) dfhack_plugin(strangemood strangemood.cpp) dfhack_plugin(tailor tailor.cpp LINK_LIBRARIES lua) dfhack_plugin(tiletypes tiletypes.cpp Brushes.h LINK_LIBRARIES lua) -dfhack_plugin(title-folder title-folder.cpp) +#dfhack_plugin(title-folder title-folder.cpp) #dfhack_plugin(trackstop trackstop.cpp) #dfhack_plugin(tubefill tubefill.cpp) #add_subdirectory(tweak) From 94e56bf4c74e46f8b6d50c9ea051255f8308d59e Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 10 May 2023 23:49:02 -0400 Subject: [PATCH 3/4] Update changelog and docs for readded plugins Also mark reinstated plugins in the changelog, including for previous v50 releases --- docs/changelog.txt | 14 ++++++++++---- docs/plugins/changeitem.rst | 4 ++-- docs/plugins/createitem.rst | 2 +- docs/plugins/deramp.rst | 2 +- docs/plugins/flows.rst | 2 +- docs/plugins/lair.rst | 2 +- docs/plugins/luasocket.rst | 2 +- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index f6524dc58..fc706cdba 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -34,8 +34,14 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: # Future ## New Plugins -- `add-spatter`: allow mods to add poisons and magical effects to weapons -- `work-now`: reduce the time that dwarves are left without a task after completing a job +- `add-spatter`: reinstated: allow mods to add poisons and magical effects to weapons +- `changeitem`: reinstated: change item material, quality, and subtype +- `createitem`: reinstated: create arbitrary items, from the command line +- `deramp`: reinstated: removes all ramps designated for removal from the map +- `flows`: reinstated: counts map blocks with flowing liquids +- `lair`: reinstated: mark the map as a monster lair (this avoids item scatter when the fortress is abandoned) +- `luasocket`: reinstated: provides a Lua API for accessing network sockets +- `work-now`: reinstated, renamed from ``workNow``: reduce the time that dwarves are left without a task after completing a job ## Fixes @@ -112,8 +118,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: # 50.07-beta2 ## New Plugins -- `getplants`: designate trees for chopping and shrubs for gathering according to type -- `prospector`: get stone, ore, gem, and other tile property counts in fort mode. +- `getplants`: reinstated: designate trees for chopping and shrubs for gathering according to type +- `prospector`: reinstated: get stone, ore, gem, and other tile property counts in fort mode. ## Fixes -@ `buildingplan`: filters are now properly applied to planned stairs diff --git a/docs/plugins/changeitem.rst b/docs/plugins/changeitem.rst index 788b49247..f452f6a74 100644 --- a/docs/plugins/changeitem.rst +++ b/docs/plugins/changeitem.rst @@ -2,8 +2,8 @@ changeitem ========== .. dfhack-tool:: - :summary: Change item material or base quality. - :tags: unavailable adventure fort armok items + :summary: Change item material, quality, and subtype. + :tags: adventure fort armok items By default, a change is only allowed if the existing and desired item materials are of the same subtype (for example wood -> wood, stone -> stone, etc). But diff --git a/docs/plugins/createitem.rst b/docs/plugins/createitem.rst index b287042c7..b29e41521 100644 --- a/docs/plugins/createitem.rst +++ b/docs/plugins/createitem.rst @@ -3,7 +3,7 @@ createitem .. dfhack-tool:: :summary: Create arbitrary items. - :tags: unavailable adventure fort armok items + :tags: adventure fort armok items You can create new items of any type and made of any material. A unit must be selected in-game to use this command. By default, items created are spawned at diff --git a/docs/plugins/deramp.rst b/docs/plugins/deramp.rst index 4a1f34548..fdc0f7619 100644 --- a/docs/plugins/deramp.rst +++ b/docs/plugins/deramp.rst @@ -3,7 +3,7 @@ deramp .. dfhack-tool:: :summary: Removes all ramps designated for removal from the map. - :tags: unavailable fort armok map + :tags: fort armok map It also removes any "floating" down ramps that can remain after a cave-in. diff --git a/docs/plugins/flows.rst b/docs/plugins/flows.rst index 56840d999..bbb2c6661 100644 --- a/docs/plugins/flows.rst +++ b/docs/plugins/flows.rst @@ -3,7 +3,7 @@ flows .. dfhack-tool:: :summary: Counts map blocks with flowing liquids. - :tags: unavailable fort inspection map + :tags: fort inspection map If you suspect that your magma sea leaks into HFS, you can use this tool to be sure without revealing the map. diff --git a/docs/plugins/lair.rst b/docs/plugins/lair.rst index 82c5e211c..9bded57ab 100644 --- a/docs/plugins/lair.rst +++ b/docs/plugins/lair.rst @@ -3,7 +3,7 @@ lair .. dfhack-tool:: :summary: Mark the map as a monster lair. - :tags: unavailable fort armok map + :tags: fort armok map This avoids item scatter when the fortress is abandoned. diff --git a/docs/plugins/luasocket.rst b/docs/plugins/luasocket.rst index 1aa320ed7..4b5b18540 100644 --- a/docs/plugins/luasocket.rst +++ b/docs/plugins/luasocket.rst @@ -3,7 +3,7 @@ luasocket .. dfhack-tool:: :summary: Provides a Lua API for accessing network sockets. - :tags: unavailable dev + :tags: dev :no-command: See `luasocket-api` for details. From b6723e4fdbd0a72d766d12d8322ca240632d0ba4 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 11 May 2023 00:26:19 -0400 Subject: [PATCH 4/4] Remove "unavailable" tag from add-spatter and channel-safely docs These plugins are currently being built --- docs/plugins/add-spatter.rst | 2 +- docs/plugins/channel-safely.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst index 2c43a88ef..e8a39f781 100644 --- a/docs/plugins/add-spatter.rst +++ b/docs/plugins/add-spatter.rst @@ -3,7 +3,7 @@ add-spatter .. dfhack-tool:: :summary: Add poisons and magical effects to weapons. - :tags: unavailable adventure fort gameplay items + :tags: adventure fort gameplay items :no-command: Give some use to all those poisons that can be bought from caravans! The plugin diff --git a/docs/plugins/channel-safely.rst b/docs/plugins/channel-safely.rst index c24f352b0..c5dbc37f6 100644 --- a/docs/plugins/channel-safely.rst +++ b/docs/plugins/channel-safely.rst @@ -3,7 +3,7 @@ channel-safely .. dfhack-tool:: :summary: Auto-manage channel designations to keep dwarves safe. - :tags: unavailable fort auto + :tags: fort auto Multi-level channel projects can be dangerous, and managing the safety of your dwarves throughout the completion of such projects can be difficult and time