From 990f9f6061d353ae2235a0aa1c06b89439ed1aac Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 18 Dec 2022 17:25:18 -0800 Subject: [PATCH] comment out all plugins and default tool init until we can prove things work in v50 --- data/init/dfhack.tools.init | 106 +++++++++--------- plugins/CMakeLists.txt | 207 ++++++++++++++++++------------------ 2 files changed, 155 insertions(+), 158 deletions(-) diff --git a/data/init/dfhack.tools.init b/data/init/dfhack.tools.init index 70da533b3..a910a8e34 100644 --- a/data/init/dfhack.tools.init +++ b/data/init/dfhack.tools.init @@ -9,7 +9,7 @@ ############################ # stabilize the cursor of dwarfmode when switching menus -tweak stable-cursor +#tweak stable-cursor # stop stacked liquid/bar/thread/cloth items from lasting forever # if used in reactions that use only a fraction of the dimension. @@ -18,114 +18,114 @@ tweak stable-cursor # make reactions requiring containers usable in advmode - the issue is # that the screen asks for those reagents to be selected directly -tweak advmode-contained +#tweak advmode-contained # support Shift-Enter in Trade and Move Goods to Depot screens for faster # selection; it selects the current item or stack and scrolls down one line -tweak fast-trade +#tweak fast-trade # stop the right list in military->positions from resetting to top all the time -tweak military-stable-assign +#tweak military-stable-assign # in same list, color units already assigned to squads in brown & green -tweak military-color-assigned +#tweak military-color-assigned # make crafted cloth items wear out with time like in old versions (bug 6003) -tweak craft-age-wear +#tweak craft-age-wear # stop adamantine clothing from wearing out (bug 6481) #tweak adamantine-cloth-wear # Add "Select all" and "Deselect all" options to farm plot menus -tweak farm-plot-select +#tweak farm-plot-select # Add Shift-Left/Right controls to import agreement screen -tweak import-priority-category +#tweak import-priority-category # Fixes a crash in the work order contition material list (bug 9905). -tweak condition-material +#tweak condition-material # Adds an option to clear currently-bound hotkeys -tweak hotkey-clear +#tweak hotkey-clear # Allows lowercase letters in embark profile names, and allows exiting the name prompt without saving -tweak embark-profile-name +#tweak embark-profile-name # Reduce performance impact of temperature changes -tweak fast-heat 100 +#tweak fast-heat 100 # Misc. UI tweaks -tweak block-labors # Prevents labors that can't be used from being toggled -tweak burrow-name-cancel -tweak cage-butcher -tweak civ-view-agreement -tweak do-job-now -tweak eggs-fertile -tweak fps-min -tweak hide-priority -tweak kitchen-prefs-all -tweak kitchen-prefs-empty -tweak max-wheelbarrow -tweak partial-items -tweak shift-8-scroll -tweak stone-status-all -tweak title-start-rename -tweak tradereq-pet-gender +#tweak block-labors # Prevents labors that can't be used from being toggled +#tweak burrow-name-cancel +#tweak cage-butcher +#tweak civ-view-agreement +#tweak do-job-now +#tweak eggs-fertile +#tweak fps-min +#tweak hide-priority +#tweak kitchen-prefs-all +#tweak kitchen-prefs-empty +#tweak max-wheelbarrow +#tweak partial-items +#tweak shift-8-scroll +#tweak stone-status-all +#tweak title-start-rename +#tweak tradereq-pet-gender ########################### # Globally acting plugins # ########################### # Display DFHack version on title screen -enable title-version +#enable title-version # Dwarf Manipulator (simple in-game Dwarf Therapist replacement) -enable manipulator +#enable manipulator # Search tool in various screens (by falconne) -enable search +#enable search # Improved build material selection interface (by falconne) -enable automaterial +#enable automaterial # Other interface improvement tools -enable \ - overlay \ - confirm \ - dwarfmonitor \ - mousequery \ - autogems \ - autodump \ - automelt \ - autotrade \ - buildingplan \ - trackstop \ - zone \ - stocks \ - autochop \ - stockpiles +#enable \ +# overlay \ +# confirm \ +# dwarfmonitor \ +# mousequery \ +# autogems \ +# autodump \ +# automelt \ +# autotrade \ +# buildingplan \ +# trackstop \ +# zone \ +# stocks \ +# autochop \ +# stockpiles #end a line with a backslash to make it continue to the next line. The \ is deleted for the final command. # Multiline commands are ONLY supported for scripts like dfhack.init. You cannot do multiline command manually on the DFHack console. # You cannot extend a commented line. # You can comment out the extension of a line. # enable mouse controls and sand indicator in embark screen -embark-tools enable sticky sand mouse +#embark-tools enable sticky sand mouse # enable option to enter embark assistant -enable embark-assistant +#enable embark-assistant ########### # Scripts # ########### # write extra information to the gamelog -modtools/extra-gamelog enable +#modtools/extra-gamelog enable # extended status screen (bedrooms page) -enable gui/extended-status +#enable gui/extended-status # add information to item viewscreens -view-item-info enable +#view-item-info enable # a replacement for the "load game" screen -gui/load-screen enable +#gui/load-screen enable diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 3ad19efb4..5fbc7bf89 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -75,111 +75,108 @@ add_custom_target(generate_proto DEPENDS ${PROJECT_PROTO_TMP_FILES}) set_source_files_properties( Brushes.h PROPERTIES HEADER_FILE_ONLY TRUE ) # Plugins -option(BUILD_SUPPORTED "Build the supported plugins (reveal, probe, etc.)." ON) -if(BUILD_SUPPORTED) - # If you are adding a plugin that you do not intend to commit to the DFHack repo, - # see instructions for adding "external" plugins at the end of this file. - - dfhack_plugin(3dveins 3dveins.cpp) - dfhack_plugin(add-spatter add-spatter.cpp) - dfhack_plugin(autobutcher autobutcher.cpp LINK_LIBRARIES lua) - dfhack_plugin(autochop autochop.cpp) - dfhack_plugin(autoclothing autoclothing.cpp) - dfhack_plugin(autodump autodump.cpp) - dfhack_plugin(autofarm autofarm.cpp) - dfhack_plugin(autogems autogems.cpp LINK_LIBRARIES jsoncpp_static) - add_subdirectory(autolabor) - dfhack_plugin(automaterial automaterial.cpp LINK_LIBRARIES lua) - dfhack_plugin(automelt automelt.cpp) - dfhack_plugin(autonestbox autonestbox.cpp LINK_LIBRARIES lua) - dfhack_plugin(autotrade autotrade.cpp) - 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(changelayer changelayer.cpp) - dfhack_plugin(changevein changevein.cpp) - add_subdirectory(channel-safely) - 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(cursecheck cursecheck.cpp) - dfhack_plugin(cxxrandom cxxrandom.cpp LINK_LIBRARIES lua) - 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) - dfhack_plugin(digFlood digFlood.cpp) - add_subdirectory(diggingInvaders) - dfhack_plugin(dwarfvet dwarfvet.cpp) - dfhack_plugin(dwarfmonitor dwarfmonitor.cpp LINK_LIBRARIES lua) - add_subdirectory(embark-assistant) - dfhack_plugin(embark-tools embark-tools.cpp) - dfhack_plugin(eventful eventful.cpp LINK_LIBRARIES lua) - dfhack_plugin(fastdwarf fastdwarf.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(follow follow.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) - dfhack_plugin(infiniteSky infiniteSky.cpp) - dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote) - dfhack_plugin(jobutils jobutils.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(manipulator manipulator.cpp) - dfhack_plugin(map-render map-render.cpp LINK_LIBRARIES lua) - dfhack_plugin(misery misery.cpp) - dfhack_plugin(mode mode.cpp) - dfhack_plugin(mousequery mousequery.cpp) - dfhack_plugin(nestboxes nestboxes.cpp) - dfhack_plugin(orders orders.cpp LINK_LIBRARIES jsoncpp_static) - dfhack_plugin(overlay overlay.cpp LINK_LIBRARIES lua) - dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua) - dfhack_plugin(petcapRemover petcapRemover.cpp) - dfhack_plugin(plants plants.cpp) - dfhack_plugin(probe probe.cpp) - dfhack_plugin(prospector prospector.cpp LINK_LIBRARIES lua) - dfhack_plugin(power-meter power-meter.cpp LINK_LIBRARIES lua) - dfhack_plugin(regrass regrass.cpp) - add_subdirectory(remotefortressreader) - dfhack_plugin(rename rename.cpp LINK_LIBRARIES lua PROTOBUFS rename) - add_subdirectory(rendermax) - dfhack_plugin(reveal reveal.cpp LINK_LIBRARIES lua) - dfhack_plugin(search search.cpp) - dfhack_plugin(seedwatch seedwatch.cpp) - dfhack_plugin(showmood showmood.cpp) - dfhack_plugin(siege-engine siege-engine.cpp LINK_LIBRARIES lua) - dfhack_plugin(sort sort.cpp LINK_LIBRARIES lua) - dfhack_plugin(steam-engine steam-engine.cpp) - add_subdirectory(spectate) - dfhack_plugin(stockflow stockflow.cpp LINK_LIBRARIES lua) - add_subdirectory(stockpiles) - dfhack_plugin(stocks stocks.cpp) - dfhack_plugin(strangemood strangemood.cpp) - dfhack_plugin(tailor tailor.cpp) - dfhack_plugin(tiletypes tiletypes.cpp Brushes.h LINK_LIBRARIES lua) - dfhack_plugin(title-folder title-folder.cpp) - dfhack_plugin(title-version title-version.cpp) - dfhack_plugin(trackstop trackstop.cpp) - dfhack_plugin(tubefill tubefill.cpp) - add_subdirectory(tweak) - dfhack_plugin(workflow workflow.cpp LINK_LIBRARIES lua) - dfhack_plugin(workNow workNow.cpp) - dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat) - dfhack_plugin(zone zone.cpp) - - # If you are adding a plugin that you do not intend to commit to the DFHack repo, - # see instructions for adding "external" plugins at the end of this file. -endif() +# If you are adding a plugin that you do not intend to commit to the DFHack repo, +# see instructions for adding "external" plugins at the end of this file. + +#dfhack_plugin(3dveins 3dveins.cpp) +#dfhack_plugin(add-spatter add-spatter.cpp) +#dfhack_plugin(autobutcher autobutcher.cpp LINK_LIBRARIES lua) +#dfhack_plugin(autochop autochop.cpp) +#dfhack_plugin(autoclothing autoclothing.cpp) +#dfhack_plugin(autodump autodump.cpp) +#dfhack_plugin(autofarm autofarm.cpp) +#dfhack_plugin(autogems autogems.cpp LINK_LIBRARIES jsoncpp_static) +#add_subdirectory(autolabor) +#dfhack_plugin(automaterial automaterial.cpp LINK_LIBRARIES lua) +#dfhack_plugin(automelt automelt.cpp) +#dfhack_plugin(autonestbox autonestbox.cpp LINK_LIBRARIES lua) +#dfhack_plugin(autotrade autotrade.cpp) +#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(changelayer changelayer.cpp) +#dfhack_plugin(changevein changevein.cpp) +#add_subdirectory(channel-safely) +#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(cursecheck cursecheck.cpp) +#dfhack_plugin(cxxrandom cxxrandom.cpp LINK_LIBRARIES lua) +#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) +#dfhack_plugin(digFlood digFlood.cpp) +#add_subdirectory(diggingInvaders) +#dfhack_plugin(dwarfvet dwarfvet.cpp) +#dfhack_plugin(dwarfmonitor dwarfmonitor.cpp LINK_LIBRARIES lua) +#add_subdirectory(embark-assistant) +#dfhack_plugin(embark-tools embark-tools.cpp) +#dfhack_plugin(eventful eventful.cpp LINK_LIBRARIES lua) +#dfhack_plugin(fastdwarf fastdwarf.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(follow follow.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) +#dfhack_plugin(infiniteSky infiniteSky.cpp) +#dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote) +#dfhack_plugin(jobutils jobutils.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(manipulator manipulator.cpp) +#dfhack_plugin(map-render map-render.cpp LINK_LIBRARIES lua) +#dfhack_plugin(misery misery.cpp) +#dfhack_plugin(mode mode.cpp) +#dfhack_plugin(mousequery mousequery.cpp) +#dfhack_plugin(nestboxes nestboxes.cpp) +#dfhack_plugin(orders orders.cpp LINK_LIBRARIES jsoncpp_static) +#dfhack_plugin(overlay overlay.cpp LINK_LIBRARIES lua) +#dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua) +#dfhack_plugin(petcapRemover petcapRemover.cpp) +#dfhack_plugin(plants plants.cpp) +#dfhack_plugin(probe probe.cpp) +#dfhack_plugin(prospector prospector.cpp LINK_LIBRARIES lua) +#dfhack_plugin(power-meter power-meter.cpp LINK_LIBRARIES lua) +#dfhack_plugin(regrass regrass.cpp) +#add_subdirectory(remotefortressreader) +#dfhack_plugin(rename rename.cpp LINK_LIBRARIES lua PROTOBUFS rename) +#add_subdirectory(rendermax) +#dfhack_plugin(reveal reveal.cpp LINK_LIBRARIES lua) +#dfhack_plugin(search search.cpp) +#dfhack_plugin(seedwatch seedwatch.cpp) +#dfhack_plugin(showmood showmood.cpp) +#dfhack_plugin(siege-engine siege-engine.cpp LINK_LIBRARIES lua) +#dfhack_plugin(sort sort.cpp LINK_LIBRARIES lua) +#dfhack_plugin(steam-engine steam-engine.cpp) +#add_subdirectory(spectate) +#dfhack_plugin(stockflow stockflow.cpp LINK_LIBRARIES lua) +#add_subdirectory(stockpiles) +#dfhack_plugin(stocks stocks.cpp) +#dfhack_plugin(strangemood strangemood.cpp) +#dfhack_plugin(tailor tailor.cpp) +#dfhack_plugin(tiletypes tiletypes.cpp Brushes.h LINK_LIBRARIES lua) +#dfhack_plugin(title-folder title-folder.cpp) +#dfhack_plugin(title-version title-version.cpp) +#dfhack_plugin(trackstop trackstop.cpp) +#dfhack_plugin(tubefill tubefill.cpp) +#add_subdirectory(tweak) +#dfhack_plugin(workflow workflow.cpp LINK_LIBRARIES lua) +#dfhack_plugin(workNow workNow.cpp) +#dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat) +#dfhack_plugin(zone zone.cpp) + +# If you are adding a plugin that you do not intend to commit to the DFHack repo, +# see instructions for adding "external" plugins at the end of this file. # this is the skeleton plugin. If you want to make your own, make a copy and then change it option(BUILD_SKELETON "Build the skeleton plugin." OFF)