Skip to content

Commit bb380ba

Browse files
committed
Merge branch 'develop' into testing
2 parents 0457a90 + ef7f30e commit bb380ba

5 files changed

Lines changed: 299 additions & 168 deletions

File tree

docs/changelog.txt

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,26 @@ Template for new versions:
5252
# Future
5353

5454
## New Tools
55-
- `preserve-rooms`: manage room assignments for off-map units and noble roles. reserves rooms owned by traveling units and reinstates their ownership when they return to the site. also allows you to assign rooms to noble/administrator roles, and the rooms will be automatically assigned whenever the holder of the role changes
5655

5756
## New Features
5857

58+
## Fixes
59+
60+
## Misc Improvements
61+
62+
## Documentation
63+
64+
## API
65+
66+
## Lua
67+
68+
## Removed
69+
70+
# 50.13-r5
71+
72+
## New Tools
73+
- `preserve-rooms`: manage room assignments for off-map units and noble roles. reserves rooms owned by traveling units and reinstates their ownership when they return to the site. also allows you to assign rooms to noble/administrator roles, and the rooms will be automatically assigned whenever the holder of the role changes
74+
5975
## Fixes
6076
- prevent hang when buildings in zones are destroyed in the case where the buildings were not added to the zone in the same order that they were created (uncommon)
6177
- `buildingplan`: improved performance in forts with large numbers of items
@@ -67,7 +83,7 @@ Template for new versions:
6783
- `strangemood`: manually-triggered Macabre moods will now correctly request up to 3 bones/remains for the primary component instead of only 1
6884
- `regrass`: no longer add all compatible grass types when using ``--force`` without ``--new``
6985
- `regrass`: ``--mud`` now converts muddy slade to grass, consistent with normal DF behavior
70-
- `gui/pathable`: fix hang when showing trade depot wagon access and a trade depot is submerged under water
86+
- `gui/pathable`: fix hang when showing trade depot wagon access and a trade depot is submerged under water or magma
7187
- `gui/pathable`: fix representation of wagon paths over stairs and through doors
7288
- DFHack state for a site is now properly saved when retiring a fort
7389
- `gui/teleport`: fix issue when teleporting units that are not prone, resulting in later issues with phantom "cannot build here: unit blocking tile" messages
@@ -81,6 +97,8 @@ Template for new versions:
8197

8298
## Documentation
8399
- add documentation for ``dfhack.items.findType(string)`` and ``dfhack.items.findSubtype(string)``
100+
- `modding-guide`: added examples for reading and writing various types of persistent storage
101+
- `modding-guide`: updated all code snippets for greater clarity
84102

85103
## API
86104
- ``Units``: new ``isWildlife`` and ``isAgitated`` property checks

docs/dev/Lua API.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,9 +2100,10 @@ Items module
21002100
``df.global.game.main_interface.trade.mer``), then the value is modified by civ
21012101
properties and any trade agreements that might be in effect.
21022102

2103-
* ``dfhack.items.createItem(unit, item_type, item_subtype, mat_type, mat_index, growth_print, no_floor)``
2103+
* ``dfhack.items.createItem(unit, item_type, item_subtype, mat_type, mat_index, no_floor)``
21042104

2105-
Creates an item, similar to the `createitem` plugin.
2105+
Creates an item, similar to the `createitem` plugin. Returns a list of created
2106+
``df.item`` objects.
21062107

21072108
* ``dfhack.items.checkMandates(item)``
21082109

0 commit comments

Comments
 (0)