Merge remote-tracking branch 'DFHack/develop' into remote_reader

docs/changelog.txt

@@ -39,11 +39,18 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Fixes
 - `building-hacks`: fixed error when dealing with custom animation tables
+- `devel/test-perlin`: fixed Lua error (``math.pow()``)
 - `embark-assistant`: fixed crash when entering finder with a 16x16 embark selected, and added 16 to dimension choices
+- `labormanager`:
+    - stopped assigning labors to ineligible dwarves, pets, etc.
+    - stopped assigning invalid labors
+    - added support for crafting jobs that use pearl
 - `prospector`: (also affected `embark-tools`) - fixed a crash when prospecting an unusable site (ocean, mountains, etc.) with a large default embark size in d_init.txt (e.g. 16x16)
+- `siege-engine`: fixed a few Lua errors (``math.pow()``, ``unit.relationship_ids``)
 
 ## Misc Improvements
 - `devel/export-dt-ini`: added viewscreen offsets for DT 40.1.2
+- `labormanager`: now takes nature value into account when assigning jobs
 
 ## Internals
 - Linux/macOS: changed recommended build backend from Make to Ninja (Make builds will be significantly slower now)

plugins/labormanager/joblabormapper.cpp

@@ -516,7 +516,8 @@ public:
                     if (j->material_category.bits.bone ||
                         j->material_category.bits.horn ||
                         j->material_category.bits.tooth ||
-                        j->material_category.bits.shell)
+                        j->material_category.bits.shell ||
+                        j->material_category.bits.pearl)
                         return df::unit_labor::BONE_CARVE;
                     else
                     {

plugins/labormanager/labormanager.cpp

@@ -70,6 +70,7 @@
 #include <df/personality_facet_type.h>
 #include <df/cultural_identity.h>
 #include <df/ethic_type.h>
+#include <df/value_type.h>
 
 #include "labormanager.h"
 #include "joblabormapper.h"
@@ -945,6 +946,15 @@ private:
     {
         if (labor >= 0 && labor <= ENUM_LAST_ITEM(unit_labor))
         {
+            if (!Units::isValidLabor(dwarf->dwarf, labor))
+            {
+                debug("WARN(labormanager): Attempted to %s dwarf %s with ineligible labor %s\n",
+                    value ? "set" : "unset",
+                    dwarf->dwarf->name.first_name.c_str(),
+                    ENUM_KEY_STR(unit_labor, labor).c_str());
+                return;
+            }
+
             bool old = dwarf->dwarf->status.labors[labor];
             dwarf->dwarf->status.labors[labor] = value;
             if (old != value)
@@ -1182,7 +1192,17 @@ private:
         {
             df::unit* cre = *u;
 
-            if (Units::isCitizen(cre))
+            // following tests shamelessly stolen from Dwarf Manipulator plugin
+
+            bool isAssignable =
+                (Units::isOwnCiv(cre)) &&
+                (Units::isOwnGroup(cre)) &&
+                (Units::isActive(cre)) &&
+                (!cre->flags2.bits.visitor) &&
+                (!cre->flags3.bits.ghostly) &&
+                (ENUM_ATTR(profession, can_assign_labor, cre->profession));
+
+            if (isAssignable)
             {
                 dwarf_info_t* dwarf = add_dwarf(cre);
 
@@ -1438,8 +1458,8 @@ private:
                     {
                         if (labor == unit_labor::NONE)
                             continue;
-
-                        set_labor(dwarf, labor, false);
+                        if (Units::isValidLabor(dwarf->dwarf, labor))
+                            set_labor(dwarf, labor, false);
                     }
                 }
                 else {
@@ -1518,6 +1538,26 @@ private:
             else if (altruism <= 24)
                 score -= 50000;
         }
+
+        // Favor/disfavor BUTCHER (covers slaughtering), HAUL_ANIMALS (covers caging), and CUTWOOD based on NATURE value
+
+        if (labor == df::unit_labor::BUTCHER || labor == df::unit_labor::HAUL_ANIMALS || labor == df::unit_labor::CUTWOOD)
+        {
+            int nature = 0;
+            for (auto i = d->dwarf->status.current_soul->personality.values.begin();
+                i != d->dwarf->status.current_soul->personality.values.end();
+                i++)
+            {
+                if ((*i)->type == df::value_type::NATURE)
+                    nature = (*i)->strength;
+            }
+
+            if (nature <= -11)
+                score += 5000;
+            else if (nature >= 26)
+                score -= 50000;
+        }
+
         // This should reweight assigning CUTWOOD jobs based on a citizen's ethic toward killing plants
 
         if (labor == df::unit_labor::CUTWOOD)
@@ -1690,12 +1730,15 @@ public:
             {
                 dwarf_info_t* d = (*k);
 
-                int score = score_labor(d, df::unit_labor::HAUL_FOOD);
-
-                if (score > best_score)
+                if (Units::isValidLabor(d->dwarf, df::unit_labor::HAUL_FOOD))
                 {
-                    bestdwarf = k;
-                    best_score = score;
+                    int score = score_labor(d, df::unit_labor::HAUL_FOOD);
+
+                    if (score > best_score)
+                    {
+                        bestdwarf = k;
+                        best_score = score;
+                    }
                 }
             }
 
@@ -1708,8 +1751,8 @@ public:
                 {
                     if (l == df::unit_labor::NONE)
                         continue;
-
-                    set_labor(*bestdwarf, l, l == df::unit_labor::HAUL_FOOD);
+                    if (Units::isValidLabor((*bestdwarf)->dwarf, l))
+                        set_labor(*bestdwarf, l, l == df::unit_labor::HAUL_FOOD);
                 }
 
                 available_dwarfs.erase(bestdwarf);
@@ -1822,12 +1865,15 @@ public:
                 for (std::list<dwarf_info_t*>::iterator k = available_dwarfs.begin(); k != available_dwarfs.end(); k++)
                 {
                     dwarf_info_t* d = (*k);
-                    int score = score_labor(d, labor);
-                    if (score > best_score)
+                    if (Units::isValidLabor(d->dwarf, labor))
                     {
-                        bestdwarf = k;
-                        best_score = score;
-                        best_labor = labor;
+                        int score = score_labor(d, labor);
+                        if (score > best_score)
+                        {
+                            bestdwarf = k;
+                            best_score = score;
+                            best_labor = labor;
+                        }
                     }
                 }
             }
@@ -1845,7 +1891,9 @@ public:
 
                 tools_enum t = default_labor_infos[l].tool;
 
-                if (l == best_labor && (t == TOOL_NONE || tool_in_use[t] < tool_count[t]))
+                if (l == best_labor &&
+                    Units::isValidLabor((*bestdwarf)->dwarf, l) &&
+                    (t == TOOL_NONE || tool_in_use[t] < tool_count[t]))
                 {
                     set_labor(*bestdwarf, l, true);
                     if (t != TOOL_NONE && !((*bestdwarf)->has_tool[t]))
@@ -1865,7 +1913,8 @@ public:
                 }
                 else if ((*bestdwarf)->state == IDLE)
                 {
-                    set_labor(*bestdwarf, l, false);
+                    if (Units::isValidLabor((*bestdwarf)->dwarf, l))
+                        set_labor(*bestdwarf, l, false);
                 }
             }
 
@@ -1897,6 +1946,8 @@ public:
                     continue;
                 if (labor_needed[l] <= 0)
                     continue;
+                if (!Units::isValidLabor((*d)->dwarf, l))
+                    continue;
 
                 int score = score_labor(*d, l);
 
@@ -1934,7 +1985,8 @@ public:
             FOR_ENUM_ITEMS(unit_labor, l)
             {
                 if (l >= df::unit_labor::HAUL_STONE && l <= df::unit_labor::HAUL_ANIMALS &&
-                    canary & (1 << l))
+                    canary & (1 << l) &&
+                    Units::isValidLabor(canary_dwarf->dwarf, l))
                     set_labor(canary_dwarf, l, true);
             }
 
@@ -1967,13 +2019,14 @@ public:
                 if (l == df::unit_labor::NONE)
                     continue;
 
-                set_labor(*d, l,
-                    (l >= df::unit_labor::HAUL_STONE && l <= df::unit_labor::HAUL_ANIMALS) ||
-                    l == df::unit_labor::CLEAN ||
-                    l == df::unit_labor::HAUL_WATER ||
-                    l == df::unit_labor::REMOVE_CONSTRUCTION ||
-                    l == df::unit_labor::PULL_LEVER ||
-                    l == df::unit_labor::HAUL_TRADE);
+                if (Units::isValidLabor((*d)->dwarf, l))
+                    set_labor(*d, l,
+                        (l >= df::unit_labor::HAUL_STONE && l <= df::unit_labor::HAUL_ANIMALS) ||
+                        l == df::unit_labor::CLEAN ||
+                        l == df::unit_labor::HAUL_WATER ||
+                        l == df::unit_labor::REMOVE_CONSTRUCTION ||
+                        l == df::unit_labor::PULL_LEVER ||
+                        l == df::unit_labor::HAUL_TRADE);
             }
         }
 

plugins/lua/siege-engine.lua

@@ -163,7 +163,7 @@ function getBaseUnitWeight(unit)
         rv = rv * 3
     elseif unit.job.destroy_target then
         rv = rv * 2
-    elseif unit.relations.group_leader_id < 0 and not flags1.rider then
+    elseif unit.relationship_ids.GroupLeader < 0 and not flags1.rider then
         rv = rv * 1.5
     end
 
@@ -172,7 +172,7 @@ end
 
 function getUnitWeight(unit)
     local base = getBaseUnitWeight(unit)
-    return base * math.pow(0.7, recent_targets[unit.id] or 0)
+    return base * (0.7 ^ (recent_targets[unit.id] or 0))
 end
 
 function unitWeightCache()
@@ -200,7 +200,7 @@ function scoreTargets(engine, reachable)
     computeNearbyWeight(engine, reachable, ucache)
 
     for _,tgt in ipairs(reachable) do
-        tgt.score = (tgt.score + tgt.nearby_weight*0.7) * math.pow(0.995, tgt.time/3)
+        tgt.score = (tgt.score + tgt.nearby_weight*0.7) * (0.995 ^ (tgt.time/3))
     end
 
     table.sort(reachable, function(a,b)
@@ -309,4 +309,4 @@ function doAimProjectile(engine, item, target_min, target_max, operator, skill)
     produceCombatReport(operator, item, nil)
 end
 
-return _ENV
+return _ENV

scripts

@@ -1 +1 @@
-Subproject commit 66b39d888e5f2d4f5c194ece08ba62ac7f110478
+Subproject commit 87cc0fcad57a3a8ff7b558be9f3523101ac2f69d