Merge branch 'master' into caravan-work

Author: chdoc

.pre-commit-config.yaml

@@ -20,11 +20,11 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.34.1
+  rev: 0.37.4
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks
-  rev: v1.5.5
+  rev: v1.5.6
   hooks:
     - id: forbid-tabs
       exclude_types:

CMakeLists.txt

@@ -4,6 +4,8 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                        PATTERN "*.json"
                        PATTERN "scripts/docs" EXCLUDE
                        PATTERN "scripts/test" EXCLUDE
+                       PATTERN ".github" EXCLUDE
+                       PATTERN ".vscode" EXCLUDE
 )
 
 if(BUILD_TESTS)

add-recipe.lua

@@ -63,7 +63,7 @@ function addItems(category, exotic)
     --category: the category of items we're adding
     --exotic: whether to add exotic items
   --returns: list of item objects that were added
-  local known = category[1]
+  local known_category = category[1]
   local native = category[2]
   local all = category[3]
   local added = {} --as:df.itemdef[]
@@ -72,27 +72,33 @@ function addItems(category, exotic)
     local item = item --as:df.itemdef_weaponst
     local subtype = item.subtype
     local itemOk = false
+    local known = known_category
+    -- digging implements are seperate from weapons in entity resources.
+    if (df.itemdef_weaponst:is_instance(item) and item.skill_melee == df.job_skill.MINING) then
+      known = diggers
+    end
 
     --check if it's a training weapon
     local t1, t2 = pcall(function () return item.flags.TRAINING == false end)
     local training = not(not t1 or t2)
 
-    --we don't want procedural items with adjectives such as "wavy spears"
-    --(because they don't seem to be craftable even if added)
+    --excludes procedural items, eg: "wavy spears" for divine origins
     --nor do we want known items or training items (because adding training
     --items seems to allow them to be made out of metals)
-    if (item.adjective == "" and not training and not checkKnown(known, subtype)) then
+    if (not item.base_flags.GENERATED and not training and not checkKnown(known, subtype)) then
       itemOk = true
     end
 
     if (not exotic and not checkNative(native, subtype)) then
       itemOk = false
     end
 
-    --check that the weapon we're adding is not already known to the civ as
-    --a digging implement so picks don't get duplicated
-    if (checkKnown(diggers, subtype)) then
-      itemOk = false
+    --if the weapon we're adding is a digging implement, add to diggers instead of weapons
+    --prevents picks from being duplicated, and puts great picks in correct category
+    if (df.itemdef_weaponst:is_instance(item) and item.skill_melee == df.job_skill.MINING) then
+      if (checkKnown(diggers, subtype)) then
+        itemOk = false
+      end
     end
 
     if (itemOk) then

armoks-blessing.lua

@@ -23,7 +23,7 @@ function brainwash_unit(unit)
     unit.status.current_soul.personality.traits.GREED                    = 25
     unit.status.current_soul.personality.traits.IMMODERATION             = 25
     unit.status.current_soul.personality.traits.VIOLENT                  = 50
-    unit.status.current_soul.personality.traits.PERSEVERENCE             = 75
+    unit.status.current_soul.personality.traits.PERSEVERANCE             = 75
     unit.status.current_soul.personality.traits.WASTEFULNESS             = 50
     unit.status.current_soul.personality.traits.DISCORD                  = 25
     unit.status.current_soul.personality.traits.FRIENDLINESS             = 75
@@ -80,7 +80,7 @@ function brainwash_unit(unit)
         [df.value_type.HARD_WORK]=41,
         [df.value_type.SACRIFICE]=41,
         [df.value_type.COMPETITION]=-41,
-        [df.value_type.PERSEVERENCE]=41,
+        [df.value_type.PERSEVERANCE]=41,
         [df.value_type.LEISURE_TIME]=-11,
         [df.value_type.COMMERCE]=41,
         [df.value_type.ROMANCE]=41,

assign-beliefs.lua

@@ -134,10 +134,6 @@ function assign(beliefs, unit, reset)
     for belief, level in pairs(beliefs) do
         assert(type(level) == "number")
         belief = belief:upper()
-        -- there's a typo in the game data
-        if belief == "PERSEVERANCE" then
-            belief = "PERSEVERENCE"
-        end
         if df.value_type[belief] then
             if level >= -3 and level <= 3 then
                 local belief_value = calculate_random_belief_value(level)

assign-facets.lua

@@ -134,10 +134,6 @@ function assign(facets, unit, reset)
     for facet, level in pairs(facets) do
         assert(type(level) == "number")
         facet = facet:upper()
-        -- there's a typo in the game data
-        if facet == "PERSEVERANCE" then
-            facet = "PERSEVERENCE"
-        end
         if df.personality_facet_type[facet] then
             if level >= -3 and level <= 3 then
                 local facet_strength = calculate_random_facet_strength(level)

assign-profile.lua

@@ -92,7 +92,7 @@ local scripts = {
     FACETS = reqscript("assign-facets"),
 }
 
-local default_filename = "/hack/scripts/dwarf_profiles.json"
+local default_filename = dfhack.getHackPath().."/scripts/dwarf_profiles.json"
 
 -- ------------------------------------------------- APPLY PROFILE -------------------------------------------------- --
 --- Apply the given profile to a unit, erasing or resetting the unit characteristics as requested.

changelog.txt

@@ -38,6 +38,158 @@ Template for new versions:
 
 ## Removed
 
+# 53.15-r2
+
+## New Tools
+
+## New Features
+
+## Fixes
+- `combine`: stopgap fix for incorrectly combining dyes, no longer affects dyes
+- `gui/rename`: fix script error that sometimes caused the script to malfunction when started from the Launcher.
+
+## Misc Improvements
+
+## Removed
+
+# 53.15-r1
+
+## New Tools
+- `machine-toggle`: interface for toggling gear assemblies, as well as pressure plates (previously in `trackstop`) (available only if ``armok`` tools are shown)
+
+## New Features
+
+## Fixes
+- `add-recipe`: fix to include incorrectly excluded recipes
+- `gui/control-panel`: fixed incorrect description of deteriorate commands
+- `gui/petitions`: fix deity display
+
+## Misc Improvements
+- `trackstop`: ``pressureplate`` overlay moved to `machine-toggle` as an ``armok`` tool
+
+## Removed
+
+# 53.14-r2
+
+## New Tools
+
+## New Features
+
+## Fixes
+
+## Misc Improvements
+
+## Removed
+- ``gui/logcleaner``: Removed
+
+# 53.14-r1
+
+## New Tools
+
+## New Features
+
+## Fixes
+- `caravan`: fix ethics warning for wooden weapons
+- `gui/control-panel`: fixed inconsistent space in command help ("tweak" -> "tweak ", like with other commands)
+- `gui/siegemanager`: consistently set the initial filter to "All"
+- `immortal-cravings`: also take care of immortal units with alcohol dependence
+
+## Misc Improvements
+
+## Removed
+
+# 53.11-r2
+
+## New Tools
+
+## New Features
+
+## Fixes
+- `gui/rename`: skip ``NONE`` when iterating through language name options
+- `quickfort`: work orders will no longer be created with a repetition frequency of ``NONE``
+
+## Misc Improvements
+
+## Removed
+
+# 53.10-r2
+
+## New Tools
+- `gui/logcleaner`: graphical overlay for configuring the logcleaner plugin with enable and filter toggles.
+
+## New Features
+- `trackstop`: can now modify pressure plates; permits minecart and creature triggers to be set beyond normal sensitivity
+
+## Fixes
+- `gui/rename`: added check for entity_id input in get_target function
+- `prioritize`: Fix the overlay appearing where it should not when following a unit
+
+## Misc Improvements
+- `gui/notify`: reduced severity of the missing nemesis records warning if no units on the map are affected.  clarified wording.
+
+## Removed
+
+# 53.10-r1
+
+## New Tools
+
+## New Features
+- `gui/quickcmd`: added custom command names and option to display command output
+- `gui/notify`: new notification type: missing nemesis records; displays a warning message about game corruption.
+
+## Fixes
+
+## Misc Improvements
+
+## Removed
+
+# 53.07-r1
+
+## New Tools
+- `fix/codex-pages`: add pages to written content that have unspecified page counts.
+- `gui/keybinds`: gui for managing and saving custom keybindings
+
+## New Features
+
+## Fixes
+- `empty-bin`: renamed ``--liquids`` parameter to ``--force`` and made emptying of containers (bags) with powders contingent on that parameter. Previously powders would just always get disposed.
+
+## Misc Improvements
+- `combine`: try harder to find the currently-selected stockpile
+
+## Removed
+
+# 53.06-r1
+
+## New Tools
+
+## New Features
+
+## Fixes
+- `gui/design`: designating a single-level stair construction now properly follows the selected stair type.
+- `gui/design`: adjusted conflicting keybinds, diagonal line reverse becoming ``R`` and bottom stair type becoming ``g``.
+- `modtools/set-personality`: use correct caste trait ranges; fixes `gui/gm-unit` being unable to correctly randomize traits or set traits to caste average
+
+## Misc Improvements
+
+## Removed
+
+# 53.04-r1
+
+## New Tools
+- `gui/siegemanager`: manage your siege engines at a glance.
+
+## New Features
+- `item`: new ``--total-quality`` option for use in conjunction with ``--min-quality`` or ``--max-quality`` to filter items according to their total quality
+
+## Fixes
+
+## Misc Improvements
+- `gui/design`: can now construct reinforced walls
+- `quickfort`: support for reinforced walls and bolt throwers
+
+## Removed
+
 # 53.01-r1
 
 ## New Tools

combine.lua

@@ -182,6 +182,17 @@ local function stack_type_new(type_vals)
     return stack_type
 end
 
+local function isDye(item)
+    -- Dyes should not be combined as this will cause bugs when mixing them together
+    if item:getType() ~= df.item_type.POWDER_MISC then return false end
+    -- pcall guards items/materials that can't be decoded or lack the flag
+    local ok, is_dye = pcall(function()
+        local mat = dfhack.matinfo.decode(item.mat_type, item.mat_index)
+        return mat and mat.material.flags.IS_DYE or false
+    end)
+    return ok and is_dye or false
+end
+
 local function stacks_add_item(stockpile, stacks, stack_type, item, container)
     -- add an item to the matching comp_items table; based on comp_key.
     local comp_key = ''
@@ -436,7 +447,7 @@ local function stacks_add_items(stockpile, stacks, items, container, ind)
         local stack_type = stacks.stack_types[type_id]
 
         -- item type in list of included types?
-        if stack_type and not item:isSand() and not item:isPlaster() and isValidPart(item) then
+        if stack_type and not item:isSand() and not item:isPlaster() and not isDye(item) and isValidPart(item) then
             if not isRestrictedItem(item) and item.stack_size <= stack_type.max_stack_qty then
 
                 stacks_add_item(stockpile, stacks, stack_type, item, container)
@@ -736,6 +747,26 @@ local function get_stockpile_here()
     -- return the stockpile as a table
     local stockpiles = {}
     local building = dfhack.gui.getSelectedStockpile(true)
+
+    -- try finding the stockpile by viewed item or first item in itemlist viewsheet.
+    if building == nil then
+        local item = nil
+        if dfhack.gui.getSelectedItem(true) ~= nil then
+            item = dfhack.gui.getSelectedItem(true)
+        elseif tonumber(dfhack.DF_VERSION:match("^0*%.*(%d+%.%d+)")) >= 50.07   -- matchFocusString() in Commit a770a4c
+            and dfhack.gui.matchFocusString("dwarfmode/ViewSheets/ITEM_LIST", dfhack.gui.getDFViewscreen())
+            and df.global.game.main_interface.view_sheets.open == true
+            and df.global.game.main_interface.view_sheets.active_sheet == df.view_sheet_type.ITEM_LIST
+            and #df.global.game.main_interface.view_sheets.viewing_itid > 0
+        then
+            local itemid = df.global.game.main_interface.view_sheets.viewing_itid[0]
+            item = df.item.find(itemid)
+        end
+        local pos = (item) and xyz2pos(dfhack.items.getPosition(item)) or nil
+        building = (pos) and dfhack.buildings.findAtTile(pos) or nil
+        building = (df.building_stockpilest:is_instance(building)) and building or nil
+    end
+
     if not building then qerror('Please select a stockpile.') end
     table.insert(stockpiles, building)
     if opts.verbose > 0 then

devel/print-event.lua

@@ -34,7 +34,7 @@ end
 local function print_event(event)
     local str = df.new("string")
     local ctx = df.history_event_context:new()
-    event:getSentence(str, ctx)
+    event:getSentence(str, ctx, true, false)
     ctx:delete()
     print(str.value)
     str:delete()