Skip to content

Commit 0b3e017

Browse files
committed
use historical record in list-waves
supports deceased citizens and differentiates citizens that joined via petition also prints names of wave members by default several new options for filtering output
1 parent 8836e7a commit 0b3e017

File tree

3 files changed

+245
-121
lines changed

3 files changed

+245
-121
lines changed

changelog.txt

+3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,12 @@ Template for new versions:
3636
- `gui/unit-info-viewer`: correctly display skill levels when rust is involved
3737
- `build-now`: fix error when building buildings that (in previous DF versions) required the architecture labor
3838
- `prioritize`: fix incorrect loading of persisted data on some OS types
39+
- `list-waves`: no longer gets confused by units that leave the map and then return (e.g. squads who go out on raids)
3940

4041
## Misc Improvements
4142
- `build-now`: if `suspendmanager` is running, run an unsuspend cycle immediately before scanning for buildings to build
43+
- `list-waves`: now outputs the names of the dwarves in each migration wave
44+
- `list-waves`: can now display information about specific migration waves (like identifying your starting 7 dwarves)
4245

4346
## Removed
4447

docs/list-waves.rst

+32-19
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,54 @@ list-waves
22
==========
33

44
.. dfhack-tool::
5-
:summary: Show migration wave information.
5+
:summary: Show migration wave membership and history.
66
:tags: fort inspection units
77

8-
This script displays information about migration waves or identifies which wave
9-
a particular dwarf came from.
8+
This script displays information about past migration waves: when they arrived
9+
and which dwarves arrived in them. If you have a citizen selected in the UI or
10+
if you have passed the ``--unit`` option with a unit id, that citizen's name
11+
and wave will be highlighted in the output.
12+
13+
Residents that became citizens via petitions will be grouped with any other
14+
dwarves that immigrated/joined at the same time.
1015

1116
Usage
1217
-----
1318

1419
::
1520

16-
list-waves --all [--showarrival] [--granularity <value>]
17-
list-waves --unit [--granularity <value>]
21+
list-waves [<wave num> ...] [<options>]
22+
23+
You can show only information about specific waves by specifing the wave
24+
numbers on the commandline. Otherwise, all waves are shown. The first migration
25+
wave that normally arrives in a fort's second season is wave number 1. The
26+
founding dwarves arrive in wave 0.
1827

1928
Examples
2029
--------
2130

22-
``list-waves --all``
23-
Show how many dwarves came in each migration wave.
24-
``list-waves --all --showarrival``
25-
Show how many dwarves came in each migration wave and when that migration
26-
wave arrived.
27-
``list-waves --unit``
28-
Show which migration wave the selected dwarf arrived with.
31+
``list-waves``
32+
Show how many of your current dwarves came in each migration wave, when
33+
the waves arrived, and the names of the dwarves in each wave.
34+
``list-waves --no-names``
35+
Only show how many dwarves came in each seasonal migration wave and when
36+
the waves arrived. Don't show the list of dwarves that came in each wave.
37+
``list-waves 0``
38+
Identify your founding dwarves.
2939

3040
Options
3141
-------
3242

33-
``--unit``
34-
Displays the highlighted unit's arrival wave information.
35-
``--all``
36-
Displays information about each arrival wave.
37-
``--granularity <value>``
43+
``-d``, ``--no-dead``
44+
Exclude residents and citizens who have died.
45+
``-g``, ``--granularity <value>``
3846
Specifies the granularity of wave enumeration: ``years``, ``seasons``,
3947
``months``, or ``days``. If omitted, the default granularity is ``seasons``,
4048
the same as Dwarf Therapist.
41-
``--showarrival``:
42-
Shows the arrival date for each wave.
49+
``-n``, ``--no-names``
50+
Don't output the names of the members of each migration wave.
51+
``-p``, ``--no-petitioners``
52+
Exclude citizens who joined via petition. That is, only show dwarves who
53+
came in an actual migration wave.
54+
``-u``, ``--unit <id>``
55+
Highlight the specified unit's arrival wave information.

0 commit comments

Comments
 (0)