Merge branch 'develop' of https://github.com/DFHack/dfhack into remote_reader

docs/changelog.txt

@@ -63,6 +63,17 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Lua
 - ``utils``: new ``OrderedTable`` class
 
+## Structures
+- ``musical_form``: named voices field
+- ``musical_form_instruments``: named minimum_required and maximum_permitted
+- ``dance_form``: named musical_form_id and musical_written_content_id
+- ``written_content``: named poetic_form
+- ``activity_event_performancest``: renamed poem as written_content_id
+- ``incident_sub6_performance``: made performance_event an enum
+- ``incident_sub6_performance.participants``: named performance_event and role_index
+- ``incident_sub6_performance``: named poetic_form_id, musical_form_id, and dance_form_id
+
+
 ================================================================================
 # 0.44.12-r1
 

plugins/autohauler.cpp

@@ -879,11 +879,8 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
         // Account for the military
         else if (ENUM_ATTR(profession, military, dwarfs[dwarf]->profession))
             dwarf_info[dwarf].state = MILITARY;
-        // Account for dwarves on break or migrants
+        // Account for incoming migrants
-        // DF leaves the OnBreak trait type on some dwarves while they're not actually on break
-        // Since they have no current job, they will default to IDLE
         else if (is_migrant)
-        // Dwarf is unemployed with null job
         {
             dwarf_info[dwarf].state = OTHER;
         }

plugins/autolabor.cpp

@@ -1202,14 +1202,6 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
 
     for (int dwarf = 0; dwarf < n_dwarfs; dwarf++)
     {
-        bool is_on_break = false;
-
-        for (auto p = dwarfs[dwarf]->status.misc_traits.begin(); p < dwarfs[dwarf]->status.misc_traits.end(); p++)
-        {
-            if ((*p)->id == misc_trait_type::Migrant /*|| (*p)->id == misc_trait_type::OnBreak*/)
-                is_on_break = true;
-        }
-
         if (Units::isBaby(dwarfs[dwarf]) ||
             Units::isChild(dwarfs[dwarf]) ||
             dwarfs[dwarf]->profession == profession::DRUNK)
@@ -1220,7 +1212,7 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
             dwarf_info[dwarf].state = MILITARY;
         else if (dwarfs[dwarf]->job.current_job == NULL)
         {
-            if (is_on_break)
+            if (Units::getMiscTrait(dwarfs[dwarf], misc_trait_type::Migrant))
                 dwarf_info[dwarf].state = OTHER;
             else if (dwarfs[dwarf]->specific_refs.size() > 0)
                 dwarf_info[dwarf].state = OTHER;

plugins/dwarfmonitor.cpp

@@ -1742,11 +1742,11 @@ static void add_work_history(df::unit *unit, activity_type type)
 
 static bool is_at_leisure(df::unit *unit)
 {
-    for (auto p = unit->status.misc_traits.begin(); p < unit->status.misc_traits.end(); p++)
+    if (Units::getMiscTrait(unit, misc_trait_type::Migrant))
-    {
+        return true;
-        if ((*p)->id == misc_trait_type::Migrant /*|| (*p)->id == misc_trait_type::OnBreak*/)
+
-            return true;
+    if (!unit->job.current_job && Units::getMainSocialActivity(unit))
-    }
+        return true;
 
     return false;
 }

plugins/ruby/unit.rb

@@ -252,8 +252,8 @@ module DFHack
             not u.specific_refs.find { |s| s.type == :ACTIVITY } and
             # filter soldiers (TODO check schedule)
             u.military.squad_id == -1 and
-            # filter 'on break'
+            # filter incoming migrants
-            not u.status.misc_traits.find { |t| t.id == :OnBreak }
+            not u.status.misc_traits.find { |t| t.id == :Migrant }
         end
 
         def unit_entitypositions(unit)

plugins/search.cpp

@@ -1122,10 +1122,9 @@ private:
             return "";
         for (auto p = unit->status.misc_traits.begin(); p < unit->status.misc_traits.end(); p++)
         {
-            if ((*p)->id == misc_trait_type::Migrant /*|| (*p)->id == misc_trait_type::OnBreak*/)
+            if ((*p)->id == misc_trait_type::Migrant)
             {
-                int i = (*p)->value;
+                return ".new arrival.migrant";
-                return ".on break";
             }
         }
 

plugins/siege-engine.cpp

@@ -1492,7 +1492,7 @@ static void releaseTiredWorker(EngineInfo *engine, df::job *job, df::unit *worke
 
         if (unit == worker ||
             unit->job.current_job || !unit->status.labors[unit_labor::SIEGEOPERATE] ||
-            !Units::isCitizen(unit) /*|| Units::getMiscTrait(unit, misc_trait_type::OnBreak)*/ ||
+            !Units::isCitizen(unit) || Units::getMiscTrait(unit, misc_trait_type::Migrant) ||
             isTired(unit) || !Maps::canWalkBetween(job->pos, unit->pos))
             continue;