From 0fc451d2dcf3efca8ebf73e277ab9a5ffb06feef Mon Sep 17 00:00:00 2001 From: lethosor Date: Tue, 12 Apr 2022 14:48:11 -0400 Subject: [PATCH 1/2] Add initial pre-commit config --- .pre-commit-config.yaml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 000000000..94d5a4566 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,35 @@ +ci: + autofix_prs: false +repos: +# shared across repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.1.0 + hooks: + - id: check-added-large-files + - id: check-case-conflict + - id: check-executables-have-shebangs + - id: check-merge-conflict + - id: check-shebang-scripts-are-executable + - id: check-symlinks + - id: check-xml + - id: check-yaml + - id: destroyed-symlinks + - id: end-of-file-fixer + - id: mixed-line-ending + args: ['--fix=lf'] + - id: trailing-whitespace +- repo: https://github.com/python-jsonschema/check-jsonschema + rev: 0.14.2 + hooks: + - id: check-github-workflows +- repo: https://github.com/Lucas-C/pre-commit-hooks + rev: v1.1.13 + hooks: + - id: forbid-tabs + exclude_types: + - json + - id: remove-tabs + exclude_types: + - json +# specific to dfhack: +exclude: '^(depends/|data/examples/.*\.json$|.*\.diff$)' From d1f0edd33b0a1927c7ab48f0e6687b7eaed659af Mon Sep 17 00:00:00 2001 From: lethosor Date: Tue, 12 Apr 2022 14:48:19 -0400 Subject: [PATCH 2/2] Apply initial pre-commit config --- .github/workflows/buildmaster-rebuild.yml | 2 +- CMake/Modules/FindSphinx.cmake | 1 - README.html | 2 +- build/build-osx.sh | 112 +++--- build/sublime/dfhack.sublime-project | 64 ++-- build/win32/build-debug.bat | 2 +- build/win32/build-release.bat | 2 +- build/win32/generate-MSVC-all.bat | 0 build/win32/generate-MSVC-gui.bat | 0 build/win32/generate-MSVC-minimal.bat | 0 build/win32/generate-MSVC-release.bat | 0 build/win32/install-debug.bat | 2 +- build/win32/install-release.bat | 2 +- build/win32/package-debug.bat | 2 +- build/win32/set_df_path.vbs | 4 +- build/win64/generate-MSVC-all.bat | 0 build/win64/generate-MSVC-gui.bat | 0 build/win64/generate-MSVC-minimal.bat | 0 build/win64/generate-MSVC-release.bat | 0 build/win64/package-debug.bat | 2 +- build/win64/set_df_path.vbs | 4 +- conf.py | 1 - data/CMakeLists.txt | 1 - data/blueprints/library/aquifer_tap.csv | 1 - data/blueprints/library/dreamfort.csv | 9 +- data/blueprints/library/quickfortress.csv | 2 +- dfhack-config/autonick.txt | 1 - docs/Binpatches.rst | 1 - docs/Contributing.rst | 1 - docs/Structures-intro.rst | 1 - docs/index-dev.rst | 1 - docs/index.html | 2 +- library/include/Error.h | 1 - library/include/Hooks.h | 1 - library/include/LuaWrapper.h | 1 - library/include/Module.h | 1 - library/include/SDL_events.h | 2 +- library/include/SDL_keyboard.h | 2 +- library/include/SDL_keysym.h | 2 +- library/include/TileTypes.h | 1 - .../df/custom/block_burrow.methods.inc | 1 - library/include/df/custom/coord2d.methods.inc | 2 +- .../df/custom/inorganic_raw.methods.inc | 2 +- library/include/modules/Graphic.h | 2 +- library/include/modules/Items.h | 1 - library/include/modules/Job.h | 1 - library/include/modules/Materials.h | 1 - library/include/modules/Once.h | 1 - library/include/modules/Windows.h | 2 +- library/include/modules/World.h | 1 - library/lua/repeat-util.lua | 1 - library/lua/tile-material.lua | 1 - library/modules/Burrows.cpp | 1 - library/modules/EventManager.cpp | 1 - library/modules/Graphic.cpp | 2 +- library/modules/Maps.cpp | 1 - library/modules/Once.cpp | 1 - library/modules/Units.cpp | 2 +- library/modules/Windows.cpp | 2 +- package/darwin/dfhack | 8 +- package/windows/sdl license.txt | 18 +- plugins/autofarm.cpp | 1 - plugins/cleanconst.cpp | 2 +- plugins/devel/eventExample.cpp | 1 - plugins/devel/onceExample.cpp | 1 - plugins/devel/stockcheck.cpp | 1 - plugins/devel/zoom.cpp | 1 - plugins/dig.cpp | 1 - plugins/diggingInvaders/assignJob.h | 1 - plugins/diggingInvaders/diggingInvaders.cpp | 2 - plugins/diggingInvaders/edgeCost.cpp | 1 - plugins/diggingInvaders/edgeCost.h | 1 - plugins/embark-assistant/defs.h | 4 +- plugins/embark-assistant/finder_ui.h | 2 +- plugins/embark-assistant/help_ui.h | 2 +- plugins/embark-assistant/matcher.cpp | 12 +- plugins/embark-assistant/matcher.h | 2 +- plugins/embark-assistant/overlay.h | 2 +- plugins/embark-assistant/screen.h | 2 +- plugins/embark-assistant/survey.cpp | 3 +- plugins/embark-assistant/survey.h | 2 +- plugins/labormanager/labormanager.cpp | 1 - plugins/listcolumn.h | 1 - plugins/lua/burrows.lua | 2 +- plugins/lua/cxxrandom.lua | 4 +- plugins/lua/liquids.lua | 2 +- plugins/lua/luasocket.lua | 2 +- plugins/lua/map-render.lua | 2 +- plugins/lua/power-meter.lua | 2 +- plugins/lua/rename.lua | 2 +- plugins/lua/rendermax.lua | 2 +- plugins/lua/sort.lua | 2 +- plugins/lua/sort/items.lua | 2 +- plugins/lua/zone.lua | 2 +- plugins/misery.cpp | 1 - plugins/nestboxes.cpp | 1 - plugins/pathable.cpp | 1 - plugins/petcapRemover.cpp | 1 - plugins/raw/building_spatter.txt | 44 +-- plugins/raw/building_steam_engine.txt | 184 +++++----- plugins/raw/item_trapcomp_steam_engine.txt | 24 +- plugins/raw/reaction_spatter.txt | 336 +++++++++--------- plugins/raw/reaction_steam_engine.txt | 27 +- .../remotefortressreader/building_reader.cpp | 1 - .../remotefortressreader/building_reader.h | 2 +- plugins/remotefortressreader/dwarf_control.h | 2 - plugins/skeleton/skeleton.cpp | 2 +- plugins/skeleton/skeleton.h | 2 +- plugins/skeleton/skeletonShort.cpp | 1 - plugins/stockpiles/OrganicMatLookup.h | 1 - plugins/stockpiles/StockpileUtils.h | 2 - plugins/stockpiles/stockpiles.cpp | 4 - plugins/tweak/tweaks/civ-agreement-ui.h | 1 - plugins/tweak/tweaks/fast-heat.h | 1 - plugins/tweak/tweaks/fast-trade.h | 1 - test/library/gui/dialogs.lua | 28 +- test/library/utils.lua | 1 - test/structures/other_vectors.lua | 1 - 118 files changed, 481 insertions(+), 543 deletions(-) mode change 100644 => 100755 build/build-osx.sh mode change 100755 => 100644 build/win32/generate-MSVC-all.bat mode change 100755 => 100644 build/win32/generate-MSVC-gui.bat mode change 100755 => 100644 build/win32/generate-MSVC-minimal.bat mode change 100755 => 100644 build/win32/generate-MSVC-release.bat mode change 100755 => 100644 build/win64/generate-MSVC-all.bat mode change 100755 => 100644 build/win64/generate-MSVC-gui.bat mode change 100755 => 100644 build/win64/generate-MSVC-minimal.bat mode change 100755 => 100644 build/win64/generate-MSVC-release.bat diff --git a/.github/workflows/buildmaster-rebuild.yml b/.github/workflows/buildmaster-rebuild.yml index 281a6b059..5a1fe9504 100644 --- a/.github/workflows/buildmaster-rebuild.yml +++ b/.github/workflows/buildmaster-rebuild.yml @@ -5,7 +5,7 @@ on: inputs: pull_request: description: Pull request ID - type: number + type: string required: true # remove if we support commit rebuilds later jobs: diff --git a/CMake/Modules/FindSphinx.cmake b/CMake/Modules/FindSphinx.cmake index 54fc5ea8d..6b78a555f 100644 --- a/CMake/Modules/FindSphinx.cmake +++ b/CMake/Modules/FindSphinx.cmake @@ -13,4 +13,3 @@ find_package_handle_standard_args(Sphinx DEFAULT_MSG ) mark_as_advanced(SPHINX_EXECUTABLE) - diff --git a/README.html b/README.html index b8e15a0d1..4d1b0fd13 100644 --- a/README.html +++ b/README.html @@ -13,4 +13,4 @@ Follow this link to the documentation. - \ No newline at end of file + diff --git a/build/build-osx.sh b/build/build-osx.sh old mode 100644 new mode 100755 index 8e3410159..e6be0f308 --- a/build/build-osx.sh +++ b/build/build-osx.sh @@ -7,88 +7,88 @@ LUA_PATCH=1 ME=$PWD/`basename $0` usage() { - echo "Usage: $0 [options] {DF_OSX_PATH}" - echo -e "\told\t- use on pre-Snow Leopard OSX installations" - echo -e "\tbrew\t- if GCC 4.5 was installed with homebrew" - echo -e "\tport\t- if GCC 4.5 was insalled with macports" - echo -e "\tclean\t- delete ../build-osx before compiling" - echo "Example:" - echo -e "\t$0 old brew ../../../personal/df_osx" - echo -e "\t$0 port clean /Users/dfplayer/df_osx" - exit $1 + echo "Usage: $0 [options] {DF_OSX_PATH}" + echo -e "\told\t- use on pre-Snow Leopard OSX installations" + echo -e "\tbrew\t- if GCC 4.5 was installed with homebrew" + echo -e "\tport\t- if GCC 4.5 was insalled with macports" + echo -e "\tclean\t- delete ../build-osx before compiling" + echo "Example:" + echo -e "\t$0 old brew ../../../personal/df_osx" + echo -e "\t$0 port clean /Users/dfplayer/df_osx" + exit $1 } options() { - case $1 in - brew) - echo "Using homebrew gcc." - export CC=/usr/local/bin/gcc-4.5 - export CXX=/usr/local/bin/g++-4.5 - targetted=1 - ;; - port) - echo "Using macports gcc." - export CC=/opt/local/bin/gcc-mp-4.5 - export CXX=/opt/local/bin/g++-mp-4.5 - targetted=1 - ;; - old) - LUA_PATCH=0 - ;; - clean) - echo "Deleting ../build-osx" - rm -rf ../build-osx - ;; - *) - ;; - esac + case $1 in + brew) + echo "Using homebrew gcc." + export CC=/usr/local/bin/gcc-4.5 + export CXX=/usr/local/bin/g++-4.5 + targetted=1 + ;; + port) + echo "Using macports gcc." + export CC=/opt/local/bin/gcc-mp-4.5 + export CXX=/opt/local/bin/g++-mp-4.5 + targetted=1 + ;; + old) + LUA_PATCH=0 + ;; + clean) + echo "Deleting ../build-osx" + rm -rf ../build-osx + ;; + *) + ;; + esac } # sanity checks if [[ $# -lt 1 ]] then - echo "Not enough arguments." - usage 0 + echo "Not enough arguments." + usage 0 fi if [[ $# -gt 4 ]] then - echo "Too many arguments." - usage 1 + echo "Too many arguments." + usage 1 fi # run through the arguments for last do - options $last + options $last done # last keeps the last argument if [[ $targetted -eq 0 ]] then - echo "You did not specify whether you intalled GCC 4.5 from brew or ports." - echo "If you continue, your default compiler will be used." - read -p "Are you sure you want to continue? [y/N] " -n 1 -r - echo # (optional) move to a new line - if [[ ! $REPLY =~ ^[Yy]$ ]] - then - exit 0 - fi + echo "You did not specify whether you intalled GCC 4.5 from brew or ports." + echo "If you continue, your default compiler will be used." + read -p "Are you sure you want to continue? [y/N] " -n 1 -r + echo # (optional) move to a new line + if [[ ! $REPLY =~ ^[Yy]$ ]] + then + exit 0 + fi fi # check for build folder and start working there if [[ ! -d ../build-osx ]] then - mkdir ../build-osx + mkdir ../build-osx fi cd ../build-osx # patch if necessary if [[ $LUA_PATCH -ne 0 ]] then - cd .. - echo "$PWD" - sed -e '1,/'"PATCH""CODE"'/d' "$ME" | patch -p0 - cd - + cd .. + echo "$PWD" + sed -e '1,/'"PATCH""CODE"'/d' "$ME" | patch -p0 + cd - fi echo "Generate" @@ -101,17 +101,17 @@ make install # unpatch if /libarary/luaTypes.cpp was patched if [[ $LUA_PATCH -ne 0 ]] then - cd .. - echo -n "un" - sed -e '1,/'"PATCH""CODE"'/d' "$ME" | patch -p0 -R - cd - + cd .. + echo -n "un" + sed -e '1,/'"PATCH""CODE"'/d' "$ME" | patch -p0 -R + cd - fi exit 0 # PATCHCODE - everything below this line is fed into patch ---- library/LuaTypes.cpp 2014-08-20 00:13:17.000000000 -0700 -+++ library/LuaTypes.cpp 2014-08-31 23:31:00.000000000 -0700 +--- library/LuaTypes.cpp 2014-08-20 00:13:17.000000000 -0700 ++++ library/LuaTypes.cpp 2014-08-31 23:31:00.000000000 -0700 @@ -464,7 +464,7 @@ { case struct_field_info::STATIC_STRING: diff --git a/build/sublime/dfhack.sublime-project b/build/sublime/dfhack.sublime-project index 1b1aa272b..cc147764f 100644 --- a/build/sublime/dfhack.sublime-project +++ b/build/sublime/dfhack.sublime-project @@ -1,34 +1,34 @@ { - "folders": - [ - { - "path": "." - } - ], - "build_systems": - [ - { - "name": "DFHack make", - "working_dir": "$project_path", - "cmd": ["python", "$project_path/build/sublime/make.py", "$file"], - "variants": [ - { - "name": "Build all", - "cmd": ["python", "$project_path/build/sublime/make.py", "-a"] - }, - { - "name": "Build+install all", - "cmd": ["python", "$project_path/build/sublime/make.py", "-ai"] - }, - { - "name": "Build plugin", - "cmd": ["python", "$project_path/build/sublime/make.py", "-ap", "$file"] - }, - { - "name": "Build+install plugin", - "cmd": ["python", "$project_path/build/sublime/make.py", "-aip", "$file"] - } - ] - } - ] + "folders": + [ + { + "path": "." + } + ], + "build_systems": + [ + { + "name": "DFHack make", + "working_dir": "$project_path", + "cmd": ["python", "$project_path/build/sublime/make.py", "$file"], + "variants": [ + { + "name": "Build all", + "cmd": ["python", "$project_path/build/sublime/make.py", "-a"] + }, + { + "name": "Build+install all", + "cmd": ["python", "$project_path/build/sublime/make.py", "-ai"] + }, + { + "name": "Build plugin", + "cmd": ["python", "$project_path/build/sublime/make.py", "-ap", "$file"] + }, + { + "name": "Build+install plugin", + "cmd": ["python", "$project_path/build/sublime/make.py", "-aip", "$file"] + } + ] + } + ] } diff --git a/build/win32/build-debug.bat b/build/win32/build-debug.bat index b75676ff4..dd972093d 100644 --- a/build/win32/build-debug.bat +++ b/build/win32/build-debug.bat @@ -1,4 +1,4 @@ call "%VS140COMNTOOLS%vsvars32.bat" cd VC2015_32 msbuild /m /p:Platform=Win32 /p:Configuration=RelWithDebInfo ALL_BUILD.vcxproj -cd .. \ No newline at end of file +cd .. diff --git a/build/win32/build-release.bat b/build/win32/build-release.bat index 0b7a2a407..71f14eaf0 100644 --- a/build/win32/build-release.bat +++ b/build/win32/build-release.bat @@ -2,4 +2,4 @@ call "%VS140COMNTOOLS%vsvars32.bat" cd VC2015_32 msbuild /m /p:Platform=Win32 /p:Configuration=Release ALL_BUILD.vcxproj cd .. -pause \ No newline at end of file +pause diff --git a/build/win32/generate-MSVC-all.bat b/build/win32/generate-MSVC-all.bat old mode 100755 new mode 100644 diff --git a/build/win32/generate-MSVC-gui.bat b/build/win32/generate-MSVC-gui.bat old mode 100755 new mode 100644 diff --git a/build/win32/generate-MSVC-minimal.bat b/build/win32/generate-MSVC-minimal.bat old mode 100755 new mode 100644 diff --git a/build/win32/generate-MSVC-release.bat b/build/win32/generate-MSVC-release.bat old mode 100755 new mode 100644 diff --git a/build/win32/install-debug.bat b/build/win32/install-debug.bat index b13e7c29a..f9dc48b85 100644 --- a/build/win32/install-debug.bat +++ b/build/win32/install-debug.bat @@ -1,4 +1,4 @@ call "%VS140COMNTOOLS%vsvars32.bat" cd VC2015_32 msbuild /m /p:Platform=Win32 /p:Configuration=RelWithDebInfo INSTALL.vcxproj -cd .. \ No newline at end of file +cd .. diff --git a/build/win32/install-release.bat b/build/win32/install-release.bat index 8a9d61fc3..a5c571617 100644 --- a/build/win32/install-release.bat +++ b/build/win32/install-release.bat @@ -1,4 +1,4 @@ call "%VS140COMNTOOLS%vsvars32.bat" cd VC2015_32 msbuild /m /p:Platform=Win32 /p:Configuration=Release INSTALL.vcxproj -cd .. \ No newline at end of file +cd .. diff --git a/build/win32/package-debug.bat b/build/win32/package-debug.bat index 094749651..c4d380b7a 100644 --- a/build/win32/package-debug.bat +++ b/build/win32/package-debug.bat @@ -3,4 +3,4 @@ call "%VS140COMNTOOLS%vsvars32.bat" cd VC2015_32 msbuild /m /p:Platform=Win32 /p:Configuration=RelWithDebInfo PACKAGE.vcxproj cd .. -exit %ERRORLEVEL% \ No newline at end of file +exit %ERRORLEVEL% diff --git a/build/win32/set_df_path.vbs b/build/win32/set_df_path.vbs index 1d494a2e5..219d150da 100644 --- a/build/win32/set_df_path.vbs +++ b/build/win32/set_df_path.vbs @@ -11,7 +11,7 @@ If fso.FileExists("DF_PATH.txt") Then fso.DeleteFile "DF_PATH.txt", True End If -If IsValue(objF) Then +If IsValue(objF) Then If InStr(1, TypeName(objF), "Folder") > 0 Then Set spoFile = fso.CreateTextFile("DF_PATH.txt", True) spoFile.WriteLine(objF.Self.Path) @@ -29,4 +29,4 @@ Function IsValue(obj) IsValue = True End If On Error GoTo 0 -End Function \ No newline at end of file +End Function diff --git a/build/win64/generate-MSVC-all.bat b/build/win64/generate-MSVC-all.bat old mode 100755 new mode 100644 diff --git a/build/win64/generate-MSVC-gui.bat b/build/win64/generate-MSVC-gui.bat old mode 100755 new mode 100644 diff --git a/build/win64/generate-MSVC-minimal.bat b/build/win64/generate-MSVC-minimal.bat old mode 100755 new mode 100644 diff --git a/build/win64/generate-MSVC-release.bat b/build/win64/generate-MSVC-release.bat old mode 100755 new mode 100644 diff --git a/build/win64/package-debug.bat b/build/win64/package-debug.bat index d0137e5ab..eb583ba0d 100644 --- a/build/win64/package-debug.bat +++ b/build/win64/package-debug.bat @@ -3,4 +3,4 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd6 cd VC2015 msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo PACKAGE.vcxproj cd .. -exit %ERRORLEVEL% \ No newline at end of file +exit %ERRORLEVEL% diff --git a/build/win64/set_df_path.vbs b/build/win64/set_df_path.vbs index 1d494a2e5..219d150da 100644 --- a/build/win64/set_df_path.vbs +++ b/build/win64/set_df_path.vbs @@ -11,7 +11,7 @@ If fso.FileExists("DF_PATH.txt") Then fso.DeleteFile "DF_PATH.txt", True End If -If IsValue(objF) Then +If IsValue(objF) Then If InStr(1, TypeName(objF), "Folder") > 0 Then Set spoFile = fso.CreateTextFile("DF_PATH.txt", True) spoFile.WriteLine(objF.Self.Path) @@ -29,4 +29,4 @@ Function IsValue(obj) IsValue = True End If On Error GoTo 0 -End Function \ No newline at end of file +End Function diff --git a/conf.py b/conf.py index bf1dde2c4..c762a3cfa 100644 --- a/conf.py +++ b/conf.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # -*- coding: utf-8 -*- """ DFHack documentation build configuration file diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 777e3c42b..53e88fed9 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -14,4 +14,3 @@ if(BUILD_TESTS) DESTINATION blueprints/library/test ) endif() - diff --git a/data/blueprints/library/aquifer_tap.csv b/data/blueprints/library/aquifer_tap.csv index a15357d7f..22025d8e7 100644 --- a/data/blueprints/library/aquifer_tap.csv +++ b/data/blueprints/library/aquifer_tap.csv @@ -58,4 +58,3 @@ u <- drainage level ,,,,,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r ,,,,,,,,,,,,r ,,,,,,,,,,,,r - diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv index 801bb32e6..c58ce9111 100644 --- a/data/blueprints/library/dreamfort.csv +++ b/data/blueprints/library/dreamfort.csv @@ -66,7 +66,7 @@ quickfort undo library/dreamfort.csv -n /perimeter,# Clean up after you find you quickfort run library/dreamfort.csv -n /surface1,# Run when you find your center tile. quickfort run library/dreamfort.csv -n /dig_all,"# Run when you find a suitable rock layer for the industry level. It designates digging for industry, services, guildhall, suites, and apartments all in one go. This list does not include the farming level, which we'll dig in the uppermost soil layer a bit later. Note that it is more efficient for your miners if you designate your digging before they dig the central stairs past that level since the stairs are dug at a low priority. This keeps your miners focused on one level at a time. If you need to designate your levels individually due to caverns interrupting the sequence or just because it is your preference, run the level-specific dig blueprints (i.e. /industry1, /services1, /guildhall1, /suites1, and 5 levels of /apartments1) instead of running /dig_all." "" --- Core fort (should finish at about the third migration wave) -- +-- Core fort (should finish at about the third migration wave) -- quickfort run library/dreamfort.csv -n /surface2,# Run after initial trees are cleared. quickfort run library/dreamfort.csv -n /farming1,# Run when channels are dug and the additional designated trees are cleared. quickfort run library/dreamfort.csv -n /farming2,# Run when the farming level has been dug out. @@ -82,11 +82,11 @@ prioritize ConstructBuilding,# Run when you see the bridges ready to be built so "quickfort run,orders library/dreamfort.csv -n /surface6",# Run when at least the beehives and weapon rack are constructed and you have linked all levers to their respective bridges. "quickfort run,orders library/dreamfort.csv -n /surface7",# Run after the surface walls are completed and any marked trees are chopped down. "" --- Plumbing -- +-- Plumbing -- "This is a good time to fill your well cisterns, either with a bucket brigade or by routing water from a freshwater stream or an aquifer (see the library/aquifer_tap.csv blueprint for help with this)." "Also consider bringing magma up to your services level so you can replace the forge and furnaces on your industry level with more powerful magma versions. This is especially important if your embark has insufficient trees to convert into charcoal. Keep in mind that moving magma is a tricky process and can take a long time. Don't forget to continue making progress through the checklist! If you choose to use magma, I suggest getting it in place before importing the military and smelting automation orders since they make heavy use of furnaces and forges." "" --- Mature fort (third migration wave onward) -- +-- Mature fort (third migration wave onward) -- orders import furnace,# Automated production of basic furnace-related items. Don't forget to create a sand collection zone (or remove the sand- and glass-related orders if you have no sand). "quickfort run,orders library/dreamfort.csv -n /suites2",# Run when the suites level has been dug out. "quickfort run,orders library/dreamfort.csv -n /surface8","# Run if/when you need longer trap corridors on the surface for larger sieges, anytime after you run /surface7." @@ -334,7 +334,7 @@ corridor/surface_corridor message(Once the central stairs are mined out deeply enough, you should start digging the industry level in a non-aquifer rock layer. You'll need the boulders from the digging to make blocks. If your wagon is within the fort perimeter, deconstruct it to get it out of the way. Once the marked trees are all chopped down (if any), continue with /surface2.) clear trees and set up pastures" -central_stairs/central_stairs repeat(down 10) +central_stairs/central_stairs repeat(down 10) clear_small/surface_clear_small zones/surface_zones name_zones/surface_name_zones @@ -2897,4 +2897,3 @@ build2_apartments/apartments_build2 ,,,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h ,,,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,` ,,,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f - diff --git a/data/blueprints/library/quickfortress.csv b/data/blueprints/library/quickfortress.csv index edd52788b..e66cc4022 100644 --- a/data/blueprints/library/quickfortress.csv +++ b/data/blueprints/library/quickfortress.csv @@ -765,4 +765,4 @@ r+,,,,,,,,r+,,r+,,,,,,,,,r+,,r+,,,,,,,,,# ,,,,,,,,,,,,,,,,,,,,,Tl,Tl,Tl,d,,,,,,# ,,,,,,,,,,,,,,,,,,,,,,Tl,,,,,d,Msm,Msm,# ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# -#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,# \ No newline at end of file +#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,# diff --git a/dfhack-config/autonick.txt b/dfhack-config/autonick.txt index 79cfefb0a..e7de79f54 100644 --- a/dfhack-config/autonick.txt +++ b/dfhack-config/autonick.txt @@ -150,4 +150,3 @@ Wilder Wisdom Wyatt Zephyr - diff --git a/docs/Binpatches.rst b/docs/Binpatches.rst index 8af50fa45..5c1c640d4 100644 --- a/docs/Binpatches.rst +++ b/docs/Binpatches.rst @@ -175,4 +175,3 @@ The script interface simply lets you designate one of the squads that are assigned to the barracks/armory containing the selected stand as the intended user. In order to aid in the choice, it shows the number of currently assigned racks for every valid squad. - diff --git a/docs/Contributing.rst b/docs/Contributing.rst index 1fcf6afc4..799a420a5 100644 --- a/docs/Contributing.rst +++ b/docs/Contributing.rst @@ -112,4 +112,3 @@ If you're not comfortable programming, you can help by: All those things are crucial, and often under-represented. So if that's your thing, go get started! - diff --git a/docs/Structures-intro.rst b/docs/Structures-intro.rst index c45d03eaf..48aa571c8 100644 --- a/docs/Structures-intro.rst +++ b/docs/Structures-intro.rst @@ -31,4 +31,3 @@ of DF-structures: /library/xml/SYNTAX /library/xml/how-to-update - diff --git a/docs/index-dev.rst b/docs/index-dev.rst index 3788baf1d..5a03cbedf 100644 --- a/docs/index-dev.rst +++ b/docs/index-dev.rst @@ -18,4 +18,3 @@ These are pages relevant to people developing for DFHack. /docs/Structures-intro /docs/Memory-research /docs/Binpatches - diff --git a/docs/index.html b/docs/index.html index d716eb842..410b59571 100644 --- a/docs/index.html +++ b/docs/index.html @@ -20,4 +20,4 @@ Follow this link to the documentation. - \ No newline at end of file + diff --git a/library/include/Error.h b/library/include/Error.h index 29564d69d..e5e569542 100644 --- a/library/include/Error.h +++ b/library/include/Error.h @@ -131,4 +131,3 @@ namespace DFHack }; } } - diff --git a/library/include/Hooks.h b/library/include/Hooks.h index 97caecfa5..f5ef7079c 100644 --- a/library/include/Hooks.h +++ b/library/include/Hooks.h @@ -93,4 +93,3 @@ DFhackCExport int egg_sdl_event(SDL::Event* event); // hook - ncurses event. return -1 to consume DFhackCExport int egg_curses_event(int orig_return); - diff --git a/library/include/LuaWrapper.h b/library/include/LuaWrapper.h index c5daed0fc..6166dc88f 100644 --- a/library/include/LuaWrapper.h +++ b/library/include/LuaWrapper.h @@ -240,4 +240,3 @@ namespace LuaWrapper { void AttachDFGlobals(lua_State *state); }} - diff --git a/library/include/Module.h b/library/include/Module.h index 639edea6a..7770e1397 100644 --- a/library/include/Module.h +++ b/library/include/Module.h @@ -57,4 +57,3 @@ namespace DFHack }; } #endif //MODULE_H_INCLUDED - diff --git a/library/include/SDL_events.h b/library/include/SDL_events.h index 0457dbca1..80067f07d 100644 --- a/library/include/SDL_events.h +++ b/library/include/SDL_events.h @@ -207,4 +207,4 @@ namespace SDL UserEvent user; SysWMEvent syswm; }; -} \ No newline at end of file +} diff --git a/library/include/SDL_keyboard.h b/library/include/SDL_keyboard.h index f0d325f57..1d58bd63f 100644 --- a/library/include/SDL_keyboard.h +++ b/library/include/SDL_keyboard.h @@ -58,4 +58,4 @@ namespace SDL /** This is the mask which refers to all hotkey bindings */ #define ALL_HOTKEYS 0xFFFFFFFF -} \ No newline at end of file +} diff --git a/library/include/SDL_keysym.h b/library/include/SDL_keysym.h index b73c93a92..e19f786af 100644 --- a/library/include/SDL_keysym.h +++ b/library/include/SDL_keysym.h @@ -326,4 +326,4 @@ namespace SDL KMOD_ALT = (KMOD_LALT|KMOD_RALT), KMOD_META = (KMOD_LMETA|KMOD_RMETA) }; -} \ No newline at end of file +} diff --git a/library/include/TileTypes.h b/library/include/TileTypes.h index f547eaec1..5dbc81d0d 100644 --- a/library/include/TileTypes.h +++ b/library/include/TileTypes.h @@ -352,4 +352,3 @@ namespace DFHack */ DFHACK_EXPORT df::tiletype matchTileMaterial(df::tiletype source, df::tiletype_material tmat); } - diff --git a/library/include/df/custom/block_burrow.methods.inc b/library/include/df/custom/block_burrow.methods.inc index 3959fcf35..4da4c65be 100644 --- a/library/include/df/custom/block_burrow.methods.inc +++ b/library/include/df/custom/block_burrow.methods.inc @@ -18,4 +18,3 @@ bool has_assignments() { return tile_bitmask.has_assignments(); } - diff --git a/library/include/df/custom/coord2d.methods.inc b/library/include/df/custom/coord2d.methods.inc index f15475b6f..202192bb8 100644 --- a/library/include/df/custom/coord2d.methods.inc +++ b/library/include/df/custom/coord2d.methods.inc @@ -42,4 +42,4 @@ coord2d operator%(int number) const coord2d operator&(int number) const { return coord2d(x&number, y&number); -} \ No newline at end of file +} diff --git a/library/include/df/custom/inorganic_raw.methods.inc b/library/include/df/custom/inorganic_raw.methods.inc index 0e8a62e78..bb682bcd0 100644 --- a/library/include/df/custom/inorganic_raw.methods.inc +++ b/library/include/df/custom/inorganic_raw.methods.inc @@ -1,4 +1,4 @@ bool isOre() { return flags.is_set(df::enums::inorganic_flags::METAL_ORE) || flags.is_set(df::enums::inorganic_flags::THREAD_METAL); -} \ No newline at end of file +} diff --git a/library/include/modules/Graphic.h b/library/include/modules/Graphic.h index 9103ce2be..fa2cc30c6 100644 --- a/library/include/modules/Graphic.h +++ b/library/include/modules/Graphic.h @@ -86,4 +86,4 @@ namespace DFHack } -#endif \ No newline at end of file +#endif diff --git a/library/include/modules/Items.h b/library/include/modules/Items.h index 25090cd83..7f2c9ce69 100644 --- a/library/include/modules/Items.h +++ b/library/include/modules/Items.h @@ -207,4 +207,3 @@ DFHACK_EXPORT bool isSquadEquipment(df::item *item); } } - diff --git a/library/include/modules/Job.h b/library/include/modules/Job.h index e2d7ff162..2a874dc5e 100644 --- a/library/include/modules/Job.h +++ b/library/include/modules/Job.h @@ -112,4 +112,3 @@ namespace DFHack DFHACK_EXPORT bool operator== (const df::job &a, const df::job &b); } #endif - diff --git a/library/include/modules/Materials.h b/library/include/modules/Materials.h index 3217b30ad..74acf5a8d 100644 --- a/library/include/modules/Materials.h +++ b/library/include/modules/Materials.h @@ -383,4 +383,3 @@ namespace DFHack }; } #endif - diff --git a/library/include/modules/Once.h b/library/include/modules/Once.h index 7bfd819ec..7b98a31f0 100644 --- a/library/include/modules/Once.h +++ b/library/include/modules/Once.h @@ -8,4 +8,3 @@ namespace DFHack { DFHACK_EXPORT bool doOnce(std::string); } } - diff --git a/library/include/modules/Windows.h b/library/include/modules/Windows.h index f77d0d031..f9b282cf3 100644 --- a/library/include/modules/Windows.h +++ b/library/include/modules/Windows.h @@ -267,4 +267,4 @@ namespace Windows } }; } -} \ No newline at end of file +} diff --git a/library/include/modules/World.h b/library/include/modules/World.h index d5f21ec08..659786ff5 100644 --- a/library/include/modules/World.h +++ b/library/include/modules/World.h @@ -110,4 +110,3 @@ namespace DFHack } } #endif - diff --git a/library/lua/repeat-util.lua b/library/lua/repeat-util.lua index c229ea70d..b3cd2e115 100644 --- a/library/lua/repeat-util.lua +++ b/library/lua/repeat-util.lua @@ -44,4 +44,3 @@ function scheduleUnlessAlreadyScheduled(name,time,timeUnits,func) end return _ENV - diff --git a/library/lua/tile-material.lua b/library/lua/tile-material.lua index 5661de73e..0e5565d09 100644 --- a/library/lua/tile-material.lua +++ b/library/lua/tile-material.lua @@ -397,4 +397,3 @@ function GetTileTypeMat(typ, matspec, x, y, z) end return _ENV - diff --git a/library/modules/Burrows.cpp b/library/modules/Burrows.cpp index f8fbbb23f..7d62a53db 100644 --- a/library/modules/Burrows.cpp +++ b/library/modules/Burrows.cpp @@ -276,4 +276,3 @@ bool Burrows::setAssignedBlockTile(df::burrow *burrow, df::map_block *block, df: return true; } - diff --git a/library/modules/EventManager.cpp b/library/modules/EventManager.cpp index 80dc254d5..e6b9c5259 100644 --- a/library/modules/EventManager.cpp +++ b/library/modules/EventManager.cpp @@ -1254,4 +1254,3 @@ static void manageInteractionEvent(color_ostream& out) { //TODO: deduce attacker from latest defend event first } } - diff --git a/library/modules/Graphic.cpp b/library/modules/Graphic.cpp index a12ddb37c..7f6b8f4d3 100644 --- a/library/modules/Graphic.cpp +++ b/library/modules/Graphic.cpp @@ -90,4 +90,4 @@ DFTileSurface* Graphic::Call(int x, int y) } return NULL; -} \ No newline at end of file +} diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp index da1a775f3..889a40104 100644 --- a/library/modules/Maps.cpp +++ b/library/modules/Maps.cpp @@ -1153,4 +1153,3 @@ df::enums::biome_type::biome_type Maps::GetBiomeType(int world_coord_x, int worl { return Maps::GetBiomeTypeWithRef(world_coord_x, world_coord_y, world_coord_y); } - diff --git a/library/modules/Once.cpp b/library/modules/Once.cpp index 0ef8b22c2..e99bee0cf 100644 --- a/library/modules/Once.cpp +++ b/library/modules/Once.cpp @@ -13,4 +13,3 @@ bool DFHack::Once::alreadyDone(string bob) { bool DFHack::Once::doOnce(string bob) { return thingsDone.insert(bob).second; } - diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index 87dc61a9d..8e9f624ea 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -646,7 +646,7 @@ bool Units::isHidden(df::unit *unit) if (*df::global::debug_showambush) return false; - + if (*gamemode == game_mode::ADVENTURE) { if (unit == world->units.active[0]) diff --git a/library/modules/Windows.cpp b/library/modules/Windows.cpp index 4e749322f..af5368e50 100644 --- a/library/modules/Windows.cpp +++ b/library/modules/Windows.cpp @@ -115,4 +115,4 @@ Windows::df_tilebuf Windows::top_level_window::getBuffer() buf.height = df::global::gps->dimy; buf.width = df::global::gps->dimx; return buf; -} \ No newline at end of file +} diff --git a/package/darwin/dfhack b/package/darwin/dfhack index 5241f1a67..c950f7495 100755 --- a/package/darwin/dfhack +++ b/package/darwin/dfhack @@ -4,11 +4,11 @@ cd "${PWD}" #thanks to Iriel for figuring this out OSREV=`uname -r | cut -d. -f1` if [ "$OSREV" -ge 11 ] ; then - export DYLD_LIBRARY_PATH="./hack:./libs:./hack/libs" - export DYLD_FRAMEWORK_PATH="./hack:./libs:./hack/libs" + export DYLD_LIBRARY_PATH="./hack:./libs:./hack/libs" + export DYLD_FRAMEWORK_PATH="./hack:./libs:./hack/libs" else - export DYLD_FALLBACK_LIBRARY_PATH="./hack:./libs:./hack/libs" - export DYLD_FALLBACK_FRAMEWORK_PATH="./hack:./libs:./hack/libs" + export DYLD_FALLBACK_LIBRARY_PATH="./hack:./libs:./hack/libs" + export DYLD_FALLBACK_FRAMEWORK_PATH="./hack:./libs:./hack/libs" fi # attempt to remove quarantine flag: https://github.com/DFHack/dfhack/issues/1465 diff --git a/package/windows/sdl license.txt b/package/windows/sdl license.txt index 4362b4915..e5ab03e12 100644 --- a/package/windows/sdl license.txt +++ b/package/windows/sdl license.txt @@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. - + Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a @@ -111,7 +111,7 @@ modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. - + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -158,7 +158,7 @@ Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -216,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -267,7 +267,7 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -370,7 +370,7 @@ subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. - + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -422,7 +422,7 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest diff --git a/plugins/autofarm.cpp b/plugins/autofarm.cpp index b9414970c..2dafdee49 100644 --- a/plugins/autofarm.cpp +++ b/plugins/autofarm.cpp @@ -453,4 +453,3 @@ static command_result autofarm(color_ostream& out, std::vector& par return CR_OK; } - diff --git a/plugins/cleanconst.cpp b/plugins/cleanconst.cpp index 2d5bf77f6..84659c5d7 100644 --- a/plugins/cleanconst.cpp +++ b/plugins/cleanconst.cpp @@ -83,4 +83,4 @@ DFhackCExport command_result plugin_init ( color_ostream &out, vector name_singular[0]->c_str()); } } - diff --git a/plugins/devel/onceExample.cpp b/plugins/devel/onceExample.cpp index 75cec0841..6e5d5286b 100644 --- a/plugins/devel/onceExample.cpp +++ b/plugins/devel/onceExample.cpp @@ -32,4 +32,3 @@ command_result onceExample (color_ostream &out, std::vector & para } return CR_OK; } - diff --git a/plugins/devel/stockcheck.cpp b/plugins/devel/stockcheck.cpp index b29cb53f0..619fda9fd 100644 --- a/plugins/devel/stockcheck.cpp +++ b/plugins/devel/stockcheck.cpp @@ -273,4 +273,3 @@ static command_result stockcheck(color_ostream &out, vector & parameter return CR_OK; } - diff --git a/plugins/devel/zoom.cpp b/plugins/devel/zoom.cpp index 80f4dfaf1..735191b01 100644 --- a/plugins/devel/zoom.cpp +++ b/plugins/devel/zoom.cpp @@ -80,4 +80,3 @@ command_result df_gzoom (color_ostream &out, std::vector & paramete Gui::setViewCoords(x,y,z); return CR_OK; } - diff --git a/plugins/dig.cpp b/plugins/dig.cpp index c597a32ee..6c33f206a 100644 --- a/plugins/dig.cpp +++ b/plugins/dig.cpp @@ -1543,4 +1543,3 @@ command_result digtype (color_ostream &out, vector & parameters) delete mCache; return CR_OK; } - diff --git a/plugins/diggingInvaders/assignJob.h b/plugins/diggingInvaders/assignJob.h index 1e5750c03..23e38ddda 100644 --- a/plugins/diggingInvaders/assignJob.h +++ b/plugins/diggingInvaders/assignJob.h @@ -11,4 +11,3 @@ using namespace std; int32_t assignJob(DFHack::color_ostream& out, Edge firstImportantEdge, unordered_map parentMap, unordered_map& costMap, vector& invaders, unordered_set& requiresZNeg, unordered_set& requiresZPos, MapExtras::MapCache& cache, DigAbilities& abilities); - diff --git a/plugins/diggingInvaders/diggingInvaders.cpp b/plugins/diggingInvaders/diggingInvaders.cpp index 7c8c85ae0..573c85320 100644 --- a/plugins/diggingInvaders/diggingInvaders.cpp +++ b/plugins/diggingInvaders/diggingInvaders.cpp @@ -631,5 +631,3 @@ df::coord getRoot(df::coord point, map& rootMap) { rootMap[point] = root; return root; } - - diff --git a/plugins/diggingInvaders/edgeCost.cpp b/plugins/diggingInvaders/edgeCost.cpp index cd52f4e17..0a92050ce 100644 --- a/plugins/diggingInvaders/edgeCost.cpp +++ b/plugins/diggingInvaders/edgeCost.cpp @@ -482,4 +482,3 @@ vector* getEdgeSet(color_ostream &out, df::coord point, MapExtras::MapCach return result; } - diff --git a/plugins/diggingInvaders/edgeCost.h b/plugins/diggingInvaders/edgeCost.h index ef4cb3168..a3339d582 100644 --- a/plugins/diggingInvaders/edgeCost.h +++ b/plugins/diggingInvaders/edgeCost.h @@ -95,4 +95,3 @@ struct PointHash { cost_t getEdgeCost(DFHack::color_ostream& out, df::coord pt1, df::coord pt2, DigAbilities& abilities); std::vector* getEdgeSet(DFHack::color_ostream &out, df::coord point, MapExtras::MapCache& cache, int32_t xMax, int32_t yMax, int32_t zMax, DigAbilities& abilities); - diff --git a/plugins/embark-assistant/defs.h b/plugins/embark-assistant/defs.h index 4df27ee3d..4abf5ad1e 100644 --- a/plugins/embark-assistant/defs.h +++ b/plugins/embark-assistant/defs.h @@ -68,7 +68,7 @@ namespace embark_assist { Woodland, Heavily_Forested }; - + // only contains those attributes that are being handled during incursion processing struct mid_level_tile_incursion_base { uint8_t aquifer = Clear_Aquifer_Bits; @@ -419,4 +419,4 @@ namespace embark_assist { typedef void(*find_callbacks) (embark_assist::defs::finders finder); } -} \ No newline at end of file +} diff --git a/plugins/embark-assistant/finder_ui.h b/plugins/embark-assistant/finder_ui.h index 1011bf251..8ad13b02f 100644 --- a/plugins/embark-assistant/finder_ui.h +++ b/plugins/embark-assistant/finder_ui.h @@ -14,4 +14,4 @@ namespace embark_assist { void activate(); void shutdown(); } -} \ No newline at end of file +} diff --git a/plugins/embark-assistant/help_ui.h b/plugins/embark-assistant/help_ui.h index 65a2e4f1d..f810e1066 100644 --- a/plugins/embark-assistant/help_ui.h +++ b/plugins/embark-assistant/help_ui.h @@ -12,4 +12,4 @@ namespace embark_assist { namespace help_ui { void init(DFHack::Plugin *plugin_self); } -} \ No newline at end of file +} diff --git a/plugins/embark-assistant/matcher.cpp b/plugins/embark-assistant/matcher.cpp index c19ad02a6..52348ea33 100644 --- a/plugins/embark-assistant/matcher.cpp +++ b/plugins/embark-assistant/matcher.cpp @@ -885,7 +885,7 @@ namespace embark_assist { // Region Type result.region_types[world_data->regions[survey_results->at(x).at(y).biome_index[mlt->at(i).at(k).biome_offset]]->type] = true; - + // Metals result.metal_1 = result.metal_1 || mlt->at(i).at(k).metals[finder->metal_1]; result.metal_2 = result.metal_2 || mlt->at(i).at(k).metals[finder->metal_2]; @@ -1194,7 +1194,7 @@ namespace embark_assist { k, &failed_match); } - + if (failed_match) return false; } @@ -1881,7 +1881,7 @@ namespace embark_assist { case embark_assist::defs::tree_ranges::NA: case embark_assist::defs::tree_ranges::None: break; - + case embark_assist::defs::tree_ranges::Very_Scarce: if (tile->max_tree_level < embark_assist::defs::tree_levels::Very_Scarce) { if (trace) out.print("matcher::world_tile_match: Min_Trees Very_Scarce (%i, %i)\n", x, y); @@ -2099,7 +2099,7 @@ namespace embark_assist { return false; } } - + // Biome 3 if (finder->biome_3 != -1) { if (!tile->neighboring_biomes[finder->biome_3]) { @@ -2281,7 +2281,7 @@ namespace embark_assist { // Waterfall // Requires survey // Flat. No world tile checks. Need to look at the details - + // Clay // With no preliminary survey we don't know if incursions might bring clay, so we can't really exclude any tiles. @@ -3299,7 +3299,7 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter } } } - + // The complete set of biomes and region types is stored in the "neighboring" elements, which is a little misleading. for (uint8_t l = 0; l < 10; l++) { if (current->biome_index[l] != -1) { diff --git a/plugins/embark-assistant/matcher.h b/plugins/embark-assistant/matcher.h index 9bc213fb1..d92450d67 100644 --- a/plugins/embark-assistant/matcher.h +++ b/plugins/embark-assistant/matcher.h @@ -21,4 +21,4 @@ namespace embark_assist { void setup(); void shutdown(); } -} \ No newline at end of file +} diff --git a/plugins/embark-assistant/overlay.h b/plugins/embark-assistant/overlay.h index f4f7cf3eb..f718801ea 100644 --- a/plugins/embark-assistant/overlay.h +++ b/plugins/embark-assistant/overlay.h @@ -35,4 +35,4 @@ namespace embark_assist { void fileresult(); void shutdown(); } -} \ No newline at end of file +} diff --git a/plugins/embark-assistant/screen.h b/plugins/embark-assistant/screen.h index 06b723f24..f210406c1 100644 --- a/plugins/embark-assistant/screen.h +++ b/plugins/embark-assistant/screen.h @@ -4,4 +4,4 @@ namespace embark_assist { namespace screen { bool paintString(const DFHack::Screen::Pen &pen, int x, int y, const std::string &text, bool map = false); } -} \ No newline at end of file +} diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp index 57c4a1470..80bf58fbd 100644 --- a/plugins/embark-assistant/survey.cpp +++ b/plugins/embark-assistant/survey.cpp @@ -1269,7 +1269,7 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data } } } - + for (uint8_t i = 1; i < 16; i++) { for (uint8_t k = 0; k < 16; k++) { auto western_neighbour = mlt->at(i - 1).at(k); @@ -2549,4 +2549,3 @@ void embark_assist::survey::shutdown() { delete state; state = nullptr; } - diff --git a/plugins/embark-assistant/survey.h b/plugins/embark-assistant/survey.h index fa7fa7628..b8ba0f267 100644 --- a/plugins/embark-assistant/survey.h +++ b/plugins/embark-assistant/survey.h @@ -77,4 +77,4 @@ namespace embark_assist { void shutdown(); } -} \ No newline at end of file +} diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp index fad421104..02569fd8b 100644 --- a/plugins/labormanager/labormanager.cpp +++ b/plugins/labormanager/labormanager.cpp @@ -2458,4 +2458,3 @@ command_result labormanager(color_ostream &out, std::vector & para return CR_OK; } } - diff --git a/plugins/listcolumn.h b/plugins/listcolumn.h index 608a94b47..08d48bd58 100644 --- a/plugins/listcolumn.h +++ b/plugins/listcolumn.h @@ -491,4 +491,3 @@ protected: int display_max_rows; int max_item_width; }; - diff --git a/plugins/lua/burrows.lua b/plugins/lua/burrows.lua index 871295fdc..7c8753bf7 100644 --- a/plugins/lua/burrows.lua +++ b/plugins/lua/burrows.lua @@ -20,4 +20,4 @@ local _ENV = mkmodule('plugins.burrows') rawset_default(_ENV, dfhack.burrows) -return _ENV \ No newline at end of file +return _ENV diff --git a/plugins/lua/cxxrandom.lua b/plugins/lua/cxxrandom.lua index 4d2d59da9..78e363bef 100644 --- a/plugins/lua/cxxrandom.lua +++ b/plugins/lua/cxxrandom.lua @@ -21,7 +21,7 @@ function crng:new(engineID, destroyEngineOnDestruction, distrib) self.__index = self local idtype = type(engineID) local flagtype = type(destroyEngineOnDestruction) - + if idtype == 'number' then o.rngID = engineID elseif idtype == 'nil' then @@ -211,4 +211,4 @@ function num_sequence:shuffle() ShuffleSequence(self.rngID, self.seqID) end -return _ENV \ No newline at end of file +return _ENV diff --git a/plugins/lua/liquids.lua b/plugins/lua/liquids.lua index 22ce4da35..a658226ea 100644 --- a/plugins/lua/liquids.lua +++ b/plugins/lua/liquids.lua @@ -8,4 +8,4 @@ local _ENV = mkmodule('plugins.liquids') --]] -return _ENV \ No newline at end of file +return _ENV diff --git a/plugins/lua/luasocket.lua b/plugins/lua/luasocket.lua index bf1e919d4..6eff08631 100644 --- a/plugins/lua/luasocket.lua +++ b/plugins/lua/luasocket.lua @@ -46,7 +46,7 @@ local client=defclass(client,socket) function client:receive( pattern ) local pattern=pattern or "*l" local bytes=-1 - + if type(pattern)== 'number' then bytes=pattern end diff --git a/plugins/lua/map-render.lua b/plugins/lua/map-render.lua index 9785c365e..a05bceb21 100644 --- a/plugins/lua/map-render.lua +++ b/plugins/lua/map-render.lua @@ -8,4 +8,4 @@ local _ENV = mkmodule('plugins.map-render') --]] -return _ENV \ No newline at end of file +return _ENV diff --git a/plugins/lua/power-meter.lua b/plugins/lua/power-meter.lua index 310e51c4e..62b7543f6 100644 --- a/plugins/lua/power-meter.lua +++ b/plugins/lua/power-meter.lua @@ -8,4 +8,4 @@ local _ENV = mkmodule('plugins.power-meter') --]] -return _ENV \ No newline at end of file +return _ENV diff --git a/plugins/lua/rename.lua b/plugins/lua/rename.lua index 0e7128f57..82ed76b27 100644 --- a/plugins/lua/rename.lua +++ b/plugins/lua/rename.lua @@ -10,4 +10,4 @@ local _ENV = mkmodule('plugins.rename') --]] -return _ENV \ No newline at end of file +return _ENV diff --git a/plugins/lua/rendermax.lua b/plugins/lua/rendermax.lua index d44027c16..35962f132 100644 --- a/plugins/lua/rendermax.lua +++ b/plugins/lua/rendermax.lua @@ -1,4 +1,4 @@ local _ENV = mkmodule('plugins.rendermax') -return _ENV \ No newline at end of file +return _ENV diff --git a/plugins/lua/sort.lua b/plugins/lua/sort.lua index 55e838987..acd2eef6a 100644 --- a/plugins/lua/sort.lua +++ b/plugins/lua/sort.lua @@ -52,4 +52,4 @@ end make_sort_order = utils.make_sort_order -return _ENV \ No newline at end of file +return _ENV diff --git a/plugins/lua/sort/items.lua b/plugins/lua/sort/items.lua index 5c6d4a5ba..3d96551f7 100644 --- a/plugins/lua/sort/items.lua +++ b/plugins/lua/sort/items.lua @@ -58,4 +58,4 @@ orders.material = { end } -return _ENV \ No newline at end of file +return _ENV diff --git a/plugins/lua/zone.lua b/plugins/lua/zone.lua index f6a136690..75c9feec8 100644 --- a/plugins/lua/zone.lua +++ b/plugins/lua/zone.lua @@ -9,4 +9,4 @@ local _ENV = mkmodule('plugins.zone') --]] -return _ENV \ No newline at end of file +return _ENV diff --git a/plugins/misery.cpp b/plugins/misery.cpp index 19dac8330..b8e11f5c0 100644 --- a/plugins/misery.cpp +++ b/plugins/misery.cpp @@ -204,4 +204,3 @@ command_result misery(color_ostream &out, vector& parameters) { return CR_OK; } - diff --git a/plugins/nestboxes.cpp b/plugins/nestboxes.cpp index b527322c2..8b9a33289 100644 --- a/plugins/nestboxes.cpp +++ b/plugins/nestboxes.cpp @@ -121,4 +121,3 @@ static command_result nestboxes(color_ostream &out, vector & parameters } return CR_OK; } - diff --git a/plugins/pathable.cpp b/plugins/pathable.cpp index 6007d8401..e5a9bebcc 100644 --- a/plugins/pathable.cpp +++ b/plugins/pathable.cpp @@ -87,4 +87,3 @@ DFHACK_PLUGIN_LUA_FUNCTIONS { DFHACK_LUA_FUNCTION(paintScreen), DFHACK_LUA_END }; - diff --git a/plugins/petcapRemover.cpp b/plugins/petcapRemover.cpp index 4b1b53a46..7d6588cbc 100644 --- a/plugins/petcapRemover.cpp +++ b/plugins/petcapRemover.cpp @@ -209,4 +209,3 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) return CR_OK; } - diff --git a/plugins/raw/building_spatter.txt b/plugins/raw/building_spatter.txt index 7bde8297b..5912d9891 100644 --- a/plugins/raw/building_spatter.txt +++ b/plugins/raw/building_spatter.txt @@ -1,22 +1,22 @@ -building_spatter - -[OBJECT:BUILDING] - -[BUILDING_WORKSHOP:GREASING_STATION] - [NAME:Greasing Station] - [NAME_COLOR:2:0:1] - [DIM:1:1] - [WORK_LOCATION:1:1] - [BUILD_LABOR:DYER] - [BUILD_KEY:CUSTOM_ALT_G] - [BLOCK:1:0] - [TILE:0:1:150] - [COLOR:0:1:0:0:1] - [TILE:1:1:150] - [COLOR:1:1:MAT] - [TILE:2:1:8] - [COLOR:2:1:MAT] - [TILE:3:1:8] - [COLOR:3:1:7:5:0] - [BUILD_ITEM:1:BUCKET:NONE:NONE:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:NONE:NONE:NONE:NONE][BUILDMAT] +building_spatter + +[OBJECT:BUILDING] + +[BUILDING_WORKSHOP:GREASING_STATION] + [NAME:Greasing Station] + [NAME_COLOR:2:0:1] + [DIM:1:1] + [WORK_LOCATION:1:1] + [BUILD_LABOR:DYER] + [BUILD_KEY:CUSTOM_ALT_G] + [BLOCK:1:0] + [TILE:0:1:150] + [COLOR:0:1:0:0:1] + [TILE:1:1:150] + [COLOR:1:1:MAT] + [TILE:2:1:8] + [COLOR:2:1:MAT] + [TILE:3:1:8] + [COLOR:3:1:7:5:0] + [BUILD_ITEM:1:BUCKET:NONE:NONE:NONE][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:NONE:NONE:NONE:NONE][BUILDMAT] diff --git a/plugins/raw/building_steam_engine.txt b/plugins/raw/building_steam_engine.txt index 48657b0c1..c9cf5fbf8 100644 --- a/plugins/raw/building_steam_engine.txt +++ b/plugins/raw/building_steam_engine.txt @@ -1,92 +1,92 @@ -building_steam_engine - -[OBJECT:BUILDING] - -[BUILDING_WORKSHOP:STEAM_ENGINE] - [NAME:Steam Engine] - [NAME_COLOR:4:0:1] - [DIM:3:3] - [WORK_LOCATION:2:3] - [BUILD_LABOR:MECHANIC] - [BUILD_KEY:CUSTOM_ALT_S] - [BLOCK:1:1:1:1] - [BLOCK:2:1:1:1] - [BLOCK:3:1:0:1] - [TILE:0:1:240:' ':254] - [TILE:0:2:' ':' ':128] - [TILE:0:3:246:' ':' '] - [COLOR:0:1:6:0:0:0:0:0:7:0:0] - [COLOR:0:2:0:0:0:0:0:0:7:0:0] - [COLOR:0:3:MAT:0:0:0:0:0:0] - [TILE:1:1:246:128:' '] - [TILE:1:2:' ':' ':254] - [TILE:1:3:254:'/':240] - [COLOR:1:1:MAT:7:0:0:0:0:0] - [COLOR:1:2:0:0:0:0:0:0:7:0:0] - [COLOR:1:3:7:0:0:6:0:0:6:0:0] - [TILE:2:1:21:' ':128] - [TILE:2:2:128:' ':246] - [TILE:2:3:177:19:177] - [COLOR:2:1:6:0:0:0:0:0:7:0:0] - [COLOR:2:2:7:0:0:0:0:0:MAT] - [COLOR:2:3:7:0:0:6:0:0:7:0:0] - Tile 15 marks places where machines can connect. - Tile 19 marks the hearth (color changed to reflect power). - [TILE:3:1:15:246:15] - [TILE:3:2:'\':19:'/'] - [TILE:3:3:7:' ':7] - Color 1:?:1 water indicator, 4:?:1 magma indicator: - [COLOR:3:1:7:0:0:MAT:7:0:0] - [COLOR:3:2:6:0:0:0:0:1:6:0:0] - [COLOR:3:3:1:7:1:0:0:0:4:7:1] - [BUILD_ITEM:1:BARREL:NONE:INORGANIC:NONE][EMPTY][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:PIPE_SECTION:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:TRAPCOMP:ITEM_TRAPCOMP_STEAM_PISTON:INORGANIC:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:CHAIN:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:TRAPPARTS:NONE:NONE:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:BLOCKS:NONE:NONE:NONE][BUILDMAT][FIRE_BUILD_SAFE] - -[BUILDING_WORKSHOP:MAGMA_STEAM_ENGINE] - [NAME:Magma Steam Engine] - [NAME_COLOR:4:0:1] - [DIM:3:3] - [WORK_LOCATION:2:3] - [BUILD_LABOR:MECHANIC] - [BUILD_KEY:CUSTOM_ALT_E] - [NEEDS_MAGMA] - [BLOCK:1:1:1:1] - [BLOCK:2:1:1:1] - [BLOCK:3:1:0:1] - [TILE:0:1:240:' ':254] - [TILE:0:2:' ':' ':128] - [TILE:0:3:246:' ':' '] - [COLOR:0:1:6:0:0:0:0:0:7:0:0] - [COLOR:0:2:0:0:0:0:0:0:7:0:0] - [COLOR:0:3:MAT:0:0:0:0:0:0] - [TILE:1:1:246:128:' '] - [TILE:1:2:' ':' ':254] - [TILE:1:3:254:'/':240] - [COLOR:1:1:MAT:7:0:0:0:0:0] - [COLOR:1:2:0:0:0:0:0:0:7:0:0] - [COLOR:1:3:7:0:0:6:0:0:6:0:0] - [TILE:2:1:21:' ':128] - [TILE:2:2:128:' ':246] - [TILE:2:3:177:19:177] - [COLOR:2:1:6:0:0:0:0:0:7:0:0] - [COLOR:2:2:7:0:0:0:0:0:MAT] - [COLOR:2:3:7:0:0:6:0:0:7:0:0] - Tile 15 marks places where machines can connect. - Tile 19 marks the hearth (color changed to reflect power). - [TILE:3:1:15:246:15] - [TILE:3:2:'\':19:'/'] - [TILE:3:3:7:' ':7] - Color 1:?:1 water indicator, 4:?:1 magma indicator: - [COLOR:3:1:7:0:0:MAT:7:0:0] - [COLOR:3:2:6:0:0:0:0:1:6:0:0] - [COLOR:3:3:1:7:1:0:0:0:4:7:1] - [BUILD_ITEM:1:BARREL:NONE:INORGANIC:NONE][EMPTY][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:PIPE_SECTION:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:TRAPCOMP:ITEM_TRAPCOMP_STEAM_PISTON:INORGANIC:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:CHAIN:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:TRAPPARTS:NONE:NONE:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:BLOCKS:NONE:NONE:NONE][BUILDMAT][MAGMA_BUILD_SAFE] +building_steam_engine + +[OBJECT:BUILDING] + +[BUILDING_WORKSHOP:STEAM_ENGINE] + [NAME:Steam Engine] + [NAME_COLOR:4:0:1] + [DIM:3:3] + [WORK_LOCATION:2:3] + [BUILD_LABOR:MECHANIC] + [BUILD_KEY:CUSTOM_ALT_S] + [BLOCK:1:1:1:1] + [BLOCK:2:1:1:1] + [BLOCK:3:1:0:1] + [TILE:0:1:240:' ':254] + [TILE:0:2:' ':' ':128] + [TILE:0:3:246:' ':' '] + [COLOR:0:1:6:0:0:0:0:0:7:0:0] + [COLOR:0:2:0:0:0:0:0:0:7:0:0] + [COLOR:0:3:MAT:0:0:0:0:0:0] + [TILE:1:1:246:128:' '] + [TILE:1:2:' ':' ':254] + [TILE:1:3:254:'/':240] + [COLOR:1:1:MAT:7:0:0:0:0:0] + [COLOR:1:2:0:0:0:0:0:0:7:0:0] + [COLOR:1:3:7:0:0:6:0:0:6:0:0] + [TILE:2:1:21:' ':128] + [TILE:2:2:128:' ':246] + [TILE:2:3:177:19:177] + [COLOR:2:1:6:0:0:0:0:0:7:0:0] + [COLOR:2:2:7:0:0:0:0:0:MAT] + [COLOR:2:3:7:0:0:6:0:0:7:0:0] + Tile 15 marks places where machines can connect. + Tile 19 marks the hearth (color changed to reflect power). + [TILE:3:1:15:246:15] + [TILE:3:2:'\':19:'/'] + [TILE:3:3:7:' ':7] + Color 1:?:1 water indicator, 4:?:1 magma indicator: + [COLOR:3:1:7:0:0:MAT:7:0:0] + [COLOR:3:2:6:0:0:0:0:1:6:0:0] + [COLOR:3:3:1:7:1:0:0:0:4:7:1] + [BUILD_ITEM:1:BARREL:NONE:INORGANIC:NONE][EMPTY][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:PIPE_SECTION:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:TRAPCOMP:ITEM_TRAPCOMP_STEAM_PISTON:INORGANIC:NONE][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:CHAIN:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:TRAPPARTS:NONE:NONE:NONE][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:BLOCKS:NONE:NONE:NONE][BUILDMAT][FIRE_BUILD_SAFE] + +[BUILDING_WORKSHOP:MAGMA_STEAM_ENGINE] + [NAME:Magma Steam Engine] + [NAME_COLOR:4:0:1] + [DIM:3:3] + [WORK_LOCATION:2:3] + [BUILD_LABOR:MECHANIC] + [BUILD_KEY:CUSTOM_ALT_E] + [NEEDS_MAGMA] + [BLOCK:1:1:1:1] + [BLOCK:2:1:1:1] + [BLOCK:3:1:0:1] + [TILE:0:1:240:' ':254] + [TILE:0:2:' ':' ':128] + [TILE:0:3:246:' ':' '] + [COLOR:0:1:6:0:0:0:0:0:7:0:0] + [COLOR:0:2:0:0:0:0:0:0:7:0:0] + [COLOR:0:3:MAT:0:0:0:0:0:0] + [TILE:1:1:246:128:' '] + [TILE:1:2:' ':' ':254] + [TILE:1:3:254:'/':240] + [COLOR:1:1:MAT:7:0:0:0:0:0] + [COLOR:1:2:0:0:0:0:0:0:7:0:0] + [COLOR:1:3:7:0:0:6:0:0:6:0:0] + [TILE:2:1:21:' ':128] + [TILE:2:2:128:' ':246] + [TILE:2:3:177:19:177] + [COLOR:2:1:6:0:0:0:0:0:7:0:0] + [COLOR:2:2:7:0:0:0:0:0:MAT] + [COLOR:2:3:7:0:0:6:0:0:7:0:0] + Tile 15 marks places where machines can connect. + Tile 19 marks the hearth (color changed to reflect power). + [TILE:3:1:15:246:15] + [TILE:3:2:'\':19:'/'] + [TILE:3:3:7:' ':7] + Color 1:?:1 water indicator, 4:?:1 magma indicator: + [COLOR:3:1:7:0:0:MAT:7:0:0] + [COLOR:3:2:6:0:0:0:0:1:6:0:0] + [COLOR:3:3:1:7:1:0:0:0:4:7:1] + [BUILD_ITEM:1:BARREL:NONE:INORGANIC:NONE][EMPTY][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:PIPE_SECTION:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:TRAPCOMP:ITEM_TRAPCOMP_STEAM_PISTON:INORGANIC:NONE][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:CHAIN:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:TRAPPARTS:NONE:NONE:NONE][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:BLOCKS:NONE:NONE:NONE][BUILDMAT][MAGMA_BUILD_SAFE] diff --git a/plugins/raw/item_trapcomp_steam_engine.txt b/plugins/raw/item_trapcomp_steam_engine.txt index c35f6ef45..3ea6117b6 100644 --- a/plugins/raw/item_trapcomp_steam_engine.txt +++ b/plugins/raw/item_trapcomp_steam_engine.txt @@ -1,12 +1,12 @@ -item_trapcomp_steam_engine - -[OBJECT:ITEM] - -[ITEM_TRAPCOMP:ITEM_TRAPCOMP_STEAM_PISTON] -[NAME:piston:pistons] -[ADJECTIVE:heavy] -[SIZE:1800] -[HITS:1] -[MATERIAL_SIZE:6] -[METAL] -[ATTACK:BLUNT:40:200:bash:bashes:NO_SUB:2000] +item_trapcomp_steam_engine + +[OBJECT:ITEM] + +[ITEM_TRAPCOMP:ITEM_TRAPCOMP_STEAM_PISTON] +[NAME:piston:pistons] +[ADJECTIVE:heavy] +[SIZE:1800] +[HITS:1] +[MATERIAL_SIZE:6] +[METAL] +[ATTACK:BLUNT:40:200:bash:bashes:NO_SUB:2000] diff --git a/plugins/raw/reaction_spatter.txt b/plugins/raw/reaction_spatter.txt index 73467eca4..1665cdd56 100644 --- a/plugins/raw/reaction_spatter.txt +++ b/plugins/raw/reaction_spatter.txt @@ -1,168 +1,168 @@ -reaction_spatter - -[OBJECT:REACTION] - -Reaction name must start with 'SPATTER_ADD_': - -[REACTION:SPATTER_ADD_OBJECT_LIQUID] - [NAME:coat object with liquid] - [ADVENTURE_MODE_ENABLED] - [SKILL:DYER] - [REAGENT:extract:150:LIQUID_MISC:NONE:NONE:NONE] - [MIN_DIMENSION:150] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - [REAGENT:extract container:1:NONE:NONE:NONE:NONE] - [CONTAINS:extract] - [PRESERVE_REAGENT] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - The object to improve must be after the input mat, so that it is known: - [REAGENT:object:1:NONE:NONE:NONE:NONE] - [PRESERVE_REAGENT] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - [CAN_USE_ARTIFACT] - Need some excuse why the spatter is water-resistant: - [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:FAT][UNROTTEN] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - The probability is used as spatter size; Legendary gives +90%: - COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder - [TRANSFER_ARTIFACT_STATUS] - [IMPROVEMENT:800:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] - -[REACTION:SPATTER_ADD_WEAPON_EXTRACT] - [NAME:coat weapon with extract] - [BUILDING:GREASING_STATION:CUSTOM_W] - [SKILL:DYER] - [REAGENT:extract:100:LIQUID_MISC:NONE:NONE:NONE] - [MIN_DIMENSION:100] - [REACTION_CLASS:CREATURE_EXTRACT] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - [REAGENT:extract container:1:NONE:NONE:NONE:NONE] - [CONTAINS:extract] - [PRESERVE_REAGENT] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - [CAN_USE_ARTIFACT] - The object to improve must be after the input mat, so that it is known: - [REAGENT:object:1:WEAPON:NONE:NONE:NONE] - [PRESERVE_REAGENT] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - Need some excuse why the spatter is water-resistant: - [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - The probability is used as spatter size; Legendary gives +90%: - COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder - [TRANSFER_ARTIFACT_STATUS] - [IMPROVEMENT:800:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] - -[REACTION:SPATTER_ADD_AMMO_EXTRACT] - [NAME:coat ammo with extract] - [BUILDING:GREASING_STATION:CUSTOM_A] - [SKILL:DYER] - [REAGENT:extract:50:LIQUID_MISC:NONE:NONE:NONE] - [MIN_DIMENSION:50] - [REACTION_CLASS:CREATURE_EXTRACT] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - [REAGENT:extract container:1:NONE:NONE:NONE:NONE] - [CONTAINS:extract] - [PRESERVE_REAGENT] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - [CAN_USE_ARTIFACT] - The object to improve must be after the input mat, so that it is known: - [REAGENT:object:1:AMMO:NONE:NONE:NONE] - [PRESERVE_REAGENT] - [MIN_DIMENSION:5] don't waste materials on single bolts - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - Need some excuse why the spatter is water-resistant: - [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - The probability is used as spatter size; Legendary gives +90%: - COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder - [TRANSFER_ARTIFACT_STATUS] - [IMPROVEMENT:200:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] - -[REACTION:SPATTER_ADD_WEAPON_GCS] - [NAME:coat weapon with GCS venom] - [BUILDING:GREASING_STATION:NONE] - [SKILL:DYER] - [REAGENT:extract:100:LIQUID_MISC:NONE:CREATURE_MAT:SPIDER_CAVE_GIANT:POISON] - [MIN_DIMENSION:100] - [REACTION_CLASS:CREATURE_EXTRACT] - [REAGENT:extract container:1:NONE:NONE:NONE:NONE] - [CONTAINS:extract] - [PRESERVE_REAGENT] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - The object to improve must be after the input mat, so that it is known: - [REAGENT:object:1:WEAPON:NONE:NONE:NONE] - [PRESERVE_REAGENT] - [CAN_USE_ARTIFACT] - Need some excuse why the spatter is water-resistant: - [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] - The probability is used as spatter size; Legendary gives +90%: - COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder - [TRANSFER_ARTIFACT_STATUS] - [IMPROVEMENT:800:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] - -[REACTION:SPATTER_ADD_AMMO_GCS] - [NAME:coat ammo with GCS venom] - [BUILDING:GREASING_STATION:NONE] - [SKILL:DYER] - [REAGENT:extract:50:LIQUID_MISC:NONE:CREATURE_MAT:SPIDER_CAVE_GIANT:POISON] - [MIN_DIMENSION:50] - [REACTION_CLASS:CREATURE_EXTRACT] - [REAGENT:extract container:1:NONE:NONE:NONE:NONE] - [CONTAINS:extract] - [PRESERVE_REAGENT] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - The object to improve must be after the input mat, so that it is known: - [REAGENT:object:1:AMMO:NONE:NONE:NONE] - [PRESERVE_REAGENT] - [CAN_USE_ARTIFACT] - Need some excuse why the spatter is water-resistant: - [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] - The probability is used as spatter size; Legendary gives +90%: - COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder - [TRANSFER_ARTIFACT_STATUS] - [IMPROVEMENT:200:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] - -[REACTION:SPATTER_ADD_WEAPON_GDS] - [NAME:coat weapon with GDS venom] - [BUILDING:GREASING_STATION:NONE] - [SKILL:DYER] - [REAGENT:extract:100:LIQUID_MISC:NONE:CREATURE_MAT:SCORPION_DESERT_GIANT:POISON] - [MIN_DIMENSION:100] - [REACTION_CLASS:CREATURE_EXTRACT] - [REAGENT:extract container:1:NONE:NONE:NONE:NONE] - [CONTAINS:extract] - [PRESERVE_REAGENT] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - The object to improve must be after the input mat, so that it is known: - [REAGENT:object:1:WEAPON:NONE:NONE:NONE] - [PRESERVE_REAGENT] - [CAN_USE_ARTIFACT] - Need some excuse why the spatter is water-resistant: - [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] - The probability is used as spatter size; Legendary gives +90%: - COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder - [TRANSFER_ARTIFACT_STATUS] - [IMPROVEMENT:800:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] - -[REACTION:SPATTER_ADD_AMMO_GDS] - [NAME:coat ammo with GDS venom] - [BUILDING:GREASING_STATION:NONE] - [SKILL:DYER] - [REAGENT:extract:50:LIQUID_MISC:NONE:CREATURE_MAT:SCORPION_DESERT_GIANT:POISON] - [MIN_DIMENSION:50] - [REACTION_CLASS:CREATURE_EXTRACT] - [REAGENT:extract container:1:NONE:NONE:NONE:NONE] - [CONTAINS:extract] - [PRESERVE_REAGENT] - [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] - The object to improve must be after the input mat, so that it is known: - [REAGENT:object:1:AMMO:NONE:NONE:NONE] - [PRESERVE_REAGENT] - [CAN_USE_ARTIFACT] - Need some excuse why the spatter is water-resistant: - [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] - The probability is used as spatter size; Legendary gives +90%: - COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder - [TRANSFER_ARTIFACT_STATUS] - [IMPROVEMENT:200:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] +reaction_spatter + +[OBJECT:REACTION] + +Reaction name must start with 'SPATTER_ADD_': + +[REACTION:SPATTER_ADD_OBJECT_LIQUID] + [NAME:coat object with liquid] + [ADVENTURE_MODE_ENABLED] + [SKILL:DYER] + [REAGENT:extract:150:LIQUID_MISC:NONE:NONE:NONE] + [MIN_DIMENSION:150] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + [REAGENT:extract container:1:NONE:NONE:NONE:NONE] + [CONTAINS:extract] + [PRESERVE_REAGENT] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + The object to improve must be after the input mat, so that it is known: + [REAGENT:object:1:NONE:NONE:NONE:NONE] + [PRESERVE_REAGENT] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + [CAN_USE_ARTIFACT] + Need some excuse why the spatter is water-resistant: + [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:FAT][UNROTTEN] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + The probability is used as spatter size; Legendary gives +90%: + COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder + [TRANSFER_ARTIFACT_STATUS] + [IMPROVEMENT:800:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] + +[REACTION:SPATTER_ADD_WEAPON_EXTRACT] + [NAME:coat weapon with extract] + [BUILDING:GREASING_STATION:CUSTOM_W] + [SKILL:DYER] + [REAGENT:extract:100:LIQUID_MISC:NONE:NONE:NONE] + [MIN_DIMENSION:100] + [REACTION_CLASS:CREATURE_EXTRACT] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + [REAGENT:extract container:1:NONE:NONE:NONE:NONE] + [CONTAINS:extract] + [PRESERVE_REAGENT] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + [CAN_USE_ARTIFACT] + The object to improve must be after the input mat, so that it is known: + [REAGENT:object:1:WEAPON:NONE:NONE:NONE] + [PRESERVE_REAGENT] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + Need some excuse why the spatter is water-resistant: + [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + The probability is used as spatter size; Legendary gives +90%: + COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder + [TRANSFER_ARTIFACT_STATUS] + [IMPROVEMENT:800:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] + +[REACTION:SPATTER_ADD_AMMO_EXTRACT] + [NAME:coat ammo with extract] + [BUILDING:GREASING_STATION:CUSTOM_A] + [SKILL:DYER] + [REAGENT:extract:50:LIQUID_MISC:NONE:NONE:NONE] + [MIN_DIMENSION:50] + [REACTION_CLASS:CREATURE_EXTRACT] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + [REAGENT:extract container:1:NONE:NONE:NONE:NONE] + [CONTAINS:extract] + [PRESERVE_REAGENT] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + [CAN_USE_ARTIFACT] + The object to improve must be after the input mat, so that it is known: + [REAGENT:object:1:AMMO:NONE:NONE:NONE] + [PRESERVE_REAGENT] + [MIN_DIMENSION:5] don't waste materials on single bolts + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + Need some excuse why the spatter is water-resistant: + [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + The probability is used as spatter size; Legendary gives +90%: + COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder + [TRANSFER_ARTIFACT_STATUS] + [IMPROVEMENT:200:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] + +[REACTION:SPATTER_ADD_WEAPON_GCS] + [NAME:coat weapon with GCS venom] + [BUILDING:GREASING_STATION:NONE] + [SKILL:DYER] + [REAGENT:extract:100:LIQUID_MISC:NONE:CREATURE_MAT:SPIDER_CAVE_GIANT:POISON] + [MIN_DIMENSION:100] + [REACTION_CLASS:CREATURE_EXTRACT] + [REAGENT:extract container:1:NONE:NONE:NONE:NONE] + [CONTAINS:extract] + [PRESERVE_REAGENT] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + The object to improve must be after the input mat, so that it is known: + [REAGENT:object:1:WEAPON:NONE:NONE:NONE] + [PRESERVE_REAGENT] + [CAN_USE_ARTIFACT] + Need some excuse why the spatter is water-resistant: + [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] + The probability is used as spatter size; Legendary gives +90%: + COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder + [TRANSFER_ARTIFACT_STATUS] + [IMPROVEMENT:800:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] + +[REACTION:SPATTER_ADD_AMMO_GCS] + [NAME:coat ammo with GCS venom] + [BUILDING:GREASING_STATION:NONE] + [SKILL:DYER] + [REAGENT:extract:50:LIQUID_MISC:NONE:CREATURE_MAT:SPIDER_CAVE_GIANT:POISON] + [MIN_DIMENSION:50] + [REACTION_CLASS:CREATURE_EXTRACT] + [REAGENT:extract container:1:NONE:NONE:NONE:NONE] + [CONTAINS:extract] + [PRESERVE_REAGENT] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + The object to improve must be after the input mat, so that it is known: + [REAGENT:object:1:AMMO:NONE:NONE:NONE] + [PRESERVE_REAGENT] + [CAN_USE_ARTIFACT] + Need some excuse why the spatter is water-resistant: + [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] + The probability is used as spatter size; Legendary gives +90%: + COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder + [TRANSFER_ARTIFACT_STATUS] + [IMPROVEMENT:200:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] + +[REACTION:SPATTER_ADD_WEAPON_GDS] + [NAME:coat weapon with GDS venom] + [BUILDING:GREASING_STATION:NONE] + [SKILL:DYER] + [REAGENT:extract:100:LIQUID_MISC:NONE:CREATURE_MAT:SCORPION_DESERT_GIANT:POISON] + [MIN_DIMENSION:100] + [REACTION_CLASS:CREATURE_EXTRACT] + [REAGENT:extract container:1:NONE:NONE:NONE:NONE] + [CONTAINS:extract] + [PRESERVE_REAGENT] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + The object to improve must be after the input mat, so that it is known: + [REAGENT:object:1:WEAPON:NONE:NONE:NONE] + [PRESERVE_REAGENT] + [CAN_USE_ARTIFACT] + Need some excuse why the spatter is water-resistant: + [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] + The probability is used as spatter size; Legendary gives +90%: + COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder + [TRANSFER_ARTIFACT_STATUS] + [IMPROVEMENT:800:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] + +[REACTION:SPATTER_ADD_AMMO_GDS] + [NAME:coat ammo with GDS venom] + [BUILDING:GREASING_STATION:NONE] + [SKILL:DYER] + [REAGENT:extract:50:LIQUID_MISC:NONE:CREATURE_MAT:SCORPION_DESERT_GIANT:POISON] + [MIN_DIMENSION:50] + [REACTION_CLASS:CREATURE_EXTRACT] + [REAGENT:extract container:1:NONE:NONE:NONE:NONE] + [CONTAINS:extract] + [PRESERVE_REAGENT] + [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] + The object to improve must be after the input mat, so that it is known: + [REAGENT:object:1:AMMO:NONE:NONE:NONE] + [PRESERVE_REAGENT] + [CAN_USE_ARTIFACT] + Need some excuse why the spatter is water-resistant: + [REAGENT:grease:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN] + The probability is used as spatter size; Legendary gives +90%: + COVERED = liquid, GLAZED = solid, BANDS = paste, SPIKES = powder + [TRANSFER_ARTIFACT_STATUS] + [IMPROVEMENT:200:object:COVERED:GET_MATERIAL_FROM_REAGENT:extract:NONE] diff --git a/plugins/raw/reaction_steam_engine.txt b/plugins/raw/reaction_steam_engine.txt index 175ffdd50..6de1a7bbd 100644 --- a/plugins/raw/reaction_steam_engine.txt +++ b/plugins/raw/reaction_steam_engine.txt @@ -1,14 +1,13 @@ -reaction_steam_engine - -[OBJECT:REACTION] - -[REACTION:STOKE_BOILER] - [NAME:stoke the boiler] - [BUILDING:STEAM_ENGINE:CUSTOM_S] - [BUILDING:MAGMA_STEAM_ENGINE:CUSTOM_S] - [FUEL] - [SKILL:SMELT] - Dimension is the number of days it can produce 100 power * 100. - I.e. with 2000 it means energy of 1 job = 1 water wheel for 20 days. - [PRODUCT:100:1:LIQUID_MISC:NONE:WATER][PRODUCT_DIMENSION:2000] - +reaction_steam_engine + +[OBJECT:REACTION] + +[REACTION:STOKE_BOILER] + [NAME:stoke the boiler] + [BUILDING:STEAM_ENGINE:CUSTOM_S] + [BUILDING:MAGMA_STEAM_ENGINE:CUSTOM_S] + [FUEL] + [SKILL:SMELT] + Dimension is the number of days it can produce 100 power * 100. + I.e. with 2000 it means energy of 1 job = 1 water wheel for 20 days. + [PRODUCT:100:1:LIQUID_MISC:NONE:WATER][PRODUCT_DIMENSION:2000] diff --git a/plugins/remotefortressreader/building_reader.cpp b/plugins/remotefortressreader/building_reader.cpp index 2d396980a..a4300159e 100644 --- a/plugins/remotefortressreader/building_reader.cpp +++ b/plugins/remotefortressreader/building_reader.cpp @@ -914,4 +914,3 @@ void CopyBuilding(int buildingIndex, RemoteFortressReader::BuildingInstance * re break; } } - diff --git a/plugins/remotefortressreader/building_reader.h b/plugins/remotefortressreader/building_reader.h index 8b3743a1f..e674657d8 100644 --- a/plugins/remotefortressreader/building_reader.h +++ b/plugins/remotefortressreader/building_reader.h @@ -7,4 +7,4 @@ DFHack::command_result GetBuildingDefList(DFHack::color_ostream &stream, const DFHack::EmptyMessage *in, RemoteFortressReader::BuildingList *out); void CopyBuilding(int buildingIndex, RemoteFortressReader::BuildingInstance * remote_build); -#endif \ No newline at end of file +#endif diff --git a/plugins/remotefortressreader/dwarf_control.h b/plugins/remotefortressreader/dwarf_control.h index b16a4365d..eee8ca491 100644 --- a/plugins/remotefortressreader/dwarf_control.h +++ b/plugins/remotefortressreader/dwarf_control.h @@ -11,5 +11,3 @@ DFHack::command_result GetSideMenu(DFHack::color_ostream &stream, const dfproto: DFHack::command_result SetSideMenu(DFHack::color_ostream &stream, const DwarfControl::SidebarCommand *in); #endif // !DWARF_CONTROL_H - - diff --git a/plugins/skeleton/skeleton.cpp b/plugins/skeleton/skeleton.cpp index 374e5d8f3..7d5936f6d 100644 --- a/plugins/skeleton/skeleton.cpp +++ b/plugins/skeleton/skeleton.cpp @@ -168,4 +168,4 @@ command_result command_callback1(color_ostream &out, std::vector &p } // Give control back to DF. return CR_OK; -} \ No newline at end of file +} diff --git a/plugins/skeleton/skeleton.h b/plugins/skeleton/skeleton.h index 7b9637ef9..6f70f09be 100644 --- a/plugins/skeleton/skeleton.h +++ b/plugins/skeleton/skeleton.h @@ -1 +1 @@ -#pragma once \ No newline at end of file +#pragma once diff --git a/plugins/skeleton/skeletonShort.cpp b/plugins/skeleton/skeletonShort.cpp index 92fed687f..93712c5a5 100644 --- a/plugins/skeleton/skeletonShort.cpp +++ b/plugins/skeleton/skeletonShort.cpp @@ -59,4 +59,3 @@ command_result skeleton2 (color_ostream &out, std::vector & parame out.print("blah"); return CR_OK; } - diff --git a/plugins/stockpiles/OrganicMatLookup.h b/plugins/stockpiles/OrganicMatLookup.h index aca10b004..ef49f3f3c 100644 --- a/plugins/stockpiles/OrganicMatLookup.h +++ b/plugins/stockpiles/OrganicMatLookup.h @@ -44,4 +44,3 @@ public: private: OrganicMatLookup(); }; - diff --git a/plugins/stockpiles/StockpileUtils.h b/plugins/stockpiles/StockpileUtils.h index 65672128e..8558485e4 100644 --- a/plugins/stockpiles/StockpileUtils.h +++ b/plugins/stockpiles/StockpileUtils.h @@ -76,5 +76,3 @@ static inline bool is_dfstockfile ( const std::string& filename ) } // }}} utility Functions - - diff --git a/plugins/stockpiles/stockpiles.cpp b/plugins/stockpiles/stockpiles.cpp index dbd255377..05e5c9f96 100644 --- a/plugins/stockpiles/stockpiles.cpp +++ b/plugins/stockpiles/stockpiles.cpp @@ -544,7 +544,3 @@ DFHACK_PLUGIN_LUA_COMMANDS DFHACK_LUA_COMMAND ( stockpiles_list_settings ), DFHACK_LUA_END }; - - - - diff --git a/plugins/tweak/tweaks/civ-agreement-ui.h b/plugins/tweak/tweaks/civ-agreement-ui.h index fa5a9f0a4..cdf502762 100644 --- a/plugins/tweak/tweaks/civ-agreement-ui.h +++ b/plugins/tweak/tweaks/civ-agreement-ui.h @@ -31,4 +31,3 @@ struct civ_agreement_view_hook : df::viewscreen_entityst { }; IMPLEMENT_VMETHOD_INTERPOSE(civ_agreement_view_hook, render); - diff --git a/plugins/tweak/tweaks/fast-heat.h b/plugins/tweak/tweaks/fast-heat.h index 706ca4ffe..10208b9e1 100644 --- a/plugins/tweak/tweaks/fast-heat.h +++ b/plugins/tweak/tweaks/fast-heat.h @@ -45,4 +45,3 @@ struct fast_heat_hook : df::item_actual { IMPLEMENT_VMETHOD_INTERPOSE(fast_heat_hook, updateTempFromMap); IMPLEMENT_VMETHOD_INTERPOSE(fast_heat_hook, updateTemperature); IMPLEMENT_VMETHOD_INTERPOSE(fast_heat_hook, adjustTemperature); - diff --git a/plugins/tweak/tweaks/fast-trade.h b/plugins/tweak/tweaks/fast-trade.h index d0bcc9812..070eb600d 100644 --- a/plugins/tweak/tweaks/fast-trade.h +++ b/plugins/tweak/tweaks/fast-trade.h @@ -57,4 +57,3 @@ struct fast_trade_select_hook : df::viewscreen_tradegoodsst { }; IMPLEMENT_VMETHOD_INTERPOSE(fast_trade_select_hook, feed); - diff --git a/test/library/gui/dialogs.lua b/test/library/gui/dialogs.lua index 2197faa1e..0d3724c2e 100644 --- a/test/library/gui/dialogs.lua +++ b/test/library/gui/dialogs.lua @@ -66,7 +66,7 @@ function test.ListBox_closes_on_select2() lb:show() wait() send_keys('SEC_SELECT') - + expect.eq(0, mock_cb.call_count) expect.eq(1, mock_cb2.call_count) @@ -96,7 +96,7 @@ function test.ListBox_stays_open_with_multi_select() send_keys('SEC_SELECT') expect.eq(before_scr, dfhack.gui.getCurViewscreen(true), "With default dismiss_on_select2 it should return us to previous screen") - + expect.eq(1, mock_cb.call_count) expect.eq(1, mock_cb2.call_count) end @@ -124,7 +124,7 @@ function test.ListBox_stays_open_with_multi_select2() send_keys('SELECT') expect.eq(before_scr, dfhack.gui.getCurViewscreen(true), "With default dismiss_on_select it should return us to previous screen") - + expect.eq(1, mock_cb.call_count) expect.eq(1, mock_cb2.call_count) end @@ -159,12 +159,12 @@ function test.ListBox_with_multi_select() send_keys('STANDARDSCROLL_DOWN') wait() send_keys('SELECT') - + expect.eq(2, mock_cb.call_count) expect.eq(1, mock_cb2.call_count) - + expect.eq(lb_scr, dfhack.gui.getCurViewscreen(true), "With both dismiss_on_select and dismiss_on_select2 false the ListBox should stay open") - + send_keys('LEAVESCREEN') expect.eq(before_scr, dfhack.gui.getCurViewscreen(true), "Pressing LEAVESCREEN should still return us to previous screen") end @@ -186,7 +186,7 @@ function test.ListBox_with_multi_select_and_visual_indicator() if not (args and fnc) then return COLOR_YELLOW end return fnc(args) and dpen_active or dpen_not_active end - + local args = {} local choices = {} args.choices = choices @@ -199,7 +199,7 @@ function test.ListBox_with_multi_select_and_visual_indicator() end args.on_select2 = mock_cb2 args.dismiss_on_select = false - + local mock_is_active_cb_counter = mock.func() local is_active = function (args) mock_is_active_cb_counter() @@ -224,10 +224,10 @@ function test.ListBox_with_multi_select_and_visual_indicator() local lb = dialogs.ListBox(args) lb:show() local lb_scr = dfhack.gui.getCurViewscreen(true) - + expect.eq(pen_active, choices[1].text[1].pen(), "Pen of the first item should be the pen_active") expect.eq(pen_not_active, choices[3].text[1].pen(), "Pen of the third item should be the pen_not_active") - + wait() send_keys('SELECT') send_keys('STANDARDSCROLL_DOWN') @@ -239,9 +239,9 @@ function test.ListBox_with_multi_select_and_visual_indicator() wait(100) expect.eq(3, mock_cb.call_count) expect.eq(0, mock_cb2.call_count) - + expect.lt(0, mock_is_active_cb_counter.call_count, "is_active should be called at least once") - + expect.table_eq( { {text = 'ListBox_with_multi_select', active = false}, @@ -253,9 +253,9 @@ function test.ListBox_with_multi_select_and_visual_indicator() ) expect.eq(pen_not_active, choices[1].text[1].pen(), "Pen of the first now not active item should be the pen_not_active") expect.eq(pen_active, choices[3].text[1].pen(), "Pen of the third now active item should be the pen_active") - + expect.eq(lb_scr, dfhack.gui.getCurViewscreen(true), "With both dismiss_on_select and dismiss_on_select2 false the ListBox should stay open") - + send_keys('LEAVESCREEN') expect.eq(before_scr, dfhack.gui.getCurViewscreen(true), "Pressing LEAVESCREEN should still return us to previous screen") end diff --git a/test/library/utils.lua b/test/library/utils.lua index e8b918f0f..5261ac913 100644 --- a/test/library/utils.lua +++ b/test/library/utils.lua @@ -54,4 +54,3 @@ function test.invert_overwrite() expect.eq(i.b, 2) expect.eq(i.a, 3) end - diff --git a/test/structures/other_vectors.lua b/test/structures/other_vectors.lua index b913fcb0c..bfc6086a4 100644 --- a/test/structures/other_vectors.lua +++ b/test/structures/other_vectors.lua @@ -24,4 +24,3 @@ function test.index_id_bad() expect.eq(df.global.world.units.other[df.units_other_id._last_item + 1], 'container') end) end -