Sync

Author: Bumber64

docs/changelog.txt

@@ -59,7 +59,6 @@ Template for new versions:
 - `plant`: can now ``remove`` shrubs and saplings; ``list`` all valid shrub/sapling raw IDs; ``grow`` can make mature trees older; many new command options
 
 ## Fixes
-- `suspendmanager`: stop suspending single tile stair constructions
 - ``Gui::makeAnnouncement``, ``Gui::autoDFAnnouncement``: fix skipping index 0 when iterating reports vector
 - `regrass`: don't remove mud on regrass, consistent with vanilla behavior
 - `seedwatch`: display a limit of ``-`` instead of ``0`` for a seed that is present in inventory but not being watched
@@ -96,7 +95,8 @@ Template for new versions:
 - ``Maps::setAreaAquifer``: make all tiles in a cuboid into aquifers, with the option to provide a filter
 - ``Maps::removeTileAquifer``: remove aquifer from tile
 - ``Maps::removeAreaAquifer``: remove aquifers from all tiles in a cuboid, with the option to provide a filter
-- ``Units::makeown``: API to use bay12-provided entry point for "makeown" operation
+- ``Units::create``, ``Units::makeown``: new APIs to use bay12-provided entry points for low-level operations
+- ``format_number``: format numbers according to the current system locale
 
 ## Lua
 - ``dfhack.gui.getSelectedJob``: can now return the job with a destination under the keyboard cursor (e.g. digging/carving/engraving jobs)
@@ -113,12 +113,19 @@ Template for new versions:
 - ``dfhack.maps.removeTileAquifer``: remove aquifer from tile
 - ``plugins.tiletypes.tiletypes_setTile``: can now accept a table for access to previously unavailable options
 - ``dialogs.showYesNoPrompt``: extend options so the standard dialog can be used for `gui/confirm`-style confirmation prompts
+- ``dfhack.units.create``, ``dfhack.units.makeown``: Lua access to new module API
+- ``dfhack.formatInt``, ``dfhack.formatFloat``: formats numbers according to the current system locale
 
 ## Removed
 - `plants`: renamed to `plant`
 - ``gui.FramedScreen``: this class is now deprecated; please use ``gui.ZScreen`` and ``widgets.Window`` instead
 - ``dfhack.HIDE_CONSOLE_ON_STARTUP`` and ``dfhack.HIDE_ARMOK_TOOLS`` are no longer directly accessible. Please use `control-panel` or `gui/control-panel` to interact wtih those settings.
 
+# 50.13-r2.1
+
+## Fixes
+- `suspendmanager`: stop suspending single tile stair constructions
+
 # 50.13-r2
 
 ## New Tools

docs/dev/Lua API.rst

@@ -994,6 +994,18 @@ can be omitted.
   This function does not downcase characters. Use ``dfhack.lowerCp437``
   first, if desired.
 
+* ``dfhack.formatInt(num)``
+
+  Formats an integer value as a string according to the current system locale.
+  E.g. for American English, it would transform like: ``12345`` ->
+  ``'12,345'``
+
+* ``dfhack.formatFloat(num)``
+
+  Formats a floating point value as a string according to the current system
+  locale. E.g. for American English, it would transform like: ``-12345.6789``
+  -> ``'-12,345.678711'`` (because float imprecision).
+
 * ``dfhack.run_command(command[, ...])``
 
   Run an arbitrary DFHack command, with the core suspended, and send output to
@@ -1629,11 +1641,20 @@ Units module
 
   Returns the nemesis record of the unit if it has one, or *nil*.
 
-  ``dfhack.units.makeown(unit)``
+* ``dfhack.units.makeown(unit)``
 
   Makes the selected unit a member of the current fortress and site.
   Note that this operation may silently fail for any of several reasons, so it may be prudent to check if the operation has succeeded by using ``dfhack.units.isOwnCiv`` or another appropriate predicate on the unit in question.
 
+* ``dfhack.units.create(race, caste)``
+
+  Creates a new unit from scratch. The unit will be added to the
+  ``world.units.all`` vector, but not to the ``world.units.active`` vector. The
+  unit will not have an associated historical figure, nemesis record, map
+  position, labors, or any group associations. The unit *will* have a race,
+  caste, name, soul, and initialized body and mind (including personality). The
+  unit must be configured further as needed and put into play by the client.
+
 * ``dfhack.units.getPhysicalAttrValue(unit, attr_type)``
 * ``dfhack.units.getMentalAttrValue(unit, attr_type)``
 

library/modules/Units.cpp

@@ -1143,6 +1143,14 @@ void Units::makeown(df::unit* unit)
     (*f)(unit);
 }
 
+df::unit * Units::create(int16_t race, int16_t caste) {
+    auto fp = df::global::unitst_more_convenient_create;
+    CHECK_NULL_POINTER(fp);
+
+    using FT = std::function<df::unit * (int16_t, int16_t)>;
+    auto f = reinterpret_cast<FT*>(fp);
+    return (*f)(race, caste);
+}
 
 int Units::getPhysicalAttrValue(df::unit *unit, df::physical_attribute_type attr)
 {