Skip to content

Give position.rst the "dfhack" tag #1308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myk002 merged 7 commits into from
Sep 28, 2024
Merged

Give position.rst the "dfhack" tag #1308

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
53e25d5
Update deep-embark.lua
Bumber64 Sep 21, 2024
e50fc2e
Update reaction-trigger.lua
Bumber64 Sep 21, 2024
b83d395
Update stuckdoors.lua
Bumber64 Sep 21, 2024
c39ab02
Update exterminate.rst
Bumber64 Sep 21, 2024
41128ca
Update position.rst - Tag dfhack
Bumber64 Sep 21, 2024
c1b23c7
Separate PR
Bumber64 Sep 28, 2024
c25da7d
Merge branch 'DFHack:master' into active_units
Bumber64 Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deep-embark.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ function moveEmbarkStuff(selectedBlock, embarkTiles)
local unitsAtSpawn = dfhack.units.getUnitsInBox(x1, y1, z1, x2, y2, z2)
local movedUnit = false
for i, unit in ipairs(unitsAtSpawn) do
if unit.civ_id == df.global.plotinfo.civ_id and not unit.flags1.inactive and not unit.flags2.killed then
if unit.civ_id == df.global.plotinfo.civ_id and not unit.flags2.killed then
local pos = embarkTiles[math.random(1, #embarkTiles)]
dfhack.units.teleport(unit, pos)
reveal(pos)
Expand Down
2 changes: 1 addition & 1 deletion docs/exterminate.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Options
``-m``, ``--method <method>``
Specifies the "method" of killing units. See below for details.
``-o``, ``--only-visible``
Specifies the tool should only kill units visible to the player.
Specifies the tool should only kill units visible to the player
on the map.
``-f``, ``--include-friendly``
Specifies the tool should also kill units friendly to the player.
Expand Down
2 changes: 1 addition & 1 deletion docs/position.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ position

.. dfhack-tool::
:summary: Report cursor and mouse position, along with other info.
:tags: adventure fort inspection map
:tags: adventure dfhack fort inspection map
Comment thread
Bumber64 marked this conversation as resolved.

This tool reports the current date, clock time, month, season, and historical
era. It also reports the keyboard cursor position (or just the z-level if no
Expand Down
2 changes: 1 addition & 1 deletion fix/stuckdoors.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ end

-- Util function: find out if there are any units on the tile with coordinates x,y,z
function unitOnTile(x, y, z)
local units = dfhack.units.getUnitsInBox(x,y,z,x,y,z,dfhack.units.isActive)
local units = dfhack.units.getUnitsInBox(x,y,z,x,y,z)
return #(units) > 0
end

Expand Down
2 changes: 1 addition & 1 deletion modtools/reaction-trigger.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ local validArgs = utils.invert({
'allowMultipleTargets',
'range',
'ignoreWorker',
'dontSkipInactive',
'dontSkipInactive', --TODO: positions for inactive units are meaningless!
'resetPolicy'
})

Expand Down